fix: Update datacalss

Author: jopemachine

src/ai/backend/manager/data/error_log/__init__.py

@@ -1,6 +1,8 @@
-from .types import ErrorLogData, ErrorLogSeverity
+from .types import ErrorLogContent, ErrorLogData, ErrorLogMeta, ErrorLogSeverity
 
 __all__ = (
+    "ErrorLogContent",
     "ErrorLogData",
+    "ErrorLogMeta",
     "ErrorLogSeverity",
 )

src/ai/backend/manager/data/error_log/types.py

@@ -14,17 +14,27 @@ class ErrorLogSeverity(enum.StrEnum):
 
 
 @dataclass
-class ErrorLogData:
-    id: uuid.UUID
+class ErrorLogMeta:
     created_at: datetime
-    severity: ErrorLogSeverity
-    source: str
     user: uuid.UUID | None
+    source: str
     is_read: bool
     is_cleared: bool
-    message: str
     context_lang: str
     context_env: dict[str, Any]
     request_url: str | None
     request_status: int | None
+
+
+@dataclass
+class ErrorLogContent:
+    severity: ErrorLogSeverity
+    message: str
     traceback: str | None
+
+
+@dataclass
+class ErrorLogData:
+    id: uuid.UUID
+    meta: ErrorLogMeta
+    content: ErrorLogContent

src/ai/backend/manager/models/error_logs.py

@@ -7,7 +7,12 @@
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-from ai.backend.manager.data.error_log.types import ErrorLogData, ErrorLogSeverity
+from ai.backend.manager.data.error_log.types import (
+    ErrorLogContent,
+    ErrorLogData,
+    ErrorLogMeta,
+    ErrorLogSeverity,
+)
 
 from .base import GUID, Base, IDColumn, mapper_registry
 
