refactor: Resolve WPS5XX style violations

svazquezco · svazquezco · commit 656e671d8b84 · 2026-03-11T11:05:38.000+01:00
diff --git a/cli/core/console.py b/cli/core/console.py
@@ -43,10 +43,8 @@ def show_banner() -> None:
 
     for line in banner_lines:
         colored_line = Text()
-        for index in range(len(line)):
-            char = line[index : index + 1]
-            char.stylize(colors[index])
-            colored_line = Text.assemble(colored_line, char)
+        for index, char in enumerate(line.plain):
+            colored_line = Text.assemble(colored_line, Text(char, style=colors[index]))
         console.print(colored_line)
 
 
diff --git a/cli/core/errors.py b/cli/core/errors.py
@@ -4,7 +4,7 @@
 from typing import ParamSpec, TypeVar
 
 from mpt_api_client.exceptions import MPTHttpError as APIException
-from requests import RequestException
+from requests import RequestException, Response
 
 CallableParams = ParamSpec("CallableParams")
 RetType = TypeVar("RetType")
@@ -25,7 +25,27 @@ def __str__(self) -> str:
         return f"{self._request_msg} with response body {self._response_body}"
 
 
-def wrap_http_error[**CallableParams, RetType](  # noqa: C901
+def _parse_bad_request_message(response: Response) -> str:
+    try:
+        response_body = response.json()
+    except ValueError:
+        return str(response.content)
+
+    response_errors = response_body.get("errors", {}) if isinstance(response_body, dict) else {}
+    if not isinstance(response_errors, dict) or not response_errors:
+        return str(response.content)
+
+    return "\n".join(
+        (
+            f"{field}: {error_details[0]}"
+            if isinstance(error_details, (list, tuple)) and error_details
+            else f"{field}: {error_details}"
+        )
+        for field, error_details in response_errors.items()
+    )
+
+
+def wrap_http_error[**CallableParams, RetType](
     func: Callable[CallableParams, RetType],
 ) -> Callable[CallableParams, RetType]:
     """Decorator to wrap HTTP request functions and handle RequestException.
@@ -45,18 +65,13 @@ def _wrapper(*args: CallableParams.args, **kwargs: CallableParams.kwargs) -> Ret
         except RequestException as error:
             if error.response is None:
                 msg = "No response"
-            elif error.response.status_code == HTTPStatus.BAD_REQUEST:
-                response_body = error.response.json()
-
-                msg = ""
-                if "errors" in response_body:
-                    for field, error_details in response_body["errors"].items():
-                        msg += f"{field}: {error_details[0]}\n"
-                else:
-                    msg = str(error.response.content)
-            else:
+                raise MPTAPIError(str(error), msg) from error
+
+            if error.response.status_code != HTTPStatus.BAD_REQUEST:
                 msg = str(error.response.content)
+                raise MPTAPIError(str(error), msg) from error
 
+            msg = _parse_bad_request_message(error.response)
             raise MPTAPIError(str(error), msg) from error
 
     return _wrapper
diff --git a/cli/core/handlers/errors.py b/cli/core/handlers/errors.py
@@ -4,8 +4,8 @@ class ExcelFileHandlerError(Exception):
     _default_message = "Excel file handler error"
 
     def __init__(self, message: str | None = None, details: list | None = None):
-        self.message = message if message is not None else self._default_message
-        self.details = details if details is not None else []
+        self.message = self._default_message if message is None else message
+        self.details = [] if details is None else list(details)
 
 
 class RequiredSheetsError(ExcelFileHandlerError):
diff --git a/cli/core/handlers/excel_file_handler.py b/cli/core/handlers/excel_file_handler.py
@@ -335,10 +335,11 @@ def write_cell(
         sheet[coordinate] = cell_value
 
     def _clean_worksheets(self, sheet_name: str | None = None) -> None:
-        if sheet_name is not None:
-            self._worksheets_cache.pop(sheet_name, None)
-        else:
+        if sheet_name is None:
             self._worksheets_cache = {}
+            return
+
+        self._worksheets_cache.pop(sheet_name, None)
 
     def _get_fields_from_horizontal_worksheet(self, worksheet_name: str, max_row: int) -> list[str]:
         return list(
diff --git a/cli/core/nested_dicts.py b/cli/core/nested_dicts.py
@@ -15,12 +15,15 @@ def set_dict_value(original_dict: dict[str, Any], path: str, new_value: Any) ->
     """
     path_list = path.split(".", 1)
     if len(path_list) == 1:
-        original_dict[path_list[0]] = new_value
+        original_dict.update({path_list[0]: new_value})
+        return original_dict
+
+    current, next_path = path_list[0], path_list[-1]
+    if current in original_dict:
+        current_value = original_dict.get(current)
+        next_dict = current_value if isinstance(current_value, dict) else {}
     else:
-        current, next_path = path_list[0], path_list[-1]
-        if current in original_dict:
-            original_dict[current] = set_dict_value(original_dict[current], next_path, new_value)
-        else:
-            original_dict[current] = set_dict_value({}, next_path, new_value)
+        next_dict = {}
 
+    original_dict.update({current: set_dict_value(next_dict, next_path, new_value)})
     return original_dict
diff --git a/cli/core/price_lists/app.py b/cli/core/price_lists/app.py
@@ -141,7 +141,7 @@ def export(  # noqa: C901
         )
         raise typer.Exit(code=4)
 
-    out_path = out_path if out_path is not None else str(Path.cwd())
+    out_path = str(Path.cwd()) if out_path is None else out_path
     mpt_client = create_api_mpt_client_from_account(active_account)
     stats = PriceListStatsCollector()
     has_error = False
diff --git a/cli/core/products/app.py b/cli/core/products/app.py
@@ -51,7 +51,7 @@ def export(  # noqa: C901
         )
         raise typer.Exit(code=4)
 
-    out_path = out_path if out_path is not None else str(Path.cwd())
+    out_path = str(Path.cwd()) if out_path is None else out_path
     has_error = False
     for product_id in product_ids:
         file_path = Path(out_path) / f"{product_id}.xlsx"
diff --git a/cli/core/products/models/template.py b/cli/core/products/models/template.py
@@ -69,7 +69,7 @@ def to_xlsx(self) -> dict[str, Any]:
             constants.TEMPLATES_NAME: self.name,
             constants.TEMPLATES_ACTION: self.action,
             constants.TEMPLATES_TYPE: self.type,
-            constants.TEMPLATES_DEFAULT: str(self.default) if self.default is not None else None,
+            constants.TEMPLATES_DEFAULT: None if self.default is None else str(self.default),
             constants.TEMPLATES_CONTENT: self.template_content,
             constants.TEMPLATES_CREATED: self.created_date,
             constants.TEMPLATES_MODIFIED: self.updated_date,
diff --git a/cli/core/stats.py b/cli/core/stats.py
@@ -70,8 +70,9 @@ def __str__(self) -> str:
         msg = ""
         for section_name, section in self._sections.items():
             msg = f"{msg}{section_name}:"
-            if "" in section:
-                msg = f"{msg} {', '.join(section[''])}\n"
+            section_messages = section.get("", [])
+            if section_messages:
+                msg = f"{msg} {', '.join(section_messages)}\n"
             else:
                 msg += "\n"
 
diff --git a/cli/plugins/audit_plugin/app.py b/cli/plugins/audit_plugin/app.py
@@ -58,8 +58,8 @@ def compare_audit_trails(source_trail: dict[str, Any], target_trail: dict[str, A
             formatted_path = format_json_path(key, source_trail, target_trail)
             table.add_row(
                 formatted_path,
-                str(source_value) if source_value is not None else "[red]<missing>[/red]",
-                str(target_value) if target_value is not None else "[red]<missing>[/red]",
+                "[red]<missing>[/red]" if source_value is None else str(source_value),
+                "[red]<missing>[/red]" if target_value is None else str(target_value),
             )
 
     if differences_found:
diff --git a/pyproject.toml b/pyproject.toml
@@ -121,7 +121,7 @@ select = ["AAA", "E999", "WPS"]
 show-source = true
 statistics = false
 per-file-ignores = [
-  "*.py:WPS204,WPS210,WPS211,WPS213,WPS214,WPS218,WPS221,WPS229,WPS231,WPS232,WPS234,WPS235,WPS237,WPS322,WPS327,WPS332,WPS335,WPS336,WPS338,WPS339,WPS342,WPS347,WPS349,WPS400,WPS402,WPS404,WPS407,WPS410,WPS412,WPS420,WPS430,WPS432,WPS458,WPS471,WPS478,WPS504,WPS518,WPS519,WPS529",
+  "*.py:WPS204,WPS210,WPS211,WPS213,WPS214,WPS218,WPS221,WPS229,WPS231,WPS232,WPS234,WPS235,WPS237,WPS322,WPS327,WPS332,WPS335,WPS336,WPS338,WPS339,WPS342,WPS347,WPS349,WPS400,WPS402,WPS404,WPS407,WPS410,WPS412,WPS420,WPS430,WPS432,WPS458,WPS471,WPS478",
   "tests/**:WPS202,WPS203,WPS204,WPS210,WPS211,WPS213,WPS218,WPS221,WPS235,WPS322,WPS335,WPS339,WPS342,WPS432"
 ]
 
diff --git a/tests/cli/core/handlers/test_errors.py b/tests/cli/core/handlers/test_errors.py
@@ -0,0 +1,10 @@
+from cli.core.handlers.errors import ExcelFileHandlerError
+
+
+def test_excel_file_handler_error_copies_details():
+    details = ["Sheet1"]
+
+    details_copy = ExcelFileHandlerError(details=details).details  # act
+
+    assert details_copy is not details
+    assert details_copy == ["Sheet1"]
diff --git a/tests/cli/core/handlers/test_excel_file_handler.py b/tests/cli/core/handlers/test_excel_file_handler.py
@@ -177,6 +177,32 @@ def test_get_data_from_vertical_sheet_by_fields(excel_file_handler):
     assert result == {"Field1": {"value": "Value1", "coordinate": "B2"}}
 
 
+def test_clean_worksheets_by_sheet_name(excel_file_handler):
+    excel_file_handler.write_cell("VerticalSheet", row=2, col=3, cell_value="V")
+    excel_file_handler.write_cell("HorizontalSheet", row=2, col=3, cell_value="H")
+    clean_worksheets_attr = "_clean_worksheets"
+    worksheets_cache_attr = "_worksheets_cache"
+    clean_worksheets = getattr(excel_file_handler, clean_worksheets_attr)
+    worksheets_cache = getattr(excel_file_handler, worksheets_cache_attr)
+
+    clean_worksheets("VerticalSheet")  # act
+
+    assert "VerticalSheet" not in worksheets_cache
+    assert "HorizontalSheet" in worksheets_cache
+
+
+def test_clean_worksheets_all(excel_file_handler):
+    excel_file_handler.write_cell("VerticalSheet", row=2, col=3, cell_value="V")
+    excel_file_handler.write_cell("HorizontalSheet", row=2, col=3, cell_value="H")
+    clean_worksheets_attr = "_clean_worksheets"
+    worksheets_cache_attr = "_worksheets_cache"
+    clean_worksheets = getattr(excel_file_handler, clean_worksheets_attr)
+
+    clean_worksheets()  # act
+
+    assert getattr(excel_file_handler, worksheets_cache_attr) == {}
+
+
 def test_get_values_for_dynamic_sheet(excel_file_handler):
     fields = ["Header1"]
     patterns = [re.compile(r"Value\d+")]
diff --git a/tests/cli/core/test_errors.py b/tests/cli/core/test_errors.py
@@ -20,6 +20,18 @@ def test_wrap_http_error_no_response():
     assert "No response" in str(error.value)
 
 
+def test_wrap_http_error_non_bad_request(mocker):
+    response = mocker.Mock(spec=Response)
+    response.status_code = 500
+    response.content = b"server error"
+    wrapped = wrap_http_error(lambda: _raise_bad_request(response))
+
+    with pytest.raises(MPTAPIError) as error:
+        wrapped()
+
+    assert "server error" in str(error.value)
+
+
 def test_wrap_http_error_bad_request_fields(mocker):
     response = mocker.Mock(spec=Response)
     response.status_code = 400
@@ -43,3 +55,41 @@ def test_wrap_http_error_bad_request_no_fields(mocker):
         wrapped()
 
     assert "invalid payload content" in str(error.value)
+
+
+def test_wrap_http_error_bad_request_invalid_json(mocker):
+    response = mocker.Mock(spec=Response)
+    response.status_code = 400
+    response.json.side_effect = ValueError("invalid json")
+    response.content = b"invalid response content"
+    wrapped = wrap_http_error(lambda: _raise_bad_request(response))
+
+    with pytest.raises(MPTAPIError) as error:
+        wrapped()
+
+    assert "invalid response content" in str(error.value)
+
+
+def test_wrap_http_error_non_list_details(mocker):
+    response = mocker.Mock(spec=Response)
+    response.status_code = 400
+    response.json.return_value = {"errors": {"name": "is required"}}
+    wrapped = wrap_http_error(lambda: _raise_bad_request(response))
+
+    with pytest.raises(MPTAPIError) as error:
+        wrapped()
+
+    assert "name: is required" in str(error.value)
+
+
+def test_wrap_http_error_non_dict_payload(mocker):
+    response = mocker.Mock(spec=Response)
+    response.status_code = 400
+    response.json.return_value = ["invalid", "payload"]
+    response.content = b"invalid payload content"
+    wrapped = wrap_http_error(lambda: _raise_bad_request(response))
+
+    with pytest.raises(MPTAPIError) as error:
+        wrapped()
+
+    assert "invalid payload content" in str(error.value)
diff --git a/tests/cli/core/test_nested_dicts.py b/tests/cli/core/test_nested_dicts.py
@@ -17,3 +17,12 @@ def test_set_dict_value_same_leaf():
     result = set_dict_value(original_dict, path, "test")
 
     assert result == {"a": {"b": {"c": "old_value", "d": "test"}}}
+
+
+def test_set_dict_value_overwrites_falsy_value():
+    original_dict = {"a": 0}
+    path = "a.b"
+
+    result = set_dict_value(original_dict, path, "test")
+
+    assert result == {"a": {"b": "test"}}

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ def export( # noqa: C901`
`141`	`141`	`)`
`142`	`142`	`raise typer.Exit(code=4)`
`143`	`143`
`144`		`- out_path = out_path if out_path is not None else str(Path.cwd())`
	`144`	`+ out_path = str(Path.cwd()) if out_path is None else out_path`
`145`	`145`	`mpt_client = create_api_mpt_client_from_account(active_account)`
`146`	`146`	`stats = PriceListStatsCollector()`
`147`	`147`	`has_error = False`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def export( # noqa: C901`
`51`	`51`	`)`
`52`	`52`	`raise typer.Exit(code=4)`
`53`	`53`
`54`		`- out_path = out_path if out_path is not None else str(Path.cwd())`
	`54`	`+ out_path = str(Path.cwd()) if out_path is None else out_path`
`55`	`55`	`has_error = False`
`56`	`56`	`for product_id in product_ids:`
`57`	`57`	`file_path = Path(out_path) / f"{product_id}.xlsx"`