aigency 0.0.1rc225507851__tar.gz → 0.0.1rc235167702__tar.gz

{aigency-0.0.1rc225507851 → aigency-0.0.1rc235167702}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aigency
-Version: 0.0.1rc225507851
+Version: 0.0.1rc235167702
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{aigency-0.0.1rc225507851 → aigency-0.0.1rc235167702}/aigency/agents/generator.py

@@ -10,7 +10,7 @@ from google.adk.runners import Runner
 from google.adk.sessions import InMemorySessionService
 
 from aigency.agents.executor import AgentA2AExecutor
-from aigency.models.config import AgentConfig
+from aigency.schemas.aigency_config import AigencyConfig
 from aigency.tools.generator import ToolGenerator
 
 
@@ -18,22 +18,26 @@ class AgentA2AGenerator:
     """Generator for creating A2A agents and related components."""
 
     @staticmethod
-    def create_agent(agent_config: AgentConfig) -> Agent:
+    def create_agent(agent_config: AigencyConfig) -> Agent:
+
+        tools = [
+            ToolGenerator.create_tool(tool_cfg) for tool_cfg in agent_config.agent.tools
+        ]
 
-        tools = [ToolGenerator.create_tool(tool_cfg) for tool_cfg in agent_config.tools]
-        
         return Agent(
-            name=agent_config.name,
-            model=agent_config.model.name,
-            instruction=agent_config.instruction,
+            name=agent_config.metadata.name,
+            model=agent_config.agent.model.name,
+            instruction=agent_config.agent.instruction,
             tools=tools,
         )
 
     @staticmethod
-    def build_agent_card(agent_config: AgentConfig) -> AgentCard:
+    def build_agent_card(agent_config: AigencyConfig) -> AgentCard:
 
         # TODO: Parse properly
-        capabilities = AgentCapabilities(streaming=agent_config.capabilities.streaming)
+        capabilities = AgentCapabilities(
+            streaming=agent_config.service.capabilities.streaming
+        )
 
         skills = [
             AgentSkill(
@@ -43,24 +47,22 @@ class AgentA2AGenerator:
                 tags=skill.tags,
                 examples=skill.examples,
             )
-            for skill in agent_config.skills
+            for skill in agent_config.agent.skills
         ]
 
         return AgentCard(
-            name=agent_config.name,
-            description=agent_config.description,
-            url=agent_config.url,
-            version=agent_config.version,
-            default_input_modes=agent_config.default_input_modes,
-            default_output_modes=agent_config.default_output_modes,
+            name=agent_config.metadata.name,
+            description=agent_config.metadata.description,
+            url=agent_config.service.url,
+            version=agent_config.metadata.version,
+            default_input_modes=agent_config.service.interface.default_input_modes,
+            default_output_modes=agent_config.service.interface.default_output_modes,
             capabilities=capabilities,
             skills=skills,
         )
 
     @staticmethod
