sysnet-pyutils 1.7.7__tar.gz → 1.7.8__tar.gz

{sysnet_pyutils-1.7.7 → sysnet_pyutils-1.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysnet-pyutils
-Version: 1.7.7
+Version: 1.7.8
 Summary: SYSNET Python Utilities - kompletní sada nástrojů pro Python aplikace
 Author-email: Data Developer <info@sysnet.cz>
 Maintainer-email: SYSNET Development Team <info@sysnet.cz>

{sysnet_pyutils-1.7.7 → sysnet_pyutils-1.7.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sysnet-pyutils"
-version = "1.7.7"
+version = "1.7.8"
 description = "SYSNET Python Utilities - kompletní sada nástrojů pro Python aplikace"
 readme = "README.md"
 license = { file = "LICENSE" }

{sysnet_pyutils-1.7.7 → sysnet_pyutils-1.7.8}/sysnet_pyutils/__init__.py

@@ -93,6 +93,9 @@ from sysnet_pyutils.models.general import (
     ErrorModel,
     GeoPointJtskType,
     GeoPointType,
+    InfoComponentType,
+    InfoStatusEnum,
+    InfoType,
     LinkedType,
     ListTypeBase,
     LocationType,
@@ -111,6 +114,7 @@ from sysnet_pyutils.models.general import (
     TimeLimitedType,
     UserType,
     WorkflowType,
+    calculate_status,
 )
 
 # Syslog

{sysnet_pyutils-1.7.7 → sysnet_pyutils-1.7.8}/sysnet_pyutils/models/general.py

@@ -468,28 +468,27 @@ class InfoStatusEnum(BaseEnum):
     RED = "RED"
 
 
+def calculate_status(statuses: List[InfoStatusEnum]) -> InfoStatusEnum:
+    """Vypočítá celkový stav na základě seznamu stavů (RED > YELLOW > GREEN)."""
+    if not statuses:
+        return InfoStatusEnum.GREEN
+    if InfoStatusEnum.RED in statuses:
+        return InfoStatusEnum.RED
+    if InfoStatusEnum.YELLOW in statuses:
+        return InfoStatusEnum.YELLOW
+    return InfoStatusEnum.GREEN
+
+
 class InfoComponentType(BaseModel):
-    code: str = Field(..., description="Kód komponenty (např. mongo, storage)")
+    name: str = Field(..., description="Název komponenty (např. mongo-db, storage)")
     status: InfoStatusEnum = Field(..., description="Stav komponenty")
-    info: Optional[Any] = Field(default=None, description="Detailní informace o stavu")
+    message: Optional[str] = Field(default=None, description="Detailní zpráva o stavu")
 
 
 class InfoType(BaseModel):
-    status: InfoStatusEnum = Field(default=InfoStatusEnum.GREEN, description="Celkový stav služby")
     name: str = Field(..., description="Název služby")
     version: str = Field(..., description="Verze služby")
+    status: InfoStatusEnum = Field(default=InfoStatusEnum.GREEN, description="Celkový stav služby")
+    timestamp: datetime = Field(default_factory=datetime.now, description="Čas vygenerování reportu")
     components: List[InfoComponentType] = Field(default_factory=list, description="Seznam komponent")
 
-    def update_status(self):
-        """Aktualizuje celkový status na základě nejhoršího stavu komponent."""
-        if not self.components:
-            self.status = InfoStatusEnum.GREEN
-            return self.status
-        statuses = [c.status for c in self.components]
-        if InfoStatusEnum.RED in statuses:
-            self.status = InfoStatusEnum.RED
-        elif InfoStatusEnum.YELLOW in statuses:
-            self.status = InfoStatusEnum.YELLOW
-        else:
-            self.status = InfoStatusEnum.GREEN
-        return self.status

{sysnet_pyutils-1.7.7 → sysnet_pyutils-1.7.8}/sysnet_pyutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysnet-pyutils
-Version: 1.7.7
+Version: 1.7.8
 Summary: SYSNET Python Utilities - kompletní sada nástrojů pro Python aplikace
 Author-email: Data Developer <info@sysnet.cz>
 Maintainer-email: SYSNET Development Team <info@sysnet.cz>

{sysnet_pyutils-1.7.7 → sysnet_pyutils-1.7.8}/tests/test_models_general.py

@@ -208,20 +208,24 @@ class TestIntegration:
         assert metadata.contributor.name == "Jan Novák"
 
 def test_info_type_status_calculation():
-    from sysnet_pyutils.models.general import InfoType, InfoComponentType, InfoStatusEnum
+    from sysnet_pyutils.models.general import InfoType, InfoComponentType, InfoStatusEnum, calculate_status
     
     info = InfoType(name="Test Service", version="1.0.0")
     assert info.status == InfoStatusEnum.GREEN
     
-    info.components.append(InfoComponentType(code="mongo", status=InfoStatusEnum.GREEN))
-    assert info.update_status() == InfoStatusEnum.GREEN
+    info.components.append(InfoComponentType(name="mongo", status=InfoStatusEnum.GREEN))
+    info.status = calculate_status([c.status for c in info.components])
+    assert info.status == InfoStatusEnum.GREEN
     
-    info.components.append(InfoComponentType(code="redis", status=InfoStatusEnum.YELLOW))
-    assert info.update_status() == InfoStatusEnum.YELLOW
+    info.components.append(InfoComponentType(name="redis", status=InfoStatusEnum.YELLOW))
+    info.status = calculate_status([c.status for c in info.components])
+    assert info.status == InfoStatusEnum.YELLOW
     
-    info.components.append(InfoComponentType(code="storage", status=InfoStatusEnum.RED))
-    assert info.update_status() == InfoStatusEnum.RED
+    info.components.append(InfoComponentType(name="storage", status=InfoStatusEnum.RED))
+    info.status = calculate_status([c.status for c in info.components])
+    assert info.status == InfoStatusEnum.RED
     
     # Odebrání RED komponenty by mělo vrátit YELLOW
     info.components = [c for c in info.components if c.status != InfoStatusEnum.RED]
-    assert info.update_status() == InfoStatusEnum.YELLOW
+    info.status = calculate_status([c.status for c in info.components])
+    assert info.status == InfoStatusEnum.YELLOW