futz

Author: Hendler

jacspy-mcp/src/jacs_mcp/fast_mcp_auth3.py

@@ -32,8 +32,8 @@ async def run_auth_demo():
     # Create server
     server = FastMCP("AuthEchoServer")
 
-    @server.tool(name="echo", description="Echo with authentication")
-    async def echo(msg: str, auth: Dict = None) -> str:
+    @server.tool(name="echos", description="Echos with authentication")
+    async def echos(msg: str, auth: Dict = None) -> str:
         """Echo with authentication"""
         # Log to file instead of printing
         with open("server_logs.txt", "a") as log:
@@ -78,7 +78,7 @@ async def echo(msg: str, auth: Dict = None) -> str:
             log.flush()
 
             # Try returning just a simple string instead of JSON
-            return f"Echo via SSESSS: {msg}"
+            return f"Echo via SSESSS: {str(response_json)} s"
 
     # Start server
     import uvicorn
@@ -120,36 +120,53 @@ async def echo(msg: str, auth: Dict = None) -> str:
             print(f"Request params: {params}")
 
             # Call the tool
-            result = await client.call_tool("echo", params)
+            result = await client.call_tool("echos", params)
             print("\n=== CLIENT RECEIVED RESPONSE ===")
             print(f"Raw result: {result}")
 
             # Parse the response
             if isinstance(result, list) and len(result) > 0:
                 # Response is a TextContent object
-                content = result[0].text
-                try:
-                    # Parse the JSON response
-                    response_json = json.loads(content)
-                    print(f"Parsed response: {response_json}")
+                content_object = result[0]
+                if hasattr(content_object, 'text'):
+                    content = content_object.text
 
-                    # Verify the response authentication
-                    if "result" in response_json and "auth" in response_json:
-                        response_data = response_json["result"]
-                        auth = response_json["auth"]
+                    # Extract the JSON part from the string
+                    try:
+                        # Find the start and end of the JSON object
+                        json_start = content.find('{')
+                        json_end = content.rfind('}') + 1
 
-                        if "data" in auth and "signature" in auth:
-                            # Verify signature
-                            is_valid = verify_signature(auth["data"], auth["signature"])
-                            print(f"Response signature valid: {is_valid}")
-                            print(f"Response data: {response_data}")
-                            print(f"Auth data: {auth['data']}")
+                        if json_start != -1 and json_end != -1:
+                            json_string = content[json_start:json_end]
+                            
+                            # Parse the extracted JSON string
+                            response_json = json.loads(json_string)
+                            print(f"Parsed JSON response: {response_json}")
+                            
+                            # Verify the response authentication
+                            if "result" in response_json and "auth" in response_json:
+                                response_data = response_json["result"]
+                                auth = response_json["auth"]
+                                
+                                if "data" in auth and "signature" in auth:
+                                    # Verify signature
+                                    is_valid = verify_signature(auth["data"], auth["signature"])
+                                    print(f"Response signature valid: {is_valid}")
+                                    print(f"Response data: {response_data}")
+                                    print(f"Auth data: {auth['data']}")
+                                else:
+                                    print("Missing auth data or signature in response")
+                            else:
+                                print("Invalid response format")
                         else:
-                            print("Missing auth data or signature in response")
-                    else:
-                        print("Invalid response format")
-                except json.JSONDecodeError:
-                    print("Failed to parse response as JSON")
+                            print("Could not find JSON object in response string")
+                    except json.JSONDecodeError:
+                        print(f"Failed to parse extracted JSON: {json_string}")
+                    except Exception as e:
+                        print(f"Error processing response content: {e}")
+                else:
+                    print("TextContent object does not have 'text' attribute")
             else:
                 print("Unexpected response format")
     finally: