aiecs 1.2.2__py3-none-any.whl → 1.3.3__py3-none-any.whl

aiecs/tools/search_tool/schemas.py

@@ -0,0 +1,297 @@
+"""
+Pydantic Schema Definitions for SearchTool Operations
+
+Provides input validation, type safety, and automatic documentation
+for all SearchTool operations.
+"""
+
+from typing import Optional, List, Dict, Any
+from pydantic import BaseModel, Field, field_validator
+
+
+class SearchWebSchema(BaseModel):
+    """Schema for search_web operation"""
+    
+    query: str = Field(
+        description="Search query string"
+    )
+    num_results: int = Field(
+        default=10,
+        ge=1,
+        le=100,
+        description="Number of results to return (1-100)"
+    )
+    start_index: int = Field(
+        default=1,
+        ge=1,
+        le=91,
+        description="Starting index for pagination (1-91)"
+    )
+    language: str = Field(
+        default="en",
+        description="Language code for results (e.g., 'en', 'zh-CN', 'es')"
+    )
+    country: str = Field(
+        default="us",
+        description="Country code for geolocation (e.g., 'us', 'cn', 'uk')"
+    )
+    safe_search: str = Field(
+        default="medium",
+        description="Safe search level: 'off', 'medium', or 'high'"
+    )
+    date_restrict: Optional[str] = Field(
+        default=None,
+        description="Date restriction (e.g., 'd7' for last 7 days, 'm3' for last 3 months)"
+    )
+    file_type: Optional[str] = Field(
+        default=None,
+        description="File type filter (e.g., 'pdf', 'doc', 'xls')"
+    )
+    exclude_terms: Optional[List[str]] = Field(
+        default=None,
+        description="Terms to exclude from search results"
+    )
+    auto_enhance: bool = Field(
+        default=True,
+        description="Whether to automatically enhance query based on detected intent"
+    )
+    return_summary: bool = Field(
+        default=False,
+        description="Whether to return a structured summary of results"
+    )
+    
+    @field_validator('safe_search')
+    @classmethod
+    def validate_safe_search(cls, v: str) -> str:
+        """Validate safe search level"""
+        allowed = ['off', 'medium', 'high']
+        if v not in allowed:
+            raise ValueError(f"safe_search must be one of {allowed}")
+        return v
+
+
+class SearchImagesSchema(BaseModel):
+    """Schema for search_images operation"""
+    
+    query: str = Field(
+        description="Image search query string"
+    )
+    num_results: int = Field(
+        default=10,
+        ge=1,
+        le=100,
+        description="Number of image results to return (1-100)"
+    )
+    image_size: Optional[str] = Field(
+        default=None,
+        description="Image size filter: 'icon', 'small', 'medium', 'large', 'xlarge', 'xxlarge', 'huge'"
+    )
+    image_type: Optional[str] = Field(
+        default=None,
+        description="Image type filter: 'clipart', 'face', 'lineart', 'stock', 'photo', 'animated'"
+    )
+    image_color_type: Optional[str] = Field(
+        default=None,
+        description="Color type filter: 'color', 'gray', 'mono', 'trans'"
+    )
+    safe_search: str = Field(
+        default="medium",
+        description="Safe search level: 'off', 'medium', or 'high'"
+    )
+    
+    @field_validator('safe_search')
+    @classmethod
+    def validate_safe_search(cls, v: str) -> str:
+        """Validate safe search level"""
+        allowed = ['off', 'medium', 'high']
+        if v not in allowed:
+            raise ValueError(f"safe_search must be one of {allowed}")
+        return v
+
+
+class SearchNewsSchema(BaseModel):
+    """Schema for search_news operation"""
+    
+    query: str = Field(
+        description="News search query string"
+    )
+    num_results: int = Field(
+        default=10,
+        ge=1,
+        le=100,
+        description="Number of news results to return (1-100)"
+    )
+    start_index: int = Field(
+        default=1,
+        ge=1,
+        le=91,
+        description="Starting index for pagination (1-91)"
+    )
+    language: str = Field(
+        default="en",
+        description="Language code for news articles (e.g., 'en', 'zh-CN', 'es')"
+    )
+    date_restrict: Optional[str] = Field(
+        default=None,
+        description="Date restriction (e.g., 'd7' for last 7 days, 'm1' for last month)"
+    )
+    sort_by: str = Field(
+        default="date",
+        description="Sort order: 'date' for newest first, 'relevance' for most relevant"
+    )
+    
+    @field_validator('sort_by')
+    @classmethod
+    def validate_sort_by(cls, v: str) -> str:
+        """Validate sort order"""
+        allowed = ['date', 'relevance']
+        if v not in allowed:
+            raise ValueError(f"sort_by must be one of {allowed}")
+        return v
+
+
+class SearchVideosSchema(BaseModel):
+    """Schema for search_videos operation"""
+    
+    query: str = Field(
+        description="Video search query string"
+    )
+    num_results: int = Field(
+        default=10,
+        ge=1,
+        le=100,
+        description="Number of video results to return (1-100)"
+    )
+    start_index: int = Field(
+        default=1,
+        ge=1,
+        le=91,
+        description="Starting index for pagination (1-91)"
+    )
+    language: str = Field(
+        default="en",
+        description="Language code for videos (e.g., 'en', 'zh-CN', 'es')"
+    )
+    safe_search: str = Field(
+        default="medium",
+        description="Safe search level: 'off', 'medium', or 'high'"
+    )
+    
+    @field_validator('safe_search')
+    @classmethod
+    def validate_safe_search(cls, v: str) -> str:
+        """Validate safe search level"""
+        allowed = ['off', 'medium', 'high']
+        if v not in allowed:
+            raise ValueError(f"safe_search must be one of {allowed}")
+        return v
+
+
+class SearchPaginatedSchema(BaseModel):
+    """Schema for search_paginated operation"""
+    
+    query: str = Field(
+        description="Search query string"
+    )
+    total_results: int = Field(
+        ge=1,
+        le=1000,
+        description="Total number of results to retrieve (1-1000)"
+    )
+    search_type: str = Field(
+        default="web",
+        description="Type of search: 'web', 'images', 'news', or 'videos'"
+    )
+    
+    @field_validator('search_type')
+    @classmethod
+    def validate_search_type(cls, v: str) -> str:
+        """Validate search type"""
+        allowed = ['web', 'images', 'news', 'videos']
+        if v not in allowed:
+            raise ValueError(f"search_type must be one of {allowed}")
+        return v
+
+
+class SearchBatchSchema(BaseModel):
+    """Schema for search_batch operation"""
+    
+    queries: List[str] = Field(
+        description="List of search queries to execute in batch"
+    )
+    search_type: str = Field(
+        default="web",
+        description="Type of search: 'web', 'images', 'news', or 'videos'"
+    )
+    num_results: int = Field(
+        default=10,
+        ge=1,
+        le=100,
+        description="Number of results per query (1-100)"
+    )
+    
+    @field_validator('queries')
+    @classmethod
+    def validate_queries(cls, v: List[str]) -> List[str]:
+        """Validate queries list"""
+        if not v:
+            raise ValueError("queries list cannot be empty")
+        if len(v) > 50:
+            raise ValueError("Maximum 50 queries allowed in batch")
+        return v
+    
+    @field_validator('search_type')
+    @classmethod
+    def validate_search_type(cls, v: str) -> str:
+        """Validate search type"""
+        allowed = ['web', 'images', 'news', 'videos']
+        if v not in allowed:
+            raise ValueError(f"search_type must be one of {allowed}")
+        return v
+
+
+class ValidateCredentialsSchema(BaseModel):
+    """Schema for validate_credentials operation (no parameters required)"""
+    pass
+
+
+class GetQuotaStatusSchema(BaseModel):
+    """Schema for get_quota_status operation (no parameters required)"""
+    pass
+
+
+class GetMetricsSchema(BaseModel):
+    """Schema for get_metrics operation (no parameters required)"""
+    pass
+
+
+class GetMetricsReportSchema(BaseModel):
+    """Schema for get_metrics_report operation (no parameters required)"""
+    pass
+
+
+class GetHealthScoreSchema(BaseModel):
+    """Schema for get_health_score operation (no parameters required)"""
+    pass
+
+
+class GetSearchContextSchema(BaseModel):
+    """Schema for get_search_context operation (no parameters required)"""
+    pass
+
+
+__all__ = [
+    'SearchWebSchema',
+    'SearchImagesSchema',
+    'SearchNewsSchema',
+    'SearchVideosSchema',
+    'SearchPaginatedSchema',
+    'SearchBatchSchema',
+    'ValidateCredentialsSchema',
+    'GetQuotaStatusSchema',
+    'GetMetricsSchema',
+    'GetMetricsReportSchema',
+    'GetHealthScoreSchema',
+    'GetSearchContextSchema',
+]
+

