simplified some, walked back some decisions

llama_stack/providers/utils/sqlstore/authorized_sqlstore.py

@@ -12,10 +12,10 @@ from llama_stack.core.access_control.conditions import ProtectedResource
 from llama_stack.core.access_control.datatypes import AccessRule, Action, Scope
 from llama_stack.core.datatypes import User
 from llama_stack.core.request_headers import get_authenticated_user
+from llama_stack.core.storage.datatypes import StorageBackendType
 from llama_stack.log import get_logger
 
 from .api import ColumnDefinition, ColumnType, PaginatedResponse, SqlStore
-from .sqlstore import StorageBackendType
 
 logger = get_logger(name=__name__, category="providers::utils")
 

llama_stack/providers/utils/sqlstore/sqlalchemy_sqlstore.py

@@ -26,10 +26,10 @@ from sqlalchemy.ext.asyncio.engine import AsyncEngine
 from sqlalchemy.sql.elements import ColumnElement
 
 from llama_stack.apis.common.responses import PaginatedResponse
+from llama_stack.core.storage.datatypes import SqlAlchemySqlStoreConfig
 from llama_stack.log import get_logger
 
 from .api import ColumnDefinition, ColumnType, SqlStore
-from .sqlstore import SqlAlchemySqlStoreConfig
 
 logger = get_logger(name=__name__, category="providers::utils")
 

llama_stack/providers/utils/sqlstore/sqlstore.py

@@ -4,7 +4,7 @@
 # This source code is licensed under the terms described in the LICENSE file in
 # the root directory of this source tree.
 
-from typing import Annotated
+from typing import Annotated, cast
 
 from pydantic import Field
 
@@ -21,7 +21,6 @@ from .api import SqlStore
 sql_store_pip_packages = ["sqlalchemy[asyncio]", "aiosqlite", "asyncpg"]
 
 _SQLSTORE_BACKENDS: dict[str, StorageBackendConfig] = {}
-_SQLSTORE_DEFAULT_BACKEND: str | None = None
 
 
 SqlStoreConfig = Annotated[
@@ -45,19 +44,18 @@ def get_pip_packages(store_config: dict | SqlStoreConfig) -> list[str]:
 
 
 def sqlstore_impl(reference: SqlStoreReference) -> SqlStore:
-    backend_name = reference.backend or _SQLSTORE_DEFAULT_BACKEND
-    if not backend_name:
-        raise ValueError(
-            "SQL store reference did not specify a backend and no default backend is configured. "
-            f"Available backends: {sorted(_SQLSTORE_BACKENDS)}"
-        )
+    backend_name = reference.backend
 
     backend_config = _SQLSTORE_BACKENDS.get(backend_name)
-    if backend_config.type in [StorageBackendType.SQL_SQLITE, StorageBackendType.SQL_POSTGRES]:
+    if backend_config is None:
+        raise ValueError(
+            f"Unknown SQL store backend '{backend_name}'. Registered backends: {sorted(_SQLSTORE_BACKENDS)}"
+        )
+
+    if isinstance(backend_config, SqliteSqlStoreConfig | PostgresSqlStoreConfig):
         from .sqlalchemy_sqlstore import SqlAlchemySqlStoreImpl
 
-        config = backend_config.model_copy()
-        config.table_name = reference.table_name
+        config = cast(SqliteSqlStoreConfig | PostgresSqlStoreConfig, backend_config).model_copy()
         return SqlAlchemySqlStoreImpl(config)
     else:
         raise ValueError(f"Unknown sqlstore type {backend_config.type}")
@@ -67,18 +65,6 @@ def register_sqlstore_backends(backends: dict[str, StorageBackendConfig]) -> Non
     """Register the set of available SQL store backends for reference resolution."""
     global _SQLSTORE_BACKENDS
 
-    def _set_default_backend(name: str) -> None:
-        global _SQLSTORE_DEFAULT_BACKEND
-        if _SQLSTORE_DEFAULT_BACKEND and _SQLSTORE_DEFAULT_BACKEND != name:
-            raise ValueError(
-                f"Multiple SQL store backends marked as default: '{_SQLSTORE_DEFAULT_BACKEND}' and '{name}'. "
-                "Only one backend can be the default."
-            )
-        _SQLSTORE_DEFAULT_BACKEND = name
-
     _SQLSTORE_BACKENDS.clear()
     for name, cfg in backends.items():
-        if cfg.default:
-            _set_default_backend(name)
-
         _SQLSTORE_BACKENDS[name] = cfg