chore: switch to supabase_auth and supabase_functions (#1192)

Author: o-santi

pyproject.toml

@@ -21,10 +21,14 @@ requires-python = ">=3.9"
 dependencies = [
   "postgrest == 1.1.1",
   "realtime == 2.7.0",
-  "gotrue == 2.12.3",
+  "supabase_auth == 2.12.3",
   "storage3 == 0.12.1",
-  "supafunc == 0.10.1",
+  "supabase_functions == 0.10.1",
   "httpx >=0.26,<0.29",
+  # keep both of them in for a little while
+  # until the name deprecation is finished.
+  "gotrue == 2.12.4",
+  "supafunc == 0.10.2",
 ]
 
 [project.urls]

supabase/__init__.py

@@ -1,4 +1,4 @@
-from gotrue.errors import (
+from supabase_auth.errors import (
     AuthApiError,
     AuthError,
     AuthImplicitGrantRedirectError,
@@ -12,7 +12,11 @@
 from postgrest import APIResponse as PostgrestAPIResponse
 from realtime import AuthorizationError, NotConnectedError
 from storage3.utils import StorageException
-from supafunc.errors import FunctionsError, FunctionsHttpError, FunctionsRelayError
+from supabase_functions.errors import (
+    FunctionsError,
+    FunctionsHttpError,
+    FunctionsRelayError,
+)
 
 # Async Client
 from ._async.auth_client import AsyncSupabaseAuthClient as ASupabaseAuthClient

supabase/_async/auth_client.py

@@ -1,12 +1,12 @@
 from typing import Dict, Optional
 
-from gotrue import (
+from supabase_auth import (
     AsyncGoTrueClient,
     AsyncMemoryStorage,
     AsyncSupportedStorage,
     AuthFlowType,
 )
-from gotrue.http_clients import AsyncClient
+from supabase_auth.http_clients import AsyncClient
 
 
 class AsyncSupabaseAuthClient(AsyncGoTrueClient):

supabase/_async/client.py

@@ -3,8 +3,8 @@
 import re
 from typing import Any, Dict, Optional, Union
 
-from gotrue import AsyncMemoryStorage
-from gotrue.types import AuthChangeEvent, Session
+from supabase_auth import AsyncMemoryStorage
+from supabase_auth.types import AuthChangeEvent, Session
 from httpx import Timeout
 from postgrest import (
     AsyncPostgrestClient,
@@ -14,7 +14,7 @@
 from realtime import AsyncRealtimeChannel, AsyncRealtimeClient, RealtimeChannelOptions
 from storage3 import AsyncStorageClient
 from storage3.constants import DEFAULT_TIMEOUT as DEFAULT_STORAGE_CLIENT_TIMEOUT
-from supafunc import AsyncFunctionsClient
+from supabase_functions import AsyncFunctionsClient
 
 from ..lib.client_options import AsyncClientOptions as ClientOptions
 from ..lib.client_options import AsyncHttpxClient

supabase/_sync/auth_client.py

@@ -1,12 +1,12 @@
 from typing import Dict, Optional
 
-from gotrue import (
+from supabase_auth import (
     AuthFlowType,
     SyncGoTrueClient,
     SyncMemoryStorage,
     SyncSupportedStorage,
 )
-from gotrue.http_clients import SyncClient
+from supabase_auth.http_clients import SyncClient
 
 
 class SyncSupabaseAuthClient(SyncGoTrueClient):

supabase/_sync/client.py

@@ -2,8 +2,8 @@
 import re
 from typing import Any, Dict, Optional, Union
 
-from gotrue import SyncMemoryStorage
-from gotrue.types import AuthChangeEvent, Session
+from supabase_auth import SyncMemoryStorage
+from supabase_auth.types import AuthChangeEvent, Session
 from httpx import Timeout
 from postgrest import (
     SyncPostgrestClient,
@@ -13,7 +13,7 @@
 from realtime import RealtimeChannelOptions, SyncRealtimeChannel, SyncRealtimeClient
 from storage3 import SyncStorageClient
 from storage3.constants import DEFAULT_TIMEOUT as DEFAULT_STORAGE_CLIENT_TIMEOUT
-from supafunc import SyncFunctionsClient
+from supabase_functions import SyncFunctionsClient
 
 from ..lib.client_options import SyncClientOptions as ClientOptions
 from ..lib.client_options import SyncHttpxClient

supabase/client.py

@@ -1,4 +1,4 @@
-from gotrue.errors import (
+from supabase_auth.errors import (
     AuthApiError,
     AuthError,
     AuthImplicitGrantRedirectError,
@@ -12,7 +12,11 @@
 from postgrest import APIResponse as PostgrestAPIResponse
 from realtime import AuthorizationError, NotConnectedError
 from storage3.utils import StorageException
-from supafunc.errors import FunctionsError, FunctionsHttpError, FunctionsRelayError
+from supabase_functions.errors import (
+    FunctionsError,
+    FunctionsHttpError,
+    FunctionsRelayError,
+)
 
 # Async Client
 from ._async.auth_client import AsyncSupabaseAuthClient

supabase/lib/client_options.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import Dict, Optional, Union
 
-from gotrue import (
+from supabase_auth import (
     AsyncMemoryStorage,
     AsyncSupportedStorage,
     AuthFlowType,
@@ -13,7 +13,7 @@
 from httpx import Timeout
 from postgrest.constants import DEFAULT_POSTGREST_CLIENT_TIMEOUT
 from storage3.constants import DEFAULT_TIMEOUT as DEFAULT_STORAGE_CLIENT_TIMEOUT
-from supafunc.utils import DEFAULT_FUNCTION_CLIENT_TIMEOUT
+from supabase_functions.utils import DEFAULT_FUNCTION_CLIENT_TIMEOUT
 
 from supabase.types import RealtimeClientOptions
 

tests/_async/test_client.py

@@ -3,7 +3,7 @@
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
-from gotrue import AsyncMemoryStorage
+from supabase_auth import AsyncMemoryStorage
 from httpx import AsyncClient as AsyncHttpxClient
 from httpx import AsyncHTTPTransport, Limits, Timeout
 

tests/_sync/test_client.py

@@ -3,7 +3,7 @@
 from unittest.mock import MagicMock, Mock
 
 import pytest
-from gotrue import SyncMemoryStorage
+from supabase_auth import SyncMemoryStorage
 from httpx import Client as SyncHttpxClient
 from httpx import HTTPTransport, Limits, Timeout