aiecs/tools/statistics/data_loader_tool.py

@@ -151,7 +151,7 @@ class DataLoaderTool(BaseTool):
         source: str = Field(description="Path to data source file")
         source_type: Optional[DataSourceType] = Field(default=DataSourceType.AUTO, description="Data source type")
         strategy: LoadStrategy = Field(default=LoadStrategy.FULL_LOAD, description="Loading strategy")
-        schema: Optional[Dict[str, Any]] = Field(default=None, description="Expected schema for validation")
+        data_schema: Optional[Dict[str, Any]] = Field(default=None, description="Expected schema for validation")
         validation_rules: Optional[Dict[str, Any]] = Field(default=None, description="Data quality validation rules")
         nrows: Optional[int] = Field(default=None, description="Number of rows to load")
         chunk_size: Optional[int] = Field(default=None, description="Chunk size for chunked loading")
@@ -164,7 +164,7 @@ class DataLoaderTool(BaseTool):
     class ValidateSchemaSchema(BaseModel):
         """Schema for validate_schema operation"""
         data: Union[Dict[str, Any], List[Dict[str, Any]]] = Field(description="Data to validate")
-        schema: Dict[str, Any] = Field(description="Expected schema")
+        data_schema: Dict[str, Any] = Field(description="Expected schema")
     
     class StreamDataSchema(BaseModel):
         """Schema for stream_data operation"""

