dbx-tools-postgres 0.6.185__tar.gz → 0.6.188__tar.gz

{dbx_tools_postgres-0.6.185 → dbx_tools_postgres-0.6.188}/PKG-INFO

@@ -1,14 +1,15 @@
 Metadata-Version: 2.3
 Name: dbx-tools-postgres
-Version: 0.6.185
+Version: 0.6.188
 Summary: WorkspaceClient-backed Lakebase Postgres resolution, SQLAlchemy engines, advisory locks, and LISTEN/NOTIFY topic bus
 Requires-Dist: asyncpg>=0.30
 Requires-Dist: databricks-sdk>=0.63.0
 Requires-Dist: greenlet>=3.2
 Requires-Dist: psycopg[binary]>=3.2.9
 Requires-Dist: sqlalchemy>=2.0.41
-Requires-Dist: dbx-tools-core==0.6.185
-Requires-Python: >=3.11, <3.14
+Requires-Dist: dbx-tools-core==0.6.188
+Requires-Dist: dbx-tools-core-rs==0.6.188
+Requires-Python: >=3.11, <4
 Project-URL: Source, https://github.com/reggie-db/dbx-tools/tree/main/packages/py/postgres
 Description-Content-Type: text/markdown
 
@@ -16,8 +17,8 @@ Description-Content-Type: text/markdown
 
 Python Lakebase/Postgres connection setup, advisory locks, and topic fan-out for
 services that already hold a Databricks `WorkspaceClient`. This package is
-the Python counterpart to `@dbx-tools/postgres` plus `@dbx-tools/appkit`'s
-address parsing.
+the Python counterpart to `@dbx-tools/postgres`. Lakebase address parsing comes
+directly from the generated `dbx-tools-core-rs` Rust bindings.
 
 Install from PyPI:
 
@@ -34,7 +35,7 @@ pip install "dbx-tools-postgres @ git+https://github.com/reggie-db/dbx-tools.git
 Key features:
 
 - accepts the same Postgres URI, Lakebase resource path, hostname, and project-id
-  address shapes as `@dbx-tools/appkit`;
+  address shapes as `@dbx-tools/appkit` through the native Rust parser;
 - resolves missing autoscaling endpoint fields through
   `WorkspaceClient.api_client`;
 - resolves provisioned Lakebase instance DNS through

{dbx_tools_postgres-0.6.185 → dbx_tools_postgres-0.6.188}/README.md

@@ -2,8 +2,8 @@
 
 Python Lakebase/Postgres connection setup, advisory locks, and topic fan-out for
 services that already hold a Databricks `WorkspaceClient`. This package is
-the Python counterpart to `@dbx-tools/postgres` plus `@dbx-tools/appkit`'s
-address parsing.
+the Python counterpart to `@dbx-tools/postgres`. Lakebase address parsing comes
+directly from the generated `dbx-tools-core-rs` Rust bindings.
 
 Install from PyPI:
 
@@ -20,7 +20,7 @@ pip install "dbx-tools-postgres @ git+https://github.com/reggie-db/dbx-tools.git
 Key features:
 
 - accepts the same Postgres URI, Lakebase resource path, hostname, and project-id
-  address shapes as `@dbx-tools/appkit`;
+  address shapes as `@dbx-tools/appkit` through the native Rust parser;
 - resolves missing autoscaling endpoint fields through
   `WorkspaceClient.api_client`;
 - resolves provisioned Lakebase instance DNS through

{dbx_tools_postgres-0.6.185 → dbx_tools_postgres-0.6.188}/pyproject.toml

@@ -1,16 +1,17 @@
 [project]
 name = "dbx-tools-postgres"
-version = "0.6.185"
+version = "0.6.188"
 description = "WorkspaceClient-backed Lakebase Postgres resolution, SQLAlchemy engines, advisory locks, and LISTEN/NOTIFY topic bus"
 readme = "README.md"
