Update app.py

app.py

@@ -31,10 +31,8 @@ from PIL import Image
 # Configuration & Constants
 # ==============================================================================
 
-# Patch asyncio for nesting
 nest_asyncio.apply()
 
-# Page Config
 st.set_page_config(
     page_title="🤖🏗️ Shared World Builder 🏆",
     page_icon="🏗️",
@@ -42,14 +40,12 @@ st.set_page_config(
     initial_sidebar_state="expanded"
 )
 
-# General Constants
 icons = '🤖🏗️🗣️💾'
 Site_Name = '🤖🏗️ Shared World Builder 🗣️'
 START_ROOM = "World Lobby 🌍"
 MEDIA_DIR = "."
 STATE_FILE = "user_state.txt"
 
-# User/Chat Constants
 FUN_USERNAMES = {
     "BuilderBot 🤖": "en-US-AriaNeural", "WorldWeaver 🕸️": "en-US-JennyNeural",
     "Terraformer 🌱": "en-GB-SoniaNeural", "SkyArchitect ☁️": "en-AU-NatashaNeural",
@@ -59,22 +55,16 @@ FUN_USERNAMES = {
 }
 EDGE_TTS_VOICES = list(set(FUN_USERNAMES.values()))
 CHAT_DIR = "chat_logs"
-
-# Audio Constants
 AUDIO_CACHE_DIR = "audio_cache"
 AUDIO_DIR = "audio_logs"
-
-# World Builder Constants
-SAVED_WORLDS_DIR = "saved_worlds"  # Corrected from SAVED_WORLDS0
+SAVED_WORLDS_DIR = "saved_worlds"
 HISTORY_LOG_DIR = "history_logs"
 PLOT_WIDTH = 50.0
 PLOT_DEPTH = 50.0
 WORLD_STATE_FILE_MD_PREFIX = "🌍_"
 
-# File Emojis
 FILE_EMOJIS = {"md": "📝", "mp3": "🎵", "png": "🖼️", "mp4": "🎥", "zip": "📦", "json": "📄"}
 
-# Mapping Emojis to Primitive Types
 PRIMITIVE_MAP = {
     "🌳": "Tree", "🗿": "Rock", "🏛️": "Simple House", "🌲": "Pine Tree", "🧱": "Brick Wall",
     "🔵": "Sphere", "📦": "Cube", "🧴": "Cylinder", "🍦": "Cone", "🍩": "Torus",
@@ -82,11 +72,9 @@ PRIMITIVE_MAP = {
     "🗼": "Tower", "🚧": "Barrier", "⛲": "Fountain", "🏮": "Lantern", "🪧": "Sign Post"
 }
 
-# Directories
 for d in [CHAT_DIR, AUDIO_DIR, AUDIO_CACHE_DIR, SAVED_WORLDS_DIR, HISTORY_LOG_DIR]:
     os.makedirs(d, exist_ok=True)
 
-# Global State & Locks
 world_objects_lock = threading.Lock()
 world_objects = defaultdict(dict)
 connected_clients = set()
@@ -769,6 +757,12 @@ async def websocket_handler(websocket, path):
                         broadcast_payload = json.dumps({"type": "player_moved", "payload": {"username": sender_username, "id": client_id, "position": pos_data, "rotation": rot_data}})
                         await broadcast_message(broadcast_payload, exclude_id=client_id)
 
+                elif msg_type == "tool_selected":
+                    tool_type = payload.get("tool_type")
+                    if tool_type in PRIMITIVE_MAP.values() or tool_type == "None":
+                        st.session_state.selected_object = tool_type
+                        print(f"Tool updated to {tool_type} for {sender_username}")
+
             except json.JSONDecodeError:
                 print(f"WS Invalid JSON from {client_id}: {message[:100]}...")
             except Exception as e:
@@ -927,6 +921,16 @@ def render_sidebar():
         st.markdown("---")
         st.header("🏗️ Build Tools")
         st.caption("Select an object to place.")
+        # Hidden selectbox to sync tool state
+        tool_options = ['None'] + list(PRIMITIVE_MAP.values())
+        selected_tool = st.selectbox("Selected Tool", options=tool_options, index=tool_options.index(st.session_state.get('selected_object', 'None')), key="tool_select", label_visibility="collapsed")
+        if selected_tool != st.session_state.selected_object:
+            st.session_state.selected_object = selected_tool
+            run_async(lambda: streamlit_js_eval(
+                f"updateSelectedObjectType({json.dumps(selected_tool)});",
+                key=f"update_tool_js_{selected_tool}"
+            ))
+
         cols = st.columns(5)
         col_idx = 0
         current_tool = st.session_state.get('selected_object', 'None')
@@ -934,25 +938,30 @@ def render_sidebar():
             button_key = f"primitive_{name}"
             button_type = "primary" if current_tool == name else "secondary"
             if cols[col_idx % 5].button(emoji, key=button_key, help=name, type=button_type, use_container_width=True):
-                if st.session_state.get('selected_object', 'None') != name:
-                    st.session_state.selected_object = name
-                    run_async(lambda name_arg=name: streamlit_js_eval(
-                        f"updateSelectedObjectType({json.dumps(name_arg)});",
-                        key=f"update_tool_js_{name_arg}"
-                    ))
-                    run_async(broadcast_world_update)
-                    st.rerun()
+                # Update tool via JavaScript without rerun
+                run_async(lambda name_arg=name: streamlit_js_eval(
+                    f"""
+                    updateSelectedObjectType('{name_arg}');
+                    websocket.send(JSON.stringify({{
+                        type: 'tool_selected',
+                        payload: {{ tool_type: '{name_arg}', username: window.USERNAME }}
+                    }}));
+                    """,
+                    key=f"update_tool_js_{name_arg}"
+                ))
             col_idx += 1
         st.markdown("---")
         if st.button("🚫 Clear Tool", key="clear_tool", use_container_width=True):
-            if st.session_state.get('selected_object', 'None') != 'None':
-                st.session_state.selected_object = 'None'
-                run_async(lambda: streamlit_js_eval(
-                    "updateSelectedObjectType('None');",
-                    key="update_tool_js_none"
-                ))
-                run_async(broadcast_world_update)
-                st.rerun()
+            run_async(lambda: streamlit_js_eval(
+                """
+                updateSelectedObjectType('None');
+                websocket.send(JSON.stringify({
+                    type: 'tool_selected',
+                    payload: { tool_type: 'None', username: window.USERNAME }
+                }));
+                """,
+                key="update_tool_js_none"
+            ))
 
         st.markdown("---")
         st.header("🗣️ Voice & User")