Update line-length to 120 and update dependencies

febus982 · febus982 · commit b87baadb3d82 · 2025-02-05T12:04:02.000Z
diff --git a/Makefile b/Makefile
@@ -37,6 +37,7 @@ dev-dependencies:
 
 update-dependencies:
 	uv lock --upgrade
+	uv sync --all-groups --frozen
 
 migrate:
 	uv run alembic upgrade heads
diff --git a/pyproject.toml b/pyproject.toml
@@ -116,6 +116,7 @@ testpaths = [
 
 [tool.ruff]
 target-version = "py39"
+line-length = 120
 extend-exclude = [
     "docs",
 ]
diff --git a/src/common/di_container.py b/src/common/di_container.py
@@ -65,6 +65,4 @@ def function(
         bind=SQLAlchemyBindManager.provided.get_bind.call(),
         model_class=BookModel,
     )
-    BookEventGatewayInterface: Factory[BookEventGatewayInterface] = Factory(
-        NullEventGateway
-    )
+    BookEventGatewayInterface: Factory[BookEventGatewayInterface] = Factory(NullEventGateway)
diff --git a/src/common/dramatiq.py b/src/common/dramatiq.py
@@ -22,9 +22,7 @@ def decode(self, data: bytes) -> MessageData:
         try:
             return orjson.loads(data)
         except orjson.JSONDecodeError as e:
-            raise DecodeError(
-                "failed to decode message %r" % (data,), data, e
-            ) from None
+            raise DecodeError("failed to decode message %r" % (data,), data, e) from None
 
 
 def init_dramatiq(config: AppConfig):
diff --git a/src/common/logs/__init__.py b/src/common/logs/__init__.py
@@ -44,9 +44,7 @@ def init_logger(config: AppConfig) -> None:
 
     log_level = logging.DEBUG if config.DEBUG else logging.INFO
     if config.ENVIRONMENT in ["local", "test"]:
-        shared_processors.append(
-            structlog.processors.TimeStamper(fmt="%d-%m-%Y %H:%M:%S", utc=True)
-        )
+        shared_processors.append(structlog.processors.TimeStamper(fmt="%d-%m-%Y %H:%M:%S", utc=True))
         stdlib_processors.append(structlog.dev.ConsoleRenderer())
     else:
         shared_processors.append(structlog.processors.TimeStamper(fmt="iso", utc=True))
diff --git a/src/common/utils.py b/src/common/utils.py
@@ -1,6 +1,4 @@
-def apply_decorator_to_methods(
-    decorator, protected_methods: bool = False, private_methods: bool = False
-):
+def apply_decorator_to_methods(decorator, protected_methods: bool = False, private_methods: bool = False):
     """
     Class decorator to apply a given function or coroutine decorator
     to all functions and coroutines within a class.
diff --git a/src/domains/books/_gateway_interfaces.py b/src/domains/books/_gateway_interfaces.py
@@ -12,9 +12,7 @@ async def save(self, book: BookModel) -> BookModel: ...
     async def find(
         self,
         search_params: Union[None, Mapping[str, Any]] = None,
-        order_by: Union[
-            None, Iterable[Union[str, Tuple[str, Literal["asc", "desc"]]]]
-        ] = None,
+        order_by: Union[None, Iterable[Union[str, Tuple[str, Literal["asc", "desc"]]]]] = None,
     ) -> List[BookModel]: ...
 
 
diff --git a/src/domains/books/_service.py b/src/domains/books/_service.py
@@ -22,12 +22,8 @@ class BookService:
     @inject
     def __init__(
         self,
-        book_repository: BookRepositoryInterface = Provide[
-            BookRepositoryInterface.__name__
-        ],
-        event_gateway: BookEventGatewayInterface = Provide[
-            BookEventGatewayInterface.__name__
-        ],
+        book_repository: BookRepositoryInterface = Provide[BookRepositoryInterface.__name__],
+        event_gateway: BookEventGatewayInterface = Provide[BookEventGatewayInterface.__name__],
     ) -> None:
         super().__init__()
         self._book_repository = book_repository
@@ -37,14 +33,10 @@ async def create_book(self, book: BookData) -> Book:
         # Example of CPU intensive task ran in a different thread
         # Using processes could be better, but it would bring technical complexity
         # https://anyio.readthedocs.io/en/3.x/subprocesses.html#running-functions-in-worker-processes
-        book_data_altered: dict = await to_thread.run_sync(
-            self._some_cpu_intensive_blocking_task, book.model_dump()
-        )
+        book_data_altered: dict = await to_thread.run_sync(self._some_cpu_intensive_blocking_task, book.model_dump())
 
         book_model = BookModel(**book_data_altered)
-        book = Book.model_validate(
-            await self._book_repository.save(book_model), from_attributes=True
-        )
+        book = Book.model_validate(await self._book_repository.save(book_model), from_attributes=True)
 
         # Example of CPU intensive task ran in a dramatiq task. We should not rely on
         # dramatiq if we need to wait the operation result.
@@ -53,9 +45,7 @@ async def create_book(self, book: BookData) -> Book:
         book_cpu_intensive_task.send(book_id=str(book.book_id))
 
         await self._event_gateway.emit(
-            BookCreatedV1.event_factory(
-                data=BookCreatedV1Data.model_validate(book_model, from_attributes=True)
-            )
+            BookCreatedV1.event_factory(data=BookCreatedV1Data.model_validate(book_model, from_attributes=True))
         )
         return book
 
diff --git a/src/domains/books/events.py b/src/domains/books/events.py
@@ -23,9 +23,7 @@ class BookCreatedV1(CloudEvent):
         Field(default="/book_service", validate_default=True),
         metadata.FieldSource,
     ]
-    type: Annotated[
-        Literal["book.created.v1"], Field(default="book.created.v1"), metadata.FieldType
-    ]
+    type: Annotated[Literal["book.created.v1"], Field(default="book.created.v1"), metadata.FieldType]
     dataschema: Annotated[
         URI,
         Field(default=_dataschema_url("book.created.v1"), validate_default=True),
@@ -61,9 +59,7 @@ class BookUpdatedV1(CloudEvent):
         Field(default="/book_service", validate_default=True),
         metadata.FieldSource,
     ]
-    type: Annotated[
-        Literal["book.updated.v1"], Field(default="book.updated.v1"), metadata.FieldType
-    ]
+    type: Annotated[Literal["book.updated.v1"], Field(default="book.updated.v1"), metadata.FieldType]
     dataschema: Annotated[
         URI,
         Field(default=_dataschema_url("book.updated.v1"), validate_default=True),
diff --git a/src/gateways/event.py b/src/gateways/event.py
@@ -3,9 +3,7 @@
 
 
 class NullEventGateway:
-    async def emit(
-        self, event: CloudEvent
-    ) -> None:  # pragma: no cover # No need to test this
+    async def emit(self, event: CloudEvent) -> None:  # pragma: no cover # No need to test this
         logger = get_logger()
         await logger.ainfo(
             "Event emitted",
diff --git a/src/http_app/routes/api/books.py b/src/http_app/routes/api/books.py
@@ -34,8 +34,7 @@ class ListBooksResponse(BaseModel):
                         "book_id": 123,
                     },
                     {
-                        "title": "Clean Architecture: "
-                        "A Craftsman's Guide to Software Structure and Design",
+                        "title": "Clean Architecture: A Craftsman's Guide to Software Structure and Design",
                         "author_name": "Robert C. 'Uncle Bob' Martin",
                         "book_id": 321,
                     },
@@ -82,9 +81,7 @@ async def create_book(
     data: CreateBookRequest,
 ) -> CreateBookResponse:
     book_service = BookService()
-    created_book = await book_service.create_book(
-        book=dto.BookData.model_validate(data, from_attributes=True)
-    )
+    created_book = await book_service.create_book(book=dto.BookData.model_validate(data, from_attributes=True))
     return CreateBookResponse(book=created_book)
 
 
@@ -94,7 +91,5 @@ async def create_book_v2(
     some_optional_query_param: bool = False,
 ) -> CreateBookResponse:
     book_service = BookService()
-    created_book = await book_service.create_book(
-        book=dto.BookData.model_validate(data, from_attributes=True)
-    )
+    created_book = await book_service.create_book(book=dto.BookData.model_validate(data, from_attributes=True))
     return CreateBookResponse(book=created_book)
diff --git a/src/http_app/routes/auth.py b/src/http_app/routes/auth.py
@@ -23,9 +23,7 @@ def __init__(self, detail: str, **kwargs):
 
 class UnauthenticatedException(HTTPException):
     def __init__(self):
-        super().__init__(
-            status_code=status.HTTP_401_UNAUTHORIZED, detail="Requires authentication"
-        )
+        super().__init__(status_code=status.HTTP_401_UNAUTHORIZED, detail="Requires authentication")
 
 
 def _jwks_client(config: Annotated[AppConfig, Depends(app_config)]) -> jwt.PyJWKClient:
diff --git a/src/http_app/routes/events.py b/src/http_app/routes/events.py
@@ -22,9 +22,7 @@
 In a real application these events would be the events the app RECEIVES and
 not the ones our application SENDS. This is only an example to illustrate
 how to handle different CloudEvent classes in FastAPI"""
-_EVENTS_UNION_TYPE = Annotated[
-    Union[BookCreatedV1, BookUpdatedV1], Field(discriminator="type")
-]
+_EVENTS_UNION_TYPE = Annotated[Union[BookCreatedV1, BookUpdatedV1], Field(discriminator="type")]
 
 
 def _parse_event_registry() -> Dict[str, Type[_EVENTS_UNION_TYPE]]:
@@ -48,16 +46,11 @@ def _event_schema_examples(mode: Literal["single", "batch"]) -> dict[str, Exampl
         " message!)"
     )
     examples: Dict[str, Union[dict, str]] = {
-        k: getattr(v, "model_config", {})
-        .get("json_schema_extra", {})
-        .get("examples", [missing_example_message])[0]
+        k: getattr(v, "model_config", {}).get("json_schema_extra", {}).get("examples", [missing_example_message])[0]
         for k, v in _EVENT_REGISTRY.items()
     }
 
-    return {
-        k: Example(value=v if (mode == "single" or isinstance(v, str)) else [v])
-        for k, v in examples.items()
-    }
+    return {k: Example(value=v if (mode == "single" or isinstance(v, str)) else [v]) for k, v in examples.items()}
 
 
 @router.get(
@@ -103,9 +96,7 @@ async def submit_event(
             discriminator="type",
         ),
     ],
-    content_type: Annotated[
-        Literal["application/cloudevents+json; charset=UTF-8"], Header()
-    ],
+    content_type: Annotated[Literal["application/cloudevents+json; charset=UTF-8"], Header()],
 ) -> None:
     # Some routing will be necessary when multiple event types will be supported
     await BookService().book_created_event_handler(event_data.data.book_id)
