Skip to content

Commit d559aaa

Browse files
committed
mypy+ruff fixes
1 parent 4c1f919 commit d559aaa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+479
-346
lines changed

backend/app/api/routes/admin/events.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def _to_event_filter(pydantic_filter: AdminEventFilter) -> EventFilter:
3333
data["text_search"] = data.pop("search_text", None)
3434
return EventFilter(**data)
3535

36+
3637
router = APIRouter(
3738
prefix="/admin/events", tags=["admin-events"], route_class=DishkaRoute, dependencies=[Depends(admin_user)]
3839
)

backend/app/api/routes/admin/settings.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
LogLevel,
1212
MonitoringSettings,
1313
SecuritySettings,
14+
)
15+
from app.domain.admin import (
1416
SystemSettings as DomainSystemSettings,
1517
)
1618
from app.schemas_pydantic.admin_settings import SystemSettings

backend/app/api/routes/dlq.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ async def get_dlq_message(event_id: str, repository: FromDishka[DLQRepository])
7373

7474
return DLQMessageDetail(
7575
event_id=message.event_id or "unknown",
76-
event=message.event.to_dict(),
76+
event=message.event, # Already a dict from Document
7777
event_type=message.event_type,
7878
original_topic=message.original_topic,
7979
error=message.error,

backend/app/core/database_context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ async def create_connection(self, key: str, config: DatabaseConfig) -> AsyncData
235235
if key in self._connections:
236236
raise DatabaseAlreadyInitializedError(f"Connection '{key}' already exists")
237237

238-
connection = AsyncDatabaseConnection(config)
238+
connection = AsyncDatabaseConnection(config, self.logger)
239239
await connection.connect()
240240
self._connections[key] = connection
241241
return connection

backend/app/core/logging.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from opentelemetry import trace
99

10-
1110
correlation_id_context: contextvars.ContextVar[str | None] = contextvars.ContextVar("correlation_id", default=None)
1211

1312
request_metadata_context: contextvars.ContextVar[Dict[str, Any] | None] = contextvars.ContextVar(

backend/app/core/providers.py

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ async def get_kafka_producer(
176176
await producer.stop()
177177

178178
@provide
179-
async def get_dlq_manager(self, schema_registry: SchemaRegistryManager, logger: logging.Logger) -> AsyncIterator[DLQManager]:
179+
async def get_dlq_manager(
180+
self, schema_registry: SchemaRegistryManager, logger: logging.Logger
181+
) -> AsyncIterator[DLQManager]:
180182
manager = create_dlq_manager(schema_registry, logger)
181183
await manager.start()
182184
try:
@@ -189,7 +191,9 @@ def get_idempotency_repository(self, redis_client: redis.Redis) -> RedisIdempote
189191
return RedisIdempotencyRepository(redis_client, key_prefix="idempotency")
190192

191193
@provide
192-
async def get_idempotency_manager(self, repo: RedisIdempotencyRepository, logger: logging.Logger) -> AsyncIterator[IdempotencyManager]:
194+
async def get_idempotency_manager(
195+
self, repo: RedisIdempotencyRepository, logger: logging.Logger
196+
) -> AsyncIterator[IdempotencyManager]:
193197
manager = create_idempotency_manager(repository=repo, config=IdempotencyConfig(), logger=logger)
194198
await manager.initialize()
195199
try:
@@ -212,7 +216,11 @@ async def get_event_store(self, schema_registry: SchemaRegistryManager, logger:
212216

213217
@provide
214218
async def get_event_store_consumer(
215-
self, event_store: EventStore, schema_registry: SchemaRegistryManager, kafka_producer: UnifiedProducer, logger: logging.Logger
219+
self,
220+
event_store: EventStore,
221+
schema_registry: SchemaRegistryManager,
222+
kafka_producer: UnifiedProducer,
223+
logger: logging.Logger,
216224
) -> EventStoreConsumer:
217225
topics = get_all_topics()
218226
return create_event_store_consumer(
@@ -532,7 +540,10 @@ def get_saga_service(
532540
logger: logging.Logger,
533541
) -> SagaService:
534542
return SagaService(
535-
saga_repo=saga_repository, execution_repo=execution_repository, orchestrator=saga_orchestrator, logger=logger
543+
saga_repo=saga_repository,
544+
execution_repo=execution_repository,
545+
orchestrator=saga_orchestrator,
546+
logger=logger,
536547
)
537548

538549
@provide
@@ -545,16 +556,26 @@ def get_execution_service(
545556
logger: logging.Logger,
546557
) -> ExecutionService:
547558
return ExecutionService(
548-
execution_repo=execution_repository, producer=kafka_producer, event_store=event_store, settings=settings, logger=logger
559+
execution_repo=execution_repository,
560+
producer=kafka_producer,
561+
event_store=event_store,
562+
settings=settings,
563+
logger=logger,
549564
)
550565

551566
@provide
552-
def get_saved_script_service(self, saved_script_repository: SavedScriptRepository, logger: logging.Logger) -> SavedScriptService:
567+
def get_saved_script_service(
568+
self, saved_script_repository: SavedScriptRepository, logger: logging.Logger
569+
) -> SavedScriptService:
553570
return SavedScriptService(saved_script_repository, logger)
554571

555572
@provide
556573
async def get_replay_service(
557-
self, replay_repository: ReplayRepository, kafka_producer: UnifiedProducer, event_store: EventStore, logger: logging.Logger
574+
self,
575+
replay_repository: ReplayRepository,
576+
kafka_producer: UnifiedProducer,
577+
event_store: EventStore,
578+
logger: logging.Logger,
558579
) -> ReplayService:
559580
event_replay_service = EventReplayService(
560581
repository=replay_repository, producer=kafka_producer, event_store=event_store, logger=logger

backend/app/core/security.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
from fastapi.security import OAuth2PasswordBearer
77
from passlib.context import CryptContext
88

9-
from app.domain.user import (
10-
AuthenticationRequiredError,
11-
CSRFValidationError,
12-
InvalidCredentialsError,
13-
User as DomainAdminUser,
14-
)
9+
from app.domain.user import AuthenticationRequiredError, CSRFValidationError, InvalidCredentialsError
10+
from app.domain.user import User as DomainAdminUser
1511
from app.settings import get_settings
1612

1713
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/v1/login")

backend/app/db/docs/dlq.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,5 @@ class Settings:
5656
@property
5757
def age_seconds(self) -> float:
5858
"""Get message age in seconds since failure."""
59-
return (datetime.now(timezone.utc) - self.failed_at).total_seconds()
59+
failed_at: datetime = self.failed_at
60+
return (datetime.now(timezone.utc) - failed_at).total_seconds()

backend/app/db/docs/execution.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from datetime import datetime, timezone
2-
from typing import Any
32
from uuid import uuid4
43

54
from beanie import Document, Indexed
@@ -16,9 +15,7 @@ class ResourceUsage(BaseModel):
1615
Copied from execution.py ResourceUsage.
1716
"""
1817

19-
execution_time_wall_seconds: float | None = Field(
20-
default=None, description="Wall clock execution time in seconds"
21-
)
18+
execution_time_wall_seconds: float | None = Field(default=None, description="Wall clock execution time in seconds")
2219
cpu_time_jiffies: int | None = Field(
2320
default=None, description="CPU time in jiffies (multiply by 10 for milliseconds)"
2421
)
@@ -59,5 +56,3 @@ class Settings:
5956
indexes = [
6057
IndexModel([("status", 1)]),
6158
]
62-
63-

backend/app/db/docs/notification.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ class Settings:
105105
name = "notification_subscriptions"
106106
use_state_management = True
107107
indexes = [
108-
IndexModel([("user_id", ASCENDING), ("channel", ASCENDING)], name="idx_sub_user_channel_unique", unique=True),
108+
IndexModel(
109+
[("user_id", ASCENDING), ("channel", ASCENDING)], name="idx_sub_user_channel_unique", unique=True
110+
),
109111
IndexModel([("enabled", ASCENDING)], name="idx_sub_enabled"),
110112
]

0 commit comments

Comments
 (0)