refactor: deduplicate code

.gitignore

@@ -24,8 +24,9 @@ wheels/
 .venv/
 venv/
 
-# UV
+# uv and ruff
 .uv/
+.ruff_cache/
 
 # IDE
 .claude/
@@ -87,4 +88,3 @@ temp/
 
 # Docker compose overrides (generated per-worktree)
 docker-compose.override.yml
-

environments/_template/env.py

@@ -23,7 +23,7 @@
 import structlog
 
 from kinitro.environments import get_environment
-from kinitro.environments.registry import get_all_environment_ids
+from kinitro.environments.registry import get_environments_by_family
 from kinitro.rl_interface import Action
 
 logger = structlog.get_logger()
@@ -69,8 +69,8 @@ async def _call_miner(
 
     async def list_environments(self) -> list[str]:
         """List available environments in this family."""
-        # TODO: Change "myenv/" to your environment family prefix
-        return [e for e in get_all_environment_ids() if e.startswith("myenv/")]
+        # TODO: Change "myenv" to your environment family prefix
+        return get_environments_by_family("myenv")
 
     async def evaluate(
         self,

environments/genesis/env.py

@@ -30,7 +30,7 @@
 # Import from kinitro package (installed in container via PYTHONPATH)
 from kinitro.environments import get_environment
 from kinitro.environments.base import RoboticsEnvironment
-from kinitro.environments.registry import get_all_environment_ids
+from kinitro.environments.registry import get_environments_by_family
 from kinitro.rl_interface import Action
 
 logger = structlog.get_logger()
@@ -101,7 +101,7 @@ async def _call_miner(
 
     async def list_environments(self) -> list[str]:
         """List available Genesis environments."""
-        return [env_id for env_id in get_all_environment_ids() if env_id.startswith("genesis/")]
+        return get_environments_by_family("genesis")
 
     async def evaluate(
         self,

environments/metaworld/env.py

@@ -37,7 +37,7 @@
 
 # Import from kinitro package (installed in container via PYTHONPATH)
 from kinitro.environments import get_environment
-from kinitro.environments.registry import get_all_environment_ids
+from kinitro.environments.registry import get_environments_by_family
 from kinitro.rl_interface import Action
 
 logger = structlog.get_logger()
@@ -93,7 +93,7 @@ async def _call_miner(
 
     async def list_environments(self) -> list[str]:
         """List available MetaWorld environments."""
-        return [env_id for env_id in get_all_environment_ids() if env_id.startswith("metaworld/")]
+        return get_environments_by_family("metaworld")
 
     async def evaluate(
         self,

kinitro/api/routes/scores.py

@@ -6,27 +6,20 @@
 from kinitro.api.deps import get_session, get_storage
 from kinitro.backend.models import (
     EvaluationCycle,
+    EvaluationCycleORM,
     MinerScore,
+    MinerScoreORM,
     ScoresResponse,
 )
 from kinitro.backend.storage import Storage
 
 router = APIRouter(prefix="/v1/scores", tags=["Scores"])
 
 
-@router.get("/latest", response_model=ScoresResponse)
-async def get_latest_scores(
-    session: AsyncSession = Depends(get_session),
-    storage: Storage = Depends(get_storage),
-):
-    """Get scores from the most recent completed evaluation cycle."""
-    cycle = await storage.get_latest_cycle(session, completed_only=True)
-    if cycle is None:
-        raise HTTPException(status_code=404, detail="No completed evaluations yet")
-
-    scores_orm = await storage.get_scores_for_cycle(session, cycle.id)
-
-    # Convert to response format
+def _build_scores_response(
+    cycle: EvaluationCycleORM, scores_orm: list[MinerScoreORM]
+) -> ScoresResponse:
+    """Build a ScoresResponse from a cycle ORM object and its scores."""
     scores = [
         MinerScore(
             uid=s.uid,
@@ -40,7 +33,6 @@ async def get_latest_scores(
         for s in scores_orm
     ]
 
-    # Build miner summary
     miner_summary: dict[int, dict[str, float]] = {}
     for s in scores_orm:
         if s.uid not in miner_summary:
@@ -54,6 +46,20 @@ async def get_latest_scores(
     )
 
 
+@router.get("/latest", response_model=ScoresResponse)
+async def get_latest_scores(
+    session: AsyncSession = Depends(get_session),
+    storage: Storage = Depends(get_storage),
+):
+    """Get scores from the most recent completed evaluation cycle."""
+    cycle = await storage.get_latest_cycle(session, completed_only=True)
+    if cycle is None:
+        raise HTTPException(status_code=404, detail="No completed evaluations yet")
+
+    scores_orm = await storage.get_scores_for_cycle(session, cycle.id)
+    return _build_scores_response(cycle, scores_orm)
+
+
 @router.get("/{cycle_id}", response_model=ScoresResponse)
 async def get_scores_for_cycle(
     cycle_id: int,
@@ -66,28 +72,4 @@ async def get_scores_for_cycle(
         raise HTTPException(status_code=404, detail=f"Cycle {cycle_id} not found")
 
     scores_orm = await storage.get_scores_for_cycle(session, cycle_id)
-
-    scores = [
-        MinerScore(
-            uid=s.uid,
-            hotkey=s.hotkey,
-            env_id=s.env_id,
-            success_rate=s.success_rate,
-            mean_reward=s.mean_reward,
-            episodes_completed=s.episodes_completed,
-            episodes_failed=s.episodes_failed,
-        )
-        for s in scores_orm
-    ]
-
-    miner_summary: dict[int, dict[str, float]] = {}
-    for s in scores_orm:
-        if s.uid not in miner_summary:
-            miner_summary[s.uid] = {}
-        miner_summary[s.uid][s.env_id] = s.success_rate
-
-    return ScoresResponse(
-        cycle=EvaluationCycle.model_validate(cycle),
-        scores=scores,
-        miner_summary=miner_summary,
-    )
+    return _build_scores_response(cycle, scores_orm)

kinitro/api/routes/weights.py

@@ -4,29 +4,21 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from kinitro.api.deps import get_session, get_storage
-from kinitro.backend.models import WeightsResponse, WeightsU16
+from kinitro.backend.models import (
+    ComputedWeightsORM,
+    EvaluationCycleORM,
+    WeightsResponse,
+    WeightsU16,
+)
 from kinitro.backend.storage import Storage
 
 router = APIRouter(prefix="/v1/weights", tags=["Weights"])
 
 
-@router.get("/latest", response_model=WeightsResponse)
-async def get_latest_weights(
-    session: AsyncSession = Depends(get_session),
-    storage: Storage = Depends(get_storage),
-):
-    """
-    Get the most recently computed weights.
-
-    These weights are ready to be submitted to the chain by validators.
-    """
-    weights_orm = await storage.get_latest_weights(session)
-    if weights_orm is None:
-        raise HTTPException(status_code=404, detail="No weights available yet")
-
-    # Get the associated cycle for metadata
-    cycle = await storage.get_cycle(session, weights_orm.cycle_id)
-
+def _build_weights_response(
+    weights_orm: ComputedWeightsORM, cycle: EvaluationCycleORM | None
+) -> WeightsResponse:
+    """Build a WeightsResponse from a weights ORM object and its cycle."""
     return WeightsResponse(
         cycle_id=weights_orm.cycle_id,
         block_number=weights_orm.block_number,
@@ -44,12 +36,30 @@ async def get_latest_weights(
     )
 
 
+@router.get("/latest", response_model=WeightsResponse)
+async def get_latest_weights(
+    session: AsyncSession = Depends(get_session),
+    storage: Storage = Depends(get_storage),
+) -> WeightsResponse:
+    """
+    Get the most recently computed weights.
+
+    These weights are ready to be submitted to the chain by validators.
+    """
+    weights_orm = await storage.get_latest_weights(session)
+    if weights_orm is None:
+        raise HTTPException(status_code=404, detail="No weights available yet")
+
+    cycle = await storage.get_cycle(session, weights_orm.cycle_id)
+    return _build_weights_response(weights_orm, cycle)
+
+
 @router.get("/{block_number}", response_model=WeightsResponse)
 async def get_weights_for_block(
     block_number: int,
     session: AsyncSession = Depends(get_session),
     storage: Storage = Depends(get_storage),
-):
+) -> WeightsResponse:
     """Get weights computed at a specific block."""
     weights_orm = await storage.get_weights_for_block(session, block_number)
     if weights_orm is None:
@@ -59,19 +69,4 @@ async def get_weights_for_block(
         )
 
     cycle = await storage.get_cycle(session, weights_orm.cycle_id)
-
-    return WeightsResponse(
-        cycle_id=weights_orm.cycle_id,
-        block_number=weights_orm.block_number,
-        timestamp=weights_orm.created_at,
-        weights={int(k): float(v) for k, v in weights_orm.weights_json.items()},
-        weights_u16=WeightsU16(
-            uids=weights_orm.weights_u16_json["uids"],
-            values=weights_orm.weights_u16_json["values"],
-        ),
-        metadata={
-            "n_miners_evaluated": cycle.n_miners if cycle else None,
-            "n_environments": cycle.n_environments if cycle else None,
-            "evaluation_duration_seconds": cycle.duration_seconds if cycle else None,
-        },
-    )
+    return _build_weights_response(weights_orm, cycle)

kinitro/config.py

@@ -15,17 +15,9 @@ class NetworkConfig(BaseSettings):
     hotkey_name: str = Field(default="default", description="Hotkey name")
 
 
-class ValidatorConfig(BaseSettings):
+class ValidatorConfig(NetworkConfig):
     """Validator-specific configuration."""
 
-    model_config = SettingsConfigDict(env_prefix="KINITRO_")
-
-    # Network settings (inherited concept)
-    network: str = Field(default="finney")
-    netuid: int = Field(default=1)
-    wallet_name: str = Field(default="default")
-    hotkey_name: str = Field(default="default")
-
     # Evaluation settings
     episodes_per_env: int = Field(
         default=50, description="Number of episodes per environment per evaluation cycle"
@@ -55,16 +47,9 @@ class ValidatorConfig(BaseSettings):
     log_level: str = Field(default="INFO", description="Logging level")
 
 
-class MinerConfig(BaseSettings):
+class MinerConfig(NetworkConfig):
     """Miner-specific configuration."""
 
-    model_config = SettingsConfigDict(env_prefix="KINITRO_")
-
-    network: str = Field(default="finney")
-    netuid: int = Field(default=1)
-    wallet_name: str = Field(default="default")
-    hotkey_name: str = Field(default="default")
-
     # Model settings
     huggingface_repo: str | None = Field(default=None, description="HuggingFace model repo")
     model_revision: str | None = Field(default=None, description="Model revision/commit SHA")

kinitro/environments/__init__.py

@@ -5,7 +5,7 @@
 robotics simulation environments (MetaWorld, Genesis, DM Control, ManiSkill).
 """
 
-from kinitro.environments.base import EpisodeResult, RoboticsEnvironment, TaskConfig
+from kinitro.environments.base import RoboticsEnvironment, TaskConfig
 from kinitro.environments.registry import (
     ENVIRONMENTS,
     get_all_environment_ids,
@@ -16,7 +16,6 @@
 __all__ = [
     "RoboticsEnvironment",
     "TaskConfig",
-    "EpisodeResult",
     "ENVIRONMENTS",
     "get_environment",
     "get_all_environment_ids",

kinitro/environments/base.py

@@ -45,23 +45,6 @@ def to_dict(self) -> dict[str, Any]:
         }
 
 
-@dataclass
-class EpisodeResult:
-    """Result of a single episode evaluation."""
-
-    success: bool
-    total_reward: float
-    timesteps: int
-    info: dict[str, Any] = field(default_factory=dict)
-
-    @property
-    def efficiency(self) -> float:
-        """Reward per timestep (higher is better)."""
-        if self.timesteps == 0:
-            return 0.0
-        return self.total_reward / self.timesteps
-
-
 class RoboticsEnvironment(ABC):
     """
     Abstract base class for all robotics environments.