sunholo 0.143.7__py3-none-any.whl → 0.143.9__py3-none-any.whl

sunholo/agents/flask/vac_routes.py

@@ -1026,58 +1026,57 @@ if __name__ == "__main__":
                 
                 # Create an async handler for the request
                 async def process_request():
-                    # Create mock read/write streams for the server
-                    from io import StringIO
-                    import asyncio
+                    # Handle JSON-RPC requests directly
+                    if not isinstance(data, dict) or "method" not in data:
+                        raise ValueError("Invalid JSON-RPC request")
                     
-                    # Convert request to proper format
-                    request_str = json_module.dumps(data) + '\n'
-                    
-                    # Create read queue with the request
-                    read_queue = asyncio.Queue()
-                    await read_queue.put(request_str.encode())
-                    await read_queue.put(None)  # EOF signal
-                    
-                    # Create write queue for response
-                    write_queue = asyncio.Queue()
-                    
-                    # Create async iterators
-                    async def read_messages():
-                        while True:
-                            msg = await read_queue.get()
-                            if msg is None:
-                                break
-                            yield msg
-                    
-                    responses = []
-                    async def write_messages():
-                        async for msg in write_queue:
-                            if msg is None:
-                                break
-                            responses.append(msg.decode())
-                    
-                    # Run the server with these streams
-                    server = self.vac_mcp_server.get_server()
-                    
-                    # Start write handler
-                    write_task = asyncio.create_task(write_messages())
+                    method = data["method"]
+                    params = data.get("params", {})
+                    request_id = data.get("id")
                     
                     try:
-                        # Process the request through the server
-                        # Use the server's run method with HTTP transport
-                        await server.run()
+                        # Handle different MCP methods
+                        if method == "tools/list":
+                            # Get the server and call list_tools handler
+                            server = self.vac_mcp_server.get_server()
+                            tools = await server._request_handlers["tools/list"]()
+                            
+                            return {
+                                "jsonrpc": "2.0",
+                                "result": {"tools": [tool.model_dump() for tool in tools]},
+                                "id": request_id
+                            }
+                            
+                        elif method == "tools/call":
+                            # Handle tool calls
+                            tool_name = params.get("name")
+                            arguments = params.get("arguments", {})
+                            
+                            if not tool_name:
+                                raise ValueError("Missing tool name")
+                            
+                            server = self.vac_mcp_server.get_server()
+                            result = await server._request_handlers["tools/call"](tool_name, arguments)
+                            
+                            return {
+                                "jsonrpc": "2.0", 
+                                "result": {"content": [item.model_dump() for item in result]},
+                                "id": request_id
+                            }
+                            
+                        else:
+                            raise ValueError(f"Unknown method: {method}")
+                            
                     except Exception as e:
-                        log.error(f"Error processing MCP request: {e}")
-                        await write_queue.put(None)
-                        await write_task
-                        raise
-                    
-                    # Signal end and wait for write task
-                    await write_queue.put(None)
-                    await write_task
-                    
-                    # Return collected responses
-                    return responses
+                        log.error(f"Error handling MCP method {method}: {e}")
+                        return {
+                            "jsonrpc": "2.0",
+                            "error": {
+                                "code": -32603,
+                                "message": str(e)
+                            },
+                            "id": request_id
+                        }
                 
                 # Run the async handler
                 loop = asyncio.new_event_loop()

sunholo/mcp/vac_mcp_server.py

@@ -166,18 +166,31 @@ class VACMCPServer:
             # Collect streaming responses
             full_response = ""
             
