Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: expose verify option through client options #1091

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: expose verify option through client options #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions supabase/_async/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ def __init__(
self.auth = self._init_supabase_auth_client(
auth_url=self.auth_url,
client_options=options,
verify=(
options.httpx_options.get("verify")
if options.httpx_options is not None
else True
),
)
self.realtime = self._init_realtime_client(
realtime_url=self.realtime_url,
Expand Down Expand Up @@ -168,6 +173,11 @@ def postgrest(self):
headers=self.options.headers,
schema=self.options.schema,
timeout=self.options.postgrest_client_timeout,
verify=(
self.options.httpx_options.get("verify")
if self.options.httpx_options is not None
else True
),
)

return self._postgrest
Expand All @@ -179,6 +189,11 @@ def storage(self):
storage_url=self.storage_url,
headers=self.options.headers,
storage_client_timeout=self.options.storage_client_timeout,
verify=(
self.options.httpx_options.get("verify")
if self.options.httpx_options is not None
else True
),
)
return self._storage

Expand All @@ -189,6 +204,11 @@ def functions(self):
self.functions_url,
self.options.headers,
self.options.function_client_timeout,
verify=(
self.options.httpx_options.get("verify")
if self.options.httpx_options is not None
else True
),
)
return self._functions

Expand Down
20 changes: 20 additions & 0 deletions supabase/_sync/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ def __init__(
self.auth = self._init_supabase_auth_client(
auth_url=self.auth_url,
client_options=options,
verify=(
options.httpx_options.get("verify")
if options.httpx_options is not None
else True
),
)
self.realtime = self._init_realtime_client(
realtime_url=self.realtime_url,
Expand Down Expand Up @@ -167,6 +172,11 @@ def postgrest(self):
headers=self.options.headers,
schema=self.options.schema,
timeout=self.options.postgrest_client_timeout,
verify=(
self.options.httpx_options.get("verify")
if self.options.httpx_options is not None
else True
),
)

return self._postgrest
Expand All @@ -178,6 +188,11 @@ def storage(self):
storage_url=self.storage_url,
headers=self.options.headers,
storage_client_timeout=self.options.storage_client_timeout,
verify=(
self.options.httpx_options.get("verify")
if self.options.httpx_options is not None
else True
),
)
return self._storage

Expand All @@ -188,6 +203,11 @@ def functions(self):
self.functions_url,
self.options.headers,
self.options.function_client_timeout,
verify=(
self.options.httpx_options.get("verify")
if self.options.httpx_options is not None
else True
),
)
return self._functions

Expand Down
11 changes: 10 additions & 1 deletion supabase/lib/client_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from storage3.constants import DEFAULT_TIMEOUT as DEFAULT_STORAGE_CLIENT_TIMEOUT
from supafunc.utils import DEFAULT_FUNCTION_CLIENT_TIMEOUT

from supabase.types import RealtimeClientOptions
from supabase.types import HttpxOptions, RealtimeClientOptions

from ..version import __version__

Expand All @@ -40,6 +40,9 @@ class ClientOptions:
storage: SyncSupportedStorage = field(default_factory=SyncMemoryStorage)
"""A storage provider. Used to store the logged in session."""

httpx_options: Optional[HttpxOptions] = None
"""Options passed to httpx when making requests"""

realtime: Optional[RealtimeClientOptions] = None
"""Options passed to the realtime-py instance"""

Expand Down Expand Up @@ -74,6 +77,7 @@ def replace(
int, float, Timeout
] = DEFAULT_STORAGE_CLIENT_TIMEOUT,
flow_type: Optional[AuthFlowType] = None,
httpx_options: Optional[HttpxOptions] = None,
) -> "ClientOptions":
"""Create a new SupabaseClientOptions with changes"""
client_options = ClientOptions()
Expand All @@ -85,6 +89,7 @@ def replace(
client_options.persist_session = persist_session or self.persist_session
client_options.storage = storage or self.storage
client_options.realtime = realtime or self.realtime
client_options.httpx_options = httpx_options or self.httpx_options
client_options.postgrest_client_timeout = (
postgrest_client_timeout or self.postgrest_client_timeout
)
Expand Down Expand Up @@ -115,6 +120,7 @@ def replace(
int, float, Timeout
] = DEFAULT_STORAGE_CLIENT_TIMEOUT,
flow_type: Optional[AuthFlowType] = None,
httpx_options: Optional[HttpxOptions] = None,
) -> "AsyncClientOptions":
"""Create a new SupabaseClientOptions with changes"""
client_options = AsyncClientOptions()
Expand All @@ -126,6 +132,7 @@ def replace(
client_options.persist_session = persist_session or self.persist_session
client_options.storage = storage or self.storage
client_options.realtime = realtime or self.realtime
client_options.httpx_options = httpx_options or self.httpx_options
client_options.postgrest_client_timeout = (
postgrest_client_timeout or self.postgrest_client_timeout
)
Expand Down Expand Up @@ -153,6 +160,7 @@ def replace(
int, float, Timeout
] = DEFAULT_STORAGE_CLIENT_TIMEOUT,
flow_type: Optional[AuthFlowType] = None,
httpx_options: Optional[HttpxOptions] = None,
) -> "SyncClientOptions":
"""Create a new SupabaseClientOptions with changes"""
client_options = SyncClientOptions()
Expand All @@ -164,6 +172,7 @@ def replace(
client_options.persist_session = persist_session or self.persist_session
client_options.storage = storage or self.storage
client_options.realtime = realtime or self.realtime
client_options.httpx_options = httpx_options or self.httpx_options
client_options.postgrest_client_timeout = (
postgrest_client_timeout or self.postgrest_client_timeout
)
Expand Down
5 changes: 5 additions & 0 deletions supabase/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@ class RealtimeClientOptions(TypedDict, total=False):
hb_interval: int
max_retries: int
initial_backoff: float


class HttpxOptions(TypedDict, total=False):
verify: bool = True
"""Either `True` to use an SSL context with the default CA bundle, `False` to disable verification."""