aiecs/tools/statistics/data_transformer_tool.py

@@ -149,7 +149,7 @@ class DataTransformerTool(BaseTool):
         """Schema for transform_data operation"""
         data: Union[Dict[str, Any], List[Dict[str, Any]]] = Field(description="Data to transform")
         transformations: List[Dict[str, Any]] = Field(description="List of transformation steps")
-        validate: bool = Field(default=True, description="Validate transformations")
+        enable_validation: bool = Field(default=True, description="Validate transformations")
     
     class AutoTransformSchema(BaseModel):
         """Schema for auto_transform operation"""

aiecs/tools/task_tools/__init__.py

@@ -12,8 +12,11 @@ This module contains specialized tools for various task-oriented operations:
 - report_tool: Report generation and formatting operations
 - research_tool: Research and information gathering operations
 - scraper_tool: Web scraping and data extraction operations
-- search_api: Search API integration operations
 - stats_tool: Statistical analysis and computation operations
+
+Note:
+- apisource_tool is now a standalone package at aiecs.tools.apisource
+- search_tool is now a standalone package at aiecs.tools.search_tool
 """
 
 # Lazy import all task tools to avoid heavy dependencies at import time
@@ -22,13 +25,12 @@ import os
 # Define available tools for lazy loading
 _AVAILABLE_TOOLS = [
     'chart_tool',
-    'classfire_tool', 
+    'classfire_tool',
     'image_tool',
     'pandas_tool',
     'report_tool',
     'research_tool',
     'scraper_tool',
-    'search_api',
     'stats_tool'
 ]
 
@@ -43,7 +45,7 @@ def _lazy_load_tool(tool_name: str):
     """Lazy load a specific tool module"""
     if tool_name in _LOADED_TOOLS:
         return
-        
+
     try:
         if tool_name == 'chart_tool':
             from . import chart_tool
@@ -61,13 +63,11 @@ def _lazy_load_tool(tool_name: str):
             from . import research_tool
         elif tool_name == 'scraper_tool':
             from . import scraper_tool
-        elif tool_name == 'search_api':
-            from . import search_api
         elif tool_name == 'stats_tool':
             from . import stats_tool
-        
+
         _LOADED_TOOLS.add(tool_name)
-        
+
     except Exception as e:
         import logging
         logger = logging.getLogger(__name__)

aiecs/tools/task_tools/report_tool.py

@@ -19,7 +19,7 @@ from docx import Document
 from docx.shared import Pt as DocxPt, RGBColor
 import markdown
 import matplotlib.pyplot as plt
-from pydantic import ValidationError, ConfigDict, Field
+from pydantic import BaseModel, ValidationError, ConfigDict, Field
 import tempfile
 import logging
 

aiecs/tools/tool_executor/__init__.py

@@ -12,6 +12,7 @@ from .tool_executor import (
     get_executor,
     validate_input,
     cache_result,
+    cache_result_with_strategy,
     run_in_executor,
     measure_execution_time,
     sanitize_input
@@ -29,6 +30,7 @@ __all__ = [
     'get_executor',
     'validate_input',
     'cache_result',
+    'cache_result_with_strategy',
     'run_in_executor',
     'measure_execution_time',
     'sanitize_input'