Merge branch 'develop' into dependabot/docker/docs/squidfunk/mkdocs-material-sha25695f2ff42251979c043d6cb5b1c82e6ae8189e57e02105813dd1ce124021a418b

Author: leandrodamascena

.github/workflows/quality_check.yml

@@ -63,6 +63,8 @@ jobs:
         run: make dev-quality-code
       - name: Checking third-party library licenses
         run: make check-licenses
+      - name: Checking and enforcing format
+        run: make format-check
       - name: Formatting and Linting
         run: make lint
       - name: Static type checking

.pre-commit-config.yaml

@@ -12,13 +12,13 @@ repos:
       - id: check-toml
   - repo: local
     hooks:
-      - id: black
-        name: formatting::black
-        entry: poetry run black
+      - id: ruff
+        name: formatting::ruff
+        entry: poetry run ruff format
         language: system
         types: [python]
       - id: ruff
-        name: linting-format::ruff
+        name: linting::ruff
         entry: poetry run ruff check
         language: system
         types: [python]

Makefile

@@ -25,8 +25,11 @@ dev-gitpod:
 check-licenses:
 	poetry run licensecheck -u poetry:dev
 
+format-check:
+	poetry run ruff format aws_lambda_powertools tests examples --check
+
 format:
-	poetry run black aws_lambda_powertools tests examples
+	poetry run ruff format aws_lambda_powertools tests examples
 
 lint: format
 	poetry run ruff check aws_lambda_powertools tests examples

aws_lambda_powertools/event_handler/api_gateway.py

@@ -1604,7 +1604,6 @@ def _validate_response_validation_error_http_code(
         response_validation_error_http_code: HTTPStatus | int | None,
         enable_validation: bool,
     ) -> HTTPStatus:
-
         if response_validation_error_http_code and not enable_validation:
             msg = "'response_validation_error_http_code' cannot be set when enable_validation is False."
             raise ValueError(msg)
@@ -1613,7 +1612,6 @@ def _validate_response_validation_error_http_code(
             not isinstance(response_validation_error_http_code, HTTPStatus)
             and response_validation_error_http_code is not None
         ):
-
             try:
                 response_validation_error_http_code = HTTPStatus(response_validation_error_http_code)
             except ValueError:

aws_lambda_powertools/event_handler/bedrock_agent.py

@@ -110,11 +110,11 @@ def get(  # type: ignore[override]
         tags: list[str] | None = None,
         operation_id: str | None = None,
         include_in_schema: bool = True,
+        openapi_extensions: dict[str, Any] | None = None,
         deprecated: bool = False,
         custom_response_validation_http_code: int | HTTPStatus | None = None,
         middlewares: list[Callable[..., Any]] | None = None,
     ) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