@@ -128,9 +119,7 @@ async def submit_event_batch(
             openapi_examples=_event_schema_examples(mode="batch"),
         ),
     ],
-    content_type: Annotated[
-        Literal["application/cloudevents-batch+json; charset=UTF-8"], Header()
-    ],
+    content_type: Annotated[Literal["application/cloudevents-batch+json; charset=UTF-8"], Header()],
 ) -> None:
     for event in event_batch:
         await BookService().book_created_event_handler(event.data.book_id)
diff --git a/src/http_app/routes/hello.py b/src/http_app/routes/hello.py
@@ -10,6 +10,4 @@
 
 @router.get("/", response_class=HTMLResponse, include_in_schema=True)
 async def hello(request: Request, jwt_token=Security(decode_jwt)):
-    return templates.TemplateResponse(
-        "hello.html", {"request": request, "token_payload": jwt_token}
-    )
+    return templates.TemplateResponse("hello.html", {"request": request, "token_payload": jwt_token})
diff --git a/src/migrations/env.py b/src/migrations/env.py
@@ -54,18 +54,14 @@ class FixtureMigration(declarative_base):
             String(), nullable=True, default=str(context.get_head_revision())
         )
 
-        processed_at: Mapped[datetime] = mapped_column(
-            DateTime(), nullable=False, default=datetime.now
-        )
+        processed_at: Mapped[datetime] = mapped_column(DateTime(), nullable=False, default=datetime.now)
 
     return FixtureMigration
 
 
 fixture_migration_models = {}
 for name in db_names:
