Combining repository models into one file

src/data/repositories/account.py

@@ -25,7 +25,7 @@ from pymongo.errors import ConnectionFailure, PyMongoError, WriteError
 
 from src.data.connection import (ActionFailed, Collections, get_collection,
                                  setup_collection)
-from src.models.account import Account
+from src.models.repositories import Account
 from src.utils.logger import logger
 
 VALID_ROLES = [

src/data/repositories/patient.py

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

src/data/repositories/session.py

@@ -28,7 +28,7 @@ from pymongo.errors import ConnectionFailure, PyMongoError, WriteError
 
 from src.data.connection import (ActionFailed, Collections, get_collection,
                                  setup_collection)
-from src.models.session import Message, Session
+from src.models.repositories import Message, Session
 from src.utils.logger import logger
 
 

src/models/account.py

@@ -1,16 +0,0 @@
-# src/models/account.py
-
-from datetime import datetime
-
-from src.models.common import BaseMongoModel
-
-
-class Account(BaseMongoModel):
-	"""A Pydantic model for an account, used across all layers."""
-	# The '_id' field and base config are inherited from BaseMongoModel
-	name: str
-	role: str
-	specialty: str | None = None
-	created_at: datetime
-	updated_at: datetime
-	last_seen: datetime

src/models/common.py

@@ -1,17 +0,0 @@
-# src/models/common.py
-
-from typing import Annotated
-
-from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
-
-PyObjectId = Annotated[str, BeforeValidator(str)]
-
-class BaseMongoModel(BaseModel):
-	"""A base Pydantic model for all MongoDB documents."""
-	id: PyObjectId = Field(..., alias="_id")
-
-	model_config = ConfigDict(
-		frozen=True,
-		from_attributes=True,
-		arbitrary_types_allowed=True
-	)

src/models/patient.py

@@ -1,22 +0,0 @@
-# src/models/patient.py
-
-from datetime import datetime
-
-from src.models.common import BaseMongoModel, PyObjectId
-
-
-class Patient(BaseMongoModel):
-	"""A Pydantic model for a patient, used across all layers."""
-	# The '_id' field and base config are inherited from BaseMongoModel
-	name: str
-	age: int
-	sex: str
-	ethnicity: str
-	created_at: datetime
-	updated_at: datetime
-	address: str | None = None
-	phone: str | None = None
-	email: str | None = None
-	medications: list[str] | None = None
-	past_assessment_summary: str | None = None
-	assigned_doctor_id: PyObjectId | None = None

src/models/{session.py → repositories.py}

@@ -1,11 +1,45 @@
-# src/models/session.py
+# src/models/repositories.py
 
 from datetime import datetime
+from typing import Annotated
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 
-from src.models.common import BaseMongoModel, PyObjectId
+PyObjectId = Annotated[str, BeforeValidator(str)]
 
+class BaseMongoModel(BaseModel):
+	"""A base Pydantic model for all MongoDB documents."""
+	id: PyObjectId = Field(..., alias="_id")
+
+	model_config = ConfigDict(
+		frozen=True,
+		from_attributes=True,
+		arbitrary_types_allowed=True
+	)
+
+class Account(BaseMongoModel):
+	"""A Pydantic model for an account."""
+	name: str
+	role: str
+	specialty: str | None = None
+	created_at: datetime
+	updated_at: datetime
+	last_seen: datetime
+
+class Patient(BaseMongoModel):
+	"""A Pydantic model for a patient."""
+	name: str
+	age: int
+	sex: str
+	ethnicity: str
+	created_at: datetime
+	updated_at: datetime
+	address: str | None = None
+	phone: str | None = None
+	email: str | None = None
+	medications: list[str] | None = None
+	past_assessment_summary: str | None = None
+	assigned_doctor_id: PyObjectId | None = None
 
 class Message(BaseModel):
 	"""A Pydantic sub-model for a single message within a session."""
@@ -18,10 +52,8 @@ class Message(BaseModel):
 	# Use a standard config for this sub-model
 	model_config = ConfigDict(frozen=True, from_attributes=True)
 
-
 class Session(BaseMongoModel):
 	"""A Pydantic model for a chat session, including nested messages."""
-	# The '_id' field and base config are inherited from BaseMongoModel
 	account_id: PyObjectId
 	patient_id: PyObjectId
 	title: str