Merge pull request #46 from renbytes/dev-sugarscapeSim

Sim - Sugarscape

Author: bordumb

.github/workflows/ci.yml

@@ -1,13 +1,10 @@
 # .github/workflows/ci.yml
-
 name: Continuous Integration
-
 on:
   push:
     branches: [main]
   pull_request:
     branches: [main]
-
 jobs:
   ci:
     # The job name will be dynamically set based on the matrix task name
@@ -28,7 +25,6 @@ jobs:
             run_command: poetry run pytest --cov=agent_core --cov=agent_engine --cov-report=term-missing --cov-fail-under=80
             # Add a flag to indicate that this specific task needs graphviz
             needs_graphviz: true
-
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v4
@@ -59,12 +55,30 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .venv
-          key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+          # Include pyproject.toml in cache key to invalidate when dependencies change
+          key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock', '**/pyproject.toml') }}-v2
           restore-keys: |
+            poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock', '**/pyproject.toml') }}-v2
             poetry-${{ runner.os }}-
 
-      - name: "Install dependencies"
-        run: poetry install
+      - name: "Clean corrupted packages and install dependencies"
+        run: |
+          # Clean any corrupted mlflow packages that might exist
+          if [ -d ".venv" ]; then
+            poetry run pip uninstall mlflow mlflow-skinny mlflow-tracing -y || true
+          fi
+
+          # Install dependencies with retry logic
+          poetry install --no-cache || {
+            echo "Installation failed, cleaning environment and retrying..."
+            poetry env remove --all || true
+            poetry install --no-cache
+          }
+
+      - name: "Verify installation"
+        run: |
+          poetry run python -c "import sys; print('Python version:', sys.version)"
+          poetry run python -c "import pygraphviz; print('pygraphviz version:', pygraphviz.__version__)" || echo "pygraphviz not needed for this job"
 
       - name: "Run Task"
         run: ${{ matrix.task.run_command }}

.pre-commit-config.yaml

