fix: black issues

epam · May 17, 2024 · cd10945 · cd10945
1 parent 56546e0
commit cd10945
Show file tree

Hide file tree

Showing 17 changed files with 96 additions and 38 deletions.
diff --git a/assets/tests/test_utils.py b/assets/tests/test_utils.py
@@ -496,7 +496,6 @@ def test_file_processor_conversion_error(
         assert converter.conversion_status == "conversion error"
 
 
-
 @pytest.mark.skip(reason="tests refactoring")
 def test_convert_pdf(file_converter_service):
     with NamedTemporaryFile(suffix=".pdf", prefix="123") as tmp_file:

diff --git a/convert/convert/config.py b/convert/convert/config.py
@@ -25,6 +25,7 @@
 DEFAULT_PDF_FONT_WIDTH = 7
 DEFAULT_PDF_LINE_SPACING = 2
 
+
 def get_service_uri(prefix: str) -> str:  # noqa
     service_scheme = os.getenv(f"{prefix}SERVICE_SCHEME")
     service_host = os.getenv(f"{prefix}SERVICE_HOST")

diff --git a/convert/convert/converters/base_format/models/tokens.py b/convert/convert/converters/base_format/models/tokens.py
@@ -25,7 +25,6 @@ class PageSize(BaseModel):
 
 
 class Page(BaseModel):
-
     """A model for the field with bboxes."""
 
     page_num: int = Field(..., example=1)

diff --git a/jobs/jobs/s3.py b/jobs/jobs/s3.py
@@ -28,12 +28,14 @@ def create_boto3_config() -> Dict[str, Optional[str]]:
                 "aws_access_key_id": config.S3_ACCESS_KEY,
                 "aws_secret_access_key": config.S3_SECRET_KEY,
                 "endpoint_url": (
-                    ("https" if config.S3_SECURE else "http")
-                    + "://"
-                    + config.S3_ENDPOINT
-                )
-                if config.S3_ENDPOINT
-                else None,
+                    (
+                        ("https" if config.S3_SECURE else "http")
+                        + "://"
+                        + config.S3_ENDPOINT
+                    )
+                    if config.S3_ENDPOINT
+                    else None
+                ),
             }
         )
     elif config.S3_PROVIDER == S3Providers.AWS_IAM:

diff --git a/jobs/tests/conftest.py b/jobs/tests/conftest.py
@@ -141,9 +141,9 @@ def testing_app(testing_engine, testing_session, setup_tenant):
         ),
     ):
         main.app.dependency_overrides[main.tenant] = lambda: setup_tenant
-        main.app.dependency_overrides[
-            service.get_session
-        ] = lambda: testing_session
+        main.app.dependency_overrides[service.get_session] = (
+            lambda: testing_session
+        )
         client = TestClient(main.app)
         yield client
 

diff --git a/lib/filter_lib/src/query_modificator.py b/lib/filter_lib/src/query_modificator.py
@@ -18,9 +18,11 @@ def splint_to_distinct_and_not(
 ) -> Tuple[List[Dict[str, Any]], List[Dict[str, Any]]]:
     distinct_filters, non_distinct_filters = [], []
     for fil in filters:
-        distinct_filters.append(fil) if _op_is_distinct(
-            fil
-        ) else non_distinct_filters.append(fil)
+        (
+            distinct_filters.append(fil)
+            if _op_is_distinct(fil)
+            else non_distinct_filters.append(fil)
+        )
 
     return distinct_filters, non_distinct_filters
 

diff --git a/lib/python3.12/filter_lib/src/query_modificator.py b/lib/python3.12/filter_lib/src/query_modificator.py
@@ -18,9 +18,11 @@ def splint_to_distinct_and_not(
 ) -> Tuple[List[Dict[str, Any]], List[Dict[str, Any]]]:
     distinct_filters, non_distinct_filters = [], []
     for fil in filters:
-        distinct_filters.append(fil) if _op_is_distinct(
-            fil
-        ) else non_distinct_filters.append(fil)
+        (
+            distinct_filters.append(fil)
+            if _op_is_distinct(fil)
+            else non_distinct_filters.append(fil)
+        )
 
     return distinct_filters, non_distinct_filters
 

diff --git a/search/tests/conftest.py b/search/tests/conftest.py
@@ -179,8 +179,7 @@ def __init__(self):
         async def __aenter__(self):
             return self
 
-        async def __aexit__(self, exc_type, exc_val, exc_tb):
-            ...
+        async def __aexit__(self, exc_type, exc_val, exc_tb): ...
 
         def __aiter__(self):
             return self

