fix(core): bugs

Author: majkshkurti

apps/core/alembic/env.py

@@ -4,6 +4,7 @@
 from logging.config import fileConfig
 
 from alembic import context
+from core._dotenv import load_dotenv  # noqa: F401
 from core.core.config import settings
 from core.db.models import *  # noqa: F403
 from sqlalchemy import pool

apps/core/src/core/_dotenv.py

@@ -1,6 +1,12 @@
-import os
+from pathlib import Path
 
 from dotenv import load_dotenv
 
-BASEDIR = os.path.abspath(os.path.dirname(__file__))
-load_dotenv(os.path.join(BASEDIR,"../../.env"))
+BASE_DIR = Path(__file__).resolve().parents[2]
+ENV_FILE = BASE_DIR / ".env"
+ROOT_ENV = Path("/app/.env")
+
+load_dotenv(ENV_FILE)
+
+if ROOT_ENV.exists():
+    load_dotenv(ROOT_ENV, override=True)

apps/core/src/core/crud/crud_project.py

@@ -179,7 +179,7 @@ async def get_public_project(
         project = result.scalars().first()
         if not project:
             return None
-        project_public_read = ProjectPublicRead(**project.dict())
+        project_public_read = ProjectPublicRead(**project.model_dump())
         return project_public_read
 
     async def publish_project(

apps/core/src/core/schemas/layer.py

@@ -377,7 +377,7 @@ class IFeatureStandardUpdate(FeatureUpdateBase):
 class FeatureToolAttributesBase(BaseModel):
     """Base model for additional attributes feature layer tool."""
 
-    tool_type: ToolType = Field(..., description="Tool type")
+    tool_type: ToolType | None = Field(None, description="Tool type")
 
 
 feature_layer_tool_attributes_example = {