Inspections analysis

.flake8

@@ -51,6 +51,8 @@ ignore =
     WPS347,
     # Forbid starting lines with a dot
     WPS348,
+    # Forbids to unpack iterable objects to lists. Disabled due to false-positives with pandas
+    WPS359,
     # Forbid mutable constants on a module level
     WPS407,
     # Forbid logic inside __init__ module
@@ -65,6 +67,8 @@ ignore =
     WPS432,
     # Forbid overlapping local and block variables. Disabled due to false-positives
     WPS440,
+    # Forbids direct usage of multiline strings
+    WPS462,
     # Forbid comparisons between bitwise and boolean expressions
     WPS465,
     # Forbid @staticmethod decorator

core/src/utils/file/yaml_utils.py

@@ -7,3 +7,14 @@
 def parse_yaml(path: Union[Path, str]) -> Any:
     with open(path) as file:
         return yaml.safe_load(file)
+
+
+def read_yaml_field_content(yaml_file: Path, field_name: str) -> Any:
+    if not yaml_file.exists():
+        raise ValueError(f'{field_name} does not exist.')
+
+    parsed_yaml_file = parse_yaml(yaml_file)
+    if parsed_yaml_file is None:
+        raise ValueError(f'`{yaml_file} is empty.')
+
+    return parsed_yaml_file.get(field_name)

data_labelling/src/hyperstyle/evaluate.py

@@ -49,6 +49,7 @@ def main():
     config = HyperstyleEvaluationConfig(tool_path=args.tool_path,
                                         allow_duplicates=args.allow_duplicates,
                                         with_all_categories=args.with_all_categories,
+                                        new_format=False,
                                         tmp_path=args.tmp_directory,
                                         disable=args.disable,
                                         working_directory=args.working_directory,

data_labelling/src/hyperstyle/hyperstyle_evaluation_config.py

@@ -1,8 +1,9 @@
+import json
 import logging.config
 import platform
 import sys
 from pathlib import Path
-from typing import List, Optional, Union
+from typing import List, Optional, Union, Dict
 
 from hyperstyle.src.python.review.application_config import LanguageVersion
 
@@ -12,17 +13,23 @@
 
 HYPERSTYLE_TOOL_PATH = 'review/hyperstyle/src/python/review/run_tool.py'
 
+IJConfig = Dict[str, Dict[str, str]]
+
 
 class HyperstyleEvaluationConfig(EvaluationConfig):
-    def __init__(self,
-                 tool_path: str,
-                 allow_duplicates: bool,
-                 with_all_categories: bool,
-                 tmp_path: Path,
-                 n_cpu: Optional[int] = None,
-                 disable: Optional[str] = None,
-                 working_directory: Optional[str] = None,
-                 venv: Optional[str] = None):
+    def __init__(
+        self,
+        tool_path: str,
+        allow_duplicates: bool,
+        with_all_categories: bool,
+        new_format: bool,
+        tmp_path: Path,
+        n_cpu: Optional[int] = None,
+        disable: Optional[str] = None,
+        working_directory: Optional[str] = None,
+        venv: Optional[str | Path] = None,
+        ij_config: Optional[IJConfig] = None,
+    ):
         """
         `tool_path` - path to hyperstyle tool running script (custom or HYPERSTYLE_TOOL_PATH)
         `tmp_path` - path where to place evaluation temporary files
@@ -37,10 +44,12 @@ def __init__(self,
 
         self.allow_duplicates: bool = allow_duplicates
         self.with_all_categories: bool = with_all_categories
+        self.new_format: bool = new_format
         self.n_cpu: int = n_cpu
         self.disable: Optional[str] = disable
+        self.ij_config: Optional[IJConfig] = ij_config
         self.working_directory: Optional[str] = working_directory
-        self.venv: Optional[str] = venv
+        self.venv: Optional[str | Path] = venv
 
     def build_command(self,
                       input_path: Union[str, Path],
@@ -73,6 +82,9 @@ def build_command(self,
         if self.disable:
             python_command += ['--disable', self.disable]
 
+        if self.ij_config:
+            python_command += ['--ij-config', json.dumps(self.ij_config)]
+
         if platform.system() == 'Darwin':
             bash_prefix = None
         else:

data_labelling/src/utils/evaluation_utils.py

@@ -1,9 +1,10 @@
 import logging
+import subprocess
+import time
 from pathlib import Path
 from typing import Callable, List, TypeVar, Optional, Tuple
 
 import pandas as pd
-import time
 
 from core.src.model.column_name import SubmissionColumns
 from core.src.utils.file.file_utils import create_directory, remove_directory, create_file
@@ -70,7 +71,7 @@ def evaluate_command(command: List[str], working_directory: Optional[str] = None
     logger.info('Start evaluation')
     start = time.time()
 
-    logger.info(f'Executing command: {" ".join(command)}')
+    logger.info(f'Executing command: {subprocess.list2cmdline(command)}')
     output, _ = run_in_subprocess(command, working_directory=working_directory)
 
     end = time.time()