zero-server 0.0.1__tar.gz → 0.0.2__tar.gz

{zero_server-0.0.1 → zero_server-0.0.2}/PKG-INFO

@@ -1,24 +1,23 @@
 Metadata-Version: 2.4
 Name: zero-server
-Version: 0.0.1
+Version: 0.0.2
 Summary: Community Python server SDK for Rocicorp Zero. Not affiliated with Rocicorp.
 Keywords: zero,rocicorp,sync,zql
 Author: Agent Labs
 License-Expression: Apache-2.0
 License-File: LICENSE
-Classifier: Development Status :: 1 - Planning
+Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
-Requires-Dist: pydantic>=2.14
+Requires-Dist: pydantic>=2.12
 Requires-Dist: typing-extensions>=4.12
-Requires-Dist: asyncpg>=0.32 ; extra == 'asyncpg'
-Requires-Dist: psycopg>=3.3 ; extra == 'psycopg'
-Requires-Dist: psycopg-pool>=3.3 ; extra == 'psycopg'
-Requires-Dist: sqlalchemy[asyncio]>=2.1 ; extra == 'sqlalchemy'
-Requires-Dist: asyncpg>=0.32 ; extra == 'sqlalchemy'
-Requires-Dist: starlette>=1.8 ; extra == 'starlette'
+Requires-Dist: asyncpg>=0.30 ; extra == 'asyncpg'
+Requires-Dist: psycopg>=3.2.10 ; extra == 'psycopg'
+Requires-Dist: psycopg-pool>=3.2.6 ; extra == 'psycopg'
+Requires-Dist: sqlalchemy[asyncio]>=2.0.40 ; extra == 'sqlalchemy'
+Requires-Dist: starlette>=1.6 ; extra == 'starlette'
 Requires-Python: >=3.12
 Project-URL: Homepage, https://github.com/agent-labs-dev/zero-python
 Project-URL: Source, https://github.com/agent-labs-dev/zero-python
@@ -41,7 +40,7 @@ Compatibility is pinned to one Zero release at a time. This version is tested ag
 ## Usage
 
 ```sh
-pip install "zero-server[sqlalchemy,starlette]"   # or [asyncpg], or [psycopg]
+pip install "zero-server[sqlalchemy,asyncpg,starlette]"   # or [asyncpg], or [psycopg]
 ```
 
 The schema stays in your TypeScript `schema.ts`, because the client needs it. Emit it as JSON, and generate Python types from it:
