hub: parse calls directly from dispatch

This will make it much easier for a user to see what was called.
We can do this for negotiation too.

Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

mcpserver/core/base.py

@@ -15,6 +15,32 @@ class WorkerBase:
     ask secretary. We provide it here so that a hub can use it to generate
     its dual mode (acting as worker AND hub.)
     """
+    def jsonify_response(self, result):
+        """
+        Ensure we get the text, and separate and parse tool calls,
+        which the agent will return in a verbose mode.
+        """
+        print('result')
+        print(result)
+        print(type(result))
+        if isinstance(result, dict):
+            return result
+        if not isinstance(result, str) and hasattr(result, "content"):
+            result = result.content[0].text
+     
+        # Audit the tool calls (Did the agent just get lucky?)
+        calls = []
+        if "CALLS" in result:
+            try:
+                result, calls_block = result.split("CALLS")
+                calls = utils.format_calls(calls_block)
+            except:
+                print(f"Issue parsing calls, agent had malformed response: {result}")
+                pass
+
+        result = json.loads(utils.extract_code_block(result))
+        result["calls"] = calls
+        return result
 
     def init_providers(self, mock=False):
         """
@@ -73,9 +99,9 @@ async def receive_job(request: str) -> dict:
             agent = SecretaryAgent(active_providers, verbose=self.verbose)
             raw_result = await agent.submit(request)
             try:
-                receipt = json.loads(utils.extract_code_block(raw_result))
-            except:
-                receipt = {"status": "FAILED", "reasoning": raw_result}
+                receipt = self.jsonify_response(raw_result)
+            except Exception as e:
+                receipt = {"status": "FAILED", "reasoning": raw_result, "error": str(e)}
 
             return {"worker_id": self.worker_id, "receipt": receipt}
 

mcpserver/core/hub.py

@@ -209,7 +209,10 @@ async def dispatch_job(worker_id: str, prompt: str) -> dict:
 
             async with info["client"] as sess:
                 result = await sess.call_tool("submit", {"request": prompt})
-                return json.loads(utils.extract_code_block(result.content[0].text))
+                print('response in hub')
+                print(type(result))
+                print(result)
+                return self.jsonify_response(result)
 
         @self.mcp.tool(name="negotiate_job")
         async def negotiate_job(prompt: str) -> dict:
@@ -253,6 +256,7 @@ async def negotiate_handler(wid, sess):
                 mcp_result = await sess.call_tool("ask_secretary", {"request": prompt})
                 raw_text = mcp_result.content[0].text
 
+                # TODO: vsoch: add support to parse the calls here too (like dispatch)
                 try:
                     # Parse and handle potential quote issues in LLM JSON
                     proposal_data = json.loads(utils.extract_code_block(raw_text))

mcpserver/utils/text.py

@@ -1,7 +1,11 @@
+import json
 import re
 
 
 def sanitize(name: str) -> str:
+    """
+    Sanitize worker ids and arguments for hub properties.
+    """
     # Replace hyphens/dots with underscores
     clean = name.replace("-", "_").replace(".", "_")
     # Python identifiers cannot start with a digit
@@ -10,8 +14,21 @@ def sanitize(name: str) -> str:
     return clean
 
 
-def format_rules(rules):
-    return "\n".join([f"- {r}" for r in rules])
+def format_calls(calls_block):
+    """
+    The secretary agent can return calls. We need to ensure we try
+    to get and parse them correctly.
+    """
+    calls = []
+    try:
+        print(calls_block)
+        print(type(calls_block))
+        calls = extract_code_block(calls_block)
+        print('success to extract calls')
+        return calls
+    except Exception as e:
+        print(f'Issue in format calls: {e}')
+        return calls
 
 
 def extract_code_block(text):