kagent-adk 0.6.10__py3-none-any.whl → 0.6.11__py3-none-any.whl

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/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.10.dist-info → kagent_adk-0.6.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kagent-adk
-Version: 0.6.10
+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.10.dist-info → kagent_adk-0.6.11.dist-info}/RECORD

@@ -6,12 +6,13 @@ kagent/adk/_token.py,sha256=OL46m7U5vUTby1WWjVB7Jqzig4TWddzoAmLVLlfSdAg,2515
 kagent/adk/cli.py,sha256=Sdw9FXnUmeHfgJhdRDq1zpoNMf6GM7x35ZDz_OkQgJg,2963
 kagent/adk/types.py,sha256=v7VbO0tAPvpjdEgWJroEq64jSCz6D3Q0yPdRM0a7MjM,4260
 kagent/adk/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kagent/adk/converters/event_converter.py,sha256=gPDxJhPtoIp2CAm0VjSPTH-siuz3IR23CV25AiN_1B8,10392
+kagent/adk/converters/error_mappings.py,sha256=1KUJPS8VrcaTv6yUKb5Whg-S2XX8YGJmtTIeZqnqvuw,2769
+kagent/adk/converters/event_converter.py,sha256=WKQRqREB11TbgGp6U_--mmukvJJgew6-VEkrGBqGVA4,10519
 kagent/adk/converters/part_converter.py,sha256=Q9Kbteit8XdL_9Tb8bAtxRxOZQei8Wabszwsl4YMe2c,7507
 kagent/adk/converters/request_converter.py,sha256=iTmTmhlnyRfuYyFi4WmpTSXPz22xjjotbe750j-CvYA,1072
 kagent/adk/models/__init__.py,sha256=mqD0JhS9kT1rMpFNLq5-qnjstpp6lzT9xADaOfjrUKY,78
 kagent/adk/models/_openai.py,sha256=0hQklnXacTHsb5h1gkPqmuoEyJl_ibh5R-FBY-wQ7Ts,16594
-kagent_adk-0.6.10.dist-info/METADATA,sha256=VsGqdcwyjzgZuaW88j91gog1aE1pllMz6yOwNlJjcO4,944
-kagent_adk-0.6.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kagent_adk-0.6.10.dist-info/entry_points.txt,sha256=a1Q2Inc9L0dvXWEkwnCdf9cfXdpX5Dl2Q6DhNWNjhxw,50
-kagent_adk-0.6.10.dist-info/RECORD,,
+kagent_adk-0.6.11.dist-info/METADATA,sha256=tgksopEr1rQBB4B6nGmtBeQeNTDG7dwxLpWXEitjTs8,944
+kagent_adk-0.6.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kagent_adk-0.6.11.dist-info/entry_points.txt,sha256=a1Q2Inc9L0dvXWEkwnCdf9cfXdpX5Dl2Q6DhNWNjhxw,50
+kagent_adk-0.6.11.dist-info/RECORD,,