fix: change map_status and clean up schema

Author: HeloiseJoffe

diracx-core/src/diracx/core/models/rss.py

@@ -8,7 +8,7 @@
 
 class AllowedStatus(BaseModel):
     allowed: Literal[True]
-    warnings: list[str] = []
+    warnings: str | None = None
 
     def __bool__(self) -> bool:
         return True
@@ -55,19 +55,3 @@ class SiteStatus(BaseModel):
 
 ALLOWED = {"Active", "Degraded"}
 BANNED = {"Banned", "Probing", "Error", "Unknown"}
-
-
-def map_status(db_status: str, reason: str | None = None) -> ResourceStatus:
-    if db_status in ALLOWED:
-        return AllowedStatus(allowed=True)
-
-    if db_status in BANNED:
-        return BannedStatus(
-            allowed=False,
-            reason=reason or db_status,
-        )
-
-    return BannedStatus(
-        allowed=False,
-        reason=f"Unknown status: {db_status}",
-    )

diracx-db/src/diracx/db/sql/rss/db.py

@@ -21,7 +21,7 @@ class ResourceStatusDB(BaseSQLDB):
     async def get_site_status(self, name: str, vo: str = "all") -> tuple[str, str]:
         stmt = select(SiteStatus.status, SiteStatus.reason).where(
             SiteStatus.name == name,
-            SiteStatus.statustype == "all",
+            SiteStatus.status_type == "all",
             SiteStatus.vo == vo,
         )
         result = await self.conn.execute(stmt)
@@ -34,14 +34,16 @@ async def get_site_status(self, name: str, vo: str = "all") -> tuple[str, str]:
     async def get_resource_status(
         self,
         name: str,
-        statustypes: list[str] = ["all"],
+        status_types: list[str] | None = None,
         vo: str = "all",
     ) -> dict[str, Row]:
+        if not status_types:
+            status_types = ["all"]
         stmt = select(
-            ResourceStatus.status, ResourceStatus.reason, ResourceStatus.statustype
+            ResourceStatus.status, ResourceStatus.reason, ResourceStatus.status_type
         ).where(
             ResourceStatus.name == name,
-            ResourceStatus.statustype.in_(statustypes),
+            ResourceStatus.status_type.in_(status_types),
             ResourceStatus.vo == vo,
         )
         result = await self.conn.execute(stmt)

diracx-db/src/diracx/db/sql/rss/schema.py

@@ -2,9 +2,11 @@
 
 from datetime import datetime
 
-from sqlalchemy import BigInteger, DateTime, String
+from sqlalchemy import BigInteger, String
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
+from diracx.db.sql.utils.types import SmarterDateTime
+
 from ..utils import str32, str64, str128, str512
 
 # Defining the tables
@@ -20,24 +22,22 @@ class RSSBase(DeclarativeBase):
 
 
 class ElementStatusBase:
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
-
     name: Mapped[str64] = mapped_column("Name", primary_key=True)
