more fixes

Author: HardMax71

backend/app/events/metadata.py

@@ -7,7 +7,7 @@
 from app.domain.enums.common import Environment
 
 
-class EventMetadata(AvroBase):
+class AvroEventMetadata(AvroBase):
     """Unified event metadata for auditing and tracing."""
 
     service_name: str
@@ -24,7 +24,7 @@ def to_dict(self, exclude_none: bool = True) -> Dict[str, Any]:
         return self.model_dump(exclude_none=exclude_none)
 
     @classmethod
-    def from_dict(cls, data: Dict[str, Any]) -> "EventMetadata":
+    def from_dict(cls, data: Dict[str, Any]) -> "AvroEventMetadata":
         return cls(
             service_name=data.get("service_name", "unknown"),
             service_version=data.get("service_version", "1.0"),
@@ -35,13 +35,13 @@ def from_dict(cls, data: Dict[str, Any]) -> "EventMetadata":
             environment=data.get("environment", Environment.PRODUCTION),
         )
 
-    def with_correlation(self, correlation_id: str) -> "EventMetadata":
+    def with_correlation(self, correlation_id: str) -> "AvroEventMetadata":
         return self.model_copy(update={"correlation_id": correlation_id})
 
-    def with_user(self, user_id: str) -> "EventMetadata":
+    def with_user(self, user_id: str) -> "AvroEventMetadata":
         return self.model_copy(update={"user_id": user_id})
 
-    def ensure_correlation_id(self) -> "EventMetadata":
+    def ensure_correlation_id(self) -> "AvroEventMetadata":
         if self.correlation_id:
             return self
         return self.model_copy(update={"correlation_id": str(uuid4())})

backend/tests/helpers/events.py

@@ -2,7 +2,7 @@
 from typing import Iterable
 
 from app.infrastructure.kafka.events.execution import ExecutionRequestedEvent
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 
 
 def make_execution_requested_event(
@@ -31,7 +31,7 @@ def make_execution_requested_event(
     if execution_id is None:
         execution_id = f"exec-{uuid.uuid4().hex[:8]}"
 
-    metadata = EventMetadata(service_name=service_name, service_version=service_version, user_id=user_id)
+    metadata = AvroEventMetadata(service_name=service_name, service_version=service_version, user_id=user_id)
     return ExecutionRequestedEvent(
         execution_id=execution_id,
         script=script,

backend/tests/integration/events/test_dlq_handler.py

@@ -2,7 +2,7 @@
 
 from app.events.core import create_dlq_error_handler, create_immediate_dlq_handler
 from app.events.core import UnifiedProducer
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.infrastructure.kafka.events.saga import SagaStartedEvent
 
 pytestmark = [pytest.mark.integration, pytest.mark.kafka]
@@ -19,7 +19,7 @@ async def _record_send_to_dlq(original_event, original_topic, error, retry_count
     monkeypatch.setattr(p, "send_to_dlq", _record_send_to_dlq)
     h = create_dlq_error_handler(p, original_topic="t", max_retries=2)
     e = SagaStartedEvent(saga_id="s", saga_name="n", execution_id="x", initial_event_id="i",
-                         metadata=EventMetadata(service_name="a", service_version="1"))
+                         metadata=AvroEventMetadata(service_name="a", service_version="1"))
     # Call 1 and 2 should not send to DLQ
     await h(RuntimeError("boom"), e)
     await h(RuntimeError("boom"), e)
@@ -41,6 +41,6 @@ async def _record_send_to_dlq(original_event, original_topic, error, retry_count
     monkeypatch.setattr(p, "send_to_dlq", _record_send_to_dlq)
     h = create_immediate_dlq_handler(p, original_topic="t")
     e = SagaStartedEvent(saga_id="s2", saga_name="n", execution_id="x", initial_event_id="i",
-                         metadata=EventMetadata(service_name="a", service_version="1"))
+                         metadata=AvroEventMetadata(service_name="a", service_version="1"))
     await h(RuntimeError("x"), e)
     assert calls and calls[0][3] == 0

backend/tests/integration/events/test_event_store.py

@@ -4,7 +4,7 @@
 
 from app.events.event_store import EventStore
 from app.events.schema.schema_registry import SchemaRegistryManager
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.infrastructure.kafka.events.pod import PodCreatedEvent
 from app.infrastructure.kafka.events.user import UserLoggedInEvent
 from motor.motor_asyncio import AsyncIOMotorDatabase
@@ -27,15 +27,15 @@ async def test_store_and_query_events(event_store: EventStore) -> None:
         execution_id="x1",
         pod_name="pod1",
         namespace="ns",
-        metadata=EventMetadata(service_name="svc", service_version="1", user_id="u1", correlation_id="cid"),
+        metadata=AvroEventMetadata(service_name="svc", service_version="1", user_id="u1", correlation_id="cid"),
     )
     assert await event_store.store_event(ev1) is True
 
     ev2 = PodCreatedEvent(
         execution_id="x2",
         pod_name="pod2",
         namespace="ns",
-        metadata=EventMetadata(service_name="svc", service_version="1", user_id="u1"),
+        metadata=AvroEventMetadata(service_name="svc", service_version="1", user_id="u1"),
     )
     res = await event_store.store_batch([ev1, ev2])
     assert res["total"] == 2 and res["stored"] >= 1
@@ -55,7 +55,7 @@ async def test_store_and_query_events(event_store: EventStore) -> None:
 @pytest.mark.asyncio
 async def test_replay_events(event_store: EventStore) -> None:
     ev = UserLoggedInEvent(user_id="u1", login_method="password",
-                           metadata=EventMetadata(service_name="svc", service_version="1"))
+                           metadata=AvroEventMetadata(service_name="svc", service_version="1"))
     await event_store.store_event(ev)
 
     called = {"n": 0}

backend/tests/integration/events/test_event_store_consumer.py

@@ -11,7 +11,7 @@
 from app.events.event_store import EventStore
 from app.events.schema.schema_registry import SchemaRegistryManager, initialize_event_schemas
 from app.infrastructure.kafka.events.user import UserLoggedInEvent
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 
 
 pytestmark = [pytest.mark.integration, pytest.mark.kafka, pytest.mark.mongodb]
@@ -32,7 +32,7 @@ async def test_event_store_consumer_stores_events(scope) -> None:  # type: ignor
     ev = UserLoggedInEvent(
         user_id=f"u-{uuid.uuid4().hex[:6]}",
         login_method="password",
-        metadata=EventMetadata(service_name="tests", service_version="1.0.0"),
+        metadata=AvroEventMetadata(service_name="tests", service_version="1.0.0"),
     )
 
     # Create a tuned consumer (fast batch timeout) limited to user-events

backend/tests/integration/events/test_schema_registry_real.py

@@ -1,7 +1,7 @@
 import pytest
 
 from app.events.schema.schema_registry import SchemaRegistryManager
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.infrastructure.kafka.events.pod import PodCreatedEvent
 
 pytestmark = [pytest.mark.integration, pytest.mark.kafka]
@@ -14,7 +14,7 @@ def test_serialize_and_deserialize_event_real_registry() -> None:
         execution_id="e1",
         pod_name="p",
         namespace="n",
-        metadata=EventMetadata(service_name="s", service_version="1"),
+        metadata=AvroEventMetadata(service_name="s", service_version="1"),
     )
     data = m.serialize_event(ev)
     obj = m.deserialize_event(data, topic=str(ev.topic))

