fixed a problem with Stella's environment

Signed-off-by: Deborah Dahl <dahl@conversational-technologies.com>

Author: dadahl

assistantClient/assistantClient.py

@@ -318,7 +318,7 @@ def send_broadcast_to_agents(payload_obj, urls_to_send, status_callback=None, ui
     return all_responses
 
 
-def process_agent_responses(root, all_responses, floor_manager, update_conversation_history_callback, invited_agents=None, update_agent_textboxes_callback=None, extract_url_callback=None, manifest_cache=None, show_incoming_events: bool = False, directed_addressee=None, display_name_resolver=None):
+def process_agent_responses(root, all_responses, floor_manager, update_conversation_history_callback, invited_agents=None, update_agent_textboxes_callback=None, extract_url_callback=None, manifest_cache=None, show_incoming_events: bool = False, directed_addressee=None, display_name_resolver=None, sync_conversant_callback=None):
     """Phase 2: Process all responses and update conversation history.
     
     Args:
@@ -360,6 +360,17 @@ def _url_from_speaker_uri(speaker_uri):
                             normalized = _normalize_agent_id(key)
                             if normalized:
                                 manifest_cache[normalized] = assistantConversationalName
+
+                    canonical_speaker_uri = manifest_speaker_uri or assistant_uri
+                    if sync_conversant_callback is not None:
+                        try:
+                            sync_conversant_callback(
+                                agent_url=manifest_service_url or target_url,
+                                speaker_uri=canonical_speaker_uri,
+                                conversational_name=assistantConversationalName,
+                            )
+                        except Exception:
+                            pass
 
                     # Update agent info with conversational name
                     if invited_agents is not None and extract_url_callback is not None:
@@ -376,14 +387,14 @@ def _url_from_speaker_uri(speaker_uri):
                                 break
 
                     # Add agent to floor manager if active
-                    if floor_manager is not None and assistant_uri:
+                    if floor_manager is not None and canonical_speaker_uri:
                         try:
                             floor_manager.add_conversant(
-                                speaker_uri=assistant_uri,
+                                speaker_uri=canonical_speaker_uri,
                                 service_url=manifest_service_url,
                                 conversational_name=assistantConversationalName
                             )
-                            print(f"Added {assistantConversationalName or assistant_uri} to floor manager")
+                            print(f"Added {assistantConversationalName or canonical_speaker_uri} to floor manager")
                         except Exception as e:
                             print(f"Failed to add agent to floor manager: {e}")
                 else:
@@ -399,6 +410,15 @@ def _url_from_speaker_uri(speaker_uri):
                 # Extract speaker info for conversation history
                 speaker_uri = dialog_event.get("speakerUri", "Unknown")
                 print(f"[DEBUG] Processing utterance - speakerUri from dialogEvent: {speaker_uri}")
+
+                if sync_conversant_callback is not None:
+                    try:
+                        sync_conversant_callback(
+                            agent_url=target_url,
+                            speaker_uri=speaker_uri if speaker_uri != "Unknown" else None,
+                        )
+                    except Exception:
+                        pass
 
                 # Get the conversational name for the actual speaker (from speakerUri in dialogEvent)
                 speaker_conversational_name = None
@@ -484,7 +504,7 @@ def _url_from_speaker_uri(speaker_uri):
             )
 
 
-def forward_responses_to_agents(all_responses, urls_to_send, global_conversation, update_conversation_history_callback, status_callback=None, ui_pump_callback=None, directed_addressee=None, display_name_resolver=None):
+def forward_responses_to_agents(all_responses, urls_to_send, global_conversation, update_conversation_history_callback, status_callback=None, ui_pump_callback=None, directed_addressee=None, display_name_resolver=None, build_conversation_callback=None):
     """Phase 3: Forward all responses to all other agents (after processing all initial responses).
     
     Args:
@@ -502,7 +522,28 @@ def _url_from_speaker_uri(speaker_uri):
             return speaker_uri
         return None
 
+    def _current_conversation_state():
+        if build_conversation_callback is not None:
+            try:
+                return build_conversation_callback()
+            except Exception:
+                pass
+        return global_conversation
+
+    def _serialize_conversants(conversation_obj):
+        return [
+            {
+                "identification": {
+                    "speakerUri": c.identification.speakerUri,
+                    "serviceUrl": c.identification.serviceUrl,
+                    "conversationalName": c.identification.conversationalName
+                }
+            }
+            for c in getattr(conversation_obj, "conversants", []) or []
+        ]
+
     for target_url, response_data, original_sender, incoming_events in all_responses:
+        current_conversation = _current_conversation_state()
         print(f"\n=== FORWARDING CHECK ===")
         print(f"incoming_events count: {len(incoming_events)}")
         print(f"urls_to_send: {urls_to_send}")
@@ -533,17 +574,8 @@ def _url_from_speaker_uri(speaker_uri):
                 forward_payload = {
                     "openFloor": {
                         "conversation": {
-                            "id": global_conversation.id,
-                            "conversants": [
-                                {
-                                    "identification": {
-                                        "speakerUri": c.identification.speakerUri,
-                                        "serviceUrl": c.identification.serviceUrl,
-                                        "conversationalName": c.identification.conversationalName
-                                    }
-                                }
-                                for c in global_conversation.conversants
-                            ]
+                            "id": current_conversation.id,
+                            "conversants": _serialize_conversants(current_conversation)
                         },
                         "sender": original_sender,  # Preserve original sender, not client
                         "events": broadcast_events  # Forward events as broadcasts
@@ -559,7 +591,7 @@ def _url_from_speaker_uri(speaker_uri):
                             except Exception:
                                 pass
                         print(f"\n=== FORWARDING TO {other_agent_url} ===")
-                        print(f"Conversation ID: {global_conversation.id}")
+                        print(f"Conversation ID: {current_conversation.id}")
                         print(f"Number of broadcast events: {len(broadcast_events)}")
                         print(f"Broadcast events: {json.dumps(broadcast_events, indent=2)}")
                         forward_response = _post_with_optional_ui_pump(
@@ -610,15 +642,15 @@ def _url_from_speaker_uri(speaker_uri):
                                         # Find speaker name by matching serviceUrl
                                         speaker_name = None
                                         speaker_service_url = _url_from_speaker_uri(speaker_uri)
-                                        for c in global_conversation.conversants:
+                                        for c in getattr(current_conversation, "conversants", []) or []:
                                             if c.identification.speakerUri == speaker_uri:
                                                 speaker_name = c.identification.conversationalName
                                                 speaker_service_url = c.identification.serviceUrl or speaker_service_url
                                                 break
 
                                         # If not found by speakerUri, try by serviceUrl
                                         if not speaker_name:
-                                            for c in global_conversation.conversants:
+                                            for c in getattr(current_conversation, "conversants", []) or []:
                                                 if c.identification.serviceUrl == other_agent_url:
                                                     speaker_name = c.identification.conversationalName
                                                     speaker_service_url = c.identification.serviceUrl or speaker_service_url
@@ -673,20 +705,12 @@ def _url_from_speaker_uri(speaker_uri):
                                         response_broadcast_events.append(evt_copy)
 
                                     # Create payload for recursive forwarding
+                                    recursive_conversation = _current_conversation_state()
                                     recursive_payload = {
                                         "openFloor": {
                                             "conversation": {
-                                                "id": global_conversation.id,
-                                                "conversants": [
-                                                    {
-                                                        "identification": {
-                                                            "speakerUri": c.identification.speakerUri,
-                                                            "serviceUrl": c.identification.serviceUrl,
-                                                            "conversationalName": c.identification.conversationalName
-                                                        }
-                                                    }
-                                                    for c in global_conversation.conversants
-                                                ]
+                                                "id": recursive_conversation.id,
+                                                "conversants": _serialize_conversants(recursive_conversation)
                                             },
                                             "sender": responding_agent_sender,
                                             "events": response_broadcast_events

assistantClient/event_handlers.py

@@ -308,6 +308,24 @@ def create_ui_elements(root, known_agents):
     # Conversation history
     CTkLabel(content_frame, text="Conversation History:", font=HEADING_FONT).pack(pady=(5, 0))
     widgets['conversation_text'] = CTkTextbox(content_frame, wrap='word', height=294)
+
+    def _scroll_conversation_with_wheel(event):
+        # Keep scrolling available even when the textbox is disabled/read-only.
+        delta = getattr(event, "delta", 0)
+        if delta:
+            widgets['conversation_text'].yview_scroll(int(-delta / 120), "units")
+            return "break"
+        if getattr(event, "num", None) == 4:
+            widgets['conversation_text'].yview_scroll(-1, "units")
+            return "break"
+        if getattr(event, "num", None) == 5:
+            widgets['conversation_text'].yview_scroll(1, "units")
+            return "break"
+        return None
+
+    widgets['conversation_text'].bind("<MouseWheel>", _scroll_conversation_with_wheel)
+    widgets['conversation_text'].bind("<Button-4>", _scroll_conversation_with_wheel)
+    widgets['conversation_text'].bind("<Button-5>", _scroll_conversation_with_wheel)
     widgets['conversation_text'].configure(state='disabled')
     widgets['conversation_text'].pack(pady=5, padx=20, fill="both")
 

assistantClient/ui_components.py

@@ -6,7 +6,8 @@
       "serviceUrl": "http://localhost:8083",
       "organization": "OpenVoiceNetwork",
       "role": "assistant",
-      "synopsis": "A financial agent that provides real-time stock data powered by Finnhub"
+      "synopsis": "A financial agent that provides real-time stock data powered by Finnhub",
+      "openFloorRoles": ["information"]
     },
     "capabilities": {
       "keyphrases": [

financial/agent_config.json

@@ -116,7 +116,7 @@ async def handler(websocket):
                 finn_data = query_finnhub(intent, stock, time_text=time_text)
                 response = {"intent": intent, "stock": stock, "data": finn_data}
             else:
-                response = {"error": "Could not parse intent or stock"}
+                response = {"error": "Could not parse both intent and stock"}
 
         except Exception as exc:
             logger.exception("Error handling MCP websocket message")

financial/mcp_server.py

@@ -24,6 +24,7 @@
 import json
 import logging
 import os
+import re
 from typing import Any, Callable, Dict, List
 
 # Import OpenFloor components
@@ -228,8 +229,40 @@ def _is_only_agent_on_floor(self, in_envelope: Envelope) -> bool:
         if not isinstance(conversants, list):
             conversants = []
 
-        # Floor-awareness is based on incoming conversant count.
-        return len(conversants) <= 1
+        # Be conservative: missing/empty conversants means floor composition is unknown.
+        if not conversants:
+            return False
+
+        self_speaker_normalized = self._normalize_endpoint_id(self._manifest.identification.speakerUri)
+        self_service_normalized = self._normalize_endpoint_id(self._manifest.identification.serviceUrl)
+        known_conversant_ids = []
+
+        for conversant in conversants:
+            identification = getattr(conversant, "identification", None)
+            if identification is None and isinstance(conversant, dict):
+                identification = conversant.get("identification", {})
+
+            if isinstance(identification, dict):
+                speaker_uri = identification.get("speakerUri")
+                service_url = identification.get("serviceUrl")
+            else:
+                speaker_uri = getattr(identification, "speakerUri", None)
+                service_url = getattr(identification, "serviceUrl", None)
+
+            normalized_speaker = self._normalize_endpoint_id(speaker_uri)
+            normalized_service = self._normalize_endpoint_id(service_url)
+            if normalized_speaker:
+                known_conversant_ids.append(normalized_speaker)
+            if normalized_service:
+                known_conversant_ids.append(normalized_service)
+
+        if not known_conversant_ids:
+            return False
+
+        unique_ids = set(known_conversant_ids)
+        self_ids = {value for value in (self_speaker_normalized, self_service_normalized) if value}
+
+        return len(unique_ids) == 1 and bool(self_ids & unique_ids)
 
     def _is_directly_addressed(self, event: UtteranceEvent, user_text: str) -> bool:
         to_value = getattr(event, "to", None)
@@ -295,26 +328,17 @@ def _handle_utterance(self, event: UtteranceEvent, in_envelope: Envelope, out_en
                 logger.debug("[UTTERANCE] No text found in utterance event")
                 return
 
-            parsed = utterance_handler.parse_query(user_text)
-            has_stock = bool(parsed.get("stock"))
-            has_intent = bool(parsed.get("intent"))
+            is_directly_addressed = self._is_directly_addressed(event, user_text)
 
-            if not has_stock and not has_intent:
-                if is_only_agent:
-                    dialog = DialogEvent(
-                        speakerUri=self._manifest.identification.speakerUri,
-                        features={"text": TextFeature(values=["that's outside of my expertise"])},
-                    )
-                    out_envelope.events.append(UtteranceEvent(dialogEvent=dialog))
-                else:
-                    logger.debug("[UTTERANCE] Ignoring non-financial utterance while multiple agents are on the floor")
-                return
-
-            if not (is_only_agent or self._is_directly_addressed(event, user_text)):
+            if not (is_only_agent or is_directly_addressed):
                 logger.debug("[UTTERANCE] Ignoring utterance; Finn is neither directly addressed nor the only agent on the floor")
                 return
 
             logger.debug("[UTTERANCE] Received: %s", user_text)
+
+            parsed = utterance_handler.parse_query(user_text)
+            parsed_stock = parsed.get("stock")
+            parsed_intent = parsed.get("intent")
 
             # Call utterance handler with just text + plain context - returns text response
             response_text = utterance_handler.process_utterance(
@@ -323,12 +347,27 @@ def _handle_utterance(self, event: UtteranceEvent, in_envelope: Envelope, out_en
             )
 
             if not response_text:
+                if parsed_stock and not parsed_intent:
+                    stock_name = utterance_handler.get_stock_display_name(parsed_stock)
+                    dialog = DialogEvent(
+                        speakerUri=self._manifest.identification.speakerUri,
+                        features={"text": TextFeature(values=[f"what information would you like about {stock_name}?"])}
+                    )
+                    out_envelope.events.append(UtteranceEvent(dialogEvent=dialog))
+                    logger.debug("[UTTERANCE] Clarifying stock-only query for %s", stock_name)
+                    return
+
+                if is_only_agent or is_directly_addressed:
+                    dialog = DialogEvent(
+                        speakerUri=self._manifest.identification.speakerUri,
+                        features={"text": TextFeature(values=["that's outside of my expertise"])}
+                    )
+                    out_envelope.events.append(UtteranceEvent(dialogEvent=dialog))
                 logger.debug("[UTTERANCE] No response generated")
                 return
 
             responding_to_name = self._resolve_utterance_speaker_name(event, in_envelope)
-            _known_agent_markers = ("lucky", "prudence", "finn")
-            if responding_to_name and any(m in responding_to_name.lower() for m in _known_agent_markers):
+            if responding_to_name:
                 response_text = f"{responding_to_name}: {response_text}"
 
             logger.debug("[UTTERANCE] Response: %s", response_text)
@@ -514,13 +553,18 @@ def _infer_agent_name_from_uri(uri: str) -> str:
             normalized = self._normalize_endpoint_id(uri)
             if not normalized:
                 return ""
-            if "finn" in normalized or ":8083" in normalized:
-                return "Finn"
-            if "prudence" in normalized or ":8084" in normalized:
-                return "Prudence"
-            if "lucky" in normalized or ":8085" in normalized:
-                return "Lucky"
-            return ""
+
+            candidate = str(uri or "").strip().rstrip("/")
+            if "/" in candidate:
+                candidate = candidate.split("/")[-1]
+            if ":" in candidate:
+                candidate = candidate.split(":")[-1]
+
+            candidate = re.sub(r"^agent:\s*", "", candidate, flags=re.IGNORECASE).strip()
+            candidate = re.sub(r"[^A-Za-z0-9 _-]", " ", candidate).strip()
+            if not candidate:
+                return ""
+            return " ".join(part.capitalize() for part in candidate.split())
 
         conversation = getattr(in_envelope, 'conversation', None)
         conversants = getattr(conversation, 'conversants', []) if conversation else []
@@ -817,7 +861,8 @@ def load_manifest_from_config(config_path: str = "agent_config.json") -> Manifes
         conversationalName=ident_data.get('conversationalName', 'TemplateAgent'),
         organization=ident_data.get('organization', 'YourOrganization'),
         role=ident_data.get('role', 'assistant'),
-        synopsis=ident_data.get('synopsis', 'A template OpenFloor agent')
+        synopsis=ident_data.get('synopsis', 'A template OpenFloor agent'),
+        openFloorRoles=ident_data.get('openFloorRoles', ['information'])
     )
 
     # Build Capabilities