@@ -72,16 +77,20 @@ def __init__(
     def to_dataclass(self) -> ErrorLogData:
         return ErrorLogData(
             id=self.id,
-            created_at=self.created_at,
-            severity=ErrorLogSeverity(self.severity),
-            source=self.source,
-            user=self.user,
-            is_read=self.is_read,
-            is_cleared=self.is_cleared,
-            message=self.message,
-            context_lang=self.context_lang,
-            context_env=self.context_env,
-            request_url=self.request_url,
-            request_status=self.request_status,
-            traceback=self.traceback,
+            meta=ErrorLogMeta(
+                created_at=self.created_at,
+                user=self.user,
+                source=self.source,
+                is_read=self.is_read,
+                is_cleared=self.is_cleared,
+                context_lang=self.context_lang,
+                context_env=self.context_env,
+                request_url=self.request_url,
+                request_status=self.request_status,
+            ),
+            content=ErrorLogContent(
+                severity=ErrorLogSeverity(self.severity),
+                message=self.message,
+                traceback=self.traceback,
+            ),
         )

tests/unit/manager/repositories/error_log/test_error_log_repository.py

@@ -11,7 +11,10 @@
 import pytest
 
 from ai.backend.common.types import BinarySize
-from ai.backend.manager.data.error_log.types import ErrorLogData, ErrorLogSeverity
+from ai.backend.manager.data.error_log.types import (
+    ErrorLogData,
+    ErrorLogSeverity,
+)
 from ai.backend.manager.models.agent import AgentRow
 from ai.backend.manager.models.deployment_auto_scaling_policy import DeploymentAutoScalingPolicyRow
 from ai.backend.manager.models.deployment_policy import DeploymentPolicyRow
@@ -214,35 +217,35 @@ async def test_create_multiple_error_logs(
         assert len(created_logs) == 3
 
         # Verify first log (CRITICAL)
-        assert created_logs[0].severity == ErrorLogSeverity.CRITICAL
-        assert created_logs[0].source == "manager"
-        assert created_logs[0].user == test_user_id
-        assert created_logs[0].message == "Critical error occurred"
-        assert created_logs[0].context_lang == "en"
-        assert created_logs[0].context_env == {"version": "1.0.0"}
-        assert created_logs[0].request_url == "/api/v1/test"
-        assert created_logs[0].request_status == 500
-        assert created_logs[0].traceback == "Traceback: ..."
-        assert created_logs[0].is_read is False
-        assert created_logs[0].is_cleared is False
+        assert created_logs[0].content.severity == ErrorLogSeverity.CRITICAL
+        assert created_logs[0].meta.source == "manager"
+        assert created_logs[0].meta.user == test_user_id
+        assert created_logs[0].content.message == "Critical error occurred"
+        assert created_logs[0].meta.context_lang == "en"
+        assert created_logs[0].meta.context_env == {"version": "1.0.0"}
+        assert created_logs[0].meta.request_url == "/api/v1/test"
+        assert created_logs[0].meta.request_status == 500
+        assert created_logs[0].content.traceback == "Traceback: ..."
+        assert created_logs[0].meta.is_read is False
+        assert created_logs[0].meta.is_cleared is False
         assert created_logs[0].id is not None
-        assert created_logs[0].created_at is not None
+        assert created_logs[0].meta.created_at is not None
 
         # Verify second log (ERROR)
-        assert created_logs[1].severity == ErrorLogSeverity.ERROR
-        assert created_logs[1].source == "agent"
-        assert created_logs[1].user == test_user_id
-        assert created_logs[1].message == "Error in agent"
-        assert created_logs[1].request_url is None
-        assert created_logs[1].request_status is None
-        assert created_logs[1].traceback is None
+        assert created_logs[1].content.severity == ErrorLogSeverity.ERROR
+        assert created_logs[1].meta.source == "agent"
+        assert created_logs[1].meta.user == test_user_id
+        assert created_logs[1].content.message == "Error in agent"
+        assert created_logs[1].meta.request_url is None
+        assert created_logs[1].meta.request_status is None
+        assert created_logs[1].content.traceback is None
 
         # Verify third log (WARNING, no user)
-        assert created_logs[2].severity == ErrorLogSeverity.WARNING
-        assert created_logs[2].source == "storage"
-        assert created_logs[2].user is None
-        assert created_logs[2].message == "Storage warning"
-        assert created_logs[2].context_lang == "ko"
+        assert created_logs[2].content.severity == ErrorLogSeverity.WARNING
+        assert created_logs[2].meta.source == "storage"
+        assert created_logs[2].meta.user is None
+        assert created_logs[2].content.message == "Storage warning"
+        assert created_logs[2].meta.context_lang == "ko"
 
         # Verify all IDs are unique
         ids = [log.id for log in created_logs]

tests/unit/manager/services/error_log/test_error_log_service.py

@@ -11,7 +11,12 @@
 
 import pytest
 
-from ai.backend.manager.data.error_log.types import ErrorLogData, ErrorLogSeverity
+from ai.backend.manager.data.error_log.types import (
+    ErrorLogContent,
+    ErrorLogData,
+    ErrorLogMeta,
+    ErrorLogSeverity,
+)
 from ai.backend.manager.repositories.base import Creator
 from ai.backend.manager.repositories.error_log import ErrorLogCreatorSpec, ErrorLogRepository
 from ai.backend.manager.services.error_log.actions import CreateErrorLogAction
@@ -36,18 +41,22 @@ def sample_error_log_data(self) -> ErrorLogData:
         """Create sample error log data"""
         return ErrorLogData(
             id=uuid.uuid4(),
-            created_at=datetime.now(tz=UTC),
-            severity=ErrorLogSeverity.ERROR,
-            source="manager",
-            user=uuid.uuid4(),
-            is_read=False,
-            is_cleared=False,
-            message="Test error message",
-            context_lang="en",
-            context_env={"test": "value"},
-            request_url="/api/v1/test",
-            request_status=500,
-            traceback="Traceback: ...",
+            meta=ErrorLogMeta(
+                created_at=datetime.now(tz=UTC),
+                user=uuid.uuid4(),
+                source="manager",
+                is_read=False,
+                is_cleared=False,
+                context_lang="en",
+                context_env={"test": "value"},
+                request_url="/api/v1/test",
+                request_status=500,
+            ),
+            content=ErrorLogContent(
+                severity=ErrorLogSeverity.ERROR,
+                message="Test error message",
+                traceback="Traceback: ...",
+            ),
         )
 
     @pytest.mark.asyncio
@@ -62,17 +71,17 @@ async def test_create_error_log(
 
         creator = Creator(
             spec=ErrorLogCreatorSpec(
-                severity=sample_error_log_data.severity,
-                source=sample_error_log_data.source,
-                message=sample_error_log_data.message,
-                context_lang=sample_error_log_data.context_lang,
-                context_env=sample_error_log_data.context_env,
-                user=sample_error_log_data.user,
-                is_read=sample_error_log_data.is_read,
-                is_cleared=sample_error_log_data.is_cleared,
-                request_url=sample_error_log_data.request_url,
-                request_status=sample_error_log_data.request_status,
-                traceback=sample_error_log_data.traceback,
+                severity=sample_error_log_data.content.severity,
+                source=sample_error_log_data.meta.source,
+                message=sample_error_log_data.content.message,
+                context_lang=sample_error_log_data.meta.context_lang,
+                context_env=sample_error_log_data.meta.context_env,
+                user=sample_error_log_data.meta.user,
+                is_read=sample_error_log_data.meta.is_read,
+                is_cleared=sample_error_log_data.meta.is_cleared,
+                request_url=sample_error_log_data.meta.request_url,
+                request_status=sample_error_log_data.meta.request_status,
+                traceback=sample_error_log_data.content.traceback,
             )
         )
         action = CreateErrorLogAction(creator=creator)