-        openapi_extensions = None
         security = None
 
         return super().get(
@@ -151,11 +151,11 @@ def post(  # type: ignore[override]
         tags: list[str] | None = None,
         operation_id: str | None = None,
         include_in_schema: bool = True,
+        openapi_extensions: dict[str, Any] | None = None,
         deprecated: bool = False,
         custom_response_validation_http_code: int | HTTPStatus | None = None,
         middlewares: list[Callable[..., Any]] | None = None,
     ):
-        openapi_extensions = None
         security = None
 
         return super().post(
@@ -192,11 +192,11 @@ def put(  # type: ignore[override]
         tags: list[str] | None = None,
         operation_id: str | None = None,
         include_in_schema: bool = True,
+        openapi_extensions: dict[str, Any] | None = None,
         deprecated: bool = False,
         custom_response_validation_http_code: int | HTTPStatus | None = None,
         middlewares: list[Callable[..., Any]] | None = None,
     ):
-        openapi_extensions = None
         security = None
 
         return super().put(
@@ -233,11 +233,11 @@ def patch(  # type: ignore[override]
         tags: list[str] | None = None,
         operation_id: str | None = None,
         include_in_schema: bool = True,
+        openapi_extensions: dict[str, Any] | None = None,
         deprecated: bool = False,
         custom_response_validation_http_code: int | HTTPStatus | None = None,
         middlewares: list[Callable] | None = None,
     ):
-        openapi_extensions = None
         security = None
 
         return super().patch(
@@ -274,11 +274,11 @@ def delete(  # type: ignore[override]
         tags: list[str] | None = None,
         operation_id: str | None = None,
         include_in_schema: bool = True,
+        openapi_extensions: dict[str, Any] | None = None,
         deprecated: bool = False,
         custom_response_validation_http_code: int | HTTPStatus | None = None,
         middlewares: list[Callable[..., Any]] | None = None,
     ):
-        openapi_extensions = None
         security = None
 
         return super().delete(
@@ -325,6 +325,7 @@ def get_openapi_json_schema(  # type: ignore[override]
         license_info: License | None = None,
         security_schemes: dict[str, SecurityScheme] | None = None,
         security: list[dict[str, list[str]]] | None = None,
+        openapi_extensions: dict[str, Any] | None = None,
     ) -> str:
         """
         Returns the OpenAPI schema as a JSON serializable dict.
@@ -365,8 +366,6 @@ def get_openapi_json_schema(  # type: ignore[override]
         """
         from aws_lambda_powertools.event_handler.openapi.compat import model_json
 
-        openapi_extensions = None
-
         schema = super().get_openapi_schema(
             title=title,
             version=version,

aws_lambda_powertools/event_handler/openapi/models.py

@@ -36,7 +36,6 @@ class OpenAPIExtensions(BaseModel):
     @model_validator(mode="before")
     def serialize_openapi_extension_v2(self):
         if isinstance(self, dict) and self.get("openapi_extensions"):
-
             openapi_extension_value = self.get("openapi_extensions")
 
             for extension_key in openapi_extension_value:

aws_lambda_powertools/logging/logger.py

@@ -1205,15 +1205,15 @@ def flush_buffer(self) -> None:
         buffer = self._buffer_cache.get(tracer_id)
         if not buffer:
             return
-        
+
         if not self._buffer_config:
             return
-        
+
         # Check ALC level against buffer level
         lambda_log_level = self._get_aws_lambda_log_level()
         if lambda_log_level:
             # Check if buffer level is less verbose than ALC
-            if (logging.getLevelName(lambda_log_level) > logging.getLevelName(self._buffer_config.buffer_at_verbosity)):
+            if logging.getLevelName(lambda_log_level) > logging.getLevelName(self._buffer_config.buffer_at_verbosity):
                 warnings.warn(
                     "Advanced Logging Controls (ALC) Log Level is less verbose than Log Buffering Log Level. "
                     "Some logs might be missing",

aws_lambda_powertools/utilities/batch/base.py

@@ -296,8 +296,7 @@ def _clean(self):
 
         if self._entire_batch_failed() and self.raise_on_entire_batch_failure:
             raise BatchProcessingError(
-                msg=f"All records failed processing. {len(self.exceptions)} individual errors logged "
-                f"separately below.",
+                msg=f"All records failed processing. {len(self.exceptions)} individual errors logged separately below.",
                 child_exceptions=self.exceptions,
             )
 

aws_lambda_powertools/utilities/data_classes/code_pipeline_job_event.py

@@ -314,7 +314,6 @@ def put_artifact(self, artifact_name: str, body: Any, content_type: str) -> None
         # So we are using if/else instead.
 
         if self.data.encryption_key:
-
             encryption_key_id = self.data.encryption_key.get_id
             encryption_key_type = self.data.encryption_key.get_type
             if encryption_key_type == "KMS":

aws_lambda_powertools/utilities/data_classes/transfer_family_event.py

@@ -39,7 +39,6 @@ def source_ip(self) -> str:
 
 
 class TransferFamilyAuthorizerResponse:
-
     def _build_authentication_response(
         self,
         role_arn: str,
@@ -51,7 +50,6 @@ def _build_authentication_response(
         user_uid: int | None = None,
         public_keys: str | None = None,
     ) -> dict[str, Any]:
-
         response: dict[str, Any] = {}
 
         if home_directory_type == "PATH":