econagents 0.0.5__tar.gz → 0.0.8__tar.gz

{econagents-0.0.5 → econagents-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: econagents
-Version: 0.0.5
+Version: 0.0.8
 Summary: 
 License: MIT
 Author: Dylan Castillo
@@ -18,24 +18,34 @@ Provides-Extra: langsmith
 Provides-Extra: ollama
 Provides-Extra: openai
 Provides-Extra: standard
-Requires-Dist: langfuse (>=2.60.3,<3.0.0) ; extra == "langfuse" or extra == "all"
-Requires-Dist: langsmith (>=0.3.33,<0.4.0) ; extra == "langsmith" or extra == "standard" or extra == "all"
-Requires-Dist: ollama (>=0.4.8,<0.5.0) ; extra == "ollama" or extra == "all"
-Requires-Dist: openai (>=1.68.2,<2.0.0) ; extra == "openai" or extra == "standard" or extra == "all"
-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)
+Requires-Dist: langfuse (>=3.0.3)
+Requires-Dist: langfuse ; extra == "all"
+Requires-Dist: langfuse ; extra == "langfuse"
+Requires-Dist: langsmith (>=0.4.1)
+Requires-Dist: langsmith ; extra == "all"
+Requires-Dist: langsmith ; extra == "langsmith"
+Requires-Dist: langsmith ; extra == "standard"
+Requires-Dist: ollama (>=0.5.1)
+Requires-Dist: ollama ; extra == "all"
+Requires-Dist: ollama ; extra == "ollama"
+Requires-Dist: openai (>=1.89.0)
+Requires-Dist: openai ; extra == "all"
+Requires-Dist: openai ; extra == "openai"
+Requires-Dist: openai ; extra == "standard"
+Requires-Dist: pydantic (>=2.11.5)
+Requires-Dist: requests (>=2.32.4)
+Requires-Dist: websockets (>=15.0)
 Description-Content-Type: text/markdown
 
 <div align="center">