backend/tests/integration/k8s/test_k8s_worker_create_pod.py

@@ -4,7 +4,7 @@
 import pytest
 from kubernetes.client.rest import ApiException
 
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.infrastructure.kafka.events.saga import CreatePodCommandEvent
 from app.services.k8s_worker.config import K8sWorkerConfig
 from app.services.k8s_worker.worker import KubernetesWorker
@@ -63,7 +63,7 @@ async def test_worker_creates_configmap_and_pod(scope, monkeypatch):  # type: ig
         cpu_request="50m",
         memory_request="64Mi",
         priority=5,
-        metadata=EventMetadata(service_name="tests", service_version="1", user_id="u1"),
+        metadata=AvroEventMetadata(service_name="tests", service_version="1", user_id="u1"),
     )
 
     # Build and create ConfigMap + Pod

backend/tests/integration/result_processor/test_result_processor.py

@@ -15,7 +15,7 @@
 from app.events.core.types import ConsumerConfig
 from app.events.schema.schema_registry import SchemaRegistryManager, initialize_event_schemas
 from app.infrastructure.kafka.events.execution import ExecutionCompletedEvent
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.services.idempotency import IdempotencyManager
 from app.services.result_processor.processor import ResultProcessor
 from app.settings import get_settings
@@ -88,7 +88,7 @@ async def _stored(_event) -> None:  # noqa: ANN001
                 stdout="hello",
                 stderr="",
                 resource_usage=usage,
-                metadata=EventMetadata(service_name="tests", service_version="1.0.0"),
+                metadata=AvroEventMetadata(service_name="tests", service_version="1.0.0"),
             )
             await producer.produce(evt, key=execution_id)
 

backend/tests/integration/services/events/test_event_service_integration.py

@@ -6,7 +6,7 @@
 from app.domain.events.event_models import EventFields, Event, EventFilter
 from app.domain.enums.common import SortOrder
 from app.domain.enums.user import UserRole
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.domain.enums.events import EventType
 from app.services.event_service import EventService
 
@@ -20,8 +20,8 @@ async def test_event_service_access_and_queries(scope) -> None:  # type: ignore[
 
     now = datetime.now(timezone.utc)
     # Seed some events (domain Event, not infra BaseEvent)
-    md1 = EventMetadata(service_name="svc", service_version="1", user_id="u1", correlation_id="c1")
-    md2 = EventMetadata(service_name="svc", service_version="1", user_id="u2", correlation_id="c1")
+    md1 = AvroEventMetadata(service_name="svc", service_version="1", user_id="u1", correlation_id="c1")
+    md2 = AvroEventMetadata(service_name="svc", service_version="1", user_id="u2", correlation_id="c1")
     e1 = Event(event_id="e1", event_type=str(EventType.USER_LOGGED_IN), event_version="1.0", timestamp=now,
                metadata=md1, payload={"user_id": "u1", "login_method": "password"}, aggregate_id="agg1")
     e2 = Event(event_id="e2", event_type=str(EventType.USER_LOGGED_IN), event_version="1.0", timestamp=now,

backend/tests/integration/test_sse_routes.py

@@ -9,7 +9,7 @@
 from app.domain.enums.notification import NotificationSeverity, NotificationStatus
 from app.schemas_pydantic.sse import RedisNotificationMessage, SSEHealthResponse
 from app.infrastructure.kafka.events.pod import PodCreatedEvent
-from app.infrastructure.kafka.events.metadata import EventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 from app.services.sse.redis_bus import SSERedisBus
 from app.services.sse.sse_service import SSEService
 from tests.helpers.eventually import eventually
@@ -131,7 +131,7 @@ async def _connected() -> None:
             execution_id=exec_id,
             pod_name=f"executor-{exec_id}",
             namespace="default",
-            metadata=EventMetadata(service_name="tests", service_version="1"),
+            metadata=AvroEventMetadata(service_name="tests", service_version="1"),
         )
         await bus.publish_event(exec_id, ev)