-    fixture_migration_models[name] = generate_fixture_migration_model(
-        sa_manager.get_bind(name).declarative_base
-    )
+    fixture_migration_models[name] = generate_fixture_migration_model(sa_manager.get_bind(name).declarative_base)
 
 
 # add your model's MetaData objects here
@@ -137,9 +133,7 @@ def _get_fixture_modules(cls) -> List[ModuleType]:
         return [
             importlib.import_module(f"fixtures.{f[:-3]}")
             for f in listdir(cls.fixtures_path)
-            if isfile(join(cls.fixtures_path, f))
-            and f.endswith(".py")
-            and f != "__init__.py"
+            if isfile(join(cls.fixtures_path, f)) and f.endswith(".py") and f != "__init__.py"
         ]
 
     @classmethod
@@ -217,9 +211,7 @@ def _add_fixture_data_to_session(
         )
 
     @classmethod
-    async def a_migrate_fixtures(
-        cls, bind_name: str, session: async_sessionmaker[AsyncSession]
-    ):
+    async def a_migrate_fixtures(cls, bind_name: str, session: async_sessionmaker[AsyncSession]):
         """
         Perform asynchronous migration of fixture data modules for a specific database bind.
 
@@ -242,9 +234,7 @@ async def a_migrate_fixtures(
         modules = cls._get_fixture_modules()
         async with session() as session:
             for fixture_module in modules:
-                cls.logger.debug(
-                    f"Creating `{fixture_module.__name__}` fixtures for `{bind_name}` bind"
-                )
+                cls.logger.debug(f"Creating `{fixture_module.__name__}` fixtures for `{bind_name}` bind")
                 fixture_migration = await session.get(
                     fixture_migration_models[bind_name],
                     (bind_name, f"{fixture_module.__name__}"),
@@ -254,14 +244,10 @@ async def a_migrate_fixtures(
                 if cls._fixture_already_migrated(fixture_migration, signature):
                     continue
 
-                cls._add_fixture_data_to_session(
-                    bind_name, fixture_module, session, signature
-                )
+                cls._add_fixture_data_to_session(bind_name, fixture_module, session, signature)
                 try:
                     await session.commit()
-                    cls.logger.info(
-                        f"`{fixture_module.__name__}` fixtures correctly created for `{bind_name}` bind"
-                    )
+                    cls.logger.info(f"`{fixture_module.__name__}` fixtures correctly created for `{bind_name}` bind")
                 except Exception:
                     cls.logger.error(
                         f"`{fixture_module.__name__}` fixtures failed to apply to `{bind_name}` bind",
@@ -291,9 +277,7 @@ def migrate_fixtures(cls, bind_name: str, session: sessionmaker[Session]):
         modules = cls._get_fixture_modules()
         with session() as session:
             for fixture_module in modules:
-                cls.logger.debug(
-                    f"Creating `{fixture_module.__name__}` fixtures for `{bind_name}` bind"
-                )
+                cls.logger.debug(f"Creating `{fixture_module.__name__}` fixtures for `{bind_name}` bind")
                 fixture_migration = session.get(
                     fixture_migration_models[bind_name],
                     (bind_name, f"{fixture_module.__name__}"),
@@ -303,19 +287,13 @@ def migrate_fixtures(cls, bind_name: str, session: sessionmaker[Session]):
                 if cls._fixture_already_migrated(fixture_migration, signature):
                     continue
 
-                cls._add_fixture_data_to_session(
-                    bind_name, fixture_module, session, signature
-                )
+                cls._add_fixture_data_to_session(bind_name, fixture_module, session, signature)
                 try:
                     session.commit()
-                    cls.logger.info(
-                        f"`{fixture_module.__name__}` fixtures correctly created for `{bind_name}` bind"
-                    )
+                    cls.logger.info(f"`{fixture_module.__name__}` fixtures correctly created for `{bind_name}` bind")
                 except Exception:
                     session.rollback()
-                    cls.logger.error(
-                        f"`{fixture_module.__name__}` fixtures failed to apply to `{bind_name}` bind"
-                    )
+                    cls.logger.error(f"`{fixture_module.__name__}` fixtures failed to apply to `{bind_name}` bind")
 
 
 def run_migrations_offline() -> None:
@@ -429,9 +407,7 @@ def migration_callable(*args, **kwargs):
                         session=async_sessionmaker(bind=rec["connection"]),
                     )
                 else:
-                    FixtureHandler.migrate_fixtures(
-                        bind_name=name, session=sessionmaker(bind=rec["connection"])
-                    )
+                    FixtureHandler.migrate_fixtures(bind_name=name, session=sessionmaker(bind=rec["connection"]))
     except:
         for rec in engines.values():
             if isinstance(rec["engine"], AsyncEngine):
diff --git a/tests/common/test_dramatiq.py b/tests/common/test_dramatiq.py
@@ -52,9 +52,7 @@ def test_init_dramatiq_with_test_env():
 def test_init_dramatiq_with_redis():
     """Test if the RedisBroker is set with a valid Redis URL."""
     redis_url = "redis://localhost:6379/0"
-    config = AppConfig(
-        ENVIRONMENT="production", DRAMATIQ=DramatiqConfig(REDIS_URL=redis_url)
-    )  # Mock config
+    config = AppConfig(ENVIRONMENT="production", DRAMATIQ=DramatiqConfig(REDIS_URL=redis_url))  # Mock config
     with patch("common.dramatiq.RedisBroker") as mock_redis_broker:
         init_dramatiq(config)
         mock_redis_broker.assert_called_once_with(url=redis_url)
@@ -64,12 +62,8 @@ def test_init_dramatiq_with_redis():
 
 def test_init_dramatiq_without_redis_url(caplog):
     """Test if an exception is raised when in non-test environment without Redis URL."""
-    config = AppConfig(
-        ENVIRONMENT="production", DRAMATIQ=DramatiqConfig(REDIS_URL=None)
-    )  # Mock config
+    config = AppConfig(ENVIRONMENT="production", DRAMATIQ=DramatiqConfig(REDIS_URL=None))  # Mock config
     with caplog.at_level(logging.CRITICAL):
         init_dramatiq(config)
 
-    assert (
-        "Running a non-test/non-local environment without Redis URL set" in caplog.text
-    )
+    assert "Running a non-test/non-local environment without Redis URL set" in caplog.text
diff --git a/tests/common/test_tracing.py b/tests/common/test_tracing.py
diff --git a/tests/http_app/routes/books/conftest.py b/tests/http_app/routes/books/conftest.py
diff --git a/tests/http_app/routes/books/graphql/test_query_books.py b/tests/http_app/routes/books/graphql/test_query_books.py
diff --git a/tests/http_app/routes/test_auth.py b/tests/http_app/routes/test_auth.py
diff --git a/tests/http_app/routes/test_events.py b/tests/http_app/routes/test_events.py
diff --git a/tests/storage/tables/test_book_table.py b/tests/storage/tables/test_book_table.py
diff --git a/tests/storage/test_sqlalchemy_init.py b/tests/storage/test_sqlalchemy_init.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ testpaths = [`
`116`	`116`
`117`	`117`	`[tool.ruff]`
`118`	`118`	`target-version = "py39"`
	`119`	`+line-length = 120`
`119`	`120`	`extend-exclude = [`
`120`	`121`	`"docs",`
`121`	`122`	`]`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,4 @@ def function(`
`65`	`65`	`bind=SQLAlchemyBindManager.provided.get_bind.call(),`
`66`	`66`	`model_class=BookModel,`
`67`	`67`	`)`
`68`		`- BookEventGatewayInterface: Factory[BookEventGatewayInterface] = Factory(`
`69`		`- NullEventGateway`
`70`		`- )`
	`68`	`+ BookEventGatewayInterface: Factory[BookEventGatewayInterface] = Factory(NullEventGateway)`