-  <img src="https://raw.githubusercontent.com/iwanalabs/econagents/main/assets/logo_200w.png">
+  <img src="https://raw.githubusercontent.com/IBEX-TUDelft/econagents/main/assets/logo_200w.png">
 </div>
 
 <div align="center">
 
 ![Python compat](https://img.shields.io/badge/%3E=python-3.10-blue.svg)
 [![PyPi](https://img.shields.io/pypi/v/econagents.svg)](https://pypi.python.org/pypi/econagents)
-[![GHA Status](https://github.com/iwanalabs/econagents/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/iwanalabs/econagents/actions?query=workflow%3Atests)
+[![GHA Status](https://github.com/IBEX-TUDelft/econagents/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/IBEX-TUDelft/econagents/actions?query=workflow%3Atests)
 [![Documentation Status](https://readthedocs.org/projects/econagents/badge/?version=latest)](https://econagents.readthedocs.io/en/latest/?badge=latest)
 
 </div>
@@ -53,7 +63,7 @@ econagents is a Python library that lets you use LLM agents in economic experime
 pip install econagents
 
 # Or install directly from GitHub
-pip install git+https://github.com/iwanalabs/econagents.git
+pip install git+https://github.com/IBEX-TUDelft/econagents.git
 ```
 
 ## Framework Components
@@ -79,7 +89,7 @@ The simplest game to run is a version of the repeated prisoner's dilemma game th
 
 ```shell
 # Run the server
-python examples/server/prisoner/server.py
+python examples/prisoner/server/server.py
 
 # Run the experiment (in a separate terminal)
 python examples/prisoner/run_game.py
@@ -98,3 +108,5 @@ Note: you still have to set up the connection to the agents.
 
 For detailed guides and API reference, visit [the documentation](https://econagents.readthedocs.io/en/latest/).
 
+You should also check out the [econagents cookbook](https://github.com/iwanalabs/econagents-cookbook/tree/main/) for more examples.
+

{econagents-0.0.5 → econagents-0.0.8}/README.md

@@ -1,12 +1,12 @@
 <div align="center">
-  <img src="https://raw.githubusercontent.com/iwanalabs/econagents/main/assets/logo_200w.png">
+  <img src="https://raw.githubusercontent.com/IBEX-TUDelft/econagents/main/assets/logo_200w.png">
 </div>
 
 <div align="center">
 
 ![Python compat](https://img.shields.io/badge/%3E=python-3.10-blue.svg)
 [![PyPi](https://img.shields.io/pypi/v/econagents.svg)](https://pypi.python.org/pypi/econagents)
-[![GHA Status](https://github.com/iwanalabs/econagents/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/iwanalabs/econagents/actions?query=workflow%3Atests)
+[![GHA Status](https://github.com/IBEX-TUDelft/econagents/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/IBEX-TUDelft/econagents/actions?query=workflow%3Atests)
 [![Documentation Status](https://readthedocs.org/projects/econagents/badge/?version=latest)](https://econagents.readthedocs.io/en/latest/?badge=latest)
 
 </div>
@@ -24,7 +24,7 @@ econagents is a Python library that lets you use LLM agents in economic experime
 pip install econagents
 
 # Or install directly from GitHub
-pip install git+https://github.com/iwanalabs/econagents.git
+pip install git+https://github.com/IBEX-TUDelft/econagents.git
 ```
 
 ## Framework Components
@@ -50,7 +50,7 @@ The simplest game to run is a version of the repeated prisoner's dilemma game th
 
 ```shell
 # Run the server
-python examples/server/prisoner/server.py
+python examples/prisoner/server/server.py
 
 # Run the experiment (in a separate terminal)
 python examples/prisoner/run_game.py
@@ -68,3 +68,5 @@ Note: you still have to set up the connection to the agents.
 ## Documentation
 
 For detailed guides and API reference, visit [the documentation](https://econagents.readthedocs.io/en/latest/).
+
+You should also check out the [econagents cookbook](https://github.com/iwanalabs/econagents-cookbook/tree/main/) for more examples.

{econagents-0.0.5 → econagents-0.0.8}/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.5"
+__version__ = "0.0.8"
 
 __all__: list[str] = [
     "AgentRole",

econagents-0.0.8/econagents/cli.py

@@ -0,0 +1,136 @@
+import argparse
+import asyncio
+import sys
+import json
+from pathlib import Path
+from typing import Dict, List, Any
+
+from econagents.config_parser.base import BaseConfigParser
+
+
+async def async_main(args: argparse.Namespace):
+    """Asynchronous main function to run the experiment."""
+    config_path = Path(args.config_path).resolve()
+    login_payloads_path = Path(args.login_payloads_file).resolve()
+
+    if not config_path.is_file():
+        print(f"Error: Configuration file not found at {config_path}", file=sys.stderr)
+        sys.exit(1)
+
+    if not login_payloads_path.is_file():
+        print(f"Error: Login payloads file not found at {login_payloads_path}", file=sys.stderr)
+        sys.exit(1)
+
+    try:
+        # Load configuration using the base parser
+        parser = BaseConfigParser(config_path)
+        config = parser.config
+    except Exception as e:
+        print(f"Error loading or parsing config file {config_path}: {e}", file=sys.stderr)
+        sys.exit(1)
+
+    login_payloads: List[Dict[str, Any]] = []  # Initialize empty list
+    try:
+        with open(login_payloads_path, "r") as f:
+            for line_num, line in enumerate(f, 1):
+                line = line.strip()  # Remove leading/trailing whitespace
+                if not line:  # Skip empty lines
+                    continue
+                try:
+                    payload = json.loads(line)
+                    if not isinstance(payload, dict):
+                        raise ValueError("Each line must be a valid JSON object.")
+                    login_payloads.append(payload)
+                except json.JSONDecodeError as e:
+                    print(f"Error decoding JSON on line {line_num} in {login_payloads_path}: {e}", file=sys.stderr)
+                    sys.exit(1)
+                except ValueError as e:
+                    print(f"Error processing line {line_num} in {login_payloads_path}: {e}", file=sys.stderr)
+                    sys.exit(1)
+
+        if not login_payloads:  # Check if any payloads were loaded
+            print(f"Error: No valid login payloads found in {login_payloads_path}", file=sys.stderr)
+            sys.exit(1)
+
+    except Exception as e:
+        print(f"Error reading login payloads file {login_payloads_path}: {e}", file=sys.stderr)
+        sys.exit(1)
+
+    # Ensure the number of payloads matches the number of agents defined
+    num_defined_agents = len(config.agents)
+    if len(login_payloads) != num_defined_agents:
+        print(
+            f"Error: Number of login payloads ({len(login_payloads)}) in {login_payloads_path} "
+            f"does not match the number of agents defined in the config ({num_defined_agents}).",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    # Extract gameId from the first payload for display purposes (assuming all payloads are for the same game)
+    # Add basic check to ensure payloads exist and have gameId
+    game_id_display = "N/A"
+    if login_payloads and isinstance(login_payloads[0], dict) and "gameId" in login_payloads[0]:
+        game_id_display = login_payloads[0]["gameId"]
+
+    print(f"Starting experiment '{config.name}' with Game ID: {game_id_display}...")
+    print(f"Using config: {config_path}")
+    print(f"Using login payloads from: {login_payloads_path}")
+    print(f"Number of agents: {len(login_payloads)}")
+
+    try:
+        await parser.run_experiment(login_payloads)
+        print("Experiment finished.")
+    except Exception as e:
+        print(f"Error running experiment: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+def run_cli():
+    """Entry point function for the CLI script."""
+    parser = argparse.ArgumentParser(
+        description=(
+            "Economic Agents CLI - Run experiments with AI agents in economic simulations.\n\n"
+            "Example usage:\n"
+            "  econagents run config.yaml --login-payloads-file payloads.jsonl\n\n"
+            "The config file should be a YAML file defining the experiment setup.\n"
+            "The login payloads file should be a JSONL file with login credentials for each agent."
+        ),
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    subparsers = parser.add_subparsers(dest="command", required=True, help="Available commands")
+
+    # --- Run Command ---
+    run_parser = subparsers.add_parser(
+        "run", 
+        help="Run an experiment defined by a YAML configuration file.",
+        description=(
+            "Run an economic agent experiment using the specified configuration.\n\n"
+            "Example:\n"
+            "  econagents run experiments/market_sim.yaml --login-payloads-file credentials.jsonl"
+        ),
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    run_parser.add_argument(
+        "config_path", 
+        type=str, 
+        help="Path to the experiment configuration YAML file that defines the agent behaviors and experiment parameters."
+    )
+    run_parser.add_argument(
+        "--login-payloads-file",
+        required=True,
+        type=str,
+        help="Path to a JSON Lines (.jsonl) file containing login credentials for each agent, one per line."
+    )
+
+    args = parser.parse_args()
+
+    if args.command == "run":
+        try:
+            asyncio.run(async_main(args))
+        except KeyboardInterrupt:
+            print("\nExperiment interrupted by user.")
+            sys.exit(0)
+
+
+if __name__ == "__main__":
+    run_cli()

econagents-0.0.8/econagents/config_parser/__init__.py

@@ -0,0 +1,18 @@
+"""
+Configuration parsers for different server types.
+
+This package provides configuration parsers for different server types:
+- Base: No custom event handlers
+- Basic: Custom event handler for player-is-ready messages
+- IBEX-TUDelft: Handles player-is-ready messages and role assignment
+"""
+
+from econagents.config_parser.base import BaseConfigParser
+from econagents.config_parser.basic import BasicConfigParser
+from econagents.config_parser.ibex_tudelft import IbexTudelftConfigParser
+
+__all__ = [
+    "BaseConfigParser",
+    "BasicConfigParser",
+    "IbexTudelftConfigParser",
+]