solace-agent-mesh 1.7.1__py3-none-any.whl → 1.13.2__py3-none-any.whl

solace_agent_mesh/tools/web_search/google_search.py

@@ -0,0 +1,247 @@
+"""Google Custom Search API implementation."""
+
+import httpx
+import logging
+from typing import Literal, Optional
+from urllib.parse import quote
+from .base import WebSearchTool
+from .models import SearchResult, SearchSource
+
+logger = logging.getLogger(__name__)
+
+
+class GoogleSearchTool(WebSearchTool):
+    """Google Custom Search API implementation."""
+    
+    def __init__(self, api_key: str, search_engine_id: str, **kwargs):
+        """Initialize Google Custom Search tool.
+        
+        Args:
+            api_key: Google API key
+            search_engine_id: Google Custom Search Engine ID (CSE ID)
+            **kwargs: Additional configuration
+        """
+        super().__init__(api_key=api_key, **kwargs)
+        self.search_engine_id = search_engine_id
+        self.base_url = "https://www.googleapis.com/customsearch/v1"
+        
+        if not self.api_key:
+            raise ValueError("Google API key is required")
+        if not self.search_engine_id:
+            raise ValueError("Google Custom Search Engine ID is required")
+    
+    async def search(
+        self,
+        query: str,
+        max_results: int = 5,
+        search_depth: Literal["basic", "advanced"] = "basic",
+        search_type: Optional[Literal["image"]] = None,
+        date_restrict: Optional[str] = None,
+        safe_search: Optional[Literal["off", "medium", "high"]] = None,
+        **kwargs
+    ) -> SearchResult:
+        """Execute Google Custom Search.
+        
+        Args:
+            query: Search query string
+            max_results: Maximum number of results (1-10)
+            search_depth: Not used for Google (kept for interface compatibility)
+            search_type: Set to "image" for image search
+            date_restrict: Restricts results based on recency (e.g., "d[number]" for days)
+            safe_search: Safe search level
+            **kwargs: Additional Google CSE parameters
+            
+        Returns:
+            SearchResult object
+        """
+        try:
+            # Google CSE allows max 10 results per request
+            num_results = min(max(max_results, 1), 10)
+            
+            # Build query parameters
+            params = {
+                "key": self.api_key,
+                "cx": self.search_engine_id,
+                "q": query,
+                "num": num_results,
+            }
+            
+            # Add optional parameters
+            if search_type:
+                params["searchType"] = search_type
+            if date_restrict:
+                params["dateRestrict"] = date_restrict
+            if safe_search:
+                params["safe"] = safe_search
+            
+            # Add any additional kwargs
+            params.update(kwargs)
+            
+            logger.info(f"Executing Google search: query='{query}', num={num_results}")
+            
+            async with httpx.AsyncClient() as client:
+                response = await client.get(
+                    self.base_url,
+                    params=params,
+                    timeout=30.0
+                )
+                
+                if response.status_code != 200:
+                    error_msg = f"Google API error: {response.status_code}"
+                    try:
+                        error_data = response.json()
+                        error_msg += f" - {error_data.get('error', {}).get('message', '')}"
+                    except:
+                        error_msg += f" - {response.text}"
+                    
+                    logger.error(error_msg)
+                    return SearchResult(
+                        success=False,
+                        query=query,
+                        error=error_msg
+                    )
+                
+                data = response.json()
+                
+                # Transform results to our format
+                organic = []
+                images = []
+                items = data.get("items", [])
+                
+                # Handle image search results separately
+                if search_type == "image":
+                    from .models import ImageResult
+                    for item in items:
+                        try:
+                            image = ImageResult(
+                                imageUrl=item["link"],
+                                title=item.get("title", ""),
+                                link=item.get("image", {}).get("contextLink", item["link"])
+                            )
+                            images.append(image)
+                        except Exception as e:
+                            logger.warning(f"Failed to parse image result: {e}")
+                            continue
+                else:
+                    # Regular web search - add to organic results
+                    for item in items:
+                        try:
+                            # Extract snippet (description)
+                            snippet = item.get("snippet", "")
+                            
+                            # For HTML-formatted snippets, try to get plain text
+                            if "htmlSnippet" in item:
+                                import html
+                                snippet = html.unescape(item["htmlSnippet"])
+                                # Remove HTML tags
+                                import re
+                                snippet = re.sub(r'<[^>]+>', '', snippet)
+                            
+                            source = SearchSource(
+                                link=item["link"],
+                                title=item["title"],
+                                snippet=snippet,
+                                attribution=self._extract_domain(item["link"]),
+                                imageUrl=item.get("pagemap", {}).get("cse_thumbnail", [{}])[0].get("src")
+                            )
+                            organic.append(source)
+                        except Exception as e:
+                            logger.warning(f"Failed to parse search result: {e}")
+                            continue
+                
+                logger.info(f"Google search successful: {len(organic)} results")
+                
+                return SearchResult(
+                    success=True,
+                    query=query,
+                    organic=organic,
+                    images=images,
+                    metadata={
+                        "search_engine": "google",
+                        "total_results": data.get("searchInformation", {}).get("totalResults"),
+                        "search_time": data.get("searchInformation", {}).get("searchTime"),
+                    }
+                )
+                
+        except httpx.TimeoutException:
+            error_msg = "Google search timed out"
+            logger.error(error_msg)
+            return SearchResult(
+                success=False,
+                query=query,
+                error=error_msg
+            )
+        except Exception as e:
+            error_msg = f"Google search failed: {str(e)}"
+            logger.error(error_msg, exc_info=True)
+            return SearchResult(
+                success=False,
+                query=query,
+                error=error_msg
+            )
+    
+    @staticmethod
+    def _extract_domain(url: str) -> str:
+        """Extract clean domain from URL.
+        
+        Args:
+            url: Full URL
+            
+        Returns:
+            Clean domain name
+        """
+        try:
+            # Remove protocol
+            domain = url.replace("https://", "").replace("http://", "")
+            # Get first part (domain)
+            domain = domain.split("/")[0]
+            # Remove www.
+            if domain.startswith("www."):
+                domain = domain[4:]
+            return domain
+        except:
+            return url
+    
+    def get_tool_definition(self) -> dict:
+        """Get the tool definition for LLM function calling.
+        
+        Returns:
+            Dictionary containing the tool definition
+        """
+        return {
+            "type": "function",
+            "function": {
+                "name": "web_search",
+                "description": (
+                    "Search the web using Google Custom Search. Use this when you need "
+                    "up-to-date information, facts, news, or data that may not be in "
+                    "your training data. Always cite sources using the citation format."
+                ),
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "query": {
+                            "type": "string",
+                            "description": "The search query"
+                        },
+                        "max_results": {
+                            "type": "integer",
+                            "description": "Maximum number of results (1-10)",
+                            "minimum": 1,
+                            "maximum": 10,
+                            "default": 5
+                        },
+                        "search_type": {
+                            "type": "string",
+                            "enum": ["image"],
+                            "description": "Set to 'image' for image search"
+                        },
+                        "date_restrict": {
+                            "type": "string",
+                            "description": "Restrict results by recency (e.g., 'd7' for last 7 days)"
+                        }
+                    },
+                    "required": ["query"]
+                }
+            }
+        }

