breakpoint to rebase

memgpt/metadata.py

@@ -38,7 +38,11 @@ class MetadataStore:
     """
     db_session: "Session" = None
 
-    def __init__(self):
+    def __init__(self, db_session: Optional["Session"] = None):
+        """
+        Args:
+            db_session: the database session to use.
+        """
         self.db_session = get_db_session()
 
     def create_api_key(self,

memgpt/server/rest_api/auth/index.py

@@ -1,9 +1,11 @@
 from uuid import UUID
+from typing import Annotated, Generator
 
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 from pydantic import BaseModel, Field
 
 from memgpt.server.rest_api.interface import QueuingInterface
+from memgpt.orm.utilities import get_db_session
 from memgpt.server.server import SyncServer
 
 router = APIRouter()
@@ -20,7 +22,9 @@ class AuthRequest(BaseModel):
 def setup_auth_router(server: SyncServer, interface: QueuingInterface, password: str) -> APIRouter:
 
     @router.post("/auth", tags=["auth"], response_model=AuthResponse)
-    def authenticate_user(request: AuthRequest) -> AuthResponse:
+    def authenticate_user(request: AuthRequest,
+                          db_session: Annotated["Generator", Depends(get_db_session)],
+                          ) -> AuthResponse:
         """
         Authenticates the user and sends response with User related data.
 

memgpt/server/server.py

@@ -130,7 +130,8 @@ def __init__(
         max_chaining_steps: bool = None,
         default_interface_factory: Callable[[], AgentInterface] = lambda: CLIInterface(),
         # test hooks
-        config: Optional["MemGPTConfig"] = None
+        config: Optional["MemGPTConfig"] = None,
+        db_session: Optional["Session"] = None,
     ):
         """Server process holds in-memory agents that are being run"""
 
@@ -179,7 +180,7 @@ def __init__(
         assert self.server_embedding_config.embedding_model is not None, vars(self.server_embedding_config)
 
         # Initialize the metadata store
-        self.ms = MetadataStore(self.config)
+        self.ms = MetadataStore(self.config, db_session=db_session)
 
         # pre-fill database (users, presets, humans, personas)
         # TODO: figure out how to handle default users  (server is technically multi-user)

tests/conftest.py

@@ -141,4 +141,5 @@ def db_session(request) -> "Session":
 @pytest.fixture
 def test_app(db_session):
     """a per-test-function db scoped version of the rest api app"""
-
+    app.dependency_overrides[sessionmaker] = lambda: db_session
+    return app