-    def build_executor(
-        agent: Agent, agent_card: AgentCard
-    ) -> AgentA2AExecutor:
+    def build_executor(agent: Agent, agent_card: AgentCard) -> AgentA2AExecutor:
 
         runner = Runner(
             app_name=agent.name,

aigency-0.0.1rc235167702/aigency/schemas/agent/agent.py

@@ -0,0 +1,12 @@
+from pydantic import BaseModel
+from typing import List, Optional
+from aigency.schemas.agent.model import AgentModel
+from aigency.schemas.agent.skills import Skill
+from aigency.schemas.agent.tools import FunctionTool, McpTool
+
+class Agent(BaseModel):
+    """El 'cerebro' del agente: su lógica, modelo y capacidades."""
+    model: AgentModel
+    instruction: str
+    skills: List[Skill]
+    tools: Optional[List[FunctionTool | McpTool]] = []

aigency-0.0.1rc235167702/aigency/schemas/agent/model.py

@@ -0,0 +1,12 @@
+from typing import Optional
+from pydantic import BaseModel
+
+class ProviderConfig(BaseModel):
+    """Configuration for AI model provider."""
+    name: str
+    endpoint: Optional[str] = None
+
+class AgentModel(BaseModel):
+    """Configuration for AI model."""
+    name: str
+    provider: Optional[ProviderConfig] = None

aigency-0.0.1rc235167702/aigency/schemas/agent/skills.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+from typing import List
+
+class Skill(BaseModel):
+    """Define una habilidad específica del agente."""
+    id: str
+    name: str
+    description: str
+    tags: List[str]
+    examples: List[str]

aigency-0.0.1rc235167702/aigency/schemas/aigency_config.py

@@ -0,0 +1,14 @@
+from pydantic import BaseModel
+from typing import Optional
+from aigency.schemas.observability.observability import Observability
+from aigency.schemas.metadata.metadata import Metadata
+from aigency.schemas.agent.agent import Agent
+from aigency.schemas.service.service import Service
+
+class AigencyConfig(BaseModel):
+    """Root Pydantic model for complete agent configuration."""
+
+    metadata: Metadata
+    service: Service
+    agent: Agent
+    observability: Optional[Observability] = None

aigency-0.0.1rc235167702/aigency/schemas/metadata/metadata.py

@@ -0,0 +1,8 @@
+from pydantic import BaseModel
+
+
+class Metadata(BaseModel):
+    """Metadatos descriptivos del agente."""
+    name: str
+    version: str
+    description: str

aigency-0.0.1rc235167702/aigency/schemas/observability/observability.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+from aigency.schemas.observability.phoenix import Phoenix
+
+class Monitoring(BaseModel):
+    """Configuración de las herramientas de monitoreo."""
+    phoenix: Phoenix
+
+class Observability(BaseModel):
+    """Agrupa todas las configuraciones de observabilidad."""
+    monitoring: Monitoring

aigency-0.0.1rc235167702/aigency/schemas/observability/phoenix.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel
+
+class Phoenix(BaseModel):
+    """Configuración del monitor Phoenix."""
+    host: str
+    port: int

aigency-0.0.1rc235167702/aigency/schemas/service/capabilities.py

@@ -0,0 +1,5 @@
+from pydantic import BaseModel
+
+class Capabilities(BaseModel):
+    """Capacidades técnicas del servicio del agente."""
+    streaming: bool

aigency-0.0.1rc235167702/aigency/schemas/service/interface.py

@@ -0,0 +1,7 @@
+from typing import List
+from pydantic import BaseModel
+
+class Interface(BaseModel):
+    """Define los modos de comunicación del agente."""
+    default_input_modes: List[str]
+    default_output_modes: List[str]

aigency-0.0.1rc235167702/aigency/schemas/service/service.py

@@ -0,0 +1,9 @@
+from pydantic import BaseModel
+from aigency.schemas.service.interface import Interface
+from aigency.schemas.service.capabilities import Capabilities
+
+class Service(BaseModel):
+    """Configuración de red y comunicación del agente."""
+    url: str
+    interface: Interface
+    capabilities: Capabilities

{aigency-0.0.1rc225507851 → aigency-0.0.1rc235167702}/aigency/tools/generator.py

@@ -14,7 +14,7 @@ from google.adk.tools.mcp_tool.mcp_toolset import (
     StreamableHTTPConnectionParams,
 )
 
-from aigency.models.tools import (
+from aigency.schemas.agent.tools import (
     FunctionTool,
     McpTool,
     McpTypeStdio,
@@ -43,11 +43,7 @@ class ToolGenerator:
 
         if isinstance(config.mcp_config, McpTypeStreamable):
             url = f"http://{config.mcp_config.url}:{config.mcp_config.port}{config.mcp_config.path}"
-            return MCPToolset(
-                connection_params=StreamableHTTPConnectionParams(
-                    url=url
-                )
-            )
+            return MCPToolset(connection_params=StreamableHTTPConnectionParams(url=url))
         elif isinstance(config.mcp_config, McpTypeStdio):
             command = config.mcp_config.command
             args = config.mcp_config.args
@@ -65,7 +61,7 @@ class ToolGenerator:
         ToolType.MCP: load_mcp_tool,
         ToolType.FUNCTION: load_function_tool,
     }
-    
+
     @staticmethod
     def create_tool(tool: Tool) -> Optional[Any]:
         """Create a tool based on its configuration.

{aigency-0.0.1rc225507851 → aigency-0.0.1rc235167702}/aigency/utils/config_service.py

@@ -6,36 +6,46 @@ from typing import Any, Dict, Optional
 
 import yaml
 
-from aigency.models.config import AgentConfig
+from aigency.schemas.aigency_config import AigencyConfig
 from aigency.utils.logger import get_logger
 
 
 logger = get_logger()
 
+
 class ConfigService:
     """Service for loading and managing agent configurations."""
+
     def __init__(self, config_file: str, environment: Optional[str] = None):
         self.config_file = config_file
-        self.environment = environment or os.getenv('ENVIRONMENT', None)
+        self.environment = environment or os.getenv("ENVIRONMENT", None)
         self.config = self._load_and_parse()
 
-    def _load_and_parse(self) -> AgentConfig:
-        """Carga los YAMLs, los mergea y parsea según AgentConfig."""
+    def _load_and_parse(self) -> AigencyConfig:
+        """Carga los YAMLs, los mergea y parsea según AigencyConfig."""
 
         logger.info(f"Loading configuration from {self.config_file}")
         config = self._load_yaml(self.config_file)
 
         if self.environment is not None:
-            logger.info(f"Environment '{self.environment}' detected, loading environment-specific configuration")
+            logger.info(
+                f"Environment '{self.environment}' detected, loading environment-specific configuration"
+            )
             env_config = self._load_env_config()
             if env_config:
-                logger.info(f"Successfully loaded environment configuration with {len(env_config)} keys: {list(env_config.keys())}")
+                logger.info(
+                    f"Successfully loaded environment configuration with {len(env_config)} keys: {list(env_config.keys())}"
+                )
                 config = self._merge_configs(config, env_config)
-                logger.debug(f"Configuration merged successfully for environment '{self.environment}'")
+                logger.debug(
+                    f"Configuration merged successfully for environment '{self.environment}'"
+                )
             else:
-                logger.warning(f"No environment-specific configuration found for '{self.environment}', using base configuration only")
-        
-        return AgentConfig(**config)
+                logger.warning(
+                    f"No environment-specific configuration found for '{self.environment}', using base configuration only"
+                )
+
+        return AigencyConfig(**config)
 
     def _load_yaml(self, file_path: str) -> Dict[str, Any]:
         """Carga un archivo YAML."""
@@ -43,26 +53,37 @@ class ConfigService:
             with open(file_path, "r", encoding="utf-8") as file:
                 return yaml.safe_load(file) or {}
         except FileNotFoundError:
-            raise FileNotFoundError(f"Archivo de configuración no encontrado: {file_path}")
+            raise FileNotFoundError(
+                f"Archivo de configuración no encontrado: {file_path}"
+            )
         except yaml.YAMLError as e:
             raise ValueError(f"Error al parsear YAML {file_path}: {e}")
 
     def _load_env_config(self) -> Optional[Dict[str, Any]]:
         """Carga configuración específica del entorno."""
         config_path = Path(self.config_file)
-        env_file = config_path.parent / f"{config_path.stem}.{self.environment}{config_path.suffix}"
-        
+        env_file = (
+            config_path.parent
+            / f"{config_path.stem}.{self.environment}{config_path.suffix}"
+        )
+
         return self._load_yaml(str(env_file)) if env_file.exists() else None
 
-    def _merge_configs(self, base: Dict[str, Any], env: Optional[Dict[str, Any]]) -> Dict[str, Any]:
+    def _merge_configs(
+        self, base: Dict[str, Any], env: Optional[Dict[str, Any]]
+    ) -> Dict[str, Any]:
         """Mergea configuración base con configuración de entorno."""
         if not env:
             return base
-            
+
         result = base.copy()
         for key, value in env.items():
-            if key in result and isinstance(result[key], dict) and isinstance(value, dict):
+            if (
+                key in result
+                and isinstance(result[key], dict)
+                and isinstance(value, dict)
+            ):
                 result[key] = self._merge_configs(result[key], value)
             else:
                 result[key] = value
-        return result
+        return result

{aigency-0.0.1rc225507851 → aigency-0.0.1rc235167702}/aigency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aigency
-Version: 0.0.1rc225507851
+Version: 0.0.1rc235167702
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

aigency-0.0.1rc235167702/aigency.egg-info/SOURCES.txt

@@ -0,0 +1,26 @@
+README.md
+pyproject.toml
+aigency/__init__.py
+aigency.egg-info/PKG-INFO
+aigency.egg-info/SOURCES.txt
+aigency.egg-info/dependency_links.txt
+aigency.egg-info/requires.txt
+aigency.egg-info/top_level.txt
+aigency/agents/executor.py
+aigency/agents/generator.py
+aigency/schemas/aigency_config.py
+aigency/schemas/agent/agent.py
+aigency/schemas/agent/model.py
+aigency/schemas/agent/skills.py
+aigency/schemas/agent/tools.py
+aigency/schemas/metadata/metadata.py
+aigency/schemas/observability/observability.py
+aigency/schemas/observability/phoenix.py
+aigency/schemas/service/capabilities.py
+aigency/schemas/service/interface.py
+aigency/schemas/service/service.py
+aigency/tools/generator.py
+aigency/utils/config_service.py
+aigency/utils/logger.py
+aigency/utils/singleton.py
+aigency/utils/utils.py

{aigency-0.0.1rc225507851 → aigency-0.0.1rc235167702}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aigency"
-version = "0.0.1rc225507851"
+version = "0.0.1rc235167702"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"

aigency-0.0.1rc225507851/aigency/models/config.py

@@ -1,69 +0,0 @@
-"""Configuration models for agents."""
-
-from typing import List, Optional, Union
-
-from pydantic import BaseModel
-
-from aigency.models.core import Capabilities, ModelConfig, Skill
-from aigency.models.tools import FunctionTool, McpTool, Tool
-
-#class SecurityScheme(BaseModel):
-#    """Define un esquema de seguridad individual."""
-#    type: str
-#    description: Optional[str] = None
-#    scheme: str
-#    bearerFormat: Optional[str] = None
-#
-#class AuthConfig(BaseModel):
-#    """Configuración de autenticación."""
-#    type: str
-#    securitySchemes: Optional[Dict[str, SecurityScheme]] = None
-#    security: Optional[List[Dict[str, List[str]]]] = None
-
-# --- Modelos para secciones opcionales ---
-
-#class MonitoringConfig(BaseModel):
-#    """Configuración de monitorización y observabilidad."""
-#    phoenix_host: Optional[str] = None
-#    phoenix_port: Optional[int] = None
-
-#class RemoteAgent(BaseModel):
-#    """Configuración para la comunicación con un agente remoto."""
-#    name: str
-#    host: str
-#    port: int
-    #auth: Optional[AuthConfig] = None # Reutilizamos la configuración de Auth
-
-# --- Clase Principal que une todo ---
-
-class AgentConfig(BaseModel):
-    """Root Pydantic model for complete agent configuration."""
-    # Configuración Básica
-    name: str
-    description: str
-    url: str
-    version: str
-    default_input_modes: Optional[List[str]] = None
-    default_output_modes: Optional[List[str]] = None
-    capabilities: Optional[Capabilities] = None
-
-    # Autenticación
-    #auth: Optional[AuthConfig] = None
-    
-    # Configuración del Modelo
-    model: ModelConfig
-        
-    # Comportamiento
-    instruction: Optional[str] = None
-    skills: Optional[List[Skill]] = None
-
-    # Herramientas
-    tools: Optional[List[Union[FunctionTool, McpTool, Tool]]] = None
-
-    # Comunicación Multi-Agente
-    #remote_agents_addresses: Optional[List[RemoteAgent]] = None
-    
-    # Monitorización
-    #monitoring: Optional[MonitoringConfig] = None
-    
-

aigency-0.0.1rc225507851/aigency/models/core.py

@@ -1,28 +0,0 @@
-"""Core models for agent configuration."""
-
-from typing import Dict, List, Optional
-
-from pydantic import BaseModel
-
-
-class ProviderConfig(BaseModel):
-    """Configuration for AI model provider."""
-    name: str
-    endpoint: Optional[str] = None
-
-class ModelConfig(BaseModel):
-    """Configuration for AI model."""
-    name: str
-    provider: Optional[ProviderConfig] = None
-
-class Capabilities(BaseModel):
-    """Agent capabilities, such as streaming."""
-    streaming: Optional[bool] = None
-
-class Skill(BaseModel):
-    """Define a specific agent skill."""
-    id: str
-    name: str
-    description: str
-    tags: Optional[List[str]] = None
-    examples: Optional[List[str]] = None

aigency-0.0.1rc225507851/aigency.egg-info/SOURCES.txt

@@ -1,18 +0,0 @@
-README.md
-pyproject.toml
-aigency/__init__.py
-aigency.egg-info/PKG-INFO
-aigency.egg-info/SOURCES.txt
-aigency.egg-info/dependency_links.txt
-aigency.egg-info/requires.txt
-aigency.egg-info/top_level.txt
-aigency/agents/executor.py
-aigency/agents/generator.py
-aigency/models/config.py
-aigency/models/core.py
-aigency/models/tools.py
-aigency/tools/generator.py
-aigency/utils/config_service.py
-aigency/utils/logger.py
-aigency/utils/singleton.py
-aigency/utils/utils.py