@@ -108,7 +107,7 @@ app = Starlette(
 
 Point `ZERO_QUERY_URL` and `ZERO_MUTATE_URL` at `/query` and `/mutate`. With FastAPI, `app.router.routes.extend(zero_routes(...))`. With another framework, call `handle_query_request` and `handle_mutate_request` yourself; `zero_server/integrations/starlette.py` is short enough to copy.
 
-- **Databases.** `SQLAlchemyDatabase` (SQLAlchemy's asyncio engine on asyncpg), `AsyncpgDatabase` (an asyncpg pool) and `PsycopgDatabase` (a psycopg 3 async pool), under `zero_server.server.adapters`. Another driver plugs into `ZQLDatabase` as a `DBConnection` whose `query` takes `$1` placeholders.
+- **Databases.** `SQLAlchemyDatabase` (SQLAlchemy's asyncio engine on asyncpg or psycopg; the `sqlalchemy` extra installs neither driver), `AsyncpgDatabase` (an asyncpg pool) and `PsycopgDatabase` (a psycopg 3 async pool), under `zero_server.server.adapters`. Another driver plugs into `ZQLDatabase` as a `DBConnection` whose `query` takes `$1` placeholders.
 - **Validation.** `@define_query(Model)` and `@define_mutator(Model)` parse args with a Pydantic model or `TypeAdapter` first; a failure reaches the client as upstream's validation error.
 - **Strict building.** `create_builder(schema, strict=True)` refuses an unknown column when the query is built. Upstream only refuses it when the endpoint maps the query, failing the whole batch, so this is for your tests.
 

{zero_server-0.0.1 → zero_server-0.0.2}/README.md

@@ -9,7 +9,7 @@ Compatibility is pinned to one Zero release at a time. This version is tested ag
 ## Usage
 
 ```sh
-pip install "zero-server[sqlalchemy,starlette]"   # or [asyncpg], or [psycopg]
+pip install "zero-server[sqlalchemy,asyncpg,starlette]"   # or [asyncpg], or [psycopg]
 ```
 
 The schema stays in your TypeScript `schema.ts`, because the client needs it. Emit it as JSON, and generate Python types from it:
@@ -76,7 +76,7 @@ app = Starlette(
 
 Point `ZERO_QUERY_URL` and `ZERO_MUTATE_URL` at `/query` and `/mutate`. With FastAPI, `app.router.routes.extend(zero_routes(...))`. With another framework, call `handle_query_request` and `handle_mutate_request` yourself; `zero_server/integrations/starlette.py` is short enough to copy.
 
-- **Databases.** `SQLAlchemyDatabase` (SQLAlchemy's asyncio engine on asyncpg), `AsyncpgDatabase` (an asyncpg pool) and `PsycopgDatabase` (a psycopg 3 async pool), under `zero_server.server.adapters`. Another driver plugs into `ZQLDatabase` as a `DBConnection` whose `query` takes `$1` placeholders.
+- **Databases.** `SQLAlchemyDatabase` (SQLAlchemy's asyncio engine on asyncpg or psycopg; the `sqlalchemy` extra installs neither driver), `AsyncpgDatabase` (an asyncpg pool) and `PsycopgDatabase` (a psycopg 3 async pool), under `zero_server.server.adapters`. Another driver plugs into `ZQLDatabase` as a `DBConnection` whose `query` takes `$1` placeholders.
 - **Validation.** `@define_query(Model)` and `@define_mutator(Model)` parse args with a Pydantic model or `TypeAdapter` first; a failure reaches the client as upstream's validation error.
 - **Strict building.** `create_builder(schema, strict=True)` refuses an unknown column when the query is built. Upstream only refuses it when the endpoint maps the query, failing the whole batch, so this is for your tests.
 

{zero_server-0.0.1 → zero_server-0.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zero-server"
-version = "0.0.1"
+version = "0.0.2"
 description = "Community Python server SDK for Rocicorp Zero. Not affiliated with Rocicorp."
 readme = "README.md"
 license = "Apache-2.0"
@@ -13,14 +13,14 @@ keywords = [
     "zql",
 ]
 classifiers = [
-    "Development Status :: 1 - Planning",
+    "Development Status :: 3 - Alpha",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Typing :: Typed",
 ]
 dependencies = [
-    "pydantic>=2.14",
+    "pydantic>=2.12",
     "typing-extensions>=4.12",
 ]
 
@@ -37,22 +37,19 @@ Changelog = "https://github.com/agent-labs-dev/zero-python/releases"
 zero-server = "zero_server.codegen:main"
 
 [project.optional-dependencies]
-sqlalchemy = [
-    "sqlalchemy[asyncio]>=2.1",
-    "asyncpg>=0.32",
-]
-asyncpg = ["asyncpg>=0.32"]
+sqlalchemy = ["sqlalchemy[asyncio]>=2.0.40"]
+asyncpg = ["asyncpg>=0.30"]
 psycopg = [
-    "psycopg>=3.3",
-    "psycopg-pool>=3.3",
+    "psycopg>=3.2.10",
+    "psycopg-pool>=3.2.6",
 ]
-starlette = ["starlette>=1.8"]
+starlette = ["starlette>=1.6"]
 
 [dependency-groups]
 dev = [
     "zero-server[sqlalchemy,asyncpg,psycopg,starlette]",
     "httpx2>=2.13",
-    "psycopg[binary]>=3.3",
+    "psycopg[binary]>=3.2.10",
     "hypothesis>=6.169",
     "pytest>=9.1",
     "pytest-asyncio>=1.4",
@@ -61,12 +58,12 @@ dev = [
     "ty>=0.0.87",
 ]
 e2e = [
-    "starlette>=1.8",
+    "starlette>=1.6",
     "uvicorn>=0.54",
 ]
 
 [build-system]
-requires = ["uv_build>=0.11,<0.12"]
+requires = ["uv_build>=0.11,<0.14"]
 build-backend = "uv_build"
 
 [tool.ruff]

{zero_server-0.0.1 → zero_server-0.0.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "zero-server"
-version = "0.0.1"
+version = "0.0.2"
 description = "Community Python server SDK for Rocicorp Zero. Not affiliated with Rocicorp."
 readme = "README.md"
 license = "Apache-2.0"
@@ -9,13 +9,14 @@ requires-python = ">=3.12"
 authors = [{ name = "Agent Labs" }]
 keywords = ["zero", "rocicorp", "sync", "zql"]
 classifiers = [
-    "Development Status :: 1 - Planning",
+    "Development Status :: 3 - Alpha",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Typing :: Typed",
 ]
-dependencies = ["pydantic>=2.14", "typing-extensions>=4.12"]
+# Floors are the lowest versions the suite passes on, and CI's `floors` job runs it at exactly these.
+dependencies = ["pydantic>=2.12", "typing-extensions>=4.12"]
 
 [project.urls]
 Homepage = "https://github.com/agent-labs-dev/zero-python"
@@ -27,17 +28,18 @@ Changelog = "https://github.com/agent-labs-dev/zero-python/releases"
 zero-server = "zero_server.codegen:main"
 
 [project.optional-dependencies]
-sqlalchemy = ["sqlalchemy[asyncio]>=2.1", "asyncpg>=0.32"]
-asyncpg = ["asyncpg>=0.32"]
-psycopg = ["psycopg>=3.3", "psycopg-pool>=3.3"]
-starlette = ["starlette>=1.8"]
+# The engine's driver is the caller's: add `asyncpg`, or install psycopg yourself.
+sqlalchemy = ["sqlalchemy[asyncio]>=2.0.40"]
+asyncpg = ["asyncpg>=0.30"]
+psycopg = ["psycopg>=3.2.10", "psycopg-pool>=3.2.6"]
+starlette = ["starlette>=1.6"]
 
 [dependency-groups]
 dev = [
     "zero-server[sqlalchemy,asyncpg,psycopg,starlette]",
     "httpx2>=2.13",
     # psycopg's prebuilt libpq, so the tests need no system libpq.
-    "psycopg[binary]>=3.3",
+    "psycopg[binary]>=3.2.10",
     "hypothesis>=6.169",
     "pytest>=9.1",
     "pytest-asyncio>=1.4",
@@ -47,10 +49,10 @@ dev = [
 ]
 
 # The Python app server of the end-to-end tier.
-e2e = ["starlette>=1.8", "uvicorn>=0.54"]
+e2e = ["starlette>=1.6", "uvicorn>=0.54"]
 
 [build-system]
-requires = ["uv_build>=0.11,<0.12"]
+requires = ["uv_build>=0.11,<0.14"]
 build-backend = "uv_build"
 
 [tool.ruff]

{zero_server-0.0.1 → zero_server-0.0.2}/src/zero_server/__init__.py

@@ -13,7 +13,7 @@ from zero_server.server.process_mutations import handle_mutate_request
 from zero_server.server.process_queries import handle_query_request
 from zero_server.server.push_processor import PushProcessor
 
-__version__ = "0.0.1"
+__version__ = "0.0.2"
 
 __all__ = [
     "ApplicationError",

{zero_server-0.0.1 → zero_server-0.0.2}/src/zero_server/server/adapters/psycopg.py

@@ -5,11 +5,15 @@ same text the other adapters send.
 """
 
 from collections.abc import Awaitable, Callable, Sequence
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import psycopg
 from psycopg.rows import dict_row
-from psycopg_pool import AsyncConnectionPool
+
+if TYPE_CHECKING:
+    # Only `PsycopgDatabase` takes a pool. The SQLAlchemy adapter reuses `PsycopgTransaction` on
+    # SQLAlchemy's own connection, and must not need psycopg-pool installed for it.
+    from psycopg_pool import AsyncConnectionPool
 
 from zero_server.schema import Schema
 from zero_server.server.transaction import DBTransaction, Row
@@ -40,7 +44,7 @@ class PsycopgTransaction:
 
 
 class PsycopgConnection:
-    def __init__(self, pool: AsyncConnectionPool) -> None:
+    def __init__(self, pool: "AsyncConnectionPool") -> None:
         self.pool = pool
 
     async def transaction[R](self, fn: Callable[[DBTransaction[psycopg.AsyncConnection[Any]]], Awaitable[R]]) -> R:
@@ -51,5 +55,5 @@ class PsycopgConnection:
 class PsycopgDatabase(ZQLDatabase[psycopg.AsyncConnection[Any]]):
     """A `ZQLDatabase` on a psycopg pool (`AsyncConnectionPool(conninfo, open=False)`, then `await pool.open()`)."""
 
-    def __init__(self, pool: AsyncConnectionPool, schema: Schema | None = None) -> None:
+    def __init__(self, pool: "AsyncConnectionPool", schema: Schema | None = None) -> None:
         super().__init__(PsycopgConnection(pool), schema)

zero_server-0.0.2/src/zero_server/server/adapters/sqlalchemy.py

@@ -0,0 +1,75 @@
+"""SQLAlchemy's asyncio engine, with the asyncpg or the psycopg driver.
+
+Needs the `zero-server[sqlalchemy]` extra, and the driver the engine's URL names.
+"""
+
+from collections.abc import Awaitable, Callable, Sequence
+from typing import Any
+
+from sqlalchemy.exc import DBAPIError
+from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
+
+from zero_server.schema import Schema
+from zero_server.server.transaction import DBTransaction, Row
+from zero_server.server.zql_database import PostgresError, ZQLDatabase
+
+
+class SQLAlchemyTransaction:
+    """One transaction of an `AsyncConnection`.
+
+    On asyncpg a statement goes through `exec_driver_sql`, which hands the `$1` placeholders to asyncpg
+    as they are. psycopg's paramstyle is `%s`, so on psycopg it goes through psycopg's raw cursor on the
+    same connection, inside the transaction SQLAlchemy opened.
+    """
+
+    def __init__(self, connection: AsyncConnection, driver_transaction: DBTransaction[Any] | None = None) -> None:
+        self._connection = connection
+        self._driver_transaction = driver_transaction
+
+    @property
+    def wrapped_transaction(self) -> AsyncConnection:
+        return self._connection
+
+    async def query(self, sql: str, params: Sequence[Any] = ()) -> list[Row]:
+        if self._driver_transaction is not None:
+            return await self._driver_transaction.query(sql, params)
+        try:
+            result = await self._connection.exec_driver_sql(sql, tuple(params))
+        except DBAPIError as error:
+            cause = error.orig.__cause__ if error.orig is not None and error.orig.__cause__ is not None else error.orig
+            # asyncpg's `message` is the primary message alone, which is all postgres.js reports.
+            message = getattr(cause, "message", None)
+            raise PostgresError(message if isinstance(message, str) else str(cause)) from error
+        return [dict(row) for row in result.mappings()] if result.returns_rows else []
+
+
+async def sqlalchemy_transaction(connection: AsyncConnection) -> SQLAlchemyTransaction:
+    """Wrap a connection that is already in a transaction, such as one an `AsyncSession` holds."""
+    driver = connection.dialect.driver
+    if driver == "asyncpg":
+        return SQLAlchemyTransaction(connection)
+    if driver == "psycopg":
+        from zero_server.server.adapters.psycopg import PsycopgTransaction
+
+        driver_connection = (await connection.get_raw_connection()).driver_connection
+        # `None` only once SQLAlchemy has invalidated the connection, which it never does mid-transaction.
+        assert driver_connection is not None
+        return SQLAlchemyTransaction(connection, PsycopgTransaction(driver_connection))
+    raise ValueError(f"SQLAlchemy driver {driver!r} is not supported; use asyncpg or psycopg")
+
+
+class SQLAlchemyConnection:
+    def __init__(self, engine: AsyncEngine) -> None:
+        self.engine = engine
+
+    async def transaction[R](self, fn: Callable[[DBTransaction[AsyncConnection]], Awaitable[R]]) -> R:
+        async with self.engine.begin() as connection:
+            return await fn(await sqlalchemy_transaction(connection))
+
+
+class SQLAlchemyDatabase(ZQLDatabase[AsyncConnection]):
+    """A `ZQLDatabase` on `engine`, whose URL names the asyncpg or the psycopg driver
+    (`postgresql+asyncpg://` or `postgresql+psycopg://`)."""
+
+    def __init__(self, engine: AsyncEngine, schema: Schema | None = None) -> None:
+        super().__init__(SQLAlchemyConnection(engine), schema)

zero_server-0.0.1/src/zero_server/server/adapters/sqlalchemy.py

@@ -1,49 +0,0 @@
-"""SQLAlchemy's asyncio engine, with the asyncpg driver.
-
-Needs the `zero-server[sqlalchemy]` extra.
-"""
-
-from collections.abc import Awaitable, Callable, Sequence
-from typing import Any
-
-from sqlalchemy.exc import DBAPIError
-from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
-
-from zero_server.schema import Schema
-from zero_server.server.transaction import DBTransaction, Row
-from zero_server.server.zql_database import PostgresError, ZQLDatabase
-
-
-class SQLAlchemyTransaction:
-    def __init__(self, connection: AsyncConnection) -> None:
-        self._connection = connection
-
-    @property
-    def wrapped_transaction(self) -> AsyncConnection:
-        return self._connection
-
-    async def query(self, sql: str, params: Sequence[Any] = ()) -> list[Row]:
-        try:
-            result = await self._connection.exec_driver_sql(sql, tuple(params))
-        except DBAPIError as error:
-            cause = error.orig.__cause__ if error.orig is not None and error.orig.__cause__ is not None else error.orig
-            # asyncpg's `message` is the primary message alone, which is all postgres.js reports.
-            message = getattr(cause, "message", None)
-            raise PostgresError(message if isinstance(message, str) else str(cause)) from error
-        return [dict(row) for row in result.mappings()] if result.returns_rows else []
-
-
-class SQLAlchemyConnection:
-    def __init__(self, engine: AsyncEngine) -> None:
-        self.engine = engine
-
-    async def transaction[R](self, fn: Callable[[DBTransaction[AsyncConnection]], Awaitable[R]]) -> R:
-        async with self.engine.begin() as connection:
-            return await fn(SQLAlchemyTransaction(connection))
-
-
-class SQLAlchemyDatabase(ZQLDatabase[AsyncConnection]):
-    """A `ZQLDatabase` on `engine`, which must use the asyncpg driver (`postgresql+asyncpg://`)."""
-
-    def __init__(self, engine: AsyncEngine, schema: Schema | None = None) -> None:
-        super().__init__(SQLAlchemyConnection(engine), schema)