fix(release): stabilize SQL HA build checks

app/database.py

@@ -7,14 +7,17 @@ from typing import Any
 
 from sqlalchemy import create_engine, exc
 from sqlalchemy.engine.url import make_url
-from sqlalchemy.orm import Session, declarative_base, sessionmaker
+from sqlalchemy.orm import DeclarativeBase, Session, sessionmaker
 from sqlalchemy.pool import NullPool, QueuePool
 
 from app.config import settings
 
 logger = logging.getLogger(__name__)
 
-Base = declarative_base()
+
+class Base(DeclarativeBase):
+    pass
+
 
 DB_URL = settings.database_url
 _parsed_url = make_url(DB_URL)

app/views/base.py

@@ -27,9 +27,16 @@ original_template_response = templates.TemplateResponse
 
 def template_response_with_version(*args, **kwargs):
     """Wrapper for TemplateResponse to include version in all templates"""
-    # If context dict is provided, add version to it
-    if len(args) >= 2 and isinstance(args[1], dict):
-        args[1].setdefault("version", settings.version)
+    if args and isinstance(args[0], str):
+        name = args[0]
+        context = args[1] if len(args) >= 2 and isinstance(args[1], dict) else kwargs.pop("context", {})
+        if isinstance(context, dict):
+            context.setdefault("version", settings.version)
+            request = context.get("request") or kwargs.pop("request", None)
+            if request is not None:
+                return original_template_response(request, name, context, *args[2:], **kwargs)
+    elif len(args) >= 3 and isinstance(args[2], dict):
+        args[2].setdefault("version", settings.version)
     elif "context" in kwargs and isinstance(kwargs["context"], dict):
         kwargs["context"].setdefault("version", settings.version)
     return original_template_response(*args, **kwargs)