solace_agent_mesh/tools/web_search/models.py

@@ -0,0 +1,99 @@
+"""Data models for web search results."""
+
+from typing import List, Optional, Dict, Any
+from pydantic import BaseModel, Field, HttpUrl
+
+
+class SearchSource(BaseModel):
+    """Individual search result source."""
+    
+    link: str = Field(..., description="URL of the source")
+    title: str = Field(..., description="Title of the source")
+    snippet: str = Field(..., description="Text snippet from the source")
+    attribution: Optional[str] = Field(None, description="Attribution/domain name")
+    imageUrl: Optional[str] = Field(None, description="Optional image URL")
+    processed: bool = Field(default=False, description="Whether source has been cited")
+    
+    class Config:
+        json_schema_extra = {
+            "example": {
+                "link": "https://example.com/article",
+                "title": "Example Article",
+                "snippet": "This is an example snippet from the article...",
+                "attribution": "example.com",
+                "processed": False
+            }
+        }
+
+
+class ImageResult(BaseModel):
+    """Image search result."""
+    
+    imageUrl: str = Field(..., description="URL of the image")
+    title: Optional[str] = Field(None, description="Title or description of the image")
+    link: str = Field(..., description="Source page URL")
+    
+    class Config:
+        json_schema_extra = {
+            "example": {
+                "imageUrl": "https://example.com/image.jpg",
+                "title": "Example Image",
+                "link": "https://example.com/page"
+            }
+        }
+
+
+class SearchResult(BaseModel):
+    """Complete search result from a search provider."""
+    
+    success: bool = Field(..., description="Whether the search was successful")
+    query: str = Field(..., description="The search query")
+    organic: List[SearchSource] = Field(default_factory=list, description="Organic search results")
+    topStories: List[SearchSource] = Field(default_factory=list, description="Top news stories")
+    images: List[ImageResult] = Field(default_factory=list, description="Image results")
+    answerBox: Optional[str] = Field(None, description="Direct answer if available")
+    error: Optional[str] = Field(None, description="Error message if search failed")
+    metadata: Dict[str, Any] = Field(default_factory=dict, description="Additional metadata")
+    
+    class Config:
+        json_schema_extra = {
+            "example": {
+                "success": True,
+                "query": "latest AI developments",
+                "organic": [
+                    {
+                        "link": "https://example.com/ai-news",
+                        "title": "Latest AI Developments",
+                        "snippet": "Recent advances in artificial intelligence...",
+                        "attribution": "example.com"
+                    }
+                ],
+                "topStories": [],
+                "images": [],
+                "answerBox": None,
+                "error": None
+            }
+        }
+
+
+class SearchResultData(BaseModel):
+    """Search result data with turn information for citations."""
+    
+    turn: int = Field(..., description="Search turn number (0-based)")
+    organic: List[SearchSource] = Field(default_factory=list)
+    topStories: List[SearchSource] = Field(default_factory=list)
+    images: List[ImageResult] = Field(default_factory=list)
+    references: List[Dict[str, Any]] = Field(default_factory=list, description="Additional references")
+    answerBox: Optional[str] = None
+    
+    class Config:
+        json_schema_extra = {
+            "example": {
+                "turn": 0,
+                "organic": [],
+                "topStories": [],
+                "images": [],
+                "references": [],
+                "answerBox": None
+            }
+        }

