chore: update dependencies and improve project structure

Author: rjarman

core/services/core/settings_service.py

@@ -5,6 +5,7 @@
 from pydantic_settings import BaseSettings
 
 from core.dtos.settings import SettingsDto
+from shared.utils.funcs import get_project_name
 
 
 class SettingsService(BaseSettings, SettingsDto):
@@ -26,10 +27,11 @@ def settings_customise_sources(
 
     @classmethod
     def yaml_config_source(cls):
+        project_name = get_project_name()
         settings_type: str = os.environ.get("ENVIRONMENT", "dev")
-        current_file_path = os.path.abspath(__file__).split("src")
+        current_file_path = os.path.abspath(__file__).split(project_name)
         current_file_path = current_file_path[:-1][0]
-        settings_dir = os.path.join(current_file_path, "src", "core", "configs")
+        settings_dir = os.path.join(current_file_path, project_name, "core", "configs")
         settings_path = os.path.join(settings_dir, f"{settings_type}.yaml")
         config_path = Path(settings_path)
         if config_path.exists():

core/services/database/database_service.py

@@ -11,7 +11,7 @@
 from core.services.core import settings
 from core.services.database.abstract_database_service import AbstractDatabaseService
 from shared.utils import logger
-from shared.utils.funcs import get_root_path, get_project_name
+from shared.utils.funcs import get_root_path
 
 
 class DatabaseService(AbstractDatabaseService):
@@ -60,7 +60,6 @@ async def _create_database(self, engine: AsyncEngine) -> None:
         logger.info(f"Creating database schema for {settings.database.schema_package}")
         try:
             schema_package = settings.database.schema_package
-            schema_package = schema_package.replace(f"{get_project_name()}.", "")
             schema_package_split = os.sep.join(schema_package.split("."))
             schema_package_path = os.path.join(get_root_path(), schema_package_split)
             if not os.path.exists(schema_package_path):

pyproject.toml

@@ -10,8 +10,10 @@ authors = [
 ]
 
 dependencies = [
+    "asyncpg>=0.30.0",
     "crewai>=0.108.0",
     "fastapi>=0.115.9",
+    "greenlet>=3.1.1",
     "gunicorn>=23.0.0",
     "pydantic-settings>=2.8.1",
     "sqlmodel>=0.0.24",

shared/utils/funcs.py

@@ -4,26 +4,24 @@
 
 def get_root_path() -> str:
     """
-    Get the root path of the project.
+    Get the root path of the project based on the given module name.
 
     Returns:
         str: The root path of the project.
     """
-    current_file_path = os.path.abspath(__file__).split("src")
+    current_file_path = os.path.abspath(__file__).split(get_project_name())
     current_file_path = current_file_path[:-1][0]
-    return current_file_path
+    return os.path.join(current_file_path, get_project_name())
 
 
 def get_project_name() -> str:
     """
-    Get the project name.
+    Get the project name based on the root path of the given module.
 
     Returns:
-        str: The project name.
+        str: The name of the project.
     """
-    root_path = get_root_path()
-    project_name = root_path.split("/")[-2]
-    return project_name
+    return "canvas"
 
 
 def make_snake_case(string: str) -> str: