clean(oculus): Standardize linting for oculus sub repository. (#4734)

Author: eyw520

servers/oculus/makefile

@@ -1,14 +1,10 @@
-install:
-	poetry install
+code-cleanup:
+	poetry run black .
+	poetry run ruff check --unsafe-fixes --fix src/ tests/
+	poetry run ruff format src/ tests/
 
 test:
 	poetry run pytest -sv
 
 typecheck:
 	poetry run mypy src/
-
-lint:
-	poetry run ruff check src/
-
-format:
-	poetry run ruff format src/

servers/oculus/poetry.lock

@@ -21,7 +21,9 @@ fern-ai = {path = "../fai", develop = true}
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.0.0"
 mypy = "^1.8.0"
-ruff = "^0.3.0"
+black = "^24.3.0"
+isort = "^5.13.2"
+ruff = "^0.1.0"
 
 [tool.poetry.scripts]
 oculus = "oculus.__main__:main"
@@ -30,17 +32,47 @@ oculus = "oculus.__main__:main"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.ruff]
-line-length = 120
-target-version = "py311"
-
-[tool.ruff.lint]
-select = ["E", "F", "I", "UP"]
-
 [tool.mypy]
 python_version = "3.11"
 strict = true
 warn_return_any = true
 warn_unused_configs = true
 mypy_path = "src"
 explicit_package_bases = true
+
+[tool.ruff]
+line-length = 120
+target-version = "py311"
+
+[tool.ruff.lint]
+select = [
+    "E",   # pycodestyle errors
+    "W",   # pycodestyle warnings  
+    "F",   # pyflakes
+    "I",   # isort
+    "UP",  # pyupgrade
+]
+ignore = []
+
+[tool.ruff.lint.isort]
+known-first-party = ["fai", "tests", "utils"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+
+[tool.black]
+line-length = 120
+
+[tool.isort]
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 2
+line_length = 120
+profile = "black"
+use_parentheses = true
+known_first_party = ["fai", "tests", "utils"]
+src_paths = ["src"]
+
+[tool.autoflake]
+in-place = true

servers/oculus/pyproject.toml

@@ -3,7 +3,6 @@
 from pathlib import Path
 
 from dotenv import load_dotenv
-
 from oculus.framework.runner import EvaluationRunner
 from oculus.integrations.fai_integration import create_fai_answer_function
 
@@ -50,10 +49,10 @@ def main() -> int:
 
     if not suite_path.exists():
         print(f"Error: Suite directory not found: {suite_path}", file=sys.stderr)
-        print(f"\nExpected structure:", file=sys.stderr)
+        print("\nExpected structure:", file=sys.stderr)
         print(f"  {suite_path}/", file=sys.stderr)
-        print(f"    questions/", file=sys.stderr)
-        print(f"      question_0.json", file=sys.stderr)
+        print("    questions/", file=sys.stderr)
+        print("      question_0.json", file=sys.stderr)
         return 1
 
     questions_dir = suite_path / "questions"
@@ -90,15 +89,15 @@ def main() -> int:
         return 0
 
     except ImportError as e:
-        print(f"\nError: Failed to import required modules", file=sys.stderr)
+        print("\nError: Failed to import required modules", file=sys.stderr)
         print(f"{e}", file=sys.stderr)
-        print(f"\nMake sure:", file=sys.stderr)
-        print(f"  1. FAI dependencies are installed (poetry install in servers/fai)", file=sys.stderr)
-        print(f"  2. PYTHONPATH includes the FAI source directory", file=sys.stderr)
+        print("\nMake sure:", file=sys.stderr)
+        print("  1. FAI dependencies are installed (poetry install in servers/fai)", file=sys.stderr)
+        print("  2. PYTHONPATH includes the FAI source directory", file=sys.stderr)
         return 1
 
     except Exception as e:
-        print(f"\nError: Evaluation failed", file=sys.stderr)
+        print("\nError: Evaluation failed", file=sys.stderr)
         print(f"{e}", file=sys.stderr)
         import traceback
 

servers/oculus/src/oculus/__main__.py

@@ -1,4 +1,3 @@
-
 from oculus.utils.anthropic_utils import generate_with_claude
 from pydantic import BaseModel
 

servers/oculus/src/oculus/evaluators/llm_judge.py

@@ -1,4 +1,7 @@
-from pydantic import BaseModel, Field
+from pydantic import (
+    BaseModel,
+    Field,
+)
 
 
 class Question(BaseModel):

servers/oculus/src/oculus/framework/models.py

@@ -1,19 +1,28 @@
 import concurrent.futures
+from collections.abc import Callable
 from datetime import datetime
 from pathlib import Path
-from typing import Callable, Optional
 
 from oculus.evaluators.llm_judge import evaluate_answer
-from oculus.framework.models import Answer, Evaluation, EvaluationMetrics, EvaluationRun, Question
-from oculus.utils.file_utils import load_json, load_json_files, save_json
+from oculus.framework.models import (
+    Answer,
+    Evaluation,
+    EvaluationMetrics,
+    EvaluationRun,
+    Question,
+)
+from oculus.utils.file_utils import (
+    load_json,
+    save_json,
+)
 
 
 class EvaluationRunner:
     def __init__(
         self,
         suite_name: str,
         suite_path: Path,
-        run_id: Optional[str] = None,
+        run_id: str | None = None,
         max_workers: int = 16,
     ):
         self.suite_name = suite_name

servers/oculus/src/oculus/framework/runner.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 QUESTION_TEMPLATES = [
     "Tell me about the {method} {path} endpoint.",
@@ -12,7 +12,7 @@
 ]
 
 
-def extract_operation_id(spec: dict[str, Any], method: str, path: str) -> Optional[str]:
+def extract_operation_id(spec: dict[str, Any], method: str, path: str) -> str | None:
     for path_key, path_item in spec.get("paths", {}).items():
         if path_key == path:
             operation = path_item.get(method, {})
@@ -21,7 +21,7 @@ def extract_operation_id(spec: dict[str, Any], method: str, path: str) -> Option
     return None
 
 
-def extract_first_request_property(spec: dict[str, Any], method: str, path: str) -> Optional[str]:
+def extract_first_request_property(spec: dict[str, Any], method: str, path: str) -> str | None:
     for path_key, path_item in spec.get("paths", {}).items():
         if path_key == path:
             operation = path_item.get(method, {})
@@ -38,7 +38,7 @@ def extract_first_request_property(spec: dict[str, Any], method: str, path: str)
     return None
 
 
-def extract_first_response_property(spec: dict[str, Any], method: str, path: str) -> Optional[str]:
+def extract_first_response_property(spec: dict[str, Any], method: str, path: str) -> str | None:
     for path_key, path_item in spec.get("paths", {}).items():
         if path_key == path:
             operation = path_item.get(method, {})