fixes for seed_users, tracing/utils

Author: HardMax71

backend/app/core/tracing/utils.py

@@ -1,11 +1,15 @@
 import asyncio
 import functools
+from collections.abc import Callable, Generator
 from contextlib import contextmanager
-from typing import Any, Callable, Dict, Generator
+from typing import Any, ParamSpec, TypeVar
 
 from opentelemetry import context, propagate, trace
 from opentelemetry.trace import SpanKind, Status, StatusCode
 
+P = ParamSpec("P")
+R = TypeVar("R")
+
 
 def get_tracer() -> trace.Tracer:
     """Get a tracer for the current module."""
@@ -16,7 +20,7 @@ def get_tracer() -> trace.Tracer:
 def trace_span(
     name: str,
     kind: SpanKind = SpanKind.INTERNAL,
-    attributes: Dict[str, Any] | None = None,
+    attributes: dict[str, Any] | None = None,
     set_status_on_exception: bool = True,
     tracer: trace.Tracer | None = None
 ) -> Generator[trace.Span, None, None]:
@@ -53,38 +57,40 @@ def trace_span(
 def trace_method(
     name: str | None = None,
     kind: SpanKind = SpanKind.INTERNAL,
-    attributes: Dict[str, Any] | None = None
-) -> Callable:
+    attributes: dict[str, Any] | None = None
+) -> Callable[[Callable[P, R]], Callable[P, R]]:
     """
     Decorator for tracing method calls.
-    
+
     Args:
         name: Custom span name, defaults to module.method_name
         kind: Kind of span (INTERNAL, CLIENT, SERVER, etc.)
         attributes: Additional attributes to set on the span
-        
+
     Returns:
         Decorated function with tracing
     """
-    def decorator(func: Callable) -> Callable:
+    def decorator(func: Callable[P, R]) -> Callable[P, R]:
         span_name = name or f"{func.__module__}.{func.__name__}"
 
         @functools.wraps(func)
-        async def async_wrapper(*args: Any, **kwargs: Any) -> Any:
+        async def async_wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
             with trace_span(span_name, kind=kind, attributes=attributes):
-                return await func(*args, **kwargs)
+                return await func(*args, **kwargs)  # type: ignore[misc, no-any-return]
 
         @functools.wraps(func)
-        def sync_wrapper(*args: Any, **kwargs: Any) -> Any:
+        def sync_wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
             with trace_span(span_name, kind=kind, attributes=attributes):
                 return func(*args, **kwargs)
 
-        return async_wrapper if asyncio.iscoroutinefunction(func) else sync_wrapper
+        if asyncio.iscoroutinefunction(func):
+            return async_wrapper  # type: ignore[return-value]
+        return sync_wrapper
 
     return decorator
 
 
-def inject_trace_context(headers: Dict[str, str]) -> Dict[str, str]:
+def inject_trace_context(headers: dict[str, str]) -> dict[str, str]:
     """
     Inject current trace context into headers for propagation.
     
@@ -99,7 +105,7 @@ def inject_trace_context(headers: Dict[str, str]) -> Dict[str, str]:
     return propagation_headers
 
 
-def extract_trace_context(headers: Dict[str, str]) -> context.Context:
+def extract_trace_context(headers: dict[str, str]) -> context.Context:
     """
     Extract trace context from headers.
     
@@ -126,7 +132,7 @@ def add_span_attributes(**attributes: Any) -> None:
                 span.set_attribute(key, value)
 
 
-def add_span_event(name: str, attributes: Dict[str, Any] | None = None) -> None:
+def add_span_event(name: str, attributes: dict[str, Any] | None = None) -> None:
     """
     Add an event to the current span.
     

backend/scripts/seed_users.py

@@ -15,6 +15,7 @@
 import asyncio
 import os
 from datetime import datetime, timezone
+from typing import Any
 
 from bson import ObjectId
 from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorDatabase
@@ -24,7 +25,7 @@
 
 
 async def upsert_user(
-    db: AsyncIOMotorDatabase,
+    db: AsyncIOMotorDatabase[dict[str, Any]],
     username: str,
     email: str,
     password: str,
@@ -68,7 +69,7 @@ async def seed_users() -> None:
 
     print(f"Connecting to MongoDB (database: {db_name})...")
 
-    client: AsyncIOMotorClient = AsyncIOMotorClient(mongodb_url)
+    client: AsyncIOMotorClient[dict[str, Any]] = AsyncIOMotorClient(mongodb_url)
     db = client[db_name]
 
     # Default user