fix: mypy supabase (#1298)

Author: o-santi

src/auth/scripts/run-unasync.py

@@ -5,7 +5,14 @@
 paths = Path("src/supabase_auth").glob("**/*.py")
 tests = Path("tests").glob("**/*.py")
 
-rules = (unasync._DEFAULT_RULE,)
+rules = (
+    unasync.Rule(
+        fromdir="/_async/",
+        todir="/_sync/",
+        additional_replacements={"AsyncClient": "Client", "aclose": "close"},
+    ),
+    unasync._DEFAULT_RULE,
+)
 
 files = [str(p) for p in list(paths) + list(tests)]
 

src/auth/src/supabase_auth/_async/gotrue_admin_api.py

@@ -2,15 +2,14 @@
 
 from typing import Dict, List, Optional
 
-from httpx import QueryParams
+from httpx import AsyncClient, QueryParams
 
 from ..helpers import (
     model_validate,
     parse_link_response,
     parse_user_response,
     validate_uuid,
 )
-from ..http_clients import AsyncClient
 from ..types import (
     AdminUserAttributes,
     AuthMFAAdminDeleteFactorParams,

src/auth/src/supabase_auth/_async/gotrue_base_api.py

@@ -2,13 +2,12 @@
 
 from typing import Any, Dict, Optional
 
-from httpx import HTTPStatusError, QueryParams, Response
+from httpx import AsyncClient, HTTPStatusError, QueryParams, Response
 from pydantic import BaseModel
 from typing_extensions import Literal, Self
 
 from ..constants import API_VERSION_HEADER_NAME, API_VERSIONS_2024_01_01_NAME
 from ..helpers import handle_exception, model_dump
-from ..http_clients import AsyncClient
 
 
 class AsyncGoTrueBaseAPI:

src/auth/src/supabase_auth/_async/gotrue_client.py

@@ -6,7 +6,7 @@
 from urllib.parse import parse_qs, urlparse
 from uuid import uuid4
 
-from httpx import QueryParams, Response
+from httpx import AsyncClient, QueryParams, Response
 from jwt import get_algorithm_by_name
 from typing_extensions import cast
 
@@ -41,7 +41,6 @@
     parse_user_response,
     validate_exp,
 )
-from ..http_clients import AsyncClient
 from ..timer import Timer
 from ..types import (
     JWK,

src/auth/src/supabase_auth/_sync/gotrue_admin_api.py

@@ -2,15 +2,14 @@
 
 from typing import Dict, List, Optional
 
-from httpx import QueryParams
+from httpx import Client, QueryParams
 
 from ..helpers import (
     model_validate,
     parse_link_response,
     parse_user_response,
     validate_uuid,
 )
-from ..http_clients import SyncClient
 from ..types import (
     AdminUserAttributes,
     AuthMFAAdminDeleteFactorParams,
@@ -42,7 +41,7 @@ def __init__(
         *,
         url: str = "",
         headers: Optional[Dict[str, str]] = None,
-        http_client: Optional[SyncClient] = None,
+        http_client: Optional[Client] = None,
         verify: bool = True,
         proxy: Optional[str] = None,
     ) -> None:

src/auth/src/supabase_auth/_sync/gotrue_base_api.py

@@ -2,13 +2,12 @@
 
 from typing import Any, Dict, Optional
 
-from httpx import HTTPStatusError, QueryParams, Response
+from httpx import Client, HTTPStatusError, QueryParams, Response
 from pydantic import BaseModel
 from typing_extensions import Literal, Self
 
 from ..constants import API_VERSION_HEADER_NAME, API_VERSIONS_2024_01_01_NAME
 from ..helpers import handle_exception, model_dump
-from ..http_clients import SyncClient
 
 
 class SyncGoTrueBaseAPI:
@@ -17,13 +16,13 @@ def __init__(
         *,
         url: str,
         headers: Dict[str, str],
-        http_client: Optional[SyncClient],
+        http_client: Optional[Client],
         verify: bool = True,
         proxy: Optional[str] = None,
     ) -> None:
         self._url = url
         self._headers = headers
-        self._http_client = http_client or SyncClient(
+        self._http_client = http_client or Client(
             verify=bool(verify),
             proxy=proxy,
             follow_redirects=True,
@@ -37,7 +36,7 @@ def __exit__(self, exc_t, exc_v, exc_tb) -> None:
         self.close()
 
     def close(self) -> None:
-        self._http_client.aclose()
+        self._http_client.close()
 
     def _request(
         self,

src/auth/src/supabase_auth/_sync/gotrue_client.py

@@ -6,7 +6,7 @@
 from urllib.parse import parse_qs, urlparse
 from uuid import uuid4
 
-from httpx import QueryParams, Response
+from httpx import Client, QueryParams, Response
 from jwt import get_algorithm_by_name
 from typing_extensions import cast
 
@@ -41,7 +41,6 @@
     parse_user_response,
     validate_exp,
 )
-from ..http_clients import SyncClient
 from ..timer import Timer
 from ..types import (
     JWK,
@@ -106,7 +105,7 @@ def __init__(
         auto_refresh_token: bool = True,
         persist_session: bool = True,
         storage: Optional[SyncSupportedStorage] = None,
-        http_client: Optional[SyncClient] = None,
+        http_client: Optional[Client] = None,
         flow_type: AuthFlowType = "implicit",
         verify: bool = True,
         proxy: Optional[str] = None,

src/auth/src/supabase_auth/http_clients.py

@@ -12,7 +12,7 @@ help::
 	@echo "  pytest         -- run pytest on postgrest package"
 
 mypy:
-	uv run --package supabase_functions mypy src/postgrest tests
+	uv run --package postgrest mypy src/postgrest tests
 help::
 	@echo "  mypy           -- run mypy on postgrest package"
 
@@ -60,4 +60,4 @@ help::
 build:
 	uv build --package postgrest
 help::
-	@echo "  build          -- invoke uv build on storage3 package"
+	@echo "  build          -- invoke uv build on postgrest package"

src/postgrest/Makefile

@@ -201,7 +201,7 @@ class RealtimeChannelConfig(TypedDict):
 
 
 class RealtimeChannelOptions(TypedDict):
-    config: RealtimeChannelConfig
+    config: NotRequired[RealtimeChannelConfig]
 
 
 @with_config(ConfigDict(extra="allow"))