-requires-python = ">=3.11,<3.14"
+requires-python = ">=3.11,<4"
 dependencies = [
     "asyncpg>=0.30",
     "databricks-sdk>=0.63.0",
     "greenlet>=3.2",
     "psycopg[binary]>=3.2.9",
     "sqlalchemy>=2.0.41",
-    "dbx-tools-core==0.6.185",
+    "dbx-tools-core==0.6.188",
+    "dbx-tools-core-rs==0.6.188",
 ]
 
 [project.urls]

{dbx_tools_postgres-0.6.185 → dbx_tools_postgres-0.6.188}/pyproject.toml.orig

@@ -2,11 +2,11 @@
 
 [project]
 name = "dbx-tools-postgres"
-version = "0.6.185"
+version = "0.6.188"
 description = "WorkspaceClient-backed Lakebase Postgres resolution, SQLAlchemy engines, advisory locks, and LISTEN/NOTIFY topic bus"
 readme = "README.md"
-requires-python = ">=3.11,<3.14"
-dependencies = ["asyncpg>=0.30", "databricks-sdk>=0.63.0", "greenlet>=3.2", "psycopg[binary]>=3.2.9", "sqlalchemy>=2.0.41", "dbx-tools-core==0.6.185"]
+requires-python = ">=3.11,<4"
+dependencies = ["asyncpg>=0.30", "databricks-sdk>=0.63.0", "greenlet>=3.2", "psycopg[binary]>=3.2.9", "sqlalchemy>=2.0.41", "dbx-tools-core==0.6.188", "dbx-tools-core-rs==0.6.188"]
 
 [project.urls]
 Source = "https://github.com/reggie-db/dbx-tools/tree/main/packages/py/postgres"

dbx_tools_postgres-0.6.188/src/dbx_tools/postgres/address.py

@@ -0,0 +1,31 @@
+from typing import Literal, TypeAlias
+
+from dbx_tools.core_rs.bindings import (
+    ParsedAddress,
+    parse_address,
+    parse_resource_path,
+)
+from dbx_tools.core_rs.bindings import (
+    SslMode as NativeSslMode,
+)
+
+"""Lakebase address types and parsers backed by the Databricks Rust bindings."""
+
+SslMode = Literal["require", "disable", "prefer"]
+SSL_MODES: tuple[SslMode, ...] = ("require", "disable", "prefer")
+LakebaseConnectionInputs: TypeAlias = ParsedAddress
+
+parseAddress = parse_address
+parseResourcePath = parse_resource_path
+
+__all__ = [
+    "SSL_MODES",
+    "LakebaseConnectionInputs",
+    "NativeSslMode",
+    "ParsedAddress",
+    "SslMode",
+    "parseAddress",
+    "parseResourcePath",
+    "parse_address",
+    "parse_resource_path",
+]

{dbx_tools_postgres-0.6.185 → dbx_tools_postgres-0.6.188}/src/dbx_tools/postgres/engine.py

@@ -13,7 +13,14 @@ from sqlalchemy import create_engine as sqlalchemy_create_engine
 from sqlalchemy.ext.asyncio import AsyncEngine
 from sqlalchemy.ext.asyncio import create_async_engine as sqlalchemy_create_async_engine
 
-from .address import SSL_MODES, ParsedAddress, SslMode, parse_address, parse_resource_path
+from .address import (
+    SSL_MODES,
+    NativeSslMode,
+    ParsedAddress,
+    SslMode,
+    parse_address,
+    parse_resource_path,
+)
 
 """Lakebase connection resolution and connect-time credential injection."""
 
@@ -474,7 +481,7 @@ def _parse_port(value: object) -> int:
 def _parse_ssl_mode(value: object) -> SslMode:
     if value is None or value == "":
         return _DEFAULT_SSL_MODE
-    mode = str(value).strip().lower()
+    mode = value.name.lower() if isinstance(value, NativeSslMode) else str(value).strip().lower()
     if mode not in SSL_MODES:
         raise ValueError(f"PGSSLMODE must be one of {', '.join(SSL_MODES)}, got {value!r}")
     return mode  # type: ignore[return-value]

dbx_tools_postgres-0.6.185/src/dbx_tools/postgres/address.py

