Update app.py

app.py

@@ -91,7 +91,7 @@ def get_current_time_str(tz='UTC'):
         now_aware = datetime.now(pytz.utc)
     return now_aware.strftime('%Y%m%d_%H%M%S')
 
-def clean_filename_part(text, max_len=30):
+def cleanROS: clean_filename_part(text, max_len=30):
     if not isinstance(text, str):
         text = "invalid_name"
     text = re.sub(r'\s+', '_', text)
@@ -755,6 +755,9 @@ async def websocket_handler(websocket, path):
                     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}")
+                        # Broadcast tool selection to update other clients
+                        broadcast_payload = json.dumps({"type": "tool_selected", "payload": {"tool_type": tool_type, "username": sender_username}})
+                        await broadcast_message(broadcast_payload, exclude_id=client_id)
 
             except json.JSONDecodeError:
                 print(f"WS Invalid JSON from {client_id}: {message[:100]}...")
@@ -915,8 +918,8 @@ def render_sidebar():
         st.header("🏗️ Build Tools")
         st.caption("Select an object to place.")
         
-        # Inject JavaScript buttons for tools
-        tool_buttons_html = """
+        # CSS for tool buttons
+        st.markdown("""
         <style>
             .tool-button {
                 width: 40px;
@@ -927,6 +930,9 @@ def render_sidebar():
                 border: 2px solid #ccc;
                 background-color: #f9f9f9;
             }
+            .tool-button:hover {
+                background-color: #e0e0e0;
+            }
             .tool-button.selected {
                 border-color: #007bff;
                 background-color: #e7f3ff;
@@ -937,32 +943,43 @@ def render_sidebar():
                 gap: 2px;
             }
         </style>
-        <div class="tool-grid">
-        """
+        """, unsafe_allow_html=True)
+
+        # Tool buttons
+        current_tool = st.session_state.get('selected_object', 'None')
+        cols = st.columns(5)
+        col_idx = 0
         for emoji, name in PRIMITIVE_MAP.items():
-            tool_buttons_html += f"""
-            <button class="tool-button" id="tool_{name}" onclick="
-                document.querySelectorAll('.tool-button').forEach(btn => btn.classList.remove('selected'));
-                this.classList.add('selected');
-                updateSelectedObjectType('{name}');
-                websocket.send(JSON.stringify({{
-                    type: 'tool_selected',
-                    payload: {{ tool_type: '{name}', username: window.USERNAME }}
-                }}));
-            " title="{name}">{emoji}</button>
-            """
-        tool_buttons_html += """
-        </div>
-        <button style="width: 100%; margin-top: 10px; padding: 5px;" onclick="
-            document.querySelectorAll('.tool-button').forEach(btn => btn.classList.remove('selected'));
-            updateSelectedObjectType('None');
-            websocket.send(JSON.stringify({
-                type: 'tool_selected',
-                payload: { tool_type: 'None', username: window.USERNAME }
-            }));
-        ">🚫 Clear Tool</button>
-        """
-        st.markdown(tool_buttons_html, unsafe_allow_html=True)
+            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.selected_object != name:
+                    st.session_state.selected_object = name
+                    # Send WebSocket message to update tool selection
+                    ws_message = json.dumps({
+                        "type": "tool_selected",
+                        "payload": {"tool_type": name, "username": st.session_state.username}
+                    })
+                    run_async(broadcast_message, ws_message)
+                    # Update JavaScript tool state
+                    run_async(lambda: streamlit_js_eval(
+                        f"updateSelectedObjectType('{name}');",
+                        key=f"update_tool_js_{name}"
+                    ))
+            col_idx += 1
+        st.markdown("---")
+        if st.button("🚫 Clear Tool", key="clear_tool", use_container_width=True):
+            if st.session_state.selected_object != 'None':
+                st.session_state.selected_object = 'None'
+                ws_message = json.dumps({
+                    "type": "tool_selected",
+                    "payload": {"tool_type": "None", "username": st.session_state.username}
+                })
+                run_async(broadcast_message, ws_message)
+                run_async(lambda: streamlit_js_eval(
+                    "updateSelectedObjectType('None');",
+                    key="update_tool_js_none"
+                ))
 
         st.markdown("---")
         st.header("🗣️ Voice & User")