diff --git a/search/tests/override_app_dependency.py b/search/tests/override_app_dependency.py
@@ -8,7 +8,6 @@
 there are necessary tenants in token.
 """
 
-
 from tenant_dependency import TenantData
 
 from search.main import TOKEN, app

diff --git a/taxonomy/alembic/versions/48dc50decbed_add_association_taxonomy_category.py b/taxonomy/alembic/versions/48dc50decbed_add_association_taxonomy_category.py
@@ -5,6 +5,7 @@
 Create Date: 2022-12-02 15:04:55.726594
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

diff --git a/taxonomy/alembic/versions/bdea8a93cafe_first_revision.py b/taxonomy/alembic/versions/bdea8a93cafe_first_revision.py
@@ -5,6 +5,7 @@
 Create Date: 2022-11-24 16:36:12.022247
 
 """
+
 import sqlalchemy as sa
 import sqlalchemy_utils
 from alembic import op

diff --git a/taxonomy/alembic/versions/d3ba69ca9d97_change_category_linking.py b/taxonomy/alembic/versions/d3ba69ca9d97_change_category_linking.py
@@ -5,6 +5,7 @@
 Create Date: 2022-12-26 04:40:50.608253
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

diff --git a/taxonomy/taxonomy/token_dependency.py b/taxonomy/taxonomy/token_dependency.py
@@ -2,6 +2,7 @@
 Dependency, that will validate X-Current-Tenant
 and Authorization token
 """
+
 import os
 
 from tenant_dependency import TenantData, get_tenant_info

diff --git a/taxonomy/tests/override_app_dependency.py b/taxonomy/tests/override_app_dependency.py
@@ -7,6 +7,7 @@
 that given token is valid, not expired and
 there are necessary tenants in token.
 """
+
 from tenant_dependency import TenantData
 
 HEADER_TENANT = "X-Current-Tenant"

diff --git a/taxonomy/tests/test_taxonomy_router.py b/taxonomy/tests/test_taxonomy_router.py
@@ -300,7 +300,10 @@ def test_should_delete_latest_taxonomy_from_db(
     db_session,
 ):
     # given
-    new_latest_taxonomy, taxonomy_to_delete, = sorted(
+    (
+        new_latest_taxonomy,
+        taxonomy_to_delete,
+    ) = sorted(
         prepare_two_taxonomy_records_with_same_id_in_db,
         key=lambda x: x.version,
     )

diff --git a/users/tests/keycloak/test_query.py b/users/tests/keycloak/test_query.py
@@ -1,4 +1,5 @@
 """Testing src/keycloak/query.py."""
+
 from unittest.mock import patch
 
 import pytest
@@ -31,7 +32,9 @@ async def test_get_token_v2(request_mock):
 
 
 @pytest.mark.asyncio
-async def test_introspect_token_test(request_mock, mocked_token1, mocked_token1_data):
+async def test_introspect_token_test(
+    request_mock, mocked_token1, mocked_token1_data
+):
     request_mock.return_value.__aenter__.return_value.json.return_value = (
         mocked_token1_data
     )
@@ -40,7 +43,9 @@ async def test_introspect_token_test(request_mock, mocked_token1, mocked_token1_
 
 
 @pytest.mark.asyncio
-async def test_get_master_realm_auth_data(request_mock, mocked_admin_auth_data):
+async def test_get_master_realm_auth_data(
+    request_mock, mocked_admin_auth_data
+):
     request_mock.return_value.__aenter__.return_value.json.return_value = (
         mocked_admin_auth_data
     )

diff --git a/users/tests/test_main.py b/users/tests/test_main.py
@@ -96,7 +96,9 @@ def does_not_raise():
             roles=["admin"],
             tenants=["tenant"],
         ),
-        TenantData(token="token", user_id="user_id", roles=[], tenants=["tenant"]),
+        TenantData(
+            token="token", user_id="user_id", roles=[], tenants=["tenant"]
+        ),
     ],
 )
 def test_check_authorization_role_is_missing(mock_tenant_data):
@@ -210,7 +212,9 @@ def test_login_status_code(token_schema, request_body, status_code):
 class TestGetUserGWT:
     def test_get_user_jwt_body(self, mock_user, user_representation):
         response = client.get("/users/current")
-        assert response.json() == user_representation(user_id="1", user_name="user")
+        assert response.json() == user_representation(
+            user_id="1", user_name="user"
+        )
 
     def test_get_user_jwt_status_code(self, mock_user):
         response = client.get("/users/current")
@@ -222,15 +226,19 @@ class TestGetUser:
     @pytest.mark.skip(reason="tests refactoring")
     def test_get_user_body(self, mock_user, user_representation):
         response = client.get("/users/user-id")
-        assert response.json() == user_representation(user_id="1", user_name="user")
+        assert response.json() == user_representation(
+            user_id="1", user_name="user"
+        )
 
     @pytest.mark.skip(reason="tests refactoring")
     def test_get_user_status_code(self, mock_user):
         response = client.get("/users/user-id")
         assert response.status_code == 200
 
 