@@ -1,21 +1,21 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.12.12
     hooks:
     -   id: ruff
         args: [--fix, --exit-non-zero-on-fix]
     -   id: ruff-format
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.17.1
     hooks:
     -   id: mypy
         additional_dependencies: [

Dockerfile

@@ -1,39 +1,38 @@
-# Use an official Python base image
-FROM python:3.11.9-slim
+# Build stage
+FROM python:3.11.9-slim as builder
 
-# Configure environment variables for Python and Poetry
-ENV PYTHONDONTWRITEBYTECODE=1
-ENV PYTHONUNBUFFERED=1
 ENV POETRY_HOME="/opt/poetry"
 ENV POETRY_NO_INTERACTION=1
 ENV POETRY_VIRTUALENVS_CREATE=false
-
-# Add Poetry's bin directory to the system PATH.
 ENV PATH="$POETRY_HOME/bin:$PATH"
 
-# Set the working directory
-WORKDIR /app
-
-# Install system dependencies and Poetry itself
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends curl gifsicle \
-    && curl -sSL https://install.python-poetry.org | python - \
-    && apt-get remove -y curl \
-    && apt-get autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get install -y --no-install-recommends \
+       build-essential \
+       cmake \
+       git \
+       graphviz-dev \
+       libgraphviz-dev \
+       pkg-config \
+       curl \
+    && curl -sSL https://install.python-poetry.org | python -
 
-# Copy ALL project files before installing dependencies.
-# This ensures Poetry can find the local path dependencies (agent-core, etc.).
+WORKDIR /app
 COPY . .
+RUN poetry install --without dev
+
+# Runtime stage
+FROM python:3.11.9-slim
 
-# Install build dependencies, install Python packages, then remove build dependencies.
-# This ensures packages that need compilation (like ecos, osqp) can be built,
-# while keeping the final image size smaller.
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends build-essential cmake git graphviz libgraphviz-dev \
-    && poetry install --without dev \
-    && apt-get purge -y --auto-remove build-essential cmake git graphviz libgraphviz-dev \
+    && apt-get install -y --no-install-recommends \
+       graphviz \
+       gifsicle \
     && rm -rf /var/lib/apt/lists/*
 
-# The default command to run when the container starts
+WORKDIR /app
+COPY --from=builder /usr/local/lib/python3.11/site-packages/ /usr/local/lib/python3.11/site-packages/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
+COPY --from=builder /app .
+
 CMD ["tail", "-f", "/dev/null"]

Makefile

@@ -26,10 +26,15 @@ WORKERS ?= 4
 
 # --- Core Docker Commands ---
 
-## up: Build images and start all services in the background.
+## up: Build images, start services, and initialize the database.
 up:
 	@echo "🚀 Building images and starting all services..."
 	@docker compose up -d --build
+	@echo "⏳ Waiting 10 seconds for services to stabilize..."
+	@sleep 10
+	@echo "🔑 Initializing database tables..."
+	@make init-db
+	@echo "✅ All services are up and the database is initialized."
 
 ## down: Stop and remove all containers, networks, and volumes.
 down:

README.md

@@ -74,4 +74,4 @@ docker compose up -d
 
     ```bash
     make down
-    ```
+    ```

agent-core/src/agent_core/agents/action_cost_provider_interface.py

@@ -0,0 +1,34 @@
+# src/agent_core/agents/action_cost_provider_interface.py
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from agent_core.core.ecs.abstractions import SimulationState
+
+
+class ActionCostProviderInterface(ABC):
+    """
+    Abstract Base Class for an action cost provider.
+
+    The concrete implementation of this interface will live in the final
+    simulation application. It is responsible for applying the cost of
+    an action to the appropriate agent component (e.g., TimeBudgetComponent,
+    EnergyComponent, etc.).
+    """
+
+    @abstractmethod
+    def apply_action_cost(
+        self,
+        entity_id: str,
+        cost: float,
+        simulation_state: "SimulationState",
+    ) -> None:
+        """
+        Deducts the cost of an action from the relevant agent component.
+
+        Args:
+            entity_id: The ID of the agent performing the action.
+            cost: The calculated cost of the action.
+            simulation_state: The current state of the simulation.
+        """
+        raise NotImplementedError

agent-core/src/agent_core/agents/actions/action_interface.py

@@ -7,6 +7,7 @@
 
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any, Dict, List
+from .action_outcome import ActionOutcome
 
 if TYPE_CHECKING:
     from agent_core.core.ecs.abstractions import SimulationState
@@ -52,7 +53,7 @@ def execute(
         simulation_state: "SimulationState",
         params: Dict[str, Any],
         current_tick: int,
-    ) -> Dict[str, Any]:
+    ) -> ActionOutcome:
         """
         Executes the action's logic and modifies the simulation state.
         """

agent-core/src/agent_core/agents/actions/action_outcome.py

@@ -0,0 +1,19 @@
+# agent-core/src/agent_core/agents/actions/action_outcome.py
+from dataclasses import dataclass, field
+from typing import Any, Dict
+
+
+@dataclass
+class ActionOutcome:
+    """A data structure to hold the results of an action's execution."""
+
+    success: bool
+    message: str
+    base_reward: float
+    details: Dict[str, Any] = field(default_factory=dict)
+    reward: float = field(init=False)
+
+    def __post_init__(self):
+        # The final reward can be modified by other systems,
+        # but it starts as the base reward.
+        self.reward = self.base_reward

agent-core/src/agent_core/agents/actions/action_registry.py

@@ -1,7 +1,8 @@
 # src/agent_core/agents/actions/action_registry.py
 """
 Defines the ActionRegistry, a singleton object that discovers and manages
-all available actions in the simulation.
+all available actions in the simulation. This version is designed to be
+"override-friendly" for testing purposes.
 """
 
 import importlib
@@ -13,23 +14,27 @@
 class ActionRegistry:
     """
     A registry for discovering, storing, and retrieving action classes.
+
+    In its default mode (`strict=False`), it allows new actions to override
+    existing actions with the same `action_id`. This is useful in testing
+    environments where multiple simulations define their own version of a
+    common action (e.g., 'move').
+
+    In `strict=True` mode, it will raise a ValueError if a duplicate
+    action_id is registered, which is useful for production to prevent
+    accidental naming collisions.
     """
 
-    def __init__(self) -> None:
+    def __init__(self, strict: bool = False) -> None:
         self._actions: Dict[str, Type[ActionInterface]] = {}
-        print("ActionRegistry initialized.")
+        self.strict = strict
+        print(
+            f"ActionRegistry initialized in {'strict' if self.strict else 'override'} mode."
+        )
 
     def load_actions_from_paths(self, module_paths: List[str]) -> None:
         """
         Dynamically imports Python modules from a list of string paths.
-
-        This is the core of the plugin system. Importing a module that
-        contains an @action_registry.register decorator will cause that
-        action to be registered.
-
-        Args:
-            module_paths: A list of module paths, e.g.,
-                          ["simulations.soul_sim.actions.move_action"].
         """
         print(f"Dynamically loading actions from: {module_paths}")
         for path in module_paths:
@@ -64,9 +69,11 @@ def register(self, action_class: Type[ActionInterface]) -> Type[ActionInterface]
                 f"Action class {action_class.__name__} has an invalid 'action_id' property."
             )
 
-        if action_id in self._actions:
+        # Only raise an error if the registry is in strict mode.
+        if action_id in self._actions and self.strict:
             raise ValueError(f"Action with ID '{action_id}' is already registered.")
 
+        # Silently override the existing action if not in strict mode.
         self._actions[action_id] = action_class
         print(f"Action '{action_name}' registered with ID '{action_id}'.")
         return action_class
@@ -88,6 +95,5 @@ def action_ids(self) -> List[str]:
         return sorted(self._actions.keys())
 
 
-# Create a global singleton instance of the registry.
-# All other parts of the application will import this instance.
-action_registry = ActionRegistry()
+# Create a global singleton instance of the registry in non-strict mode.
+action_registry = ActionRegistry(strict=False)

agent-core/src/agent_core/agents/actions/base_action.py

@@ -8,9 +8,10 @@
 
 from abc import abstractmethod
 from enum import Enum
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List
 
 from agent_core.agents.actions.action_interface import ActionInterface
+from agent_core.agents.actions.action_outcome import ActionOutcome
 
 
 class Intent(Enum):
@@ -21,23 +22,6 @@ class Intent(Enum):
     COMPETE = "COMPETE"
 
 
-class ActionOutcome:
-    """Standardized structure for the result of executing an action."""
-
-    def __init__(
-        self,
-        success: bool,
-        message: str,
-        base_reward: float,
-        details: Optional[Dict[str, Any]] = None,
-    ):
-        self.success = success
-        self.message = message
-        self.base_reward = base_reward
-        self.details = details if details is not None else {}
-        self.reward: float = base_reward
-
-
 class Action(ActionInterface):
     """
     A concrete base class for all actions that implements the ActionInterface.
@@ -71,7 +55,7 @@ def execute(
         simulation_state: Any,
         params: Dict[str, Any],
         current_tick: int,
-    ) -> Dict[str, Any]:
+    ) -> ActionOutcome:
         raise NotImplementedError
 
     @abstractmethod