Spaces:

build-small-hackathon
/

world-simulator

Runtime error

App Files Files Community

DeltaZN commited on 18 days ago

Commit

7fee07b

1 Parent(s): 54db442

feat: disable model selector & autoplay tick by default

Browse files

Files changed (7) hide show

README.md +4 -0
dist/frontend/assets/{index-DxcXnaim.js → index-C5YBy651.js} +0 -0
dist/frontend/index.html +1 -1
frontend/src/App.tsx +14 -17
frontend/src/components/AgentPanel.tsx +2 -65
frontend/src/hooks/useWorldSimulation.ts +27 -1
src/world_simulator/simulation/connectors/openai_compatible.py +73 -22

README.md CHANGED Viewed

@@ -47,6 +47,10 @@ npm run dev                              # http://127.0.0.1:5173
 Controls: drag to orbit, scroll to zoom, `WASD`/arrows to pan.
 ## Hugging Face Space
 `app.py` wraps the same game runtime in `gradio.Server` and serves the built React/Three

 Controls: drag to orbit, scroll to zoom, `WASD`/arrows to pan.
+Autoplay is on by default: the manual tick controls are hidden and the world
+advances ticks automatically. Set `VITE_WORLD_SIMULATOR_AUTOPLAY=0` (build/dev
+env) to show the manual step / play-pause controls instead.
 ## Hugging Face Space
 `app.py` wraps the same game runtime in `gradio.Server` and serves the built React/Three

dist/frontend/assets/{index-DxcXnaim.js → index-C5YBy651.js} RENAMED Viewed

The diff for this file is too large to render. See raw diff

dist/frontend/index.html CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>World Simulator</title>
-    <script type="module" crossorigin src="/world/assets/index-DxcXnaim.js"></script>
     <link rel="stylesheet" crossorigin href="/world/assets/index-DPzWURD0.css">
   </head>
   <body>

     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>World Simulator</title>
+    <script type="module" crossorigin src="/world/assets/index-C5YBy651.js"></script>
     <link rel="stylesheet" crossorigin href="/world/assets/index-DPzWURD0.css">
   </head>
   <body>

frontend/src/App.tsx CHANGED Viewed

