Merge pull request #95 from MyElectricalData/develop

Develop

Author: m4dm4rtig4n

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [1.6.0-dev.2](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.6.0-dev.1...1.6.0-dev.2) (2025-12-22)
+
+### Features
+
+* **ui:** display frontend and backend versions in admin menu ([350971d](https://github.com/MyElectricalData/myelectricaldata_new/commit/350971d06ecff945a281ad1c53078ae25357ff6b))
+
+### Bug Fixes
+
+* **api:** add type annotation to fix mypy error in version.py ([c09d769](https://github.com/MyElectricalData/myelectricaldata_new/commit/c09d7699e34d8a391d09e6ae222d5f1dbb15b01e))
+
+## [1.6.0-dev.1](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.5.0...1.6.0-dev.1) (2025-12-21)
+
+### Features
+
+* **roles:** add persistent default roles and CRUD operations ([9c56c38](https://github.com/MyElectricalData/myelectricaldata_new/commit/9c56c386701450451e4af7a353ffc7477511ac9e))
+* **web:** unify notification system with custom Zustand toast ([71825f0](https://github.com/MyElectricalData/myelectricaldata_new/commit/71825f044400304767046d41382a73895e8e2ac3))
+
 ## [1.5.0](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.4.1...1.5.0) (2025-12-21)
 
 ### Features

apps/api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "myelectricaldata-api"
-version = "1.5.0"
+version = "1.6.0-dev.2"
 description = "MyElectricalData API Gateway for Enedis data"
 authors = [{name = "m4dm4rtig4n"}]
 license = {text = "Apache-2.0"}

apps/api/src/config/__init__.py

@@ -1,3 +1,4 @@
 from .settings import settings
+from .version import APP_VERSION
 
-__all__ = ["settings"]
+__all__ = ["settings", "APP_VERSION"]

apps/api/src/config/version.py

@@ -0,0 +1,35 @@
+"""Application version management.
+
+Reads version from pyproject.toml at runtime.
+"""
+
+import tomllib
+from pathlib import Path
+
+
+def get_version() -> str:
+    """Read version from pyproject.toml.
+
+    Falls back to 'unknown' if file cannot be read.
+    """
+    try:
+        # Try multiple possible locations for pyproject.toml
+        possible_paths = [
+            Path(__file__).parent.parent.parent.parent / "pyproject.toml",  # apps/api/pyproject.toml
+            Path("/app/pyproject.toml"),  # Docker container path
+        ]
+
+        for pyproject_path in possible_paths:
+            if pyproject_path.exists():
+                with open(pyproject_path, "rb") as f:
+                    data = tomllib.load(f)
+                    version: str = data.get("project", {}).get("version", "unknown")
+                    return version
+
+        return "unknown"
+    except Exception:
+        return "unknown"
+
+
+# Export version as constant for easy import
+APP_VERSION = get_version()

apps/api/src/main.py

@@ -9,7 +9,7 @@
 from fastapi.staticfiles import StaticFiles
 
 from .adapters import enedis_adapter
-from .config import settings
+from .config import APP_VERSION, settings
 from .logging_config import setup_logging
 from .models.database import init_db
 from .routers import (
@@ -86,7 +86,7 @@ def get_servers() -> list[dict[str, str]]:
 app = FastAPI(
     title="MyElectricalData API",
     description="API Gateway for Enedis data access",
-    version="1.5.15",
+    version=APP_VERSION,
     lifespan=lifespan,
     docs_url="/docs",  # Use default docs
     root_path="/api",
@@ -259,7 +259,7 @@ async def root() -> dict:
     """API information"""
     return {
         "name": "MyElectricalData API",
-        "version": "1.5.15",
+        "version": APP_VERSION,
         "description": "API Gateway for Enedis Linky data",
         "documentation": "/docs",
     }

apps/api/src/models/seed.py

@@ -133,56 +133,73 @@ async def init_default_roles_and_permissions(db: AsyncSession) -> None:
     """
     Initialize default roles and permissions in the database.
 
-    This function is idempotent - it only creates entries that don't exist yet.
-    It will not modify existing roles or permissions.
+    This function is truly idempotent - it creates missing permissions and roles
+    without modifying existing ones. Each permission and role is checked individually.
     """
     try:
-        # Check if permissions already exist
-        result = await db.execute(select(Permission).limit(1))
-        existing_permissions = result.scalar_one_or_none()
+        logger.info("[SEED] Checking default permissions and roles...")
 
-        if existing_permissions:
-            logger.info("[SEED] Permissions already exist, skipping seed")
-            return
+        # Get existing permissions by name
+        result = await db.execute(select(Permission))
+        existing_permissions = {p.name: p for p in result.scalars().all()}
 
-        logger.info("[SEED] Initializing default permissions and roles...")
+        # Create missing permissions
+        permission_objects: dict[str, Permission] = dict(existing_permissions)
+        permissions_created = 0
 
-        # Create permissions
-        permission_objects = {}
         for perm_data in DEFAULT_PERMISSIONS:
-            permission = Permission(
-                name=perm_data["name"],
-                display_name=perm_data["display_name"],
-                description=perm_data["description"],
-                resource=perm_data["resource"],
-            )
-            db.add(permission)
-            permission_objects[perm_data["name"]] = permission
-            logger.info(f"[SEED] Created permission: {perm_data['name']}")
-
-        # Flush to get permission IDs
-        await db.flush()
-
-        # Create roles with their permissions
-        for role_data in DEFAULT_ROLES:
-            role = Role(
-                name=role_data["name"],
-                display_name=role_data["display_name"],
-                description=role_data["description"],
-                is_system=role_data["is_system"],
-            )
+            if perm_data["name"] not in existing_permissions:
+                permission = Permission(
+                    name=perm_data["name"],
+                    display_name=perm_data["display_name"],
+                    description=perm_data["description"],
+                    resource=perm_data["resource"],
+                )
+                db.add(permission)
+                permission_objects[perm_data["name"]] = permission
+                permissions_created += 1
+                logger.info(f"[SEED] Created permission: {perm_data['name']}")
+
+        if permissions_created > 0:
+            await db.flush()
+            logger.info(f"[SEED] Created {permissions_created} missing permission(s)")
+        else:
+            logger.info("[SEED] All permissions already exist")
 
-            # Assign permissions to role
-            permissions_list = cast(list[str], role_data["permissions"])
-            for perm_name in permissions_list:
-                if perm_name in permission_objects:
-                    role.permissions.append(permission_objects[perm_name])
+        # Get existing roles by name
+        result = await db.execute(select(Role))
+        existing_roles = {r.name: r for r in result.scalars().all()}
 
-            db.add(role)
-            logger.info(f"[SEED] Created role: {role_data['name']} with {len(permissions_list)} permissions")
+        # Create missing roles with their permissions
+        roles_created = 0
 
-        await db.commit()
-        logger.info("[SEED] Default roles and permissions initialized successfully")
+        for role_data in DEFAULT_ROLES:
+            if role_data["name"] not in existing_roles:
+                role = Role(
+                    name=role_data["name"],
+                    display_name=role_data["display_name"],
+                    description=role_data["description"],
+                    is_system=role_data["is_system"],
+                )
+
+                # Assign permissions to role
+                permissions_list = cast(list[str], role_data["permissions"])
+                for perm_name in permissions_list:
+                    if perm_name in permission_objects:
+                        role.permissions.append(permission_objects[perm_name])
+
+                db.add(role)
+                roles_created += 1
+                logger.info(f"[SEED] Created role: {role_data['name']} with {len(permissions_list)} permissions")
+
+        if roles_created > 0:
+            await db.commit()
+            logger.info(f"[SEED] Created {roles_created} missing role(s)")
+        elif permissions_created > 0:
+            await db.commit()
+            logger.info("[SEED] All roles already exist, committed new permissions")
+        else:
+            logger.info("[SEED] All roles and permissions already exist, nothing to do")
 
     except Exception as e:
         logger.error(f"[SEED] Error initializing roles and permissions: {e}")