databricks-tellr-app 0.4.3.dev34__tar.gz → 0.4.3.dev36__tar.gz

{databricks_tellr_app-0.4.3.dev34 → databricks_tellr_app-0.4.3.dev36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databricks-tellr-app
-Version: 0.4.3.dev34
+Version: 0.4.3.dev36
 Summary: Tellr application package for Databricks Apps
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{databricks_tellr_app-0.4.3.dev34 → databricks_tellr_app-0.4.3.dev36}/databricks_tellr_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databricks-tellr-app
-Version: 0.4.3.dev34
+Version: 0.4.3.dev36
 Summary: Tellr application package for Databricks Apps
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{databricks_tellr_app-0.4.3.dev34 → databricks_tellr_app-0.4.3.dev36}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "databricks-tellr-app"
-version = "0.4.3.dev34"
+version = "0.4.3.dev36"
 description = "Tellr application package for Databricks Apps"
 readme = "README.md"
 requires-python = ">=3.10"

{databricks_tellr_app-0.4.3.dev34 → databricks_tellr_app-0.4.3.dev36}/src/api/routes/setup.py

@@ -6,6 +6,7 @@ Databricks workspace URL.
 """
 
 import logging
+import os
 import re
 from typing import Optional
 
@@ -23,6 +24,25 @@ logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/api/setup", tags=["setup"])
 
 
+def _is_already_configured() -> bool:
+    """True once a workspace host is set via ~/.tellr/config.yaml or env."""
+    return is_tellr_configured() or bool(os.getenv("DATABRICKS_HOST"))
+
+
+def _refuse_reconfigure() -> None:
+    """Block mutating setup once the app already has a workspace host.
+
+    On Databricks Apps, DATABRICKS_HOST is always set, so configure/test-connection
+    are unreachable. That is the intended production posture: these routes exist
+    only for a true first-run local install.
+    """
+    if _is_already_configured():
+        raise HTTPException(
+            status_code=409,
+            detail="Workspace is already configured.",
+        )
+
+
 class SetupStatusResponse(BaseModel):
     """Response for setup status check."""
     configured: bool
@@ -79,8 +99,6 @@ async def get_setup_status():
     Returns configured=True if ~/.tellr/config.yaml exists with a valid host,
     or if DATABRICKS_HOST environment variable is set.
     """
-    import os
-
     # Check tellr config file first
     if is_tellr_configured():
         config = get_tellr_config()
@@ -104,6 +122,7 @@ async def configure_workspace(request: ConfigureWorkspaceRequest):
     authentication enabled. On the next API call that requires Databricks
     access, the browser will open for SSO login.
     """
+    _refuse_reconfigure()
     try:
         # Save the configuration
         save_tellr_config(host=request.host, auth_type="external-browser")
@@ -135,6 +154,7 @@ async def test_connection():
     This will trigger the OAuth browser flow if using external-browser auth.
     Returns user info on success.
     """
+    _refuse_reconfigure()
     try:
         from src.core.databricks_client import get_system_client
 

{databricks_tellr_app-0.4.3.dev34 → databricks_tellr_app-0.4.3.dev36}/src/core/database.py

@@ -195,6 +195,20 @@ async def stop_token_refresh() -> None:
         logger.info("Background token refresh task stopped")
 
 
+def _with_psycopg2_driver(url: str) -> str:
+    """Pin PostgreSQL URLs to psycopg2, matching the declared dependency.
+
+    SQLAlchemy 2.1 changed bare ``postgresql://`` to mean psycopg (v3). CI
+    installs ``sqlalchemy>=2.0`` via pip, so that default now imports a
+    package we do not ship (``psycopg2-binary`` is the driver). Explicit
+    ``postgresql+psycopg2://`` keeps both 2.0 and 2.1 on the installed driver.
+    URLs that already name a driver, and non-Postgres URLs, are left alone.
+    """
+    if url.startswith("postgresql://"):
+        return "postgresql+psycopg2://" + url[len("postgresql://") :]
+    return url
+
+
 def _get_database_url() -> str:
     """
     Determine database URL based on environment.
@@ -213,7 +227,7 @@ def _get_database_url() -> str:
     # Check for explicit DATABASE_URL first
     explicit_url = os.getenv("DATABASE_URL")
     if explicit_url and not explicit_url.startswith("jdbc:"):
-        return explicit_url
+        return _with_psycopg2_driver(explicit_url)
 
     # Check for autoscaling Lakebase (env vars set by deployment)
     lakebase_type = _get_lakebase_type()
@@ -237,7 +251,7 @@ def _get_database_url() -> str:
         url = f"postgresql://{pg_user}@{pg_host}:5432/{database}?sslmode=require"
         if schema:
             url += f"&options=-csearch_path%3D{schema}"
-        return url
+        return _with_psycopg2_driver(url)
 
     # Check for provisioned Lakebase (PGHOST auto-set by Databricks Apps)
     pg_host = os.getenv("PGHOST")
@@ -258,10 +272,10 @@ def _get_database_url() -> str:
         if schema:
             url += f"&options=-csearch_path%3D{schema}"
 
-        return url
+        return _with_psycopg2_driver(url)
 
     # Default to local PostgreSQL for development
-    return "postgresql://localhost/ai_slide_generator"
+    return _with_psycopg2_driver("postgresql://localhost/ai_slide_generator")
 
 
 def _create_engine():
@@ -291,14 +305,26 @@ def _create_engine():
 
     logger.info("Configuring database connection")
 
-    # Create engine with connection pooling
-    engine = create_engine(
-        database_url,
-        pool_pre_ping=True,
-        pool_size=80,
-        max_overflow=20,
-        echo=sql_echo,
-    )
+    # sqlite:///:memory: with the default QueuePool gives each checkout a
+    # different empty database. Unit tests use an in-memory URL; StaticPool
+    # keeps one shared connection. Postgres keeps the production pool settings.
+    if database_url.startswith("sqlite"):
+        from sqlalchemy.pool import StaticPool
+
+        engine = create_engine(
+            database_url,
+            connect_args={"check_same_thread": False},
+            poolclass=StaticPool,
+            echo=sql_echo,
+        )
+    else:
+        engine = create_engine(
+            database_url,
+            pool_pre_ping=True,
+            pool_size=80,
+            max_overflow=20,
+            echo=sql_echo,
+        )
 
     # For Lakebase: register event listener to inject fresh tokens
     if is_lakebase_environment():