@@ -30,18 +30,20 @@ export function App() {
         entities={simulation.snapshot?.entities ?? []}
       />
-      <SimulationControls
-        hasSnapshot={simulation.snapshot !== null}
-        isAutoTicking={simulation.isAutoTicking}
-        isWaitingForTick={simulation.isWaitingForTick}
-        isWorldCommandPending={simulation.isWorldCommandPending}
-        onStep={() => {
-          void simulation.step();
-        }}
-        onToggleAutoTick={() => {
-          simulation.setIsAutoTicking(!simulation.isAutoTicking);
-        }}
-      />
       <AgentPanel
         entity={simulation.selectedEntity}
@@ -49,12 +51,7 @@ export function App() {
         resource={simulation.selectedResource}
         house={simulation.selectedHouse}
         entities={simulation.snapshot?.entities ?? []}
-        modelProfiles={simulation.modelProfiles}
-        isModelSwitchPending={simulation.isModelSwitchPending}
         onSelectEntity={simulation.setSelectedId}
-        onSetNpcModel={(npcId, profileId) => {
-          void simulation.setNpcModel(npcId, profileId);
-        }}
       />
       <StatusToasts

         entities={simulation.snapshot?.entities ?? []}
       />
+      {simulation.hideTickControls ? null : (
+        <SimulationControls
+          hasSnapshot={simulation.snapshot !== null}
+          isAutoTicking={simulation.isAutoTicking}
+          isWaitingForTick={simulation.isWaitingForTick}
+          isWorldCommandPending={simulation.isWorldCommandPending}
+          onStep={() => {
+            void simulation.step();
+          }}
+          onToggleAutoTick={() => {
+            simulation.setIsAutoTicking(!simulation.isAutoTicking);
+          }}
+        />
+      )}
       <AgentPanel
         entity={simulation.selectedEntity}
         resource={simulation.selectedResource}
         house={simulation.selectedHouse}
         entities={simulation.snapshot?.entities ?? []}
         onSelectEntity={simulation.setSelectedId}
       />
       <StatusToasts

frontend/src/components/AgentPanel.tsx CHANGED Viewed

@@ -2,7 +2,6 @@ import type {
   BeastSnapshot,
   EntitySnapshot,
   HouseSnapshot,
-  ModelProfileSnapshot,
   ResourceNodeSnapshot,
 } from "../types";
 import { TooltipLabel } from "./TooltipLabel";
@@ -13,10 +12,7 @@ type AgentPanelProps = {
   resource?: ResourceNodeSnapshot | null;
   house?: HouseSnapshot | null;
   entities?: EntitySnapshot[];
-  modelProfiles?: ModelProfileSnapshot[];
-  isModelSwitchPending?: boolean;
   onSelectEntity?: (id: string) => void;
-  onSetNpcModel?: (npcId: string, profileId: string) => void;
 };
 export function AgentPanel({
@@ -25,10 +21,7 @@ export function AgentPanel({
   resource = null,
   house = null,
   entities = [],
-  modelProfiles = [],
-  isModelSwitchPending = false,
   onSelectEntity,
-  onSetNpcModel,
 }: AgentPanelProps) {
   if (beast) {
     return <BeastPanel beast={beast} />;
@@ -51,16 +44,7 @@ export function AgentPanel({
         <TooltipLabel className="panelTitle" value={selectedName} />
         <TooltipLabel className="panelRole" value={selectedRole} />
       </div>
-      {entity ? (
-        <AgentDetails
-          entity={entity}
-          modelProfiles={modelProfiles}
-          isModelSwitchPending={isModelSwitchPending}
-          onSetNpcModel={onSetNpcModel}
-        />
-      ) : (
-        <EmptyAgentReadout />
-      )}
     </aside>
   );
 }
@@ -203,26 +187,12 @@ function HouseResidentList({ label, ids, emptyLabel, entities, onSelectEntity }:
 type AgentDetailsProps = {
   entity: EntitySnapshot;
-  modelProfiles: ModelProfileSnapshot[];
-  isModelSwitchPending: boolean;
-  onSetNpcModel?: (npcId: string, profileId: string) => void;
 };
-function AgentDetails({
-  entity,
-  modelProfiles,
-  isModelSwitchPending,
-  onSetNpcModel,
-}: AgentDetailsProps) {
   return (
     <>
       <AgentReadout entity={entity} />
-      <ModelSwitcher
-        entity={entity}
-        profiles={modelProfiles}
-        isPending={isModelSwitchPending}
-        onSetNpcModel={onSetNpcModel}
-      />
       <SurvivalReadout entity={entity} />
       <ThinkingBlock entity={entity} />
       <RelationshipList entity={entity} />
@@ -231,39 +201,6 @@ function AgentDetails({
   );
 }
-type ModelSwitcherProps = {
-  entity: EntitySnapshot;
-  profiles: ModelProfileSnapshot[];
-  isPending: boolean;
-  onSetNpcModel?: (npcId: string, profileId: string) => void;
-};
-function ModelSwitcher({ entity, profiles, isPending, onSetNpcModel }: ModelSwitcherProps) {
-  if (profiles.length === 0) {
-    return null;
-  }
-  const currentProfile = entity.model_profile_id ?? entity.connector_id ?? "default";
-  return (
-    <label className="modelControl">
-      <span>Model</span>
-      <select
-        value={currentProfile}
-        disabled={isPending || !onSetNpcModel}
-        onChange={(event) => onSetNpcModel?.(entity.id, event.currentTarget.value)}
-      >
-        {profiles.map((profile) => (
-          <option key={profile.id} value={profile.id}>
-            {profile.label || profile.id}
-            {profile.model ? ` - ${profile.model}` : ""}
-          </option>
-        ))}
-      </select>
-    </label>
-  );
-}
 function SurvivalReadout({ entity }: { entity: EntitySnapshot }) {
   const { hunger, fear, safety, age, max_age, importance, goal, inventory } = entity.state;
   if (

   BeastSnapshot,
   EntitySnapshot,
   HouseSnapshot,
   ResourceNodeSnapshot,
 } from "../types";
 import { TooltipLabel } from "./TooltipLabel";
   resource?: ResourceNodeSnapshot | null;
   house?: HouseSnapshot | null;
   entities?: EntitySnapshot[];
   onSelectEntity?: (id: string) => void;
 };
 export function AgentPanel({
   resource = null,
   house = null,
   entities = [],
   onSelectEntity,
 }: AgentPanelProps) {
   if (beast) {
     return <BeastPanel beast={beast} />;
         <TooltipLabel className="panelTitle" value={selectedName} />
         <TooltipLabel className="panelRole" value={selectedRole} />
       </div>
+      {entity ? <AgentDetails entity={entity} /> : <EmptyAgentReadout />}
     </aside>
   );
 }
 type AgentDetailsProps = {
   entity: EntitySnapshot;
 };
+function AgentDetails({ entity }: AgentDetailsProps) {
   return (
     <>
       <AgentReadout entity={entity} />
       <SurvivalReadout entity={entity} />
       <ThinkingBlock entity={entity} />
       <RelationshipList entity={entity} />
   );
 }
 function SurvivalReadout({ entity }: { entity: EntitySnapshot }) {
   const { hunger, fear, safety, age, max_age, importance, goal, inventory } = entity.state;
   if (

frontend/src/hooks/useWorldSimulation.ts CHANGED Viewed

@@ -9,10 +9,17 @@ import {
 } from "../api";
 import type { GameLogEventSnapshot, ModelProfileSnapshot, WorldSnapshot } from "../types";
 export function useWorldSimulation() {
   const [snapshot, setSnapshot] = useState<WorldSnapshot | null>(null);
   const [isTickPending, setIsTickPending] = useState(false);
-  const [isAutoTicking, setIsAutoTicking] = useState(false);
   const [isModelSwitchPending, setIsModelSwitchPending] = useState(false);
   const [modelProfiles, setModelProfiles] = useState<ModelProfileSnapshot[]>([]);
   const [error, setError] = useState<string | null>(null);
@@ -96,6 +103,7 @@ export function useWorldSimulation() {
     setIsAutoTicking,
   });
   useModelStatusPolling(snapshot, refresh, setError);
   const selectedEntity = useMemo(
     () => snapshot?.entities.find((entity) => entity.id === selectedId) ?? null,
@@ -120,6 +128,7 @@ export function useWorldSimulation() {
   return {
     error,
     eventHistory,
     isAutoTicking,
     isModelSwitchPending,
     isWaitingForTick,
@@ -308,6 +317,23 @@ function useAutoTicks(options: AutoTickOptions) {
   ]);
 }
 function useModelStatusPolling(
   snapshot: WorldSnapshot | null,
   refresh: () => Promise<void>,

 } from "../api";
 import type { GameLogEventSnapshot, ModelProfileSnapshot, WorldSnapshot } from "../types";
+// When enabled, the manual tick controls are hidden and the world advances on its
+// own. Defaults to on; set VITE_WORLD_SIMULATOR_AUTOPLAY=0/false/no to show the
+// manual controls instead.
+const AUTOPLAY = !["0", "false", "no"].includes(
+  String(import.meta.env.VITE_WORLD_SIMULATOR_AUTOPLAY ?? "").toLowerCase(),
+);
 export function useWorldSimulation() {
   const [snapshot, setSnapshot] = useState<WorldSnapshot | null>(null);
   const [isTickPending, setIsTickPending] = useState(false);
+  const [isAutoTicking, setIsAutoTicking] = useState(AUTOPLAY);
   const [isModelSwitchPending, setIsModelSwitchPending] = useState(false);
   const [modelProfiles, setModelProfiles] = useState<ModelProfileSnapshot[]>([]);
   const [error, setError] = useState<string | null>(null);
     setIsAutoTicking,
   });
   useModelStatusPolling(snapshot, refresh, setError);
+  useAutoplayRearm(isAutoTicking, snapshot !== null, setIsAutoTicking);
   const selectedEntity = useMemo(
     () => snapshot?.entities.find((entity) => entity.id === selectedId) ?? null,
   return {
     error,
     eventHistory,
+    hideTickControls: AUTOPLAY,
     isAutoTicking,
     isModelSwitchPending,
     isWaitingForTick,
   ]);
 }
+// In autoplay mode the manual controls are hidden, so a transient error that
+// pauses auto-ticking must be recovered automatically; otherwise the world would
+// halt with no way to restart it.
+function useAutoplayRearm(
+  isAutoTicking: boolean,
+  hasSnapshot: boolean,
+  setIsAutoTicking: (value: boolean) => void,
+) {
+  useEffect(() => {
+    if (!AUTOPLAY || isAutoTicking || !hasSnapshot) {
+      return undefined;
+    }
+    const timeoutId = window.setTimeout(() => setIsAutoTicking(true), 2000);
+    return () => window.clearTimeout(timeoutId);
+  }, [isAutoTicking, hasSnapshot, setIsAutoTicking]);
+}
 function useModelStatusPolling(
   snapshot: WorldSnapshot | null,
   refresh: () => Promise<void>,

src/world_simulator/simulation/connectors/openai_compatible.py CHANGED Viewed

@@ -1156,11 +1156,15 @@ def _survival_briefing_lines(
     else:
         lines.append("THREATS NEAR YOU: none.")
-    # --- allies ------------------------------------------------------------ #
     allies = _survival_nearby_allies(world, npc)
     lines.append("")
     if allies:
-        lines.append("ALLIES NEAR YOU (talk to coordinate; <=12 units to speak):")
         for a in allies:
             ap = _npc_position(world, a["id"])
             where = (
@@ -1173,7 +1177,31 @@ def _survival_briefing_lines(
                 f"HP {a['hp']}, hunger {a['hunger']}."
             )
     else:
-        lines.append("ALLIES NEAR YOU: none in sight.")
     # --- resources --------------------------------------------------------- #
     resources = _survival_reachable_resources(world, npc)
@@ -1468,36 +1496,59 @@ def _survival_nearby_threats(world: WorldState, npc: Npc) -> list[dict[str, Any]
     return sorted(threats, key=lambda item: (item["distance"], item["id"]))[:5]
 def _survival_nearby_allies(world: WorldState, npc: Npc) -> list[dict[str, Any]]:
     allies: list[dict[str, Any]] = []
     for other in world.living_npcs():
         if other.id == npc.id or has_hostile_intent(other):
             continue
         distance = vec_distance(npc.position, other.position)
         if distance > VISIBLE_RADIUS:
             continue
-        allies.append(
-            {
-                "id": other.id,
-                "name": other.name,
-                "role": other.role,
-                "country_id": other.country_id,
-                "distance": round(distance, 2),
-                "trust": round(npc.relationships.get(other.id, 0.0), 2),
-                "hp": round(other.health),
-                "hunger": round(other.hunger),
-                "inventory": {
-                    "food": other.inventory_food,
-                    "herbs": other.inventory_herbs,
-                    "wood": other.inventory_wood,
-                    "weapon": other.inventory_weapon,
-                    "coins": other.inventory_coins,
-                },
-            }
-        )
     return sorted(allies, key=lambda item: (item["distance"], item["id"]))[:5]
 def _survival_reachable_resources(world: WorldState, npc: Npc) -> list[dict[str, Any]]:
     resources: list[dict[str, Any]] = []
     for node in world.resource_nodes:

     else:
         lines.append("THREATS NEAR YOU: none.")
+    # --- allies (your own nation) ------------------------------------------ #
+    own_nation = country.name if country else "your nation"
     allies = _survival_nearby_allies(world, npc)
     lines.append("")
     if allies:
+        lines.append(
+            f"ALLIES NEAR YOU - your own nation {own_nation} (talk to coordinate; "
+            "<=12 units to speak; do NOT attack them):"
+        )
         for a in allies:
             ap = _npc_position(world, a["id"])
             where = (
                 f"HP {a['hp']}, hunger {a['hunger']}."
             )
     else:
+        lines.append(f"ALLIES NEAR YOU (your nation {own_nation}): none in sight.")
+    # --- enemy citizens (the rival nation) --------------------------------- #
+    rival_name = rival.name if rival is not None else "the enemy nation"
+    enemies = _survival_nearby_enemies(world, npc)
+    lines.append("")
+    if enemies:
+        lines.append(
+            f"ENEMY CITIZENS NEAR YOU - the rival nation {rival_name} (NOT your "
+            "people; you may rob, raid, or parley with them):"
+        )
+        for e in enemies:
+            ep = _npc_position(world, e["id"])
+            where = (
+                f"{_bearing_to(pos, ep.x, ep.z)} ({_loc(ep.x, ep.z)})"
+                if ep is not None
+                else f"{e['distance']:.0f} units away"
+            )
+            carrying = e["inventory"].get("coins", 0)
+            lines.append(
+                f"  - {e['name']} \"{e['id']}\" {where}. HP {e['hp']}, "
+                f"carries {carrying} coins."
+            )
+    else:
+        lines.append(f"ENEMY CITIZENS NEAR YOU (rival nation {rival_name}): none in sight.")
     # --- resources --------------------------------------------------------- #
     resources = _survival_reachable_resources(world, npc)
     return sorted(threats, key=lambda item: (item["distance"], item["id"]))[:5]
+def _survival_nearby_npc_entry(npc: Npc, other: Npc, distance: float) -> dict[str, Any]:
+    return {
+        "id": other.id,
+        "name": other.name,
+        "role": other.role,
+        "country_id": other.country_id,
+        "distance": round(distance, 2),
+        "trust": round(npc.relationships.get(other.id, 0.0), 2),
+        "hp": round(other.health),
+        "hunger": round(other.hunger),
+        "inventory": {
+            "food": other.inventory_food,
+            "herbs": other.inventory_herbs,
+            "wood": other.inventory_wood,
+            "weapon": other.inventory_weapon,
+            "coins": other.inventory_coins,
+        },
+    }
 def _survival_nearby_allies(world: WorldState, npc: Npc) -> list[dict[str, Any]]:
+    """Nearby NPCs of the SAME nation (true allies). Enemy-nation NPCs are listed
+    separately by _survival_nearby_enemies so the two are never confused."""
     allies: list[dict[str, Any]] = []
     for other in world.living_npcs():
         if other.id == npc.id or has_hostile_intent(other):
             continue
+        if other.country_id != npc.country_id:
+            continue
         distance = vec_distance(npc.position, other.position)
         if distance > VISIBLE_RADIUS:
             continue
+        allies.append(_survival_nearby_npc_entry(npc, other, distance))
     return sorted(allies, key=lambda item: (item["distance"], item["id"]))[:5]
+def _survival_nearby_enemies(world: WorldState, npc: Npc) -> list[dict[str, Any]]:
+    """Nearby NPCs of the RIVAL nation - people you may rob, raid, or parley with.
+    Listed whether or not they are currently hostile, so the NPC always knows who
+    around it belongs to the enemy."""
+    enemies: list[dict[str, Any]] = []
+    for other in world.living_npcs():
+        if other.id == npc.id or not npc.country_id or not other.country_id:
+            continue
+        if other.country_id == npc.country_id:
+            continue
+        distance = vec_distance(npc.position, other.position)
+        if distance > VISIBLE_RADIUS:
+            continue
+        enemies.append(_survival_nearby_npc_entry(npc, other, distance))
+    return sorted(enemies, key=lambda item: (item["distance"], item["id"]))[:5]
 def _survival_reachable_resources(world: WorldState, npc: Npc) -> list[dict[str, Any]]:
     resources: list[dict[str, Any]] = []
     for node in world.resource_nodes: