${player.toUpperCase()}
-
"${escapeHtml(memory)}"
+
"${escapeHtml(getMemoryText(memory))}"
`).join('');
document.getElementById('ai-content-body').innerHTML = memoriesHTML;
}
+function getMemoryText(memory) {
+ if (memory === null || memory === undefined) return '';
+ if (typeof memory === 'string') return memory;
+ if (memory.note_to_self) return memory.note_to_self;
+ if (memory.current_note) return memory.current_note;
+ if (Array.isArray(memory.recent_notes) && memory.recent_notes.length > 0) {
+ return memory.recent_notes[memory.recent_notes.length - 1].note || String(memory.recent_notes[memory.recent_notes.length - 1]);
+ }
+ return JSON.stringify(memory);
+}
+
// Track expanded state for requests
const expandedRequests = new Set();
diff --git a/pycatan/visualizations/web_visualization.py b/pycatan/visualizations/web_visualization.py
index 30253ab79f56648249c40fce854fdb1f9d4442d3..7ef99cfe671e5fc0f01c38e5bf31d7fc333db1ca 100644
--- a/pycatan/visualizations/web_visualization.py
+++ b/pycatan/visualizations/web_visualization.py
@@ -563,6 +563,28 @@ class WebVisualization(Visualization):
card_name = card_name.split(".")[-1]
cards_list.append(card_name)
+ resources = {
+ 'wood': 0,
+ 'brick': 0,
+ 'sheep': 0,
+ 'wheat': 0,
+ 'ore': 0,
+ }
+ resource_names = {
+ 'wood': 'wood',
+ 'lumber': 'wood',
+ 'brick': 'brick',
+ 'sheep': 'sheep',
+ 'wool': 'sheep',
+ 'wheat': 'wheat',
+ 'grain': 'wheat',
+ 'ore': 'ore',
+ }
+ for card_name in cards_list:
+ normalized = resource_names.get(card_name.lower())
+ if normalized:
+ resources[normalized] += 1
+
# Get dev cards list
dev_cards_list = []
if hasattr(player, 'dev_cards'):
@@ -583,6 +605,7 @@ class WebVisualization(Visualization):
'name': player_name,
'victory_points': getattr(player, 'victory_points', 0),
'total_cards': len(getattr(player, 'cards', [])),
+ 'resources': resources,
'cards_list': cards_list,
'dev_cards_list': dev_cards_list,
'settlements': len(getattr(player, 'settlements', [])),
@@ -1167,4 +1190,4 @@ def create_web_visualization(port: int = 5000, auto_open: bool = True, debug: bo
"""
web_viz = WebVisualization(port=port, auto_open=auto_open, debug=debug)
web_viz.start_server()
- return web_viz
\ No newline at end of file
+ return web_viz
diff --git a/run.bat b/run.bat
deleted file mode 100644
index 1c7a7e75f14df55e9f31e57fd043214221f6d7b0..0000000000000000000000000000000000000000
--- a/run.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-REM Activate virtual environment and run the Catan game
-call .venv\Scripts\activate.bat
-python play_catan.py
-pause
diff --git a/start.bat b/start.bat
deleted file mode 100644
index 8a1240edbc9d84f912bd740d8adc3806afaea94b..0000000000000000000000000000000000000000
--- a/start.bat
+++ /dev/null
@@ -1,73 +0,0 @@
-@echo off
-REM ================================================================================
-REM PyCatan AI System - UPDATED VERSION
-REM ================================================================================
-REM This script has been updated to use the new AI system.
-REM Old files moved to: examples\ai_testing\_deprecated\
-REM ================================================================================
-
-echo.
-echo ================================================================================
-echo PyCatan AI System
-echo ================================================================================
-echo.
-echo Starting components:
-echo 1. AI Viewer (http://localhost:5001) - Shows AI prompts and responses
-echo 2. Catan Game with AI Agents (manual input mode)
-echo.
-echo ================================================================================
-echo.
-
-cd /d "%~dp0"
-
-REM Check for virtual environment
-if exist ".venv\Scripts\python.exe" (
- set PYTHON_CMD=.venv\Scripts\python.exe
- echo [OK] Using virtual environment
-) else (
- set PYTHON_CMD=python
- echo [!] No virtual environment found, using system Python
-)
-
-echo.
-
-REM Start Web Viewer in a new window
-echo [1/2] Starting AI Viewer...
-start "AI Viewer - http://localhost:5001" cmd /k "%PYTHON_CMD% examples\ai_testing\web_viewer.py"
-
-REM Wait for web viewer to start
-timeout /t 2 /nobreak >nul
-
-echo [OK] AI Viewer started at http://localhost:5001
-echo.
-
-REM Open browser for AI Viewer
-echo [BROWSER] Opening AI Viewer...
-timeout /t 2 /nobreak >nul
-start http://localhost:5001
-
-echo.
-echo [2/2] Starting game...
-echo.
-echo ================================================================================
-echo MANUAL AI MODE
-echo ================================================================================
-echo When it's an AI player's turn:
-echo - A prompt is generated and saved
-echo - You enter the action the AI should take
-echo.
-echo Commands: r (roll), e (end turn), s 14 (settlement), rd 14 15 (road)
-echo Type 'help' for full list
-echo ================================================================================
-echo.
-
-REM Start the game with the new system
-%PYTHON_CMD% examples\ai_testing\play_with_ai.py
-
-echo.
-echo ================================================================================
-echo Session Complete!
-echo ================================================================================
-echo Session logs: examples\ai_testing\my_games\
-echo.
-pause
diff --git a/temp_viz_console.py b/temp_viz_console.py
deleted file mode 100644
index 745be856c918f80951d907166f6fe1698b1bd2a3..0000000000000000000000000000000000000000
--- a/temp_viz_console.py
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# -*- coding: utf-8 -*-
-import sys
-import time
-import os
-
-log_file = r"C:\GIT_new\PyCatan_AI\logs\game_viz.log"
-
-print("PyCatan - Game Visualization Console")
-print("=" * 50)
-print("This window shows real-time game state updates.")
-print("Keep this window open while playing!")
-print("=" * 50)
-print(f"Reading from: {log_file}")
-
-# Wait for file to exist
-while not os.path.exists(log_file):
- time.sleep(0.1)
-
-# Tail the file
-with open(log_file, 'r', encoding='utf-8') as f:
- # Go to the end of file
- # f.seek(0, 2)
- # Actually start from beginning since we just created it
-
- while True:
- line = f.readline()
- if line:
- print(line, end='')
- else:
- time.sleep(0.1)
diff --git a/tests/unit/test_ai_user.py b/tests/unit/test_ai_user.py
new file mode 100644
index 0000000000000000000000000000000000000000..2611904d63d50385c0d87989923f683ceb5217c5
--- /dev/null
+++ b/tests/unit/test_ai_user.py
@@ -0,0 +1,182 @@
+"""Unit tests for AIUser action translation."""
+
+from dataclasses import dataclass
+
+import pytest
+
+from pycatan.ai.ai_user import AIUser
+from pycatan.management.actions import ActionType
+
+
+@dataclass
+class DummyAgent:
+ player_name: str
+ player_id: int
+ player_color: str = ""
+ recent_events: list = None
+
+ def __post_init__(self):
+ if self.recent_events is None:
+ self.recent_events = []
+
+ def add_event(self, event_type, message, data=None):
+ event = {"type": event_type, "message": message}
+ if data:
+ event["data"] = data
+ self.recent_events.append(event)
+
+
+class DummyAIManager:
+ def __init__(self):
+ self.agents = {}
+
+ def register_agent(self, name, user_id, color):
+ self.agents[name] = DummyAgent(name, user_id, color)
+
+ def get_agent(self, name):
+ return self.agents.get(name)
+
+
+def make_ai_user():
+ manager = DummyAIManager()
+ manager.register_agent("Alice", 0, "red")
+ manager.register_agent("Bob", 1, "blue")
+ manager.register_agent("Charlie", 2, "green")
+ return AIUser("Bob", 1, manager, "blue")
+
+
+def test_steal_card_resolves_target_player_name_to_id():
+ user = make_ai_user()
+
+ action = user._decision_to_action(
+ {
+ "action_type": "steal_card",
+ "parameters": {"target_player": "Charlie"},
+ },
+ ["STEAL_CARD"],
+ )
+
+ assert action.action_type == ActionType.STEAL_CARD
+ assert action.parameters["target_player"] == 2
+
+
+def test_steal_card_resolves_target_player_color_to_id():
+ user = make_ai_user()
+
+ action = user._decision_to_action(
+ {
+ "action_type": "steal_card",
+ "parameters": {"target_player": "green"},
+ },
+ ["STEAL_CARD"],
+ )
+
+ assert action.parameters["target_player"] == 2
+
+
+def test_steal_card_maps_unknown_target_player_to_invalid_id():
+ user = make_ai_user()
+
+ action = user._decision_to_action(
+ {
+ "action_type": "steal_card",
+ "parameters": {"target_player": "Nobody"},
+ },
+ ["STEAL_CARD"],
+ )
+
+ assert action.parameters["target_player"] == -1
+
+
+def test_trade_propose_resolves_target_player_name_to_id():
+ user = make_ai_user()
+
+ action = user._decision_to_action(
+ {
+ "action_type": "trade_propose",
+ "parameters": {
+ "target_player": "Charlie",
+ "offer": {"sheep": 1},
+ "request": {"wood": 1},
+ },
+ },
+ ["TRADE_PROPOSE"],
+ )
+
+ assert action.action_type == ActionType.TRADE_PROPOSE
+ assert action.parameters["target_player"] == 2
+ assert action.parameters["offer"] == {"sheep": 1}
+ assert action.parameters["request"] == {"wood": 1}
+
+
+def test_trade_propose_accepts_target_alias():
+ user = make_ai_user()
+
+ action = user._decision_to_action(
+ {
+ "action_type": "trade_propose",
+ "parameters": {
+ "to": "green",
+ "offer": {"sheep": 1},
+ "request": {"wood": 1},
+ },
+ },
+ ["TRADE_PROPOSE"],
+ )
+
+ assert action.parameters["target_player"] == 2
+
+
+def test_trade_bank_give_receive_converts_to_engine_offer_request():
+ user = make_ai_user()
+
+ action = user._decision_to_action(
+ {
+ "action_type": "trade_bank",
+ "parameters": {"give": "wheat", "receive": "ore"},
+ },
+ ["TRADE_BANK"],
+ )
+
+ assert action.action_type == ActionType.TRADE_BANK
+ assert action.parameters == {"offer": {"wheat": 4}, "request": {"ore": 1}}
+
+
+def test_failed_action_is_added_to_agent_events():
+ user = make_ai_user()
+ action = user._decision_to_action(
+ {
+ "action_type": "steal_card",
+ "parameters": {"target_player": "Charlie"},
+ },
+ ["STEAL_CARD"],
+ )
+
+ user.notify_action(action, success=False, message="Invalid target")
+
+ event = user.ai_manager.get_agent("Bob").recent_events[-1]
+ assert event["type"] == "action_failed"
+ assert "Invalid target" in event["message"]
+ assert event["data"]["action_type"] == "STEAL_CARD"
+
+
+def test_action_processing_error_is_added_to_agent_events():
+ user = make_ai_user()
+
+ user.notify_action_processing_error("missing required parameters: ['target_player']")
+
+ event = user.ai_manager.get_agent("Bob").recent_events[-1]
+ assert event["type"] == "action_failed"
+ assert "could not be processed" in event["message"]
+ assert "target_player" in event["data"]["error"]
+
+
+def test_wait_for_response_maps_to_end_turn_action():
+ user = make_ai_user()
+
+ action = user._decision_to_action(
+ {"action_type": "wait_for_response", "parameters": {}},
+ ["END_TURN"],
+ )
+
+ assert action.action_type == ActionType.END_TURN
diff --git a/tests/unit/test_game_manager.py b/tests/unit/test_game_manager.py
index 466c2300d8baddc917f0e407c6a8c59aebb0565f..32464652419583906c8b86e2f0e5ce27350f2678 100644
--- a/tests/unit/test_game_manager.py
+++ b/tests/unit/test_game_manager.py
@@ -11,6 +11,7 @@ import uuid
from pycatan.management.actions import Action, ActionType, ActionResult, GameState, GamePhase
from pycatan.players.user import create_test_user, UserInputError
from pycatan.management.game_manager import GameManager
+from pycatan.core.card import ResCard
class TestGameManagerInitialization:
@@ -137,6 +138,86 @@ class TestGameManagerActions:
create_test_user("Bob", 1)
]
self.gm = GameManager(self.users)
+
+ def test_trade_propose_records_pending_trade_and_accepts(self):
+ alice = create_test_user("Alice", 0)
+ bob = create_test_user("Bob", 1)
+ trade_offers = []
+ trade_responses = []
+
+ for user in [alice, bob]:
+ user.notify_trade_offer = lambda trade_id, proposer, target, offer, request: trade_offers.append(
+ (trade_id, proposer, target, offer, request)
+ )
+ user.notify_trade_response = lambda trade_id, status, responder: trade_responses.append(
+ (trade_id, status, responder)
+ )
+
+ bob.set_next_action(Action(ActionType.TRADE_ACCEPT, 1, {}))
+ gm = GameManager([alice, bob], random_seed=0)
+ gm.game.players[0].cards = [ResCard.Sheep]
+ gm.game.players[1].cards = [ResCard.Wood]
+
+ action = Action(
+ ActionType.TRADE_PROPOSE,
+ 0,
+ {"target_player": 1, "offer": {"sheep": 1}, "request": {"wood": 1}},
+ )
+ result = gm._execute_trade_propose(action)
+
+ assert result.success
+ assert ResCard.Wood in gm.game.players[0].cards
+ assert ResCard.Sheep in gm.game.players[1].cards
+ assert action.parameters["trade_status"] == "accepted"
+ assert action.parameters["trade_id"].startswith("trade_")
+ assert "Trade offer" in bob.last_input_call["prompt_message"]
+ assert bob.last_input_call["allowed_actions"] == ["TRADE_ACCEPT", "TRADE_REJECT"]
+ assert trade_offers
+ assert trade_responses[-1][1] == "accepted"
+ assert gm._current_game_state.pending_trades == []
+
+ def test_trade_propose_rejects_invalid_target_id(self):
+ gm = GameManager(self.users, random_seed=0)
+ action = Action(
+ ActionType.TRADE_PROPOSE,
+ 0,
+ {"target_player": -1, "offer": {"sheep": 1}, "request": {"wood": 1}},
+ )
+
+ result = gm._execute_trade_propose(action)
+
+ assert not result.success
+ assert result.status_code == "INVALID_PLAYER_ID"
+
+ def test_execute_action_rejects_action_not_allowed_in_phase(self):
+ """Test that actions outside the current phase do not execute."""
+ self.gm.start_game()
+
+ result = self.gm.execute_action(Action(ActionType.END_TURN, player_id=0))
+
+ assert result.success is False
+ assert result.status_code == "ACTION_NOT_ALLOWED"
+ assert "PLACE_STARTING_SETTLEMENT" in result.error_message
+
+ def test_get_full_state_includes_current_dice_roll(self):
+ """Test that AI-facing game state keeps the current turn dice roll."""
+ self.gm._current_game_state.dice_rolled = (5, 3)
+
+ state = self.gm.get_full_state()
+
+ assert state.dice_rolled == (5, 3)
+
+ def test_distribution_summary_uses_player_names_and_counts(self):
+ """Test resource distribution summary is useful for AI prompts."""
+ summary = self.gm._format_distribution_summary(
+ {
+ "Player 1": ["sheep", "wheat", "wheat"],
+ "Player 2": ["ore"],
+ }
+ )
+
+ assert "Alice +1 sheep, 2 wheat" in summary
+ assert "Bob +1 ore" in summary
def test_execute_action_game_not_running(self):
"""Test executing action when game is not running."""
@@ -389,4 +470,4 @@ class TestGameManagerIntegration:
if __name__ == '__main__':
- pytest.main([__file__, '-v'])
\ No newline at end of file
+ pytest.main([__file__, '-v'])