feat: add prettier frontend formatter, add it to pre-commit

Nigma-Ks · Nigma-Ks · commit bea979f365d6 · 2026-04-08T13:41:36.000+03:00
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+eslint.config.js
diff --git a/.gitignore b/.gitignore
@@ -222,3 +222,6 @@ frontend/README.md
 #dynamic created files
 frontend/src/components/components/Methods.ts
 backend/resources/dataset.json
+
+# Pre-commit
+.pre-commit-config.local
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,29 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.2
+    hooks:
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format
+
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v9.38.0
+    hooks:
+      - id: eslint
+        files: ^frontend/.*\.(js|jsx|ts|tsx)$
+        args: [ '--fix', '--config', 'frontend/eslint.config.js' ]
+        additional_dependencies:
+          - eslint@9.38.0
+          - '@typescript-eslint/eslint-plugin@8.58.1'
+          - '@typescript-eslint/parser@8.58.1'
+          - '@eslint/js@9.38.0'
+          - 'eslint-plugin-prettier@5.2.1'
+          - 'eslint-config-prettier@10.0.1'
+          - globals@15.12.0
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
+    hooks:
+      - id: prettier
+        files: ^frontend/.*\.(js|jsx|ts|tsx|json|css|md)$
+        args: [ '--write' ]
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,11 @@
+node_modules/
+dist/
+build/
+coverage/
+*.log
+.env
+.env.local
+.DS_Store
+package-lock.json
+yarn.lock
+eslint.config.js
diff --git a/backend/config/tests/test_filepaths.py b/backend/config/tests/test_filepaths.py
@@ -1,11 +1,11 @@
 import pytest
 
 from backend.config.paths import (
-    get_tmp_thread_files,
     RESULTS_DIR,
+    TMP_FILE_DIR,
     UPLOAD_DIR,
     get_thread_filepath,
-    TMP_FILE_DIR,
+    get_tmp_thread_files,
 )
 
 
diff --git a/backend/file_utils/files.py b/backend/file_utils/files.py
@@ -1,5 +1,6 @@
 import os
 import shutil
+
 from fastapi import UploadFile
 
 
diff --git a/backend/file_utils/tests/test_file_utils.py b/backend/file_utils/tests/test_file_utils.py
@@ -1,13 +1,14 @@
-import pytest
-import os
 import csv
+import os
+from io import BytesIO
+from unittest.mock import Mock
+
+import pytest
+from fastapi import UploadFile
 
 from backend.config.paths import TMP_FILE_DIR
 from backend.file_utils.csv_methods_writer import write_launch_info_to_csv
 from backend.file_utils.files import reset_dirs, save_upload_file
