refactor(schemas): clean up imports and update comments in a2a_types and schemas

This commit is contained in:
Davidson Gomes 2025-05-07 17:00:45 -03:00
parent a1ccae54c5
commit 93ad731f40
6 changed files with 14 additions and 27 deletions

View File

@ -1,6 +1,6 @@
from datetime import datetime from datetime import datetime
from enum import Enum from enum import Enum
from typing import Annotated, Any, Literal, TypeVar from typing import Annotated, Any, Literal
from uuid import uuid4 from uuid import uuid4
from typing_extensions import Self from typing_extensions import Self
@ -147,7 +147,7 @@ class TaskPushNotificationConfig(BaseModel):
pushNotificationConfig: PushNotificationConfig pushNotificationConfig: PushNotificationConfig
## RPC Messages # RPC Messages
class JSONRPCMessage(BaseModel): class JSONRPCMessage(BaseModel):
@ -243,7 +243,7 @@ A2ARequest = TypeAdapter(
] ]
) )
## Error types # Error types
class JSONParseError(JSONRPCError): class JSONParseError(JSONRPCError):

View File

@ -1,5 +1,5 @@
from pydantic import BaseModel, Field, validator, EmailStr, UUID4, ConfigDict from pydantic import BaseModel, Field, validator, UUID4, ConfigDict
from typing import Optional, Dict, Any, Union, List from typing import Optional, Dict, Any, List
from datetime import datetime from datetime import datetime
from uuid import UUID from uuid import UUID
import uuid import uuid

View File

@ -1,8 +1,7 @@
import json
import logging import logging
import asyncio import asyncio
from collections.abc import AsyncIterable from collections.abc import AsyncIterable
from typing import Any, Dict, Optional, Union, List from typing import Dict, Optional
from uuid import UUID from uuid import UUID
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
@ -10,19 +9,8 @@ from sqlalchemy.orm import Session
from src.config.settings import settings from src.config.settings import settings
from src.services.agent_service import ( from src.services.agent_service import (
get_agent, get_agent,
create_agent,
update_agent,
delete_agent,
get_agents_by_client,
) )
from src.services.mcp_server_service import get_mcp_server from src.services.mcp_server_service import get_mcp_server
from src.services.session_service import (
get_sessions_by_client,
get_sessions_by_agent,
get_session_by_id,
delete_session,
get_session_events,
)
from src.services.agent_runner import run_agent, run_agent_stream from src.services.agent_runner import run_agent, run_agent_stream
from src.services.service_providers import ( from src.services.service_providers import (
@ -367,7 +355,7 @@ class A2ATaskManager:
final_artifact = Artifact(parts=parts, index=0) final_artifact = Artifact(parts=parts, index=0)
# Update the task in the store with the final response # Update the task in the store with the final response
task = await self.update_store( await self.update_store(
task_params.id, task_params.id,
TaskStatus(state=task_state, message=final_message), TaskStatus(state=task_state, message=final_message),
[final_artifact], [final_artifact],

View File

@ -139,9 +139,7 @@ class AgentBuilder:
logger.info(f"Using stored API key for agent {agent.name}") logger.info(f"Using stored API key for agent {agent.name}")
api_key = decrypted_key api_key = decrypted_key
else: else:
logger.error( logger.error(f"Stored API key not found for agent {agent.name}")
f"Stored API key not found for agent {agent.name}"
)
raise ValueError( raise ValueError(
f"API key with ID {agent.api_key_id} not found or inactive" f"API key with ID {agent.api_key_id} not found or inactive"
) )
@ -155,7 +153,7 @@ class AgentBuilder:
key_id = uuid.UUID(config_api_key) key_id = uuid.UUID(config_api_key)
decrypted_key = get_decrypted_api_key(self.db, key_id) decrypted_key = get_decrypted_api_key(self.db, key_id)
if decrypted_key: if decrypted_key:
logger.info(f"Config API key is a valid reference") logger.info("Config API key is a valid reference")
api_key = decrypted_key api_key = decrypted_key
else: else:
# Use the key directly # Use the key directly
@ -165,7 +163,9 @@ class AgentBuilder:
api_key = config_api_key api_key = config_api_key
else: else:
logger.error(f"No API key configured for agent {agent.name}") logger.error(f"No API key configured for agent {agent.name}")
raise ValueError(f"Agent {agent.name} does not have a configured API key") raise ValueError(
f"Agent {agent.name} does not have a configured API key"
)
return ( return (
LlmAgent( LlmAgent(

View File

@ -67,7 +67,7 @@ def get_api_keys_by_client(
query = ( query = (
db.query(ApiKey) db.query(ApiKey)
.filter(ApiKey.client_id == client_id) .filter(ApiKey.client_id == client_id)
.filter(ApiKey.is_active == True) .filter(ApiKey.is_active)
) )
# Apply sorting # Apply sorting

View File

@ -7,7 +7,6 @@ from google.genai.types import Content, Part
from typing import AsyncGenerator, Dict, Any, List, TypedDict from typing import AsyncGenerator, Dict, Any, List, TypedDict
import uuid import uuid
from google.adk.runners import Runner
from src.services.agent_service import get_agent from src.services.agent_service import get_agent
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
@ -280,7 +279,7 @@ class WorkflowAgent(BaseAgent):
# Prepare a more descriptive message about the conditions # Prepare a more descriptive message about the conditions
conditions_result_text = "\n".join(condition_details) conditions_result_text = "\n".join(condition_details)
condition_summary = f"TRUE" if conditions_met else "FALSE" condition_summary = "TRUE" if conditions_met else "FALSE"
condition_content = [ condition_content = [
Event( Event(