-    statustype: Mapped[str128] = mapped_column(
+    status_type: Mapped[str128] = mapped_column(
         "StatusType", server_default="all", primary_key=True
     )
     vo: Mapped[str64] = mapped_column("VO", primary_key=True, server_default="all")
     status: Mapped[str] = mapped_column("Status", String(8), server_default="")
     reason: Mapped[str512] = mapped_column("Reason", server_default="Unspecified")
-    dateeffective: Mapped[datetime] = mapped_column("DateEffective", DateTime)
-    tokenexpiration: Mapped[datetime] = mapped_column(
-        "TokenExpiration", DateTime, server_default="9999-12-31 23:59:59"
+    date_effective: Mapped[datetime] = mapped_column("DateEffective", SmarterDateTime())
+    token_expiration: Mapped[datetime] = mapped_column(
+        "TokenExpiration", SmarterDateTime(), server_default="9999-12-31 23:59:59"
     )
-    elementtype: Mapped[str32] = mapped_column("ElementType", server_default="")
-    lastchecktime: Mapped[datetime] = mapped_column(
-        "LastCheckTime", DateTime, server_default="1000-01-01 00:00:00"
+    element_type: Mapped[str32] = mapped_column("ElementType", server_default="")
+    last_check_time: Mapped[datetime] = mapped_column(
+        "LastCheckTime", SmarterDateTime(), server_default="1000-01-01 00:00:00"
     )
-    tokenowner: Mapped[str] = mapped_column(
+    token_owner: Mapped[str] = mapped_column(
         "TokenOwner", String(16), server_default="rs_svc"
     )
 
@@ -54,19 +54,19 @@ class ElementStatusBaseWithID(ElementStatusBase):
         "ID", BigInteger, autoincrement=True, primary_key=True
     )
     name: Mapped[str64] = mapped_column("Name")
-    statustype: Mapped[str128] = mapped_column("StatusType", server_default="all")
+    status_type: Mapped[str128] = mapped_column("StatusType", server_default="all")
     vo: Mapped[str64] = mapped_column("VO", server_default="all")
     status: Mapped[str] = mapped_column("Status", String(8), server_default="")
     reason: Mapped[str512] = mapped_column("Reason", server_default="Unspecified")
-    dateeffective: Mapped[datetime] = mapped_column("DateEffective", DateTime)
-    tokenexpiration: Mapped[datetime] = mapped_column(
-        "TokenExpiration", DateTime, server_default="9999-12-31 23:59:59"
+    date_effective: Mapped[datetime] = mapped_column("DateEffective", SmarterDateTime())
+    token_expiration: Mapped[datetime] = mapped_column(
+        "TokenExpiration", SmarterDateTime(), server_default="9999-12-31 23:59:59"
     )
-    elementtype: Mapped[str32] = mapped_column("ElementType", server_default="")
-    lastchecktime: Mapped[datetime] = mapped_column(
-        "LastCheckTime", DateTime, server_default="1000-01-01 00:00:00"
+    element_type: Mapped[str32] = mapped_column("ElementType", server_default="")
+    last_check_time: Mapped[datetime] = mapped_column(
+        "LastCheckTime", SmarterDateTime(), server_default="1000-01-01 00:00:00"
     )
-    tokenowner: Mapped[str] = mapped_column(
+    token_owner: Mapped[str] = mapped_column(
         "TokenOwner", String(16), server_default="rs_svc"
     )
 

diracx-db/tests/rss/__init__.py

@@ -40,15 +40,15 @@ async def test_site_status(rss_db: ResourceStatusDB):
         )
 
     # Test with the test Site (should be found)
-    async with rss_db as rss_db:
-        status, reason = await rss_db.get_site_status("TestSite")
+    async with rss_db as db:
+        status, reason = await db.get_site_status("TestSite")
     assert status == "Active"
     assert reason == "All good"
 
     # Test with an unknow Site (should not be found)
     with pytest.raises(ResourceNotFoundError):
-        async with rss_db as rss_db:
-            await rss_db.get_site_status("Unknown")
+        async with rss_db as db:
+            await db.get_site_status("Unknown")
 
 
 async def test_resource_status(rss_db: ResourceStatusDB):
@@ -101,22 +101,22 @@ async def test_resource_status(rss_db: ResourceStatusDB):
             )
 
     # Test with the test Compute Element (should be found)
-    async with rss_db as rss_db:
-        result = await rss_db.get_resource_status("TestCompute")
+    async with rss_db as db:
+        result = await db.get_resource_status("TestCompute")
     assert "all" in result
     assert result["all"].Status == "Active"
     assert result["all"].Reason == "All good"
 
     # Test with the test FTS (should be found)
-    async with rss_db as rss_db:
-        result = await rss_db.get_resource_status("TestFTS")
+    async with rss_db as db:
+        result = await db.get_resource_status("TestFTS")
     assert "all" in result
     assert result["all"].Status == "Active"
     assert result["all"].Reason == "All good"
 
     # Test with the test Storage Element (should be found)
-    async with rss_db as rss_db:
-        result = await rss_db.get_resource_status(
+    async with rss_db as db:
+        result = await db.get_resource_status(
             "TestStorage", ["ReadAccess", "WriteAccess", "CheckAccess", "RemoveAccess"]
         )
     assert set(result.keys()) == {
@@ -131,5 +131,5 @@ async def test_resource_status(rss_db: ResourceStatusDB):
 
     # Test with an unknow Resource (should not be found)
     with pytest.raises(ResourceNotFoundError):
-        async with rss_db as rss_db:
-            await rss_db.get_resource_status("Unknown")
+        async with rss_db as db:
+            await db.get_resource_status("Unknown")

diracx-db/tests/rss/test_rss_db.py

@@ -1,17 +1,40 @@
 from __future__ import annotations
 
 from diracx.core.models.rss import (
+    ALLOWED,
+    BANNED,
+    AllowedStatus,
+    BannedStatus,
     ComputeElementStatus,
     FTSStatus,
+    ResourceStatus,
     StorageElementStatus,
-    map_status,
 )
 from diracx.core.models.rss import (
     SiteStatus as SiteStatusModel,
 )
 from diracx.db.sql import ResourceStatusDB
 
 
+def map_status(db_status: str, reason: str | None = None) -> ResourceStatus:
+    if db_status in ALLOWED:
+        return AllowedStatus(
+            allowed=True,
+            warnings=reason or db_status if db_status == "Degraded" else None,
+        )
+
+    if db_status in BANNED:
+        return BannedStatus(
+            allowed=False,
+            reason=reason or db_status,
+        )
+
+    return BannedStatus(
+        allowed=False,
+        reason=f"Unknown status: {db_status}",
+    )
+
+
 async def get_site_status(
     resource_status_db: ResourceStatusDB, name: str, vo: str
 ) -> SiteStatusModel:

diracx-logic/src/diracx/logic/rss/rss.py …racx-logic/src/diracx/logic/rss/query.pydiracx-logic/src/diracx/logic/rss/rss.py renamed to diracx-logic/src/diracx/logic/rss/query.py diracx-logic/src/diracx/logic/rss/rss.py renamed to diracx-logic/src/diracx/logic/rss/query.py

@@ -5,22 +5,28 @@
 from diracx.core.models.rss import (
     AllowedStatus,
     BannedStatus,
-    map_status,
 )
+from diracx.logic.rss.query import map_status
 
 
-@pytest.mark.parametrize("status", ["Active", "Degraded"])
-async def test_map_status_allowed(status):
-    assert bool(map_status(status, "")) is True
-    assert isinstance(map_status(status, ""), AllowedStatus)
+async def test_map_status_allowed():
+    result = map_status("Active", "Resource active")
+    assert bool(result) is True
+    assert isinstance(result, AllowedStatus)
+    assert result.warnings is None
+
+    result = map_status("Degraded", "Resource degraded")
+    assert bool(result) is True
+    assert isinstance(result, AllowedStatus)
+    assert result.warnings == "Resource degraded"
 
 
 @pytest.mark.parametrize("status", ["Banned", "Probing", "Error", "Unknown"])
 async def test_map_status_banned(status):
-    result = map_status(status, "CE banned")
+    result = map_status(status, "Resource banned")
     assert bool(result) is False
     assert isinstance(result, BannedStatus)
-    assert result.reason == "CE banned"
+    assert result.reason == "Resource banned"
 
 
 async def test_map_status_unknown_banned():