fix: linter issues

Author: jvdtoorn

Makefile

@@ -1,4 +1,4 @@
-.PHONY: up down clean-volumes help test setup clean-env
+.PHONY: up down clean-volumes help test setup clean-env lint
 
 # Default target
 .DEFAULT_GOAL := help
@@ -118,6 +118,22 @@ test:
 	@echo "All tests passed."
 	@echo ""
 
+# Lint fix flag - set to 'true' to auto-fix issues
+# Usage: make lint fix=true
+fix ?= false
+
+## lint: Run Ruff linter (use fix=true to auto-fix)
+lint:
+	@echo ""
+	@echo "Running Ruff linter..."
+	@if [ "$(fix)" = "true" ]; then \
+		uv run ruff check . --fix; \
+		uv run ruff format .; \
+	else \
+		uv run ruff check .; \
+	fi
+	@echo ""
+
 ## clean-env: Remove virtual environment
 clean-env:
 	@echo ""

libs/common/odt_common/config.py

@@ -95,13 +95,13 @@ class CalibratorConfig(BaseModel):
         description="Rolling time window in minutes for MAPE calculation",
         gt=0,
     )
-    
+
     # Legacy fields for backwards compatibility (mapped to new fields)
     asym_util_min: float | None = Field(None, exclude=True)
     asym_util_max: float | None = Field(None, exclude=True)
     asym_util_points: int | None = Field(None, exclude=True)
-    
-    @model_validator(mode='after')
+
+    @model_validator(mode="after")
     def handle_legacy_fields(self):
         """Map legacy field names to new ones if present."""
         if self.asym_util_min is not None:
@@ -159,7 +159,9 @@ class WorkloadContext(BaseModel):
 
     name: str = Field(default="", description="Workload name (e.g., 'SURF')")
     base_path: Path = Field(default=Path("/app/workload"), description="Base workload directory")
-    workload_dir: Path | None = Field(None, description="Direct path to workload directory (overrides base_path/name)")
+    workload_dir: Path | None = Field(
+        None, description="Direct path to workload directory (overrides base_path/name)"
+    )
     metadata: WorkloadMetadata | None = Field(None, description="Workload metadata")
 
     def __init__(self, **data):

libs/common/odt_common/models/consumption.py

@@ -22,10 +22,10 @@ class Consumption(BaseModel):
     @classmethod
     def parse_timestamp(cls, v: datetime | int | float | str) -> datetime:
         """Parse timestamp from epoch milliseconds to datetime (UTC-aware).
-        
+
         Args:
             v: Timestamp as milliseconds (int/float), datetime object, or ISO string
-            
+
         Returns:
             UTC-aware datetime object
         """
@@ -34,7 +34,7 @@ def parse_timestamp(cls, v: datetime | int | float | str) -> datetime:
             return datetime.fromtimestamp(v / 1000.0, tz=UTC)
         elif isinstance(v, str):
             # Parse ISO format string
-            dt = datetime.fromisoformat(v.replace('Z', '+00:00'))
+            dt = datetime.fromisoformat(v.replace("Z", "+00:00"))
             # Ensure UTC if not already timezone-aware
             if dt.tzinfo is None:
                 dt = dt.replace(tzinfo=UTC)

libs/common/odt_common/models/task.py

@@ -51,10 +51,10 @@ def parse_id(cls, v: str | int) -> int:
     @classmethod
     def parse_submission_time(cls, v: datetime | int | float | str) -> datetime:
         """Parse submission time from epoch milliseconds to datetime (UTC-aware).
-        
+
         Args:
             v: Timestamp as milliseconds (int/float), datetime object, or ISO string
-            
+
         Returns:
             UTC-aware datetime object
         """
@@ -63,7 +63,7 @@ def parse_submission_time(cls, v: datetime | int | float | str) -> datetime:
             return datetime.fromtimestamp(v / 1000.0, tz=UTC)
         elif isinstance(v, str):
             # Parse ISO format string
-            dt = datetime.fromisoformat(v.replace('Z', '+00:00'))
+            dt = datetime.fromisoformat(v.replace("Z", "+00:00"))
             # Ensure UTC if not already timezone-aware
             if dt.tzinfo is None:
                 dt = dt.replace(tzinfo=UTC)

libs/common/odt_common/models/topology.py

@@ -102,7 +102,9 @@ class Cluster(BaseModel):
 
     name: str = Field(..., description="Cluster identifier/name")
     hosts: list[Host] = Field(..., description="List of host types in this cluster", min_length=1)
-    powerSource: PowerSource | None = Field(None, description="Power source configuration (optional)")
+    powerSource: PowerSource | None = Field(
+        None, description="Power source configuration (optional)"
+    )
 
 
 class Topology(BaseModel):

libs/common/odt_common/models/workload_message.py

@@ -27,9 +27,7 @@ class WorkloadMessage(BaseModel):
         ..., description="Type of message: 'task' for workload or 'heartbeat' for keepalive"
     )
     timestamp: datetime = Field(..., description="Simulation timestamp of this message")
-    task: Task | None = Field(
-        None, description="Task data (only present when message_type='task')"
-    )
+    task: Task | None = Field(None, description="Task data (only present when message_type='task')")
 
     class Config:
         json_schema_extra = {

libs/common/odt_common/odc_runner/runner.py

@@ -249,7 +249,9 @@ def run_simulation(
                     tasks[-1].submission_time.replace(microsecond=0).isoformat() if tasks else None
                 ),
                 "task_count": len(tasks),
-                "wall_clock_time": datetime.now(UTC).replace(microsecond=0, tzinfo=None).isoformat(),
+                "wall_clock_time": datetime.now(UTC)
+                .replace(microsecond=0, tzinfo=None)
+                .isoformat(),
                 "cached": False,
             }
             with open(metadata_file, "w") as f:

libs/common/tests/test_models.py

@@ -5,6 +5,7 @@
 
 import pandas as pd
 import pytest
+
 from odt_common import Consumption, Fragment, Task
 
 # Locate test data

libs/common/tests/test_topology.py

@@ -5,6 +5,7 @@
 from pathlib import Path
 
 import pytest
+
 from odt_common.models.topology import (
     CPU,
     AsymptoticCPUPowerModel,
@@ -52,7 +53,7 @@ def test_cpu_model():
     assert cpu.coreSpeed == 2100.0
 
     # Test validation
-    with pytest.raises(Exception):
+    with pytest.raises(ValueError):
         CPU(coreCount=0, coreSpeed=2100.0)  # Invalid: coreCount must be > 0
 
 
@@ -62,7 +63,7 @@ def test_memory_model():
     assert memory.memorySize == 128000000
 
     # Test validation
-    with pytest.raises(Exception):
+    with pytest.raises(ValueError):
         Memory(memorySize=0)  # Invalid: memorySize must be > 0
 
 

pyproject.toml

@@ -73,6 +73,8 @@ select = [
     "UP",  # pyupgrade
 ]
 ignore = [
+    "E501",  # Line too long (handled by formatter)
+    "C901",  # Function too complex
     "B008",  # Allow function calls in argument defaults (FastAPI pattern for Query, Body, etc.)
 ]