Bump sqlalchemy version

Previously, `worker` would pin this to v1.3, but that would then fail tests within `shared` in a common workspace, as some tests in `shared` depend on v1.4 features.

Author: Swatinem

apps/worker/database/base.py

@@ -2,8 +2,7 @@
 
 from sqlalchemy import Column, types
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, declarative_base
 
 from helpers.clock import get_utc_now
 

apps/worker/database/engine.py

@@ -2,14 +2,13 @@
 import json
 from decimal import Decimal
 
-from sqlalchemy import create_engine
-from sqlalchemy.orm import Session, scoped_session, sessionmaker
-
 import database.events  # noqa: F401
 from database.models.timeseries import TimeseriesBaseModel
 from shared.config import get_config
 from shared.timeseries.helpers import is_timeseries_enabled
 from shared.utils.ReportEncoder import ReportEncoder
+from sqlalchemy import create_engine
+from sqlalchemy.orm import Session, scoped_session, sessionmaker
 
 from .base import Base
 
@@ -33,8 +32,8 @@ def json_dumps(d):
 
 class SessionFactory:
     def __init__(self, database_url, timeseries_database_url=None):
-        self.database_url = database_url
-        self.timeseries_database_url = timeseries_database_url
+        self.database_url = _fix_engine(database_url)
+        self.timeseries_database_url = _fix_engine(timeseries_database_url)
         self.main_engine = None
         self.timeseries_engine = None
 
@@ -54,7 +53,7 @@ def create_session(self):
             timeseries_engine = self.timeseries_engine
 
             class RoutingSession(Session):
-                def get_bind(self, mapper=None, clause=None):
+                def get_bind(self, mapper=None, clause=None, **kwargs):
                     if mapper is not None and issubclass(
                         mapper.class_, TimeseriesBaseModel
                     ):
@@ -74,16 +73,20 @@ def get_bind(self, mapper=None, clause=None):
         return scoped_session(session_factory)
 
 
+def _fix_engine(database_url: str) -> str:
+    return database_url.replace("postgres://", "postgresql://")
+
+
 session_factory = SessionFactory(
     database_url=get_config(
         "services",
         "database_url",
-        default="postgres://postgres:@postgres:5432/postgres",
+        default="postgresql://postgres:@postgres:5432/postgres",
     ),
     timeseries_database_url=get_config(
         "services",
         "timeseries_database_url",
-        default="postgres://postgres:@timescale:5432/postgres",
+        default="postgresql://postgres:@timescale:5432/postgres",
     ),
 )
 

apps/worker/pyproject.toml

@@ -39,8 +39,8 @@ dependencies = [
     "requests>=2.32.0",
     "sentry-sdk>=2.13.0",
     "shared",
-    "sqlalchemy==1.3.*",
-    "sqlparse==0.5.0",
+    "sqlalchemy<2",
+    "sqlparse>=0.5.0",
     "statsd>=3.3.0",
     "stripe>=11.4.1",
     "test-results-parser",

apps/worker/ta_storage/pg.py

@@ -37,14 +37,15 @@ def get_repo_flag_ids(db_session: Session, repoid: int, flags: list[str]) -> set
     if not flags:
         return set()
 
-    return set(
-        db_session.query(RepositoryFlag.id_)
+    return {
+        flag.id_
+        for flag in db_session.query(RepositoryFlag.id_)
         .filter(
             RepositoryFlag.repository_id == repoid,
             RepositoryFlag.flag_name.in_(flags),
         )
         .all()
-    )
+    }
 
 
 def modify_structures(

apps/worker/tasks/test_results_processor.py

@@ -45,14 +45,15 @@ def get_repo_flag_ids(db_session: Session, repoid: int, flags: list[str]) -> set
     if not flags:
         return set()
 
-    return set(
-        db_session.query(RepositoryFlag.id_)
+    return {
+        flag.id_
+        for flag in db_session.query(RepositoryFlag.id_)
         .filter(
             RepositoryFlag.repository_id == repoid,
             RepositoryFlag.flag_name.in_(flags),
         )
         .all()
-    )
+    }
 
 
 def create_daily_totals(

apps/worker/uv.lock

@@ -17,8 +17,8 @@ setup:
       receive: 15
 
 services:
-  database_url: postgres://postgres:password@postgres:5432/postgres
-  timeseries_database_url: postgres://postgres:password@timescale:5432/postgres
+  database_url: postgresql://postgres:password@postgres:5432/postgres
+  timeseries_database_url: postgresql://postgres:password@timescale:5432/postgres
   redis_url: redis://redis:6379
   minio:
     hash_key: testixik8qdauiab1yiffydimvi72ekq # never change this