-            async for chunk in start_streaming_chat_async(
-                question=user_input,
-                vector_name=vector_name,
-                qna_func_async=self.stream_interpreter,
-                chat_history=chat_history,
-                wait_time=stream_wait_time,
-                timeout=stream_timeout
-            ):
-                if isinstance(chunk, dict) and 'answer' in chunk:
-                    full_response = chunk['answer']
-                elif isinstance(chunk, str):
-                    full_response += chunk
+            # Check if stream_interpreter is async
+            if asyncio.iscoroutinefunction(self.stream_interpreter):
+                async for chunk in start_streaming_chat_async(
+                    question=user_input,
+                    vector_name=vector_name,
+                    qna_func_async=self.stream_interpreter,
+                    chat_history=chat_history,
+                    wait_time=stream_wait_time,
+                    timeout=stream_timeout
+                ):
+                    if isinstance(chunk, dict) and 'answer' in chunk:
+                        full_response = chunk['answer']
+                    elif isinstance(chunk, str):
+                        full_response += chunk
+            else:
+                # Fall back to sync version for non-async interpreters
+                result = self.stream_interpreter(
+                    question=user_input,
+                    vector_name=vector_name,
+                    chat_history=chat_history
+                )
+                if isinstance(result, dict):
+                    full_response = result.get("answer", str(result))
+                else:
+                    full_response = str(result)
             
             return [
                 TextContent(

sunholo/streaming/streaming.py

@@ -167,16 +167,16 @@ async def start_streaming_chat_async(question, vector_name, qna_func_async, chat
     content_buffer = ContentBuffer()
     chat_callback_handler = BufferStreamingStdOutCallbackHandlerAsync(content_buffer=content_buffer, tokens=".!?\n")
 
-    result_queue = Queue()
-    exception_queue = Queue()
-    stop_event = Event()
+    result_queue = asyncio.Queue()
+    exception_queue = asyncio.Queue()
+    stop_event = asyncio.Event()
 
     async def start_chat():
         try:
             final_result = await qna_func_async(question, vector_name, chat_history, callback=chat_callback_handler, **kwargs)
-            result_queue.put(final_result)
+            await result_queue.put(final_result)
         except Exception as e:
-            exception_queue.put(e)
+            await exception_queue.put(e)
 
     # Run start_chat asynchronously
     chat_task = asyncio.create_task(start_chat())
@@ -222,10 +222,10 @@ async def start_streaming_chat_async(question, vector_name, qna_func_async, chat
         final_yield = ""
     else:
         log.info("Sending final full message plus sources...")
-        if not result_queue.empty():
-            final_result = result_queue.get()
+        try:
+            final_result = result_queue.get_nowait()
             final_yield = parse_output(final_result)
-        else:
+        except asyncio.QueueEmpty:
             final_yield = ""
 
     # Match the non-async behavior - yield the parsed output directly, not as JSON

{sunholo-0.143.7.dist-info → sunholo-0.143.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.143.7
+Version: 0.143.9
 Summary: AI DevOps - a package to help deploy GenAI to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0

{sunholo-0.143.7.dist-info → sunholo-0.143.9.dist-info}/RECORD

@@ -18,7 +18,7 @@ sunholo/agents/fastapi/base.py,sha256=W-cyF8ZDUH40rc-c-Apw3-_8IIi2e4Y9qRtnoVnsc1
 sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhBlV3to-s,3864
 sunholo/agents/flask/__init__.py,sha256=dEoByI3gDNUOjpX1uVKP7uPjhfFHJubbiaAv3xLopnk,63
 sunholo/agents/flask/base.py,sha256=vnpxFEOnCmt9humqj-jYPLfJcdwzsop9NorgkJ-tSaU,1756
-sunholo/agents/flask/vac_routes.py,sha256=MvEsIWxrdeuRx-t_RfkodnJyJKP40aKaADWV4Yi3ijw,53375
+sunholo/agents/flask/vac_routes.py,sha256=WfE9ga_EZq_dpW4S5aYyj7i8r59VO5FpDFdtVtqKVKI,53604
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
@@ -117,7 +117,7 @@ sunholo/lookup/model_lookup.yaml,sha256=O7o-jP53MLA06C8pI-ILwERShO-xf6z_258wtpZB
 sunholo/mcp/__init__.py,sha256=Bi0ZYMvWuf1AL_QSrMAREVVdTZFiIokGwrytBXKBJyc,1028
 sunholo/mcp/cli.py,sha256=d24nnVzhZYz4AWgTqmN-qjKG4rPbf8RhdmEOHZkBHy8,10570
 sunholo/mcp/mcp_manager.py,sha256=g75vv6XvM24U7uz366slE-p76Qs4AvVcsarHSF9qIvE,5061
-sunholo/mcp/vac_mcp_server.py,sha256=DSSMsTeLU_1C2hHTvgLjZsg1chyMfb_S9ruCUw2f_dc,9969
+sunholo/mcp/vac_mcp_server.py,sha256=WcFOgN2_lyp1vfn-KcW4GewrBidkRYDx9gzEORV6rV8,10611
 sunholo/ollama/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/ollama/ollama_images.py,sha256=H2cpcNu88R4TwyfL_nnqkQhdvBQ2FPCAy4Ok__0yQmo,2351
 sunholo/pubsub/__init__.py,sha256=DfTEk4zmCfqn6gFxRrqDO0pOrvXTDqH-medpgYO4PGw,117
@@ -132,7 +132,7 @@ sunholo/streaming/__init__.py,sha256=MpbydI2UYo_adttPQFkxNM33b-QRyNEbrKJx0C2AGPc
 sunholo/streaming/content_buffer.py,sha256=bqPta3Q1tXI88Ngyj1kgPC-v4phhGm1nZURcuqQSGIQ,12537
 sunholo/streaming/langserve.py,sha256=hi7q8WY8DPKrALl9m_dOMxWOdE-iEuk7YW05SVDFIX8,6514
 sunholo/streaming/stream_lookup.py,sha256=hYg1DbdSE_QNJ8ZB-ynXJlWgvFjrGvwoUsGJu_E0pRQ,360
-sunholo/streaming/streaming.py,sha256=bL7JGRRYGfzQ-jCfTIZwh_YfWE8Y2rlQSWBGfadSBLM,17163
+sunholo/streaming/streaming.py,sha256=2KgiiCZl0nGZQDF1oO7gti3e3_cPlomLRkQGGMNj0qQ,17203
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=UnycBVLLEXK1HitCOG2zW3XIyxMrw47xoVf6e2OC9A0,4150
 sunholo/templates/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -175,9 +175,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.143.7.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.143.7.dist-info/METADATA,sha256=c1IhnVsC3r20UUvBImOmvOIirVrkuNY6Tj-xFuF3jr0,18413
-sunholo-0.143.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sunholo-0.143.7.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.143.7.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.143.7.dist-info/RECORD,,
+sunholo-0.143.9.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.143.9.dist-info/METADATA,sha256=6kw6sOw6kpW1voU10qdRDCRp82VXiZX57ul2z3ghuSI,18413
+sunholo-0.143.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sunholo-0.143.9.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.143.9.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.143.9.dist-info/RECORD,,