-def test_get_user_info_from_token_introspection(mocked_token1, mocked_token1_data):
+def test_get_user_info_from_token_introspection(
+    mocked_token1, mocked_token1_data
+):
     with patch(
         "users.keycloak.query.introspect_token",
         return_value=mocked_token1_data,
@@ -338,7 +346,9 @@ def test_add_user_to_tenant2(
         ("group_1", {"detail": "User has been removed from the tenant"}),
     ],
 )
-def test_remove_user_from_tenant_body(mock_user, update_user, tenant, expected_result):
+def test_remove_user_from_tenant_body(
+    mock_user, update_user, tenant, expected_result
+):
     response = client.delete(f"/tenants/{tenant}/users/user_1")
     assert response.json() == expected_result
 
@@ -359,7 +369,9 @@ def test_remove_user_from_tenant_status_code(
 
 
 @patch("users.keycloak.query.get_users_v2", return_value=mock_all_users)
-@patch("users.keycloak.query.get_users_by_role", return_value=mock_users_with_role)
+@patch(
+    "users.keycloak.query.get_users_by_role", return_value=mock_users_with_role
+)
 class TestUsersSearch:
     @pytest.mark.parametrize("request_body", [{}, {"filters": []}])
     def test_get_all_users_body(
@@ -388,7 +400,11 @@ def test_filter_users_by_name_body(
     ):
         response = client.post(
             "/users/search",
-            json={"filters": [{"field": "name", "operator": "like", "value": "r"}]},
+            json={
+                "filters": [
+                    {"field": "name", "operator": "like", "value": "r"}
+                ]
+            },
         )
         assert response.json() == [
             user_representation(user_id="1", user_name="user"),
@@ -400,7 +416,11 @@ def test_filter_users_by_name_status_code(
     ):
         response = client.post(
             "/users/search",
-            json={"filters": [{"field": "name", "operator": "like", "value": "r"}]},
+            json={
+                "filters": [
+                    {"field": "name", "operator": "like", "value": "r"}
+                ]
+            },
         )
         assert response.status_code == 200
 
@@ -443,14 +463,20 @@ def test_filter_users_by_empty_name_status_code(
     ):
         response = client.post(
             "/users/search",
-            json={"filters": [{"field": "name", "operator": "like", "value": ""}]},
+            json={
+                "filters": [{"field": "name", "operator": "like", "value": ""}]
+            },
         )
         assert response.status_code == 422
 
     @pytest.mark.parametrize(
         "request_body",
         [
-            {"filters": [{"field": "id", "operator": "in", "value": ["1", "2"]}]},
+            {
+                "filters": [
+                    {"field": "id", "operator": "in", "value": ["1", "2"]}
+                ]
+            },
             {
                 "filters": [
                     {
@@ -482,7 +508,11 @@ def test_filter_users_by_id_body(
     @pytest.mark.parametrize(
         "request_body",
         [
-            {"filters": [{"field": "id", "operator": "in", "value": ["1", "2"]}]},
+            {
+                "filters": [
+                    {"field": "id", "operator": "in", "value": ["1", "2"]}
+                ]
+            },
             {
                 "filters": [
                     {
@@ -511,7 +541,11 @@ def test_filter_users_by_id_status_code(
         "request_body",
         [
             {"filters": [{"field": "id", "operator": "in", "value": []}]},
-            {"filters": [{"field": "id", "operator": "in", "value": ["wrong_id"]}]},
+            {
+                "filters": [
+                    {"field": "id", "operator": "in", "value": ["wrong_id"]}
+                ]
+            },
         ],
     )
     def test_filter_users_by_wrong_or_empty_id_body(
@@ -531,7 +565,11 @@ def test_filter_users_by_wrong_or_empty_id_body(
         "request_body",
         [
             {"filters": [{"field": "id", "operator": "in", "value": []}]},
-            {"filters": [{"field": "id", "operator": "in", "value": ["wrong_id"]}]},
+            {
+                "filters": [
+                    {"field": "id", "operator": "in", "value": ["wrong_id"]}
+                ]
+            },
         ],
     )
     def test_filter_users_by_wrong_or_empty_id_status_code(
@@ -544,7 +582,9 @@ def test_filter_users_by_wrong_or_empty_id_status_code(
         response = client.post(
             "/users/search",
             json={
-                "filters": [{"field": "id", "operator": "in", "value": ["wrong_id"]}]
+                "filters": [
+                    {"field": "id", "operator": "in", "value": ["wrong_id"]}
+                ]
             },
         )
         assert response.status_code == 200
@@ -592,7 +632,9 @@ def test_filter_users_by_wrong_role_body(
         response = client.post(
             "/users/search",
             json={
-                "filters": [{"field": "role", "operator": "eq", "value": "wrong_role"}]
+                "filters": [
+                    {"field": "role", "operator": "eq", "value": "wrong_role"}
+                ]
             },
         )
         assert response.status_code == 422