kagent-adk 0.6.9__tar.gz → 0.6.11__tar.gz

{kagent_adk-0.6.9 → kagent_adk-0.6.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kagent-adk
-Version: 0.6.9
+Version: 0.6.11
 Summary: kagent-adk is an sdk for integrating adk agents with kagent
 Requires-Python: >=3.12.11
 Requires-Dist: a2a-sdk>=0.3.1

{kagent_adk-0.6.9 → kagent_adk-0.6.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kagent-adk"
-version = "0.6.9"
+version = "0.6.11"
 description = "kagent-adk is an sdk for integrating adk agents with kagent"
 readme = "README.md"
 requires-python = ">=3.12.11"

kagent_adk-0.6.11/src/kagent/adk/converters/error_mappings.py

@@ -0,0 +1,60 @@
+"""Error code to user-friendly message mappings for ADK events.
+
+This module provides mappings from Google GenAI finish reasons to user-friendly
+error messages, excluding STOP which is a normal completion reason.
+"""
+
+from typing import Dict, Optional
+
+from google.genai import types as genai_types
+
+# Error code to user-friendly message mappings
+# Based on Google GenAI types.py FinishReason enum (excluding STOP)
+ERROR_CODE_MESSAGES: Dict[str, str] = {
+    # Length and token limits
+    genai_types.FinishReason.MAX_TOKENS: "Response was truncated due to maximum token limit. Try asking a shorter question or breaking it into parts.",
+    # Safety and content filtering
+    genai_types.FinishReason.SAFETY: "Response was blocked due to safety concerns. Please rephrase your request to avoid potentially harmful content.",
+    genai_types.FinishReason.RECITATION: "Response was blocked due to unauthorized citations. Please rephrase your request.",
+    genai_types.FinishReason.BLOCKLIST: "Response was blocked due to restricted terminology. Please rephrase your request using different words.",
+    genai_types.FinishReason.PROHIBITED_CONTENT: "Response was blocked due to prohibited content. Please rephrase your request.",
+    genai_types.FinishReason.SPII: "Response was blocked due to sensitive personal information concerns. Please avoid including personal details.",
+    # Function calling errors
+    genai_types.FinishReason.MALFORMED_FUNCTION_CALL: "The agent generated an invalid function call. This may be due to complex input data. Try rephrasing your request or breaking it into simpler steps.",
+    # Generic fallback
+    genai_types.FinishReason.OTHER: "An unexpected error occurred during processing. Please try again or rephrase your request.",
+}
+
+# Normal completion reasons that should not be treated as errors
+NORMAL_COMPLETION_REASONS = {
+    genai_types.FinishReason.STOP,  # Normal completion
+}
+
+# Default error message when no specific mapping exists
+DEFAULT_ERROR_MESSAGE = "An error occurred during processing"
+
+
+def _get_error_message(error_code: Optional[str]) -> str:
+    """Get a user-friendly error message for the given error code.
+
+    Args:
+        error_code: The error code from the ADK event (e.g., finish_reason)
+
+    Returns:
+        User-friendly error message string
+    """
+
+    # Return mapped message or default
+    return ERROR_CODE_MESSAGES.get(error_code, DEFAULT_ERROR_MESSAGE)
+
+
+def _is_normal_completion(error_code: Optional[str]) -> bool:
+    """Check if the error code represents normal completion rather than an error.
+
+    Args:
+        error_code: The error code to check
+
+    Returns:
+        True if this is a normal completion reason, False otherwise
+    """
+    return error_code in NORMAL_COMPLETION_REASONS

{kagent_adk-0.6.9 → kagent_adk-0.6.11}/src/kagent/adk/converters/event_converter.py

@@ -20,6 +20,7 @@ from kagent.core.a2a import (
     get_kagent_metadata_key,
 )
 
+from .error_mappings import _get_error_message, _is_normal_completion
 from .part_converter import (
     convert_genai_part_to_a2a_part,
 )
@@ -27,7 +28,6 @@ from .part_converter import (
 # Constants
 
 ARTIFACT_ID_SEPARATOR = "-"
-DEFAULT_ERROR_MESSAGE = "An error occurred during processing"
 
 # Logger
 logger = logging.getLogger("kagent_adk." + __name__)
@@ -191,13 +191,16 @@ def _create_error_status_event(
     Returns:
       A TaskStatusUpdateEvent with FAILED state.
     """
-    error_message = getattr(event, "error_message", None) or DEFAULT_ERROR_MESSAGE
+    error_message = getattr(event, "error_message", None)
 
     # Get context metadata and add error code
     event_metadata = _get_context_metadata(event, invocation_context)
     if event.error_code:
         event_metadata[get_kagent_metadata_key("error_code")] = str(event.error_code)
 
+        if not error_message:
+            error_message = _get_error_message(event.error_code)
+
     return TaskStatusUpdateEvent(
         task_id=task_id,
         context_id=context_id,
@@ -298,7 +301,7 @@ def convert_event_to_a2a_events(
 
     try:
         # Handle error scenarios
-        if event.error_code:
+        if event.error_code and not _is_normal_completion(event.error_code):
             error_event = _create_error_status_event(event, invocation_context, task_id, context_id)
             a2a_events.append(error_event)
 

{kagent_adk-0.6.9 → kagent_adk-0.6.11}/src/kagent/adk/models/_openai.py

@@ -55,8 +55,13 @@ def _convert_content_to_openai_messages(
         system_message: ChatCompletionSystemMessageParam = {"role": "system", "content": system_instruction}
         messages.append(system_message)
 
-    # Track tool calls to ensure proper flow
-    pending_tool_calls = set()
+    # First pass: collect all function responses to match with tool calls
+    all_function_responses = {}
+    for content in contents:
+        for part in content.parts or []:
+            if part.function_response:
+                tool_call_id = part.function_response.id or "call_1"
+                all_function_responses[tool_call_id] = part.function_response
 
     for content in contents:
         role = _convert_role_to_openai(content.role)
@@ -83,23 +88,14 @@ def _convert_content_to_openai_messages(
                     }
                     image_parts.append(image_part)
 
-        # Handle function responses first (they should be tool messages)
-        for func_response in function_responses:
-            tool_call_id = func_response.function_response.id or "call_1"
-            if tool_call_id in pending_tool_calls:
-                tool_message: ChatCompletionToolMessageParam = {
-                    "role": "tool",
-                    "tool_call_id": tool_call_id,
-                    "content": str(func_response.function_response.response.get("result", ""))
-                    if func_response.function_response.response
-                    else "",
-                }
-                messages.append(tool_message)
-                pending_tool_calls.discard(tool_call_id)
+        # Function responses are now handled together with function calls
+        # This ensures proper pairing and prevents orphaned tool messages
 
         # Handle function calls (assistant messages with tool_calls)
         if function_calls:
             tool_calls = []
+            tool_response_messages = []
+
             for func_call in function_calls:
                 tool_call_function: ToolCallFunction = {
                     "name": func_call.function_call.name or "",
@@ -112,7 +108,25 @@ def _convert_content_to_openai_messages(
                     "function": tool_call_function,
                 }
                 tool_calls.append(tool_call)
-                pending_tool_calls.add(tool_call_id)
+
+                # Check if we have a response for this tool call
+                if tool_call_id in all_function_responses:
+                    func_response = all_function_responses[tool_call_id]
+                    tool_message: ChatCompletionToolMessageParam = {
+                        "role": "tool",
+                        "tool_call_id": tool_call_id,
+                        "content": str(func_response.response.get("result", "")) if func_response.response else "",
+                    }
+                    tool_response_messages.append(tool_message)
+                else:
+                    # If no response is available, create a placeholder response
+                    # This prevents the OpenAI API error
+                    tool_message: ChatCompletionToolMessageParam = {
+                        "role": "tool",
+                        "tool_call_id": tool_call_id,
+                        "content": "No response available for this function call.",
+                    }
+                    tool_response_messages.append(tool_message)
 
             # Create assistant message with tool calls
             text_content = "\n".join(text_parts) if text_parts else None
@@ -123,6 +137,9 @@ def _convert_content_to_openai_messages(
             }
             messages.append(assistant_message)
 
+            # Add all tool response messages immediately after the assistant message
+            messages.extend(tool_response_messages)
+
         # Handle regular text/image messages (only if no function calls)
         elif text_parts or image_parts:
             if role == "user":