-from unittest.mock import Mock
-from fastapi import UploadFile
-from io import BytesIO
 
 
 @pytest.mark.parametrize(
@@ -57,7 +58,7 @@ def test_write_launch_info_to_csv(tmp_path):
 
     assert output_file.exists()
 
-    with open(output_file, "r") as f:
+    with open(output_file) as f:
         reader = csv.reader(f)
         rows = list(reader)
 
diff --git a/backend/launch_service/app_setup.py b/backend/launch_service/app_setup.py
@@ -1,10 +1,11 @@
 import os
 import subprocess
+
 from backend.config.paths import (
-    RESOURCES_DIR,
     DATASET_FILE,
     DOCKER_DIR,
     METHODS_TS_FILE,
+    RESOURCES_DIR,
 )
 from backend.utils.methods_handler import Methods
 
diff --git a/backend/launch_service/tests/test_setup_functions.py b/backend/launch_service/tests/test_setup_functions.py
@@ -2,7 +2,7 @@
 from unittest.mock import Mock, patch
 
 from backend.config.paths import DOCKER_DIR, RESOURCES_DIR
-from backend.launch_service.app_setup import fetch_dataset, IMAGE_NAME, build_container
+from backend.launch_service.app_setup import IMAGE_NAME, build_container, fetch_dataset
 
 
 def test_fetch_dataset_success(tmp_path, monkeypatch):
diff --git a/backend/main.py b/backend/main.py
@@ -1,5 +1,5 @@
 import shortuuid
-from fastapi import FastAPI, UploadFile, File, Form
+from fastapi import FastAPI, Form, UploadFile
 from fastapi.middleware.cors import CORSMiddleware
 
 from backend.config.paths import METHODS_TS_FILE
@@ -21,7 +21,7 @@
 
 @app.post("/api/upload")
 async def handle_submit(
-    file: UploadFile = File(...),
+    file: UploadFile,
     email: str = Form(...),
     methods: str = Form(...),
     experiment: str = Form(...),
diff --git a/backend/utils/data_uploader.py b/backend/utils/data_uploader.py
@@ -3,10 +3,10 @@
 
 from fastapi import UploadFile
 
+from backend.config.paths import LAUNCH_INFO_FILE, MODEL_ONNX_FILE, get_thread_filepath
 from backend.file_utils.csv_methods_writer import write_launch_info_to_csv
 from backend.file_utils.files import save_upload_file
 from backend.utils.methods_handler import Methods
-from backend.config.paths import LAUNCH_INFO_FILE, MODEL_ONNX_FILE, get_thread_filepath
 
 
 def handle_upload(
diff --git a/backend/utils/docker_runner.py b/backend/utils/docker_runner.py
@@ -2,13 +2,13 @@
 from abc import ABC, abstractmethod
 
 from backend.config.paths import (
-    get_thread_filepath,
-    RESULTS_DIR,
-    LAUNCH_INFO_FILE,
-    MODEL_ONNX_FILE,
     ARTIFACTS_AI_CSV_FILE,
     ARTIFACTS_BASELINE_CSV_FILE,
     COMPSTRAT_RESULTS_DIR,
+    LAUNCH_INFO_FILE,
+    MODEL_ONNX_FILE,
+    RESULTS_DIR,
+    get_thread_filepath,
 )
 from backend.launch_service.app_setup import IMAGE_NAME
 
diff --git a/backend/utils/methods_handler.py b/backend/utils/methods_handler.py
@@ -17,7 +17,7 @@ def save_selection_to_frontend_file(
     def parse_frontend_file_to_dll_methods(
         front_selection_resource_path,
     ):
-        with open(front_selection_resource_path, "r") as f:
+        with open(front_selection_resource_path) as f:
             content = f.read()
         json_str = content[len(FRONT_SELECTION_PREFIX) :]
         selection_tree = json.loads(json_str)
@@ -31,7 +31,7 @@ def parse_frontend_file_to_dll_methods(
 
     @staticmethod
     def build_selection_tree_from_dataset(data_filepath):
-        with open(data_filepath, "r") as f:
+        with open(data_filepath) as f:
             data = json.load(f)
 
         groups = defaultdict(list)
@@ -57,7 +57,7 @@ def build_selection_tree_from_dataset(data_filepath):
     def expand_selected_items_to_methods(dll_methods: defaultdict, selected):
         launch_info_methods = []
         for item in selected:
-            if item in dll_methods.keys():
+            if item in dll_methods:
                 launch_info_methods.extend(dll_methods[item])
             else:
                 launch_info_methods.append(item)
diff --git a/backend/utils/results_sender.py b/backend/utils/results_sender.py
@@ -1,10 +1,11 @@
 import os
-import zipfile
 import smtplib
 import ssl
-from dotenv import load_dotenv
-from pathlib import Path
+import zipfile
 from email.message import EmailMessage
+from pathlib import Path
+
+from dotenv import load_dotenv
 
 
 def require_env(name: str) -> str:
diff --git a/backend/utils/task.py b/backend/utils/task.py
@@ -1,9 +1,9 @@
 from celery import Celery
 
-from backend.utils.docker_runner import run_pipeline
-from backend.utils.results_sender import send_folder_by_email
 from backend.config.paths import RESULTS_DIR, get_thread_filepath, get_tmp_thread_files
 from backend.file_utils.files import reset_dirs
+from backend.utils.docker_runner import run_pipeline
+from backend.utils.results_sender import send_folder_by_email
 
 celery_app = Celery(
     "tasks", broker="redis://localhost:6379", backend="redis://localhost:6379"
diff --git a/backend/utils/tests/test_docker_runner.py b/backend/utils/tests/test_docker_runner.py
@@ -1,13 +1,14 @@
-import pytest
 from pathlib import Path
 
+import pytest
+
 from backend.config.paths import (
     ARTIFACTS_AI_CSV_FILE,
     ARTIFACTS_BASELINE_CSV_FILE,
     BASE_DIR,
 )
 from backend.utils import docker_runner
-from backend.utils.docker_runner import RunstratBaseline, RunstratAI, Compstrat
+from backend.utils.docker_runner import Compstrat, RunstratAI, RunstratBaseline
 
 TEST_RESOURCES_DIR = BASE_DIR + "/utils/tests/resources/"
 TEST_ARTIFACTS_BASELINE_CSV_FILE = (
diff --git a/backend/utils/tests/test_methods_handler.py b/backend/utils/tests/test_methods_handler.py
@@ -55,12 +55,10 @@ def test_get_dlls_with_all_methods_dict_from_front_options_file():
 
         result = Methods.parse_frontend_file_to_dll_methods(temp_file.name)
 
-        expected = dict(
-            {
-                "Assembly1.dll": ["Assembly1.dll,Method1", "Assembly1.dll,Method2"],
-                "Assembly2.dll": ["Assembly2.dll,Method3"],
-            },
-        )
+        expected = {
+            "Assembly1.dll": ["Assembly1.dll,Method1", "Assembly1.dll,Method2"],
+            "Assembly2.dll": ["Assembly2.dll,Method3"],
+        }
 
         assert dict(result) == expected
 
diff --git a/backend/utils/tests/test_result_sender.py b/backend/utils/tests/test_result_sender.py
@@ -1,8 +1,9 @@
-import pytest
 import zipfile
-from unittest.mock import Mock, patch, mock_open, call
+from unittest.mock import Mock, call, mock_open, patch
+
+import pytest
 
-from backend.utils.results_sender import send_folder_by_email, require_env
+from backend.utils.results_sender import require_env, send_folder_by_email
 
 
 def test_require_env_success(monkeypatch):
diff --git a/frontend/.pre-commit-config.yaml b/frontend/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+repos:
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v9.38.0
+    hooks:
+      - id: eslint
+        args: ['--fix']
+        additional_dependencies:
+          - eslint@9.38.0
+          - '@typescript-eslint/eslint-plugin@8.58.1'
+          - '@typescript-eslint/parser@8.58.1'
diff --git a/frontend/.prettierrc b/frontend/.prettierrc
@@ -0,0 +1,10 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "printWidth": 88,
+  "bracketSpacing": true,
+  "arrowParens": "always",
+  "endOfLine": "lf"
+}
diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js
@@ -1,52 +1,60 @@
-import js from '@eslint/js';
-import typescript from '@typescript-eslint/eslint-plugin';
-import typescriptParser from '@typescript-eslint/parser';
+import js from "@eslint/js";
+import typescript from "@typescript-eslint/eslint-plugin";
+import typescriptParser from "@typescript-eslint/parser";
+import prettier from "eslint-plugin-prettier";
+import prettierConfig from "eslint-config-prettier";
 
 export default [
   js.configs.recommended,
+  prettierConfig,
   {
-    files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
+    files: ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"],
     languageOptions: {
       parser: typescriptParser,
       parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module',
+        ecmaVersion: "latest",
+        sourceType: "module",
         ecmaFeatures: {
           jsx: true,
         },
       },
       globals: {
-        console: 'readonly',
-        document: 'readonly',
-        window: 'readonly',
-        fetch: 'readonly',
-        FormData: 'readonly',
-        File: 'readonly',
-        setTimeout: 'readonly',
-        clearTimeout: 'readonly',
-        localStorage: 'readonly',
-        sessionStorage: 'readonly',
-        URL: 'readonly',
-        Blob: 'readonly',
-        FileReader: 'readonly',
+        console: "readonly",
+        document: "readonly",
+        window: "readonly",
+        fetch: "readonly",
+        FormData: "readonly",
+        File: "readonly",
+        setTimeout: "readonly",
+        clearTimeout: "readonly",
+        localStorage: "readonly",
+        sessionStorage: "readonly",
+        URL: "readonly",
+        Blob: "readonly",
+        FileReader: "readonly",
       },
     },
     plugins: {
-      '@typescript-eslint': typescript,
+      "@typescript-eslint": typescript,
+      prettier: prettier,
     },
     rules: {
-      '@typescript-eslint/no-explicit-any': 'warn',
-      '@typescript-eslint/no-unused-vars': ['error', {
-        argsIgnorePattern: '^_',
-        varsIgnorePattern: '^_'
-      }],
-      'no-undef': 'off',
-      'no-unused-vars': 'off',
+      "prettier/prettier": "error",
+      "@typescript-eslint/no-explicit-any": "warn",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          argsIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
+        },
+      ],
+      "no-undef": "off",
+      "no-unused-vars": "off",
     },
     settings: {
       react: {
-        version: 'detect',
+        version: "detect",
       },
     },
   },
-];
+];
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
diff --git a/frontend/src/components/ComparisonForm.tsx b/frontend/src/components/ComparisonForm.tsx
diff --git a/frontend/src/components/components/MethodsSelection.tsx b/frontend/src/components/components/MethodsSelection.tsx
diff --git a/frontend/src/components/components/UploadModel.tsx b/frontend/src/components/components/UploadModel.tsx
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
diff --git a/ruff.toml b/ruff.toml