{solace_agent_mesh-1.7.1.dist-info → solace_agent_mesh-1.13.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solace-agent-mesh
-Version: 1.7.1
+Version: 1.13.2
 Summary: Solace Agent Mesh is an open-source framework for building event-driven, multi-agent AI systems where specialized agents collaborate on complex tasks.
 Project-URL: Homepage, https://github.com/SolaceLabs/solace-agent-mesh
 Project-URL: Repository, https://github.com/SolaceLabs/solace-agent-mesh
@@ -217,15 +217,17 @@ Requires-Python: >=3.10.16
 Requires-Dist: a2a-sdk[http-server]==0.3.7
 Requires-Dist: alembic==1.16.5
 Requires-Dist: asteval==1.0.6
+Requires-Dist: authlib==1.6.5
+Requires-Dist: azure-cognitiveservices-speech==1.41.1
 Requires-Dist: beautifulsoup4==4.13.5
 Requires-Dist: boto3==1.40.37
 Requires-Dist: click==8.1.8
-Requires-Dist: fastapi==0.117.1
+Requires-Dist: fastapi==0.120.1
 Requires-Dist: flask-cors==6.0.1
 Requires-Dist: flask==3.0.3
 Requires-Dist: gitpython==3.1.45
-Requires-Dist: google-adk==1.7.0
-Requires-Dist: google-genai==1.39.0
+Requires-Dist: google-adk==1.18.0
+Requires-Dist: google-genai==1.49.0
 Requires-Dist: holidays==0.81.0
 Requires-Dist: httpx==0.28.1
 Requires-Dist: itsdangerous==2.2.0
@@ -235,7 +237,7 @@ Requires-Dist: jwcrypto==1.5.6
 Requires-Dist: kaleido==0.2.1
 Requires-Dist: litellm==1.76.3
 Requires-Dist: markdownify==1.2.0
-Requires-Dist: markitdown[all]==0.1.1
+Requires-Dist: markitdown[all]==0.1.4
 Requires-Dist: mermaid-cli==0.1.2
 Requires-Dist: numpy==2.2.6
 Requires-Dist: openai==1.99.9
@@ -248,20 +250,38 @@ Requires-Dist: pydub==0.25.1
 Requires-Dist: pystache==0.6.8
 Requires-Dist: python-dotenv==1.1.1
 Requires-Dist: python-jwt==4.1.0
+Requires-Dist: python-liquid==2.1.0
 Requires-Dist: python-multipart==0.0.20
 Requires-Dist: pyyaml==6.0.2
+Requires-Dist: rich==13.9.4
 Requires-Dist: rouge==1.0.1
-Requires-Dist: solace-ai-connector==1.3.1
+Requires-Dist: solace-ai-connector==3.2.1
 Requires-Dist: sqlalchemy==2.0.40
 Requires-Dist: sse-starlette==3.0.2
+Requires-Dist: starlette==0.49.1
 Requires-Dist: toml==0.10.2
 Requires-Dist: uvicorn[standard]==0.37.0
 Provides-Extra: employee-tools
 Requires-Dist: holidays==0.81.0; extra == 'employee-tools'
 Provides-Extra: gcs
-Requires-Dist: google-cloud-storage==2.19.0; extra == 'gcs'
+Requires-Dist: google-cloud-storage==3.5.0; extra == 'gcs'
+Provides-Extra: test
+Requires-Dist: aiosqlite; extra == 'test'
+Requires-Dist: asyncpg; extra == 'test'
+Requires-Dist: fastmcp==2.11.2; extra == 'test'
+Requires-Dist: httpx>=0.25; extra == 'test'
+Requires-Dist: psycopg2-binary; extra == 'test'
+Requires-Dist: pytest-asyncio; extra == 'test'
+Requires-Dist: pytest-cov>=4.0.0; extra == 'test'
+Requires-Dist: pytest-httpx>=0.35.0; extra == 'test'
+Requires-Dist: pytest-mock>=3.0.0; extra == 'test'
+Requires-Dist: pytest-xdist>=3.5.0; extra == 'test'
+Requires-Dist: pytest>=8.0.0; extra == 'test'
+Requires-Dist: respx; extra == 'test'
+Requires-Dist: ruff; extra == 'test'
+Requires-Dist: testcontainers; extra == 'test'
 Provides-Extra: vertex
-Requires-Dist: google-cloud-aiplatform==1.120.0; extra == 'vertex'
+Requires-Dist: google-cloud-aiplatform==1.126.1; extra == 'vertex'
 Description-Content-Type: text/markdown
 
 <p align="center">
@@ -430,6 +450,7 @@ Want to go further? Here are some hands-on tutorials to help you get started:
 | 🗃️ **SQL Database Integration**<br>Enable Solace Agent Mesh to answer company-specific questions using a sample coffee company database.| **~10–15 min** | [SQL Database Tutorial](https://solacelabs.github.io/solace-agent-mesh/docs/documentation/developing/tutorials/sql-database) |
 | 🧠 **MCP Integration**<br>Integrating a Model Context Protocol (MCP) Servers into Solace Agent Mesh. | **~10–15 min** | [MCP Integration Tutorial](https://solacelabs.github.io/solace-agent-mesh/docs/documentation/developing/tutorials/mcp-integration) |
 | 💬 **Slack Integration**<br>Chat with Solace Agent Mesh directly from Slack. | **~20–30 min** | [Slack Integration Tutorial](https://solacelabs.github.io/solace-agent-mesh/docs/documentation/developing/tutorials/slack-integration) |
+| 👔 **Microsoft Teams Integration (Enterprise)**<br>Connect Solace Agent Mesh Enterprise to Microsoft Teams with Azure AD authentication. | **~30–40 min** | [Teams Integration Tutorial](https://solacelabs.github.io/solace-agent-mesh/docs/documentation/developing/tutorials/teams-integration) |
 
 ---