@@ -1,114 +0,0 @@
-from __future__ import annotations
-
-import re
-from dataclasses import asdict, dataclass
-from typing import Literal
-from urllib.parse import parse_qs, unquote, urlparse
-
-SslMode = Literal["require", "disable", "prefer"]
-SSL_MODES: tuple[SslMode, ...] = ("require", "disable", "prefer")
-
-_URL_SCHEME_RE = re.compile(r"^(postgres|postgresql)://", re.IGNORECASE)
-_PROJECT_ID_RE = re.compile(r"^[a-z][a-z0-9-]{0,61}[a-z0-9]$|^[a-z]$")
-_HOSTNAME_HINT_RE = re.compile(r"^[a-z0-9][a-z0-9-]*(\.[a-z0-9][a-z0-9-]*)+$", re.IGNORECASE)
-
-
-@dataclass(frozen=True, slots=True)
-class LakebaseConnectionInputs:
-    project: str | None = None
-    branch: str | None = None
-    endpoint: str | None = None
-    database: str | None = None
-    host: str | None = None
-    port: int | None = None
-    ssl_mode: SslMode | None = None
-
-    def as_dict(self) -> dict[str, object]:
-        return {key: value for key, value in asdict(self).items() if value is not None}
-
-
-@dataclass(frozen=True, slots=True)
-class ParsedAddress(LakebaseConnectionInputs):
-    endpoint_id: str | None = None
-    database_resource_id: str | None = None
-    user: str | None = None
-
-
-def parse_address(value: str | None) -> ParsedAddress:
-    if not value or not (address := value.strip()):
-        return ParsedAddress()
-    if _URL_SCHEME_RE.match(address):
-        return _parse_uri(address)
-    if address.startswith("projects/"):
-        return _parse_resource_path_segments(address)
-    if "." in address and _HOSTNAME_HINT_RE.fullmatch(address):
-        return ParsedAddress(host=address)
-    if _PROJECT_ID_RE.fullmatch(address):
-        return ParsedAddress(project=address)
-    return ParsedAddress()
-
-
-def parse_resource_path(value: str | None) -> ParsedAddress:
-    if not value or not (address := value.strip()).startswith("projects/"):
-        return ParsedAddress()
-    return _parse_resource_path_segments(address)
-
-
-def _parse_uri(address: str) -> ParsedAddress:
-    try:
-        parsed = urlparse(address)
-        port = parsed.port
-    except ValueError:
-        return ParsedAddress()
-    if parsed.scheme.lower() not in {"postgres", "postgresql"}:
-        return ParsedAddress()
-    ssl_mode_value = parse_qs(parsed.query).get("sslmode") or parse_qs(parsed.query).get("sslMode")
-    ssl_mode = ssl_mode_value[0].lower() if ssl_mode_value else None
-    return ParsedAddress(
-        host=parsed.hostname or None,
-        port=port,
-        user=unquote(parsed.username) if parsed.username else None,
-        database=unquote(parsed.path.removeprefix("/")) or None,
-        ssl_mode=ssl_mode if ssl_mode in SSL_MODES else None,
-    )
-
-
-def _parse_resource_path_segments(address: str) -> ParsedAddress:
-    parts = address.split("/")
-    if len(parts) < 2 or parts[0] != "projects" or not parts[1]:
-        return ParsedAddress()
-    project = parts[1]
-    if len(parts) == 2:
-        return ParsedAddress(project=project)
-    if len(parts) == 4 and parts[2] == "branches" and parts[3]:
-        return ParsedAddress(project=project, branch=parts[3])
-    if (
-        len(parts) == 6
-        and parts[2] == "branches"
-        and parts[3]
-        and parts[4] == "endpoints"
-        and parts[5]
-    ):
-        return ParsedAddress(
-            project=project,
-            branch=parts[3],
-            endpoint=address,
-            endpoint_id=parts[5],
-        )
-    if (
-        len(parts) == 6
-        and parts[2] == "branches"
-        and parts[3]
-        and parts[4] == "databases"
-        and parts[5]
-    ):
-        return ParsedAddress(
-            project=project,
-            branch=parts[3],
-            database_resource_id=parts[5],
-        )
-    return ParsedAddress()
-
-
-parseAddress = parse_address
-parseResourcePath = parse_resource_path