clap-agents 0.2.1__tar.gz → 0.2.2__tar.gz

{clap_agents-0.2.1 → clap_agents-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clap-agents
-Version: 0.2.1
+Version: 0.2.2
 Summary: A Python framework for building cognitive agentic patterns including ReAct agents, Multi-Agent Teams, native tool calling, and MCP client integration.
 Project-URL: Homepage, https://github.com/MaitreyaM/CLAP-AGENTS.git
 Project-URL: Repository, https://github.com/MaitreyaM/CLAP-AGENTS.git

{clap_agents-0.2.1 → clap_agents-0.2.2}/examples/CLAP-TEST-SUITE.py

@@ -253,17 +253,17 @@ async def main():
     
     fast_ef: Optional[FastEmbedEmbeddings] = None
     # FE_KNOWN_DIMS is imported at the top
-    # try:
-    #     if FASTEMBED_MODEL in FE_KNOWN_DIMS:
-    #         fast_ef = FastEmbedEmbeddings(model_name=FASTEMBED_MODEL)
-    #     else:
-    #         print(f"Warning: FastEmbed model '{FASTEMBED_MODEL}' not in FE_KNOWN_DIMS. FastEmbed RAG will be skipped.")
-    # except NameError: # If FastEmbedEmbeddings or FE_KNOWN_DIMS not defined due to import error
-    #     print("FastEmbedEmbeddings or its KNOWN_DIMS not available.")
-    # except Exception as e:
-    #     print(f"Could not initialize FastEmbedEmbeddings: {e}")
-    # if fast_ef: print("FastEmbedEmbeddings initialized (RAG tests may be commented out).")
-    print("INFO: FastEmbed RAG tests are currently commented out to save time.")
+    try:
+        if FASTEMBED_MODEL in FE_KNOWN_DIMS:
+            fast_ef = FastEmbedEmbeddings(model_name=FASTEMBED_MODEL)
+        else:
+            print(f"Warning: FastEmbed model '{FASTEMBED_MODEL}' not in FE_KNOWN_DIMS. FastEmbed RAG will be skipped.")
+    except NameError: # If FastEmbedEmbeddings or FE_KNOWN_DIMS not defined due to import error
+        print("FastEmbedEmbeddings or its KNOWN_DIMS not available.")
+    except Exception as e:
+        print(f"Could not initialize FastEmbedEmbeddings: {e}")
+    if fast_ef: print("FastEmbedEmbeddings initialized (RAG tests may be commented out).")
+    # print("INFO: FastEmbed RAG tests are currently commented out to save time.")
 
 
     mcp_manager = get_mcp_manager()

{clap_agents-0.2.1 → clap_agents-0.2.2}/examples/local_rag.py

@@ -7,19 +7,19 @@ import uuid
 from clap import Agent
 from clap.vector_stores.qdrant_store import QdrantStore
 from clap.utils.rag_utils import load_pdf_file, chunk_text_by_fixed_size
-from clap.llm_services.ollama_llm_service import OllamaOpenAICompatService
+from clap.llm_services.ollama_service import OllamaOpenAICompatService
 from clap.embedding.ollama_embedding import OllamaEmbeddings, KNOWN_OLLAMA_EMBEDDING_DIMENSIONS
 from qdrant_client import models as qdrant_models
 
 load_dotenv()
 
-PDF_PATH = "/Users/maitreyamishra/PROJECTS/Cognitive-Layer/examples/Hands_On_ML.pdf" # Ensure this PDF exists
+PDF_PATH = "/Users/maitreyamishra/PROJECTS/Cognitive-Layer/examples/handsonml.pdf" 
 DB_PATH = "./ollama_rag_qdrant_minimal_db"
 COLLECTION_NAME = "ml_book_ollama_minimal"
 CHUNK_SIZE, CHUNK_OVERLAP = 500, 50
 OLLAMA_HOST = "http://localhost:11434"
-OLLAMA_LLM_MODEL = "llama3.2:latest" # Ensure pulled: ollama pull llama3
-OLLAMA_EMBED_MODEL = "nomic-embed-text" # Ensure pulled: ollama pull nomic-embed-text
+OLLAMA_LLM_MODEL = "llama3.2:latest" 
+OLLAMA_EMBED_MODEL = "nomic-embed-text"
 
 async def run_minimal_ollama_rag():
     start_time = time.time()
@@ -51,24 +51,21 @@ async def run_minimal_ollama_rag():
     ollama_llm_service = OllamaOpenAICompatService(default_model=OLLAMA_LLM_MODEL, base_url=f"{OLLAMA_HOST}/v1")
     rag_agent = Agent(
         name="OllamaMinimalExpert", backstory="Answer from book context.",
-        task_description="What are Generative Adversarial Networks?", # Will be overwritten
+        task_description="What are Generative Adversarial Networks?", # can be overwritten
         llm_service=ollama_llm_service, model=OLLAMA_LLM_MODEL, vector_store=vector_store
     )
 
     user_query = "Explain Generative Adversarial Networks (GANs) based on the book."
-    print(f"\nUser Query: {user_query}")
     rag_agent.task_description = user_query
     
     query_start = time.time()
     result = await rag_agent.run()
     print(f"Query Took: {time.time() - query_start:.2f}s")
-    print("\n--- Agent Answer ---")
     print(result.get("output", "No answer."))
 
     await vector_store.close()
     await ollama_llm_service.close()
     print(f"\nTotal Test Took: {time.time() - start_time:.2f}s")
 
-if __name__ == "__main__":
-    print(f"Ensure Ollama server (models: {OLLAMA_LLM_MODEL}, {OLLAMA_EMBED_MODEL}) is running.")
-    asyncio.run(run_minimal_ollama_rag())
+
+asyncio.run(run_minimal_ollama_rag())

clap_agents-0.2.2/examples/mcp_test_suite.py

@@ -0,0 +1,87 @@
+import asyncio
+import os
+from dotenv import load_dotenv
+from typing import Optional
+
+from pydantic import HttpUrl
+
+
+from clap import MCPClientManager, SseServerConfig
+
+load_dotenv()
+
+def print_header(title: str):
+    print(f"\n{'='*10} {title.upper()} {'='*10}")
+
+async def run_mcp_test_cycle(
+    manager: MCPClientManager,
+    server_name: str,
+    tool_to_call: Optional[str] = None,
+    tool_args: Optional[dict] = None
+):
+    print_header(f"TEST CYCLE FOR {server_name.upper()}")
+    try:
+        print(f"Attempting to list tools from '{server_name}'...")
+        tools = await manager.list_remote_tools(server_name)
+        print(f"Found tools on '{server_name}': {[t.name for t in tools] if tools else 'None'}")
+
+        if tool_to_call and tool_args:
+            if any(t.name == tool_to_call for t in tools):
+                print(f"Attempting to call tool '{tool_to_call}' on '{server_name}' with args: {tool_args}...")
+                result = await manager.call_remote_tool(server_name, tool_to_call, tool_args)
+                print(f"Result from '{tool_to_call}' on '{server_name}': {result}")
+            else:
+                print(f"Tool '{tool_to_call}' not found on server '{server_name}'.")
+
+    except RuntimeError as e:
+        print(f"RuntimeError during {server_name} cycle: {e}")
+    except Exception as e:
+        print(f"Unexpected error during {server_name} cycle: {type(e).__name__} - {e}")
+
+
+async def main():
+    print("MCP Robustness Test: Starting...")
+    print("Ensure MCP servers ('adder_server' on 8000, 'subtract_server' on 8001) are running.")
+
+    mcp_server_configs = {
+        "adder_server": SseServerConfig(url=HttpUrl("http://localhost:8000")),
+        "subtract_server": SseServerConfig(url=HttpUrl("http://localhost:8001")),
+        "non_existent_server": SseServerConfig(url=HttpUrl("http://localhost:8009")) # To test connection error
+    }
+    manager: Optional[MCPClientManager] = None
+
+    try:
+        manager = MCPClientManager(server_configs=mcp_server_configs)
+        print("MCPClientManager initialized.")
+
+        await run_mcp_test_cycle(manager, "adder_server", tool_to_call="add", tool_args={"a": 10, "b": 5})
+
+        print_header("SIMULATING AN EXTERNAL ERROR")
+        try:
+            
+            print("Raising a simulated application error...")
+            raise ValueError("Simulated application error after first MCP interaction.")
+        except ValueError as app_error:
+            print(f"Caught simulated application error: {app_error}")
+            print("Proceeding to test other MCP operations and cleanup...")
+
+        await run_mcp_test_cycle(manager, "subtract_server", tool_to_call="sub", tool_args={"a": 20, "b": 3})
+
+        await run_mcp_test_cycle(manager, "non_existent_server")
+
+
+    except Exception as e:
+        print(f"Critical error in main test execution: {type(e).__name__} - {e}")
+    finally:
+        if manager:
+            print_header("FINAL MCP CLEANUP")
+            print("Calling manager.disconnect_all()...")
+            await manager.disconnect_all()
+            print("manager.disconnect_all() completed.")
+        else:
+            print("MCPClientManager was not initialized.")
+
+    print("\nMCP Robustness Test: Finished.")
+
+if __name__ == "__main__":
+    asyncio.run(main())

{clap_agents-0.2.1 → clap_agents-0.2.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "clap-agents"
-version = "0.2.1"
+version = "0.2.2"
 description = "A Python framework for building cognitive agentic patterns including ReAct agents, Multi-Agent Teams, native tool calling, and MCP client integration."
 readme = "README.md"
 requires-python = ">=3.10"

{clap_agents-0.2.1 → clap_agents-0.2.2}/src/clap/mcp_client/client.py

@@ -113,14 +113,16 @@ class MCPClientManager:
                  await exit_stack.aclose()
                  print(f"{Fore.GREEN}Disconnected from MCP server: {server_name}{Fore.RESET}")
 
+        
     async def disconnect_all(self):
-        """Disconnects from all currently connected servers."""
         server_names = list(self.sessions.keys())
-        print(f"{Fore.YELLOW}Disconnecting from all servers: {server_names}{Fore.RESET}")
-        
-        tasks = [self.disconnect(name) for name in server_names]
-        await asyncio.gather(*tasks, return_exceptions=True) 
-        print(f"{Fore.GREEN}Finished disconnecting all servers.{Fore.RESET}")
+        print(f"{Fore.YELLOW}MCPClientManager: Disconnecting from all servers ({len(server_names)})...{Fore.RESET}")
+        for name in server_names:
+            try:
+                await self.disconnect(name)
+            except Exception as e:
+                print(f"{Fore.RED}MCPClientManager: Error during disconnect of '{name}': {e}{Fore.RESET}")
+        print(f"{Fore.GREEN}MCPClientManager: Finished disconnecting all servers.{Fore.RESET}")
 
     async def list_remote_tools(self, server_name: str) -> List[types.Tool]:
         """
@@ -192,4 +194,3 @@ class MCPClientManager:
         except Exception as e:
              print(f"{Fore.RED}Error calling tool '{tool_name}' on server '{server_name}': {e}{Fore.RESET}")
              raise RuntimeError(f"Failed to call tool '{tool_name}' on '{server_name}'.") from e
-

{clap_agents-0.2.1 → clap_agents-0.2.2}/src/clap/vector_stores/chroma_store.py

@@ -1,6 +1,6 @@
 import json
 import functools
-from typing import Any, Dict, List, Optional, cast
+from typing import Any, Dict, List, Optional, cast, Callable, Coroutine
 import asyncio 
 import anyio
 
@@ -38,7 +38,7 @@ from clap.embedding.base_embedding import EmbeddingFunctionInterface as ClapEFIn
 
 class _AsyncEFWrapperForChroma:
     """Wraps an async CLAP EmbeddingFunctionInterface to be callable synchronously by Chroma."""
-    def __init__(self, async_ef_call: asyncio.coroutine, loop: asyncio.AbstractEventLoop):
+    def __init__(self, async_ef_call: Callable[..., Coroutine[Any, Any, Embeddings]], loop: asyncio.AbstractEventLoop):
         self._async_ef_call = async_ef_call
         self._loop = loop