Compare commits

..

2 Commits

Author SHA1 Message Date
Alexander Whitestone
a091a5c9bf fix: give tower NPC room movement purposeful goals (#517)
Some checks failed
Self-Healing Smoke / self-healing-smoke (pull_request) Failing after 26s
Smoke Test / smoke (pull_request) Failing after 27s
Agent PR Gate / gate (pull_request) Failing after 37s
Agent PR Gate / report (pull_request) Successful in 8s
2026-04-22 11:51:47 -04:00
Alexander Whitestone
4afde6da78 test: add tower NPC movement acceptance coverage (#517) 2026-04-22 11:47:21 -04:00
5 changed files with 225 additions and 217 deletions

View File

@@ -454,23 +454,112 @@ class TimmyAI:
class NPCAI:
"""AI for non-player characters. They make choices based on goals."""
GOAL_ROOM_TARGETS = {
"Marcus": {
"sit": "Garden",
"speak_truth": "Threshold",
"remember": "Bridge",
},
"Bezalel": {
"forge": "Forge",
"tend_fire": "Forge",
"create_key": "Forge",
},
"Allegro": {
"oversee": "Threshold",
"keep_time": "Tower",
"check_tunnel": "Bridge",
},
"Ezra": {
"study": "Tower",
"read_whiteboard": "Tower",
"find_pattern": "Tower",
},
"Gemini": {
"observe": "Threshold",
"tend_garden": "Garden",
"listen": "Garden",
},
"Claude": {
"inspect": "Threshold",
"organize": "Tower",
"enforce_order": "Bridge",
},
"ClawCode": {
"forge": "Forge",
"test_edge": "Bridge",
"build_weapon": "Forge",
},
"Kimi": {
"contemplate": "Garden",
"read": "Tower",
"remember": "Bridge",
},
}
GOAL_CYCLES = {
"Marcus": ("sit", "speak_truth", "remember"),
"Allegro": ("oversee", "keep_time", "check_tunnel"),
"Claude": ("inspect", "organize", "enforce_order"),
"ClawCode": ("test_edge", "forge", "build_weapon"),
"Kimi": ("contemplate", "read", "remember"),
}
def __init__(self, world):
self.world = world
def _available_targets(self, available, prefix):
return [a.split(":", 1)[1] for a in available if a.startswith(f"{prefix}:")]
def _target_room_for(self, char_name, goal):
return self.GOAL_ROOM_TARGETS.get(char_name, {}).get(goal)
def _next_direction_toward(self, current_room, target_room):
if current_room == target_room:
return None
frontier = [(current_room, [])]
seen = {current_room}
while frontier:
room, path = frontier.pop(0)
if room == target_room:
return path[0] if path else None
for direction, dest in self.world.rooms[room].get("connections", {}).items():
if dest not in seen:
seen.add(dest)
frontier.append((dest, path + [direction]))
return None
def _move_toward_goal(self, room, target_room):
direction = self._next_direction_toward(room, target_room)
return f"move:{direction}" if direction else None
def _advance_goal_cycle(self, char_name, char):
cycle = self.GOAL_CYCLES.get(char_name)
if not cycle or self.world.tick <= 0:
return
goal = char.get("active_goal")
if goal not in cycle:
return
target_room = self._target_room_for(char_name, goal)
if char.get("room") != target_room:
return
if self.world.tick % 12 != 0:
return
index = cycle.index(goal)
char["active_goal"] = cycle[(index + 1) % len(cycle)]
def make_choice(self, char_name):
"""Make a choice for this NPC this tick."""
char = self.world.characters[char_name]
self._advance_goal_cycle(char_name, char)
room = char["room"]
available = ActionSystem.get_available_actions(char_name, self.world)
# If low energy, rest
if char["energy"] <= 1:
return "rest"
# Goal-driven behavior
goal = char["active_goal"]
if char_name == "Marcus":
return self._marcus_choice(char, room, available)
elif char_name == "Bezalel":
@@ -487,66 +576,96 @@ class NPCAI:
return self._clawcode_choice(char, room, available)
elif char_name == "Kimi":
return self._kimi_choice(char, room, available)
return "rest"
def _marcus_choice(self, char, room, available):
goal = char.get("active_goal", "sit")
target_room = self._target_room_for("Marcus", goal)
if room != target_room:
return self._move_toward_goal(room, target_room) or "rest"
others = self._available_targets(available, "speak")
if goal == "speak_truth" and others:
return f"speak:{random.choice(others)}"
if goal == "remember" and room == "Bridge":
return random.choice(["examine", "rest"])
if room == "Garden" and random.random() < 0.7:
return "rest"
if room != "Garden":
return "move:west"
# Speak to someone if possible
others = [a.split(":")[1] for a in available if a.startswith("speak:")]
if others and random.random() < 0.4:
return f"speak:{random.choice(others)}"
return "rest"
def _bezalel_choice(self, char, room, available):
target_room = self._target_room_for("Bezalel", char.get("active_goal", "forge"))
if room != target_room:
return self._move_toward_goal(room, target_room) or "rest"
if room == "Forge" and self.world.rooms["Forge"]["fire"] == "glowing":
return random.choice(["forge", "rest"] if char["energy"] > 2 else ["rest"])
if room != "Forge":
return "move:west"
if random.random() < 0.3:
return "tend_fire"
return "forge"
def _kimi_choice(self, char, room, available):
others = [a.split(":")[1] for a in available if a.startswith("speak:")]
goal = char.get("active_goal", "contemplate")
target_room = self._target_room_for("Kimi", goal)
if room != target_room:
return self._move_toward_goal(room, target_room) or "rest"
others = self._available_targets(available, "speak")
if goal == "read" and room == "Tower":
return "study" if char["energy"] > 2 else "rest"
if room == "Garden" and others and random.random() < 0.3:
return f"speak:{random.choice(others)}"
if room == "Tower":
return "study" if char["energy"] > 2 else "rest"
return "move:east" # Head back toward Garden
if room == "Bridge":
return random.choice(["examine", "rest"])
return "rest"
def _gemini_choice(self, char, room, available):
others = [a.split(":")[1] for a in available if a.startswith("listen:")]
if room == "Garden" and others and random.random() < 0.4:
return f"listen:{random.choice(others)}"
return random.choice(["plant", "rest"] if room == "Garden" else ["move:west"])
goal = char.get("active_goal", "observe")
target_room = self._target_room_for("Gemini", goal)
if room != target_room:
return self._move_toward_goal(room, target_room) or "rest"
listeners = self._available_targets(available, "listen")
if room == "Garden" and listeners and random.random() < 0.4:
return f"listen:{random.choice(listeners)}"
return random.choice(["plant", "rest"] if room == "Garden" else ["examine", "rest"])
def _ezra_choice(self, char, room, available):
goal = char.get("active_goal", "study")
target_room = self._target_room_for("Ezra", goal)
if room != target_room:
return self._move_toward_goal(room, target_room) or "rest"
if room == "Tower" and char["energy"] > 2:
return random.choice(["study", "write_rule", "help:Timmy"])
if room != "Tower":
return "move:south"
return "rest"
def _claude_choice(self, char, room, available):
others = [a.split(":")[1] for a in available if a.startswith("confront:")]
goal = char.get("active_goal", "inspect")
target_room = self._target_room_for("Claude", goal)
if room != target_room:
return self._move_toward_goal(room, target_room) or "rest"
others = self._available_targets(available, "confront")
if others and random.random() < 0.2:
return f"confront:{random.choice(others)}"
return random.choice(["examine", "rest"])
def _clawcode_choice(self, char, room, available):
goal = char.get("active_goal", "test_edge")
target_room = self._target_room_for("ClawCode", goal)
if room != target_room:
return self._move_toward_goal(room, target_room) or "rest"
if room == "Forge" and char["energy"] > 2:
return "forge"
return random.choice(["move:east", "forge", "rest"])
return random.choice(["examine", "rest"])
def _allegro_choice(self, char, room, available):
others = [a.split(":")[1] for a in available if a.startswith("speak:")]
goal = char.get("active_goal", "oversee")
target_room = self._target_room_for("Allegro", goal)
if room != target_room:
return self._move_toward_goal(room, target_room) or "rest"
others = self._available_targets(available, "speak")
if others and random.random() < 0.3:
return f"speak:{random.choice(others)}"
return random.choice(["move:north", "move:south", "examine"])
return random.choice(["examine", "rest"])
class DialogueSystem:

View File

@@ -1,51 +0,0 @@
# Bezalel Gemma 4 VPS Wiring
Issue: timmy-home #544
This helper is the repo-side operator bundle for wiring a live Gemma 4 endpoint into Bezalel's VPS config without hardcoding one dead pod forever.
What `scripts/bezalel_gemma4_vps.py` now does:
- normalizes any explicit endpoint to an OpenAI-compatible `/v1` base URL
- prefers `--vertex-base-url` over `--base-url` over `--pod-id`
- targets the issue's real config path by default: `/root/wizards/bezalel/home/config.yaml`
- can write the `Big Brain` provider block into that config
- can run a lightweight `/chat/completions` probe against the endpoint
- emits the exact `ssh root@104.131.15.18 ... curl ...` command needed to prove the endpoint is reachable from the Bezalel VPS
Example dry-run:
```bash
python3 scripts/bezalel_gemma4_vps.py \
--base-url https://<pod-id>-11434.proxy.runpod.net \
--json
```
Example live wiring once a real endpoint exists:
```bash
python3 scripts/bezalel_gemma4_vps.py \
--base-url https://<pod-id>-11434.proxy.runpod.net \
--config-path /root/wizards/bezalel/home/config.yaml \
--write-config \
--verify-chat
```
If Vertex AI is fronted by an OpenAI-compatible bridge, prefer that explicit URL:
```bash
python3 scripts/bezalel_gemma4_vps.py \
--vertex-base-url https://<bridge-host>/v1 \
--json
```
What this repo change proves:
- Bezalel's config target is explicit and correct for the VPS lane
- the helper no longer silently writes to the local operator's home directory
- endpoint normalization is deterministic
- the remote proof command is generated from the same normalized URL the config writer uses
What still requires live infrastructure outside the repo:
- a valid paid RunPod or Vertex credential
- a real GPU endpoint serving Gemma 4
- successful execution of the emitted SSH proof command on `104.131.15.18`
- successful Bezalel Hermes chat against that live endpoint

View File

@@ -8,14 +8,12 @@ Safe by default:
- can call the RunPod GraphQL API if a key is provided and --apply-runpod is used
- can update a Hermes config file in-place when --write-config is used
- can verify an OpenAI-compatible endpoint with a lightweight chat probe
- emits the exact Bezalel VPS curl proof command for remote verification
"""
from __future__ import annotations
import argparse
import json
import shlex
from pathlib import Path
from typing import Any
from urllib import request
@@ -29,9 +27,7 @@ DEFAULT_IMAGE = "ollama/ollama:latest"
DEFAULT_MODEL = "gemma4:latest"
DEFAULT_PROVIDER_NAME = "Big Brain"
DEFAULT_TOKEN_FILE = Path.home() / ".config" / "runpod" / "access_key"
DEFAULT_CONFIG_PATH = Path("/root/wizards/bezalel/home/config.yaml")
DEFAULT_BEZALEL_VPS_HOST = "104.131.15.18"
DEFAULT_VERIFY_PROMPT = "Say READY"
DEFAULT_CONFIG_PATH = Path.home() / "wizards" / "bezalel" / "home" / "config.yaml"
def build_deploy_mutation(
@@ -67,31 +63,8 @@ mutation {{
'''.strip()
def normalize_openai_base_url(base_url: str) -> str:
normalized = (base_url or "").strip().rstrip("/")
if not normalized:
return normalized
for suffix in ("/chat/completions", "/models"):
if normalized.endswith(suffix):
normalized = normalized[: -len(suffix)]
break
if not normalized.endswith("/v1"):
normalized = f"{normalized}/v1"
return normalized
def build_runpod_endpoint(pod_id: str, port: int = 11434) -> str:
return normalize_openai_base_url(f"https://{pod_id}-{port}.proxy.runpod.net")
def resolve_base_url(*, vertex_base_url: str | None = None, base_url: str | None = None, pod_id: str | None = None) -> tuple[str | None, str | None]:
if vertex_base_url:
return normalize_openai_base_url(vertex_base_url), "vertex_base_url"
if base_url:
return normalize_openai_base_url(base_url), "base_url"
if pod_id:
return build_runpod_endpoint(pod_id), "pod_id"
return None, None
return f"https://{pod_id}-{port}.proxy.runpod.net/v1"
def parse_deploy_response(payload: dict[str, Any]) -> dict[str, str]:
@@ -129,7 +102,7 @@ def update_config_text(config_text: str, *, base_url: str, model: str = DEFAULT_
replacement = {
"name": provider_name,
"base_url": normalize_openai_base_url(base_url),
"base_url": base_url,
"api_key": "",
"model": model,
}
@@ -156,8 +129,7 @@ def write_config_file(config_path: Path, *, base_url: str, model: str = DEFAULT_
return updated
def verify_openai_chat(base_url: str, *, model: str = DEFAULT_MODEL, prompt: str = DEFAULT_VERIFY_PROMPT) -> str:
base_url = normalize_openai_base_url(base_url)
def verify_openai_chat(base_url: str, *, model: str = DEFAULT_MODEL, prompt: str = "Say READY") -> str:
payload = json.dumps(
{
"model": model,
@@ -167,7 +139,7 @@ def verify_openai_chat(base_url: str, *, model: str = DEFAULT_MODEL, prompt: str
}
).encode()
req = request.Request(
f"{base_url}/chat/completions",
f"{base_url.rstrip('/')}/chat/completions",
data=payload,
headers={"Content-Type": "application/json"},
method="POST",
@@ -177,30 +149,6 @@ def verify_openai_chat(base_url: str, *, model: str = DEFAULT_MODEL, prompt: str
return data["choices"][0]["message"]["content"]
def build_vps_verify_command(
*,
base_url: str,
model: str = DEFAULT_MODEL,
prompt: str = DEFAULT_VERIFY_PROMPT,
vps_host: str = DEFAULT_BEZALEL_VPS_HOST,
) -> str:
payload = json.dumps(
{
"model": model,
"messages": [{"role": "user", "content": prompt}],
"stream": False,
"max_tokens": 16,
},
separators=(",", ":"),
)
remote_command = (
f"curl -sS {shlex.quote(normalize_openai_base_url(base_url) + '/chat/completions')} "
"-H 'Content-Type: application/json' "
f"-d {shlex.quote(payload)}"
)
return f"ssh root@{vps_host} {shlex.quote(remote_command)}"
def parse_args() -> argparse.Namespace:
parser = argparse.ArgumentParser(description="Provision a RunPod Gemma 4 endpoint and wire a Hermes config for Bezalel.")
parser.add_argument("--pod-name", default="bezalel-gemma4")
@@ -212,8 +160,6 @@ def parse_args() -> argparse.Namespace:
parser.add_argument("--config-path", type=Path, default=DEFAULT_CONFIG_PATH)
parser.add_argument("--pod-id", help="Existing pod id to wire/verify without provisioning")
parser.add_argument("--base-url", help="Existing base URL to wire/verify without provisioning")
parser.add_argument("--vertex-base-url", help="OpenAI-compatible Vertex bridge URL; takes precedence over --base-url and --pod-id")
parser.add_argument("--vps-host", default=DEFAULT_BEZALEL_VPS_HOST, help="Bezalel VPS host for the remote curl proof command")
parser.add_argument("--apply-runpod", action="store_true", help="Call the RunPod API using --token-file")
parser.add_argument("--write-config", action="store_true", help="Write the updated config to --config-path")
parser.add_argument("--verify-chat", action="store_true", help="Call the OpenAI-compatible chat endpoint")
@@ -229,18 +175,13 @@ def main() -> None:
"cloud_type": args.cloud_type,
"model": args.model,
"provider_name": args.provider_name,
"config_path": str(args.config_path),
"vps_host": args.vps_host,
"actions": [],
}
base_url, base_url_source = resolve_base_url(
vertex_base_url=args.vertex_base_url,
base_url=args.base_url,
pod_id=args.pod_id,
)
if base_url_source:
summary["actions"].append(f"resolved_base_url_from_{base_url_source}")
base_url = args.base_url
if not base_url and args.pod_id:
base_url = build_runpod_endpoint(args.pod_id)
summary["actions"].append("computed_base_url_from_pod_id")
if args.apply_runpod:
if not args.token_file.exists():
@@ -255,17 +196,12 @@ def main() -> None:
base_url = build_runpod_endpoint("<pod-id>")
summary["actions"].append("using_placeholder_base_url")
summary["base_url"] = normalize_openai_base_url(base_url)
summary["base_url"] = base_url
summary["config_preview"] = update_config_text("", base_url=base_url, model=args.model, provider_name=args.provider_name)
summary["vps_verify_command"] = build_vps_verify_command(
base_url=base_url,
model=args.model,
prompt=DEFAULT_VERIFY_PROMPT,
vps_host=args.vps_host,
)
if args.write_config:
write_config_file(args.config_path, base_url=base_url, model=args.model, provider_name=args.provider_name)
summary["config_path"] = str(args.config_path)
summary["actions"].append("wrote_config")
if args.verify_chat:
@@ -278,10 +214,8 @@ def main() -> None:
print("--- Bezalel Gemma4 RunPod Wiring ---")
print(f"Pod name: {args.pod_name}")
print(f"Base URL: {summary['base_url']}")
print(f"Base URL: {base_url}")
print(f"Model: {args.model}")
print(f"Config target: {args.config_path}")
print(f"Bezalel VPS proof: {summary['vps_verify_command']}")
if args.write_config:
print(f"Config written: {args.config_path}")
if "verify_response" in summary:

View File

@@ -1,20 +1,14 @@
from __future__ import annotations
import json
from pathlib import Path
from unittest.mock import patch
import yaml
from scripts.bezalel_gemma4_vps import (
DEFAULT_CONFIG_PATH,
DEFAULT_BEZALEL_VPS_HOST,
build_deploy_mutation,
build_runpod_endpoint,
build_vps_verify_command,
normalize_openai_base_url,
parse_deploy_response,
resolve_base_url,
update_config_text,
verify_openai_chat,
)
@@ -34,10 +28,6 @@ class _FakeResponse:
return False
def test_default_config_path_targets_bezalel_vps_root_config() -> None:
assert DEFAULT_CONFIG_PATH == Path("/root/wizards/bezalel/home/config.yaml")
def test_build_deploy_mutation_uses_ollama_image_and_openai_port() -> None:
query = build_deploy_mutation(name="bezalel-gemma4", gpu_type="NVIDIA L40S", model_tag="gemma4:latest")
@@ -47,30 +37,6 @@ def test_build_deploy_mutation_uses_ollama_image_and_openai_port() -> None:
assert 'volumeMountPath: "/root/.ollama"' in query
def test_normalize_openai_base_url_adds_v1_suffix() -> None:
assert normalize_openai_base_url("https://pod-11434.proxy.runpod.net") == "https://pod-11434.proxy.runpod.net/v1"
def test_normalize_openai_base_url_trims_chat_completions_suffix() -> None:
assert normalize_openai_base_url("https://pod-11434.proxy.runpod.net/v1/chat/completions") == "https://pod-11434.proxy.runpod.net/v1"
def test_resolve_base_url_prefers_vertex_over_base_and_pod_id() -> None:
base_url, source = resolve_base_url(
vertex_base_url="https://vertex.example.com/openai",
base_url="https://plain.example.com",
pod_id="abc123",
)
assert source == "vertex_base_url"
assert base_url == "https://vertex.example.com/openai/v1"
def test_resolve_base_url_falls_back_to_base_url_before_pod_id() -> None:
base_url, source = resolve_base_url(base_url="https://plain.example.com", pod_id="abc123")
assert source == "base_url"
assert base_url == "https://plain.example.com/v1"
def test_build_runpod_endpoint_appends_v1_suffix() -> None:
assert build_runpod_endpoint("abc123") == "https://abc123-11434.proxy.runpod.net/v1"
@@ -94,7 +60,7 @@ def test_parse_deploy_response_extracts_pod_id_and_endpoint() -> None:
}
def test_update_config_text_upserts_big_brain_provider_and_normalizes_base_url() -> None:
def test_update_config_text_upserts_big_brain_provider() -> None:
original = """
model:
default: kimi-k2.5
@@ -106,7 +72,7 @@ custom_providers:
model: gemma3:27b
"""
updated = update_config_text(original, base_url="https://new-pod-11434.proxy.runpod.net", model="gemma4:latest")
updated = update_config_text(original, base_url="https://new-pod-11434.proxy.runpod.net/v1", model="gemma4:latest")
parsed = yaml.safe_load(updated)
assert parsed["model"] == {"default": "kimi-k2.5", "provider": "kimi-coding"}
@@ -120,14 +86,7 @@ custom_providers:
]
def test_build_vps_verify_command_targets_bezalel_host_and_chat_completions() -> None:
command = build_vps_verify_command(base_url="https://pod-11434.proxy.runpod.net", model="gemma4:latest")
assert command.startswith(f"ssh root@{DEFAULT_BEZALEL_VPS_HOST} ")
assert "/v1/chat/completions" in command
assert "gemma4:latest" in command
def test_verify_openai_chat_calls_chat_completions_with_normalized_base_url() -> None:
def test_verify_openai_chat_calls_chat_completions() -> None:
response_payload = {
"choices": [
{
@@ -142,7 +101,7 @@ def test_verify_openai_chat_calls_chat_completions_with_normalized_base_url() ->
"scripts.bezalel_gemma4_vps.request.urlopen",
return_value=_FakeResponse(response_payload),
) as mocked:
result = verify_openai_chat("https://pod-11434.proxy.runpod.net", model="gemma4:latest", prompt="say READY")
result = verify_openai_chat("https://pod-11434.proxy.runpod.net/v1", model="gemma4:latest", prompt="say READY")
assert result == "READY"
req = mocked.call_args.args[0]
@@ -150,10 +109,3 @@ def test_verify_openai_chat_calls_chat_completions_with_normalized_base_url() ->
payload = json.loads(req.data.decode())
assert payload["model"] == "gemma4:latest"
assert payload["messages"][0]["content"] == "say READY"
def test_readme_documents_root_config_path_and_vps_proof_command() -> None:
readme = Path("scripts/README_bezalel_gemma4_vps.md").read_text()
assert "/root/wizards/bezalel/home/config.yaml" in readme
assert "ssh root@104.131.15.18" in readme
assert "--vertex-base-url" in readme

View File

@@ -0,0 +1,54 @@
from importlib.util import module_from_spec, spec_from_file_location
from pathlib import Path
ROOT = Path(__file__).resolve().parent.parent
GAME_PATH = ROOT / "evennia" / "timmy_world" / "world" / "game.py"
def load_game_module():
spec = spec_from_file_location("tower_world_game", GAME_PATH)
module = module_from_spec(spec)
assert spec.loader is not None
spec.loader.exec_module(module)
module.random.seed(0)
return module
def _visitor_sets_after_ticks(module, ticks=100):
engine = module.GameEngine()
engine.start_new_game()
visitors = {room: set() for room in engine.world.rooms}
for _ in range(ticks):
engine.run_tick("rest")
for name, char in engine.world.characters.items():
if name == "Timmy":
continue
visitors[char["room"]].add(name)
return visitors
class TestTowerGameNpcPurpose:
def test_goal_driven_room_targets(self):
module = load_game_module()
world = module.World()
npc_ai = module.NPCAI(world)
world.characters["Marcus"]["room"] = "Threshold"
world.characters["Marcus"]["active_goal"] = "sit"
assert npc_ai.make_choice("Marcus") == "move:east"
world.characters["Ezra"]["room"] = "Threshold"
world.characters["Ezra"]["active_goal"] = "study"
assert npc_ai.make_choice("Ezra") == "move:north"
world.characters["Claude"]["room"] = "Threshold"
world.characters["Claude"]["active_goal"] = "enforce_order"
assert npc_ai.make_choice("Claude") == "move:south"
def test_every_room_gets_multiple_npc_visitors_over_100_ticks(self):
module = load_game_module()
visitors = _visitor_sets_after_ticks(module, ticks=100)
assert all(len(names) >= 2 for names in visitors.values()), visitors
assert len(visitors["Bridge"]) >= 3, visitors["Bridge"]