Moving medical models into combined model file

src/data/repositories/medical_memory.py

@@ -22,7 +22,7 @@ from pymongo.errors import ConnectionFailure, PyMongoError, WriteError
 
 from src.data.connection import (ActionFailed, Collections, get_collection,
                                  setup_collection)
-from src.models.medical import MedicalMemory, SemanticSearchResult
+from src.models.repositories import MedicalMemory, SemanticSearchResult
 from src.utils.logger import logger
 
 

src/data/repositories/medical_record.py

@@ -23,7 +23,7 @@ from pymongo.errors import ConnectionFailure, PyMongoError, WriteError
 
 from src.data.connection import (ActionFailed, Collections, get_collection,
                                  setup_collection)
-from src.models.medical import MedicalRecord
+from src.models.repositories import MedicalRecord
 from src.utils.logger import logger
 
 

src/models/medical.py

@@ -1,38 +0,0 @@
-# src/models/medical.py
-
-from datetime import datetime
-from typing import Any
-
-from pydantic import BaseModel, ConfigDict
-
-from models.repositories import BaseMongoModel, PyObjectId
-
-
-class MedicalRecord(BaseMongoModel):
-	"""A Pydantic model for a structured medical record."""
-	patient_id: PyObjectId
-	doctor_id: PyObjectId
-	record_type: str
-	details: dict[str, Any]
-	created_at: datetime
-	updated_at: datetime
-
-
-class MedicalMemory(BaseMongoModel):
-	"""A Pydantic model for a medical memory summary, used for semantic search."""
-	patient_id: PyObjectId
-	doctor_id: PyObjectId
-	session_id: PyObjectId | None = None
-	summary: str
-	embedding: list[float] | None = None
-	created_at: datetime
-
-
-class SemanticSearchResult(BaseModel):
-	"""A Pydantic model for the result of a semantic search."""
-	summary: str
-	similarity_score: float
-	created_at: datetime
-	session_id: PyObjectId | None = None
-
-	model_config = ConfigDict(frozen=True, from_attributes=True)

src/models/repositories.py

@@ -1,7 +1,7 @@
 # src/models/repositories.py
 
 from datetime import datetime
-from typing import Annotated
+from typing import Annotated, Any
 
 from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 
@@ -60,3 +60,30 @@ class Session(BaseMongoModel):
 	created_at: datetime
 	updated_at: datetime
 	messages: list[Message] = Field(default_factory=list)
+
+class MedicalRecord(BaseMongoModel):
+	"""A Pydantic model for a structured medical record."""
+	patient_id: PyObjectId
+	doctor_id: PyObjectId
+	record_type: str
+	details: dict[str, Any]
+	created_at: datetime
+	updated_at: datetime
+
+class MedicalMemory(BaseMongoModel):
+	"""A Pydantic model for a medical memory summary, used for semantic search."""
+	patient_id: PyObjectId
+	doctor_id: PyObjectId
+	session_id: PyObjectId | None = None
+	summary: str
+	embedding: list[float] | None = None
+	created_at: datetime
+
+class SemanticSearchResult(BaseModel):
+	"""A Pydantic model for the result of a semantic search."""
+	summary: str
+	similarity_score: float
+	created_at: datetime
+	session_id: PyObjectId | None = None
+
+	model_config = ConfigDict(frozen=True, from_attributes=True)

tests/test_medical_memory.py

@@ -6,7 +6,7 @@ from pymongo.errors import ConnectionFailure
 
 from src.data.connection import ActionFailed, Collections
 from src.data.repositories import medical_memory as medical_memory_repo
-from src.models.medical import MedicalMemory, SemanticSearchResult
+from src.models.repositories import MedicalMemory, SemanticSearchResult
 from src.utils.logger import logger
 from tests.base_test import BaseMongoTest
 

tests/test_medical_record.py

@@ -7,7 +7,7 @@ from pymongo.errors import ConnectionFailure
 
 from src.data.connection import ActionFailed, Collections
 from src.data.repositories import medical_record as medical_record_repo
-from src.models.medical import MedicalRecord
+from src.models.repositories import MedicalRecord
 from src.utils.logger import logger
 from tests.base_test import BaseMongoTest