feat(functions): refactor sync and async methods

Makefile

@@ -1,6 +1,6 @@
 .PHONY: ci, default, clean, start-infra, stop-infra
 
-PACKAGES := functions realtime storage auth postgrest supabase
+PACKAGES := utils functions realtime storage auth postgrest supabase
 FORALL_PKGS = $(foreach pkg, $(PACKAGES), $(pkg).$(1))
 
 help::
@@ -58,6 +58,9 @@ help::
 realtime.%:
 	@$(MAKE) -C src/realtime $*
 
+utils.%:
+	@$(MAKE) -C src/utils $*
+
 functions.%:
 	@$(MAKE) -C src/functions $*
 

pyproject.toml

@@ -5,7 +5,8 @@ members = [
   "src/supabase",
   "src/storage",
   "src/postgrest",
-  "src/auth"
+  "src/auth",
+  "src/utils",
 ]
 
 [tool.uv.sources]

src/functions/Makefile

@@ -16,18 +16,6 @@ mypy:
 help::
 	@echo "  mypy           -- run mypy on supabase_functions package"
 
-unasync:
-	uv run --package supabase_functions run-unasync.py
-help::
-	@echo "  unasync        -- invoke run-unasync.py helper"
-
-build-sync: unasync
-	sed -i '0,/SyncMock, /{s/SyncMock, //}' tests/_sync/test_function_client.py
-	sed -i 's/SyncMock/Mock/g' tests/_sync/test_function_client.py
-	sed -i 's/SyncClient/Client/g' src/supabase_functions/_sync/functions_client.py tests/_sync/test_function_client.py
-help::
-	@echo "  build-sync     -- generate _sync from _async implementation"
-
 clean:
 	rm -rf htmlcov .pytest_cache .mypy_cache .ruff_cache
 	rm -f .coverage coverage.xml

src/functions/pyproject.toml

@@ -15,6 +15,7 @@ requires-python = ">=3.9"
 dependencies = [
   "httpx[http2] >=0.26,<0.29",
   "strenum >=0.4.15",
+  "supabase-utils==0.26.1",
   "yarl>=1.20.1",
 ]
 
@@ -43,6 +44,9 @@ dev = [{ include-group = "lints" }, {include-group = "tests" }]
 [tool.uv]
 default-groups = [ "dev" ]
 
+[tool.uv.sources]
+supabase-utils = { workspace = true }
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 addopts = "tests"

src/functions/src/supabase_functions/__init__.py

@@ -1,9 +1,6 @@
 from __future__ import annotations
 
-from typing import Literal, Union, overload
-
-from ._async.functions_client import AsyncFunctionsClient
-from ._sync.functions_client import SyncFunctionsClient
+from .client import AsyncFunctionsClient, SyncFunctionsClient, create_client
 from .utils import FunctionRegion
 
 __all__ = [
@@ -12,28 +9,3 @@
     "AsyncFunctionsClient",
     "SyncFunctionsClient",
 ]
-
-
-@overload
-def create_client(
-    url: str, headers: dict[str, str], *, is_async: Literal[True], verify: bool
-) -> AsyncFunctionsClient: ...
-
-
-@overload
-def create_client(
-    url: str, headers: dict[str, str], *, is_async: Literal[False], verify: bool
-) -> SyncFunctionsClient: ...
-
-
-def create_client(
-    url: str,
-    headers: dict[str, str],
-    *,
-    is_async: bool,
-    verify: bool = True,
-) -> Union[AsyncFunctionsClient, SyncFunctionsClient]:
-    if is_async:
-        return AsyncFunctionsClient(url, headers, verify)
-    else:
-        return SyncFunctionsClient(url, headers, verify)