fix(tests) Clean up test logic

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "honcho"
-version = "0.0.11"
+version = "0.0.12"
 description = "Honcho Server"
 authors = [
   {name = "Plastic Labs", email = "[email protected]"},
@@ -26,8 +26,8 @@ dependencies = [
     "mirascope>=0.18.0",
     "openai>=1.43.0",
 ]
-[project.optional-dependencies]
-test = [
+[tool.uv]
+dev-dependencies = [
     "pytest>=8.2.2",
     "sqlalchemy-utils>=0.41.2",
     "pytest-asyncio>=0.23.7",

src/routers/messages.py

@@ -28,12 +28,16 @@ async def enqueue(payload: dict):
             session_id=payload["session_id"],
         )
         # Check if metadata has a "deriver" key
-        deriver_disabled = session.h_metadata.get("deriver_disabled")
-        if deriver_disabled is not None and deriver_disabled is not False:
-            print("=====================")
-            print(f"Deriver is not enabled on session {payload['session_id']}")
-            print("=====================")
-            # If deriver is not enabled, do not enqueue
+        if session is not None:
+            deriver_disabled = session.h_metadata.get("deriver_disabled")
+            if deriver_disabled is not None and deriver_disabled is not False:
+                print("=====================")
+                print(f"Deriver is not enabled on session {payload['session_id']}")
+                print("=====================")
+                # If deriver is not enabled, do not enqueue
+                return
+        else:
+            # Session doesn't exist return
             return
         try:
             processed_payload = {

tests/conftest.py

@@ -125,12 +125,12 @@ async def override_get_db():
 async def sample_data(db_session):
     """Helper function to create test data"""
     # Create test app
-    test_app = models.App(name=str(uuid.uuid4()), metadata={})
+    test_app = models.App(name=str(uuid.uuid4()))
     db_session.add(test_app)
     await db_session.flush()
 
     # Create test user
-    test_user = models.User(name=str(uuid.uuid4()), app_id=test_app.id, metadata={})
+    test_user = models.User(name=str(uuid.uuid4()), app_id=test_app.id)
     db_session.add(test_user)
     await db_session.flush()
 

tests/routes/test_messages.py

@@ -7,7 +7,7 @@
 async def test_create_message(client, db_session, sample_data):
     test_app, test_user = sample_data
     # Create a test session
-    test_session = models.Session(user_id=test_user.id, metadata={})
+    test_session = models.Session(user_id=test_user.id)
     db_session.add(test_session)
     await db_session.commit()
 
@@ -31,11 +31,11 @@ async def test_create_message(client, db_session, sample_data):
 async def test_get_messages(client, db_session, sample_data):
     test_app, test_user = sample_data
     # Create a test session and message
-    test_session = models.Session(user_id=test_user.id, metadata={})
+    test_session = models.Session(user_id=test_user.id)
     db_session.add(test_session)
     await db_session.commit()
     test_message = models.Message(
-        session_id=test_session.id, content="Test message", is_user=True, metadata={}
+        session_id=test_session.id, content="Test message", is_user=True
     )
     db_session.add(test_message)
     await db_session.commit()
@@ -56,11 +56,11 @@ async def test_get_messages(client, db_session, sample_data):
 async def test_update_message(client, db_session, sample_data):
     test_app, test_user = sample_data
     # Create a test session and message
-    test_session = models.Session(user_id=test_user.id, metadata={})
+    test_session = models.Session(user_id=test_user.id)
     db_session.add(test_session)
     await db_session.commit()
     test_message = models.Message(
-        session_id=test_session.id, content="Test message", is_user=True, metadata={}
+        session_id=test_session.id, content="Test message", is_user=True
     )
     db_session.add(test_message)
     await db_session.commit()

tests/routes/test_metamessages.py

@@ -7,11 +7,11 @@
 async def test_create_metamessage(client, db_session, sample_data):
     test_app, test_user = sample_data
     # Create a test session
-    test_session = models.Session(user_id=test_user.id, metadata={})
+    test_session = models.Session(user_id=test_user.id)
     db_session.add(test_session)
     await db_session.commit()
     test_message = models.Message(
-        session_id=test_session.id, content="Test message", is_user=True, metadata={}
+        session_id=test_session.id, content="Test message", is_user=True
     )
     db_session.add(test_message)
     await db_session.commit()
@@ -37,11 +37,11 @@ async def test_create_metamessage(client, db_session, sample_data):
 async def test_get_metamessage(client, db_session, sample_data):
     test_app, test_user = sample_data
     # Create a test session
-    test_session = models.Session(user_id=test_user.id, metadata={})
+    test_session = models.Session(user_id=test_user.id)
     db_session.add(test_session)
     await db_session.commit()
     test_message = models.Message(
-        session_id=test_session.id, content="Test message", is_user=True, metadata={}
+        session_id=test_session.id, content="Test message", is_user=True
     )
     db_session.add(test_message)
     await db_session.commit()
@@ -69,11 +69,11 @@ async def test_get_metamessage(client, db_session, sample_data):
 async def test_update_metamessage(client, db_session, sample_data):
     test_app, test_user = sample_data
     # Create a test session
-    test_session = models.Session(user_id=test_user.id, metadata={})
+    test_session = models.Session(user_id=test_user.id)
     db_session.add(test_session)
     await db_session.commit()
     test_message = models.Message(
-        session_id=test_session.id, content="Test message", is_user=True, metadata={}
+        session_id=test_session.id, content="Test message", is_user=True
     )
     db_session.add(test_message)
     await db_session.commit()