econagents 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

econagents/__init__.py

@@ -12,7 +12,7 @@ from econagents.core.state.game import GameState, MetaInformation, PrivateInform
 from econagents.llm.openai import ChatOpenAI
 
 # Don't manually change, let poetry-dynamic-versioning handle it.
-__version__ = "0.0.2"
+__version__ = "0.0.3"
 
 __all__: list[str] = [
     "AgentRole",

econagents/core/agent_role.py

@@ -3,6 +3,7 @@ import logging
 import re
 from abc import ABC
 from pathlib import Path
+from jinja2 import FileSystemLoader
 from typing import Any, Callable, ClassVar, Dict, Generic, Literal, Optional, Pattern, Protocol, TypeVar
 
 from jinja2.sandbox import SandboxedEnvironment
@@ -129,12 +130,20 @@ class AgentRole(ABC, Generic[StateT_contra], LoggerMixin):
         Raises:
             FileNotFoundError: If no matching prompt template is found
         """
+        # Initialize Jinja environment with a file system loader
+        env = SandboxedEnvironment(loader=FileSystemLoader(prompts_path))
+
         # Try role-specific prompt first, then fall back to 'all'
         for role in [self.name, "all"]:
-            if prompt_file := self._resolve_prompt_file(prompt_type, phase, role, prompts_path):
-                with prompt_file.open() as f:
-                    template = SandboxedEnvironment().from_string(f.read())
-                return template.render(**context)
+            if prompt_file_path := self._resolve_prompt_file(prompt_type, phase, role, prompts_path):
+                # Get filename relative to the prompts_path for the loader
+                template_filename = str(prompt_file_path.relative_to(prompts_path))
+                try:
+                    template = env.get_template(template_filename)
+                    return template.render(**context)
+                except Exception as e:  # Catch potential Jinja errors during loading/rendering
+                    self.logger.error(f"Error loading/rendering template {template_filename}: {e}")
+                    raise  # Re-raise after logging
 
         raise FileNotFoundError(
             f"No prompt template found for type={prompt_type}, phase={phase}, "

econagents/core/game_runner.py

@@ -63,6 +63,10 @@ class GameRunnerConfig(BaseModel):
     observability_provider: Optional[Literal["langsmith", "langfuse"]] = None
     """Name of the observability provider to use. Options: 'langsmith' or 'langfuse'"""
 
+    # Agent stop configuration
+    end_game_event: str = "game-over"
+    """Event type that signals the end of the game and should stop the agent."""
+
 
 class TurnBasedGameRunnerConfig(GameRunnerConfig):
     """Configuration class for TurnBasedGameRunner."""
@@ -303,6 +307,10 @@ class GameRunner:
             agent_manager.auth_mechanism = self.config.auth_mechanism
             agent_manager.logger.debug(f"Injected default auth mechanism: {agent_manager.auth_mechanism}")
 
+        if agent_manager.end_game_event_type != self.config.end_game_event:
+            agent_manager.end_game_event_type = self.config.end_game_event
+            agent_manager.logger.debug(f"Injected default end game event: {agent_manager.end_game_event_type}")
+
         if agent_manager.llm_provider and self.config.observability_provider:
             try:
                 provider = get_observability_provider(self.config.observability_provider)
@@ -349,7 +357,7 @@ class GameRunner:
             agent_manager.logger.info(f"Connecting to WebSocket URL: {agent_manager.url}")
             await agent_manager.start()
         except Exception:
-            agent_manager.logger.exception(f"Error in simulation for Agent {agent_id}")
+            agent_manager.logger.exception(f"Error in game for Agent {agent_id}")
             raise
 
     async def run_game(self) -> None:
@@ -360,7 +368,7 @@ class GameRunner:
 
         try:
             tasks = []
-            game_logger.info("Starting simulations")
+            game_logger.info("Starting game")
 
             for i, agent_manager in enumerate(self.agents, start=1):
                 tasks.append(self.spawn_agent(agent_manager, i))
@@ -369,4 +377,5 @@ class GameRunner:
             game_logger.exception(f"Failed to run game: {e}")
             raise
         finally:
+            game_logger.info("Game over")
             self.cleanup_logging()

econagents/core/manager/base.py

@@ -68,6 +68,10 @@ class AgentManager(LoggerMixin):
         self._global_pre_event_hooks: list[Callable[[Message], Any]] = []
         self._global_post_event_hooks: list[Callable[[Message], Any]] = []
 
+        # Default event type to trigger stopping the agent
+        self._end_game_event_type: str = "game-over"
+        self.register_event_handler(self._end_game_event_type, self._handle_end_game)
+
         # Initialize transport if URL is provided
         if url:
             self._initialize_transport()
@@ -156,6 +160,30 @@ class AgentManager(LoggerMixin):
             return None
         return Message(message_type=message_type, event_type=event_type, data=data)
 
+    @property
+    def end_game_event_type(self) -> str:
+        """Get the event type that triggers the agent to stop."""
+        return self._end_game_event_type
+
+    @end_game_event_type.setter
+    def end_game_event_type(self, value: str):
+        """
+        Set the event type that triggers the agent to stop.
+
+        Unregisters the stop handler from the old event type and registers it
+        for the new event type.
+
+        Args:
+            value (str): The new event type to listen for.
+        """
+        if self._end_game_event_type != value:
+            # Unregister from the old event type
+            self.unregister_event_handler(self._end_game_event_type, self._handle_end_game)
+            # Register for the new event type
+            self._end_game_event_type = value
+            self.register_event_handler(self._end_game_event_type, self._handle_end_game)
+            self.logger.info(f"End game event type set to: {value}")
+
     async def on_message(self, message: Message):
         """
         Default implementation to handle incoming messages from the server.
@@ -202,6 +230,7 @@ class AgentManager(LoggerMixin):
         self.running = False
         if self.transport:
             await self.transport.stop()
+            self.logger.info("Agent manager stopped and connection closed.")
 
     async def on_event(self, message: Message):
         """
@@ -270,6 +299,16 @@ class AgentManager(LoggerMixin):
             if hasattr(result, "__await__"):
                 await result
 
+    async def _handle_end_game(self, message: Message):
+        """
+        Default handler for the 'end_game_event_type'. Stops the agent manager.
+
+        Args:
+            message (Message): The event message triggering the end game.
+        """
+        self.logger.info(f"Received end game event ({message.event_type}). Stopping agent manager...")
+        await self.stop()
+
     # Event handler registration
     def register_event_handler(self, event_type: str, handler: Callable[[Message], Any]):
         """
@@ -355,7 +394,17 @@ class AgentManager(LoggerMixin):
             if handler is None:
                 self._event_handlers.pop(event_type)
             else:
-                self._event_handlers[event_type] = [h for h in self._event_handlers[event_type] if h != handler]
+                # Use list comprehension to avoid modifying list while iterating
+                handlers_to_keep = [h for h in self._event_handlers[event_type] if h != handler]
+                if not handlers_to_keep:
+                    # Remove the key if the list becomes empty
+                    self._event_handlers.pop(event_type, None)
+                else:
+                    self._event_handlers[event_type] = handlers_to_keep
+                # Explicitly handle removal of the default end game handler
+                if event_type == self._end_game_event_type and handler == self._handle_end_game:
+                    self.logger.warning(f"Default end game handler for '{event_type}' unregistered.")
+
         return self
 
     def unregister_global_event_handler(self, handler: Optional[Callable] = None):
@@ -384,7 +433,13 @@ class AgentManager(LoggerMixin):
             if hook is None:
                 self._pre_event_hooks.pop(event_type)
             else:
-                self._pre_event_hooks[event_type] = [h for h in self._pre_event_hooks[event_type] if h != hook]
+                # Use list comprehension to avoid modifying list while iterating
+                hooks_to_keep = [h for h in self._pre_event_hooks[event_type] if h != hook]
+                if not hooks_to_keep:
+                    # Remove the key if the list becomes empty
+                    self._pre_event_hooks.pop(event_type, None)
+                else:
+                    self._pre_event_hooks[event_type] = hooks_to_keep
         return self
 
     def unregister_global_pre_event_hook(self, hook: Optional[Callable] = None):
@@ -413,7 +468,13 @@ class AgentManager(LoggerMixin):
             if hook is None:
                 self._post_event_hooks.pop(event_type)
             else:
-                self._post_event_hooks[event_type] = [h for h in self._post_event_hooks[event_type] if h != hook]
+                # Use list comprehension to avoid modifying list while iterating
+                hooks_to_keep = [h for h in self._post_event_hooks[event_type] if h != hook]
+                if not hooks_to_keep:
+                    # Remove the key if the list becomes empty
+                    self._post_event_hooks.pop(event_type, None)
+                else:
+                    self._post_event_hooks[event_type] = hooks_to_keep
         return self
 
     def unregister_global_post_event_hook(self, hook: Optional[Callable] = None):

econagents/core/manager/phase.py

@@ -3,14 +3,14 @@ import json
 import logging
 import random
 from abc import ABC, abstractmethod
-from typing import Any, Callable, Optional
 from pathlib import Path
+from typing import Any, Callable, Optional
 
 from econagents.core.agent_role import AgentRole
 from econagents.core.events import Message
 from econagents.core.manager.base import AgentManager
 from econagents.core.state.game import GameState
-from econagents.core.transport import AuthenticationMechanism, SimpleLoginPayloadAuth
+from econagents.core.transport import AuthenticationMechanism
 
 
 class PhaseManager(AgentManager, ABC):

econagents/core/state/game.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Optional, Protocol, Type, TypeVar
+from typing import Any, Callable, Optional, Protocol, Type, TypeVar, cast
 
 from pydantic import BaseModel, ConfigDict
 
@@ -220,3 +220,25 @@ class GameState(BaseModel):
             dict[str, EventHandler]: A mapping of event types to handler functions.
         """
         return {}
+
+    def reset(self) -> None:
+        """
+        Resets meta, private_information, and public_information
+        to their initial state by re-initializing them using their default factories.
+        This effectively removes any dynamically added attributes.
+        """
+        # Re-initialize components using their default factories from the GameState model definition
+        meta_field = self.__class__.model_fields["meta"]
+        if meta_field.default_factory:
+            fac = cast("Callable[[], Any]", meta_field.default_factory)
+            self.meta = fac()
+
+        private_field = self.__class__.model_fields["private_information"]
+        if private_field.default_factory:
+            fac = cast("Callable[[], Any]", private_field.default_factory)
+            self.private_information = fac()
+
+        public_field = self.__class__.model_fields["public_information"]
+        if public_field.default_factory:
+            fac = cast("Callable[[], Any]", public_field.default_factory)
+            self.public_information = fac()

{econagents-0.0.2.dist-info → econagents-0.0.3.dist-info}/METADATA

@@ -1,41 +1,25 @@
 Metadata-Version: 2.3
 Name: econagents
-Version: 0.0.2
-Summary: econagents is a Python library that lets you use LLM agents in economic experiments. The framework connects LLM agents to game servers through WebSockets and provides a flexible architecture for designing, customizing, and running economic simulations.
-License: MIT License
-         
-         Copyright (c) Delft University of Technology
-         
-         Permission is hereby granted, free of charge, to any person obtaining a copy
-         of this software and associated documentation files (the "Software"), to deal
-         in the Software without restriction, including without limitation the rights
-         to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-         copies of the Software, and to permit persons to whom the Software is
-         furnished to do so, subject to the following conditions:
-         
-         The above copyright notice and this permission notice shall be included in all
-         copies or substantial portions of the Software.
-         
-         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-         IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-         FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-         AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-         SOFTWARE.
-Requires-Python: >=3.10,<3.13
-Classifier: License :: Other/Proprietary License
+Version: 0.0.3
+Summary: 
+License: MIT
+Author: Dylan Castillo
+Author-email: dylan@iwanalabs.com
+Requires-Python: >=3.10,<4
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: all
 Provides-Extra: default
 Provides-Extra: langfuse
 Provides-Extra: langsmith
 Provides-Extra: ollama
 Provides-Extra: openai
-Requires-Dist: pydantic (>=2.10.6,<3.0.0)
+Requires-Dist: jinja2 (>=3.1.6,<4.0.0)
+Requires-Dist: pydantic (>=2.11.3,<3.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: websockets (>=15.0,<16.0)
 Description-Content-Type: text/markdown

{econagents-0.0.2.dist-info → econagents-0.0.3.dist-info}/RECORD

@@ -1,16 +1,16 @@
-econagents/__init__.py,sha256=dpcjNajSFFw_fMaRymVtzGFR8ihi9AT3dQ-Zr6Q81RU,1111
+econagents/__init__.py,sha256=gFWs83sRb_j9pq30PhclH3DNXifyHiPMz0IKN1O4xJk,1111
 econagents/_c_extension.pyi,sha256=evVvDNUCGqyMPrNViPF7QXfGUNNIMbUdY5HemRNQ1_o,113
 econagents/core/__init__.py,sha256=QZoOp6n5CX1j-Ob6PZgyCNY78vi2kWmd_LVLrJUj1TU,393
-econagents/core/agent_role.py,sha256=XQmq4oVJnyDRyyr3MU-D29nNsaT8b5iIo18IdyNHG1Y,15337
+econagents/core/agent_role.py,sha256=MA0aaTEWiI5NLSKN2YmWHb8gBYljtDVlLOSpohkv45M,15895
 econagents/core/events.py,sha256=hx-Ru_NoSISuN--7ZFC3CIql5hry3AATSnHZJJv3Kds,294
-econagents/core/game_runner.py,sha256=ILBxtb4ysiT1npqB50GHOICe3XoA9Y-cChUsTWTRkKA,13655
+econagents/core/game_runner.py,sha256=lrujwoeL3lXwCInA9msu6YvovCJuBUTcV0DrnyryQDE,14099
 econagents/core/logging_mixin.py,sha256=tYsRc5ngW-hzfElrb838KO-9-BGOPyUv2v5LLuJToBE,1421
 econagents/core/manager/__init__.py,sha256=bDpCQlFcw_E-js575X3Xl6iwZ1uILC18An1vt6oE7S4,284
-econagents/core/manager/base.py,sha256=IMGkyCrghHlkJnkQLGUVfUSSr7sqZsKHYsmgf4UtGlI,16186
-econagents/core/manager/phase.py,sha256=OPfY0YbvXxUeYuV6h7Ifnj-GRpkNZ3t9FUc31t-mX5M,19292
+econagents/core/manager/base.py,sha256=qJyqBaUz0dMz3XCny4YydJ8iV6mqEy5osKgL2lNozkc,19032
+econagents/core/manager/phase.py,sha256=gx1ku_hPVmT-BgKTdc55BSZ56Qd3fN1smUgjPbYYtCs,19268
 econagents/core/state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 econagents/core/state/fields.py,sha256=YxVOqdriaHRHoyeXsIB8ZDHygneMJD1OikOyeILK_oA,1854
-econagents/core/state/game.py,sha256=Ux0s7WhOxu0aFvwgX_LM0Aiho-aa1N3yh1ManwWBRP4,8681
+econagents/core/state/game.py,sha256=6J3xV_SViShwBNgcWc_sK1dQPNO8Abb7qONFF0d4qVs,9729
 econagents/core/state/market.py,sha256=Jg-X9mYH6B3cYOwxzjFDV5PDbCIYxipx2UN4ecfyyDE,3909
 econagents/core/transport.py,sha256=7eq31nb2KY67RuL5i2kxJrcGtwfcVm5qy0eVj4_xWQw,5063
 econagents/llm/__init__.py,sha256=J1PqpG3wL41oBAfzp5QaaP2ekwxCM_tiRq4H0OeSv4w,482
@@ -19,7 +19,7 @@ econagents/llm/observability.py,sha256=WSkJ7lZZl2FVpDWpFivudoeOENR_lyLZscUisveAi
 econagents/llm/ollama.py,sha256=0ElnQhyCCAOu6u-TIC2JeNzh8OV6_VZjchFpi1F3HxU,2242
 econagents/llm/openai.py,sha256=x1L9GS2DXNvPTECXP6DVMwr9fuhcHMZh_2k8ds30i-Y,2395
 econagents/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-econagents-0.0.2.dist-info/LICENSE,sha256=Bd4MAEaMayyDO5BncOl3q0T2b6sWcjABigXLRFxgKIU,1082
-econagents-0.0.2.dist-info/METADATA,sha256=auotxhLfk21vxzEns0AMcGzxRLPdHS-i122vGuJKIgg,4921
-econagents-0.0.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-econagents-0.0.2.dist-info/RECORD,,
+econagents-0.0.3.dist-info/LICENSE,sha256=Bd4MAEaMayyDO5BncOl3q0T2b6sWcjABigXLRFxgKIU,1082
+econagents-0.0.3.dist-info/METADATA,sha256=Ks0NdoiMiHBGGWZmJpY3fPurimnzd38RnWX3lzN5KSE,3557
+econagents-0.0.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+econagents-0.0.3.dist-info/RECORD,,