monocle-apptrace 0.5.2__tar.gz → 0.6.0__tar.gz

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/.gitignore

@@ -14,4 +14,9 @@ dist
 .DS_Store
 Pipfile**
 launch.json
-monocle_trace**.json
+monocle_trace**.json
+
+# Ignore LICENSE files in specific subdirectories
+apptrace/LICENSE
+mcp/LICENSE
+test_tools/LICENSE

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/PKG-INFO

@@ -1,31 +1,29 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.5.2
+Version: 0.6.0
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
 Author-email: "Okahu Inc." <okahu-pypi@okahu.ai>
 License: Apache-2.0
-License-File: LICENSE
-License-File: NOTICE
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
-Requires-Dist: click==8.2.1
-Requires-Dist: mcp>=1.13.1
 Requires-Dist: opentelemetry-api>=1.21.0
 Requires-Dist: opentelemetry-instrumentation
 Requires-Dist: opentelemetry-sdk>=1.21.0
-Requires-Dist: pydantic>=2.11.7
 Requires-Dist: requests
 Requires-Dist: wrapt>=1.14.0
+Provides-Extra: ai-test
+Requires-Dist: bert-score; extra == 'ai-test'
+Requires-Dist: transformers; extra == 'ai-test'
 Provides-Extra: aws
 Requires-Dist: boto3==1.37.24; extra == 'aws'
 Provides-Extra: azure
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'azure'
 Provides-Extra: dev
-Requires-Dist: a2a-sdk==0.2.8; extra == 'dev'
+Requires-Dist: a2a-sdk==0.3.6; extra == 'dev'
 Requires-Dist: anthropic-haystack; extra == 'dev'
 Requires-Dist: anthropic==0.57.1; extra == 'dev'
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'dev'
@@ -40,12 +38,13 @@ Requires-Dist: google-adk==1.10.0; extra == 'dev'
 Requires-Dist: google-generativeai==0.8.5; extra == 'dev'
 Requires-Dist: haystack-ai==2.3.0; extra == 'dev'
 Requires-Dist: httpx==0.28.1; extra == 'dev'
+Requires-Dist: huggingface-hub==0.35.3; extra == 'dev'
 Requires-Dist: instructorembedding==1.0.1; extra == 'dev'
 Requires-Dist: langchain-anthropic==0.3.13; extra == 'dev'
 Requires-Dist: langchain-aws==0.2.23; extra == 'dev'
 Requires-Dist: langchain-chroma==0.2.4; extra == 'dev'
 Requires-Dist: langchain-community==0.3.24; extra == 'dev'
-Requires-Dist: langchain-google-genai==2.1.8; extra == 'dev'
+Requires-Dist: langchain-google-genai==2.0.10; extra == 'dev'
 Requires-Dist: langchain-mcp-adapters==0.1.8; extra == 'dev'
 Requires-Dist: langchain-mistralai==0.2.10; extra == 'dev'
 Requires-Dist: langchain-openai==0.3.18; extra == 'dev'
@@ -64,6 +63,7 @@ Requires-Dist: llama-index-vector-stores-opensearch==0.6.0; extra == 'dev'
 Requires-Dist: llama-index==0.13.0; extra == 'dev'
 Requires-Dist: mcp==1.12.1; extra == 'dev'
 Requires-Dist: mistral-haystack==0.0.2; extra == 'dev'
+Requires-Dist: mistralai==1.9.9; extra == 'dev'
 Requires-Dist: numpy==1.26.4; extra == 'dev'
 Requires-Dist: openai-agents==0.2.6; extra == 'dev'
 Requires-Dist: opendal==0.45.14; extra == 'dev'
@@ -80,42 +80,12 @@ Requires-Dist: types-requests==2.31.0.20240106; extra == 'dev'
 Requires-Dist: uvicorn==0.35.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
-# Monocle for tracing GenAI app code
+# Monocle Apptrace
 
 **Monocle** helps developers and platform engineers building or managing GenAI apps monitor these in prod by making it easy to instrument their code to capture traces that are compliant with open-source cloud-native observability ecosystem. 
 
 **Monocle** is a community-driven OSS framework for tracing GenAI app code governed as a [Linux Foundation AI & Data project](https://lfaidata.foundation/projects/monocle/). 
 
-## Why Monocle
-
-Monocle is built for: 
-- **app developers** to trace their app code in any environment without lots of custom code decoration 
-- **platform engineers** to instrument apps in prod through wrapping instead of asking app devs to recode
-- **GenAI component providers** to add observability features to their products 
-- **enterprises** to consume traces from GenAI apps in their existing open-source observability stack
-
-Benefits:
-- Monocle provides an implementation + package, not just a spec 
-   - No expertise in OpenTelemetry spec required
-   - No bespoke implementation of that spec required
-   - No last-mile GenAI domain specific code required to instrument your app
-- Monocle provides consistency  
-   - Connect traces across app code executions, model inference or data retrievals
-   - No cleansing of telemetry data across GenAI component providers required
-   - Works the same in personal lab dev or org cloud prod environments
-   - Send traces to location that fits your scale, budget and observability stack
-- Monocle is fully open source and community driven
-   - No vendor lock-in
-   - Implementation is transparent
-   - You can freely use or customize it to fit your needs 
-
-## What Monocle provides
-
-- Easy to [use](#use-monocle) code instrumentation
-- OpenTelemetry compatible format for [spans](src/monocle_apptrace/metamodel/spans/span_format.json). 
-- Community-curated and extensible [metamodel](src/monocle_apptrace/metamodel/README.md) for consisent tracing of GenAI components. 
-- Export to local and cloud storage 
-
 ## Use Monocle
 
 - Get the Monocle package
@@ -137,42 +107,4 @@ Benefits:
 See [Monocle user guide](Monocle_User_Guide.md) for more details.
   
 
-## Use Monocle MCP
-
-First install monocle-apptrace: pip install monocle-apptrace
-
-Open bash and run the following command to run the monocle mcp server with stdio:
-monocle_apptrace
-
-If you are using VS Code you can add following entry to your .vscode/mcp.json
-
-```json
-"monocle-mcp-server": {
-      "type": "stdio",
-      "command": "uvx",
-      "args": [
-         "monocle_apptrace"
-      ],
-      "env": {}
-   }
-```
-
-## Roadmap 
-
-Goal of Monocle is to support tracing for apps written in *any language* with *any LLM orchestration or agentic framework* and built using models, vectors, agents or other components served up by *any cloud or model inference provider*. 
-
-Current version supports: 
-- Language: (🟢) Python , (🔜) [Typescript](https://github.com/monocle2ai/monocle-typescript) 
-- LLM-frameworks: (🟢) Langchain, (🟢) Llamaindex, (🟢) Haystack, (🔜) Flask
-- LLM inference providers: (🟢) OpenAI, (🟢) Azure OpenAI, (🟢) Nvidia Triton, (🔜) AWS Bedrock, (🔜) Google Vertex, (🔜) Azure ML, (🔜) Hugging Face
-- Vector stores: (🟢) FAISS, (🔜) OpenSearch, (🔜) Milvus
-- Exporter: (🟢) stdout, (🟢) file, (🔜) Azure Blob Storage, (🔜) AWS S3, (🔜) Google Cloud Storage
-
-
-## Get involved
-### Provide feedback
-- Submit issues and enhancements requests via Github issues
-
-### Contribute
-- Monocle is community based open source project. We welcome your contributions. Please refer to the CONTRIBUTING and CODE_OF_CONDUCT for guidelines. The [contributor's guide](CONTRIBUTING.md) provides technical details of the project.
 

monocle_apptrace-0.6.0/README.md

@@ -0,0 +1,28 @@
+# Monocle Apptrace
+
+**Monocle** helps developers and platform engineers building or managing GenAI apps monitor these in prod by making it easy to instrument their code to capture traces that are compliant with open-source cloud-native observability ecosystem. 
+
+**Monocle** is a community-driven OSS framework for tracing GenAI app code governed as a [Linux Foundation AI & Data project](https://lfaidata.foundation/projects/monocle/). 
+
+## Use Monocle
+
+- Get the Monocle package
+  
+```
+    pip install monocle_apptrace 
+```
+- Instrument your app code
+     - Import the Monocle package
+       ```
+          from monocle_apptrace.instrumentor import setup_monocle_telemetry
+       ```
+     - Setup instrumentation in your ```main()``` function  
+       ``` 
+          setup_monocle_telemetry(workflow_name="your-app-name")
+       ```         
+- (Optionally) Modify config to alter where traces are sent
+
+See [Monocle user guide](Monocle_User_Guide.md) for more details.
+  
+
+

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/pyproject.toml

@@ -1,10 +1,16 @@
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling","hatch-build-scripts"]
 build-backend = "hatchling.build"
 
+[[tool.hatch.build.hooks.build-scripts.scripts]]
+commands = [
+    "echo 'Running a pre-build step..copying license'",
+    "if [ -f \"LICENSE\" ]; then echo \"✅ LICENSE already exists\"; elif [ -f \"../LICENSE\" ]; then cp \"../LICENSE\" \"LICENSE\" && echo \"✅ LICENSE copied from parent\"; else echo \"❌ ERROR: LICENSE not found\" && exit 1; fi"
+]
+
 [project]
 name = "monocle_apptrace"
-version = "0.5.2"
+version = "0.6.0"
 authors = [
   { name="Okahu Inc.", email="okahu-pypi@okahu.ai" },
 ]
@@ -23,9 +29,6 @@ dependencies = [
    'opentelemetry-api>=1.21.0',
    'opentelemetry-sdk>=1.21.0',
    'opentelemetry-instrumentation',
-   'mcp>=1.13.1',
-   'pydantic>=2.11.7',
-   'click==8.2.1'
 ]
 
 [tool.pytest.ini_options]
@@ -46,6 +49,11 @@ markers = [
 ]
 
 [project.optional-dependencies]
+ai_test = [
+   'bert-score',
+   'transformers'
+]
+
 dev = [
   'langchain-openai==0.3.18',
   'langchain-chroma==0.2.4',
@@ -89,17 +97,19 @@ dev = [
   'langchain-anthropic==0.3.13',
   'langchain-mcp-adapters==0.1.8',
   'mcp==1.12.1',
-  'a2a-sdk==0.2.8', 
+  'a2a-sdk==0.3.6',
   'httpx==0.28.1',
   'fastapi>=0.115.0',
   'pydantic==2.11.7',
   'uvicorn==0.35.0',
   'click==8.2.1',
   'python-dotenv>=1.1.0',
-  'langchain-google-genai==2.1.8',
+  'langchain-google-genai==2.0.10',
   'google-adk==1.10.0',
   'google-generativeai==0.8.5',
-  'openai-agents==0.2.6'
+  'openai-agents==0.2.6',
+  'mistralai==1.9.9',
+  'huggingface_hub==0.35.3'
 ]
 
 azure = [

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/exporters/file_exporter.py

@@ -14,12 +14,13 @@ from monocle_apptrace.exporters.exporter_processor import ExportTaskProcessor
 DEFAULT_FILE_PREFIX:str = "monocle_trace_"
 DEFAULT_TIME_FORMAT:str = "%Y-%m-%d_%H.%M.%S"
 HANDLE_TIMEOUT_SECONDS: int = 60  # 1 minute timeout
+DEFAULT_TRACE_FOLDER = ".monocle"
 
 class FileSpanExporter(SpanExporterBase):
     def __init__(
         self,
         service_name: Optional[str] = None,
-        out_path:str = ".",
+        out_path:str = path.join(".", DEFAULT_TRACE_FOLDER),
         file_prefix = DEFAULT_FILE_PREFIX,
         time_format = DEFAULT_TIME_FORMAT,
         formatter: Callable[
@@ -34,12 +35,16 @@ class FileSpanExporter(SpanExporterBase):
         self.formatter = formatter
         self.service_name = service_name
         self.output_path = os.getenv("MONOCLE_TRACE_OUTPUT_PATH", out_path)
+        if not os.path.exists(self.output_path):
+            os.makedirs(self.output_path)
         self.file_prefix = file_prefix
         self.time_format = time_format
         self.task_processor = task_processor
         self.is_first_span_in_file = True  # Track if this is the first span in the current file
         if self.task_processor is not None:
             self.task_processor.start()
+        self.last_file_processed:str = None
+        self.last_trace_id = None
 
     def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
         is_root_span = any(not span.parent for span in spans)
@@ -50,6 +55,9 @@ class FileSpanExporter(SpanExporterBase):
         else:
             return self._process_spans(spans, is_root_span=is_root_span)
 
+    def set_service_name(self, service_name: str) -> None:
+        self.service_name = service_name
+
     def _cleanup_expired_handles(self) -> None:
         """Close and remove file handles that have exceeded the timeout."""
         current_time = datetime.now()
@@ -96,6 +104,8 @@ class FileSpanExporter(SpanExporterBase):
                 print(f"Error closing file {file_path}: {e}")
             finally:
                 del self.file_handles[trace_id]
+                self.last_file_processed = file_path
+                self.last_trace_id = trace_id
 
     def _mark_span_written(self, trace_id: int) -> None:
         """Mark that a span has been written for this trace (no longer first span)."""
@@ -123,7 +133,10 @@ class FileSpanExporter(SpanExporterBase):
         
         # Process spans for each trace
         for trace_id, trace_spans in spans_by_trace.items():
-            service_name = trace_spans[0].resource.attributes.get(SERVICE_NAME, "unknown")
+            if self.service_name is not None:
+                service_name = self.service_name
+            else:
+                service_name = trace_spans[0].resource.attributes.get(SERVICE_NAME, "unknown")
             handle, file_path, is_first_span = self._get_or_create_handle(trace_id, service_name)
             
             if handle is None:

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/common/instrumentor.py

@@ -165,7 +165,7 @@ def setup_monocle_telemetry(
         span_handlers: Dict[str,SpanHandler] = None,
         wrapper_methods: List[Union[dict,WrapperMethod]] = None,
         union_with_default_methods: bool = True,
-        monocle_exporters_list:str = None) -> None:
+        monocle_exporters_list:str = None) -> MonocleInstrumentor:
     """
     Set up Monocle telemetry for the application.
 

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/common/span_handler.py

@@ -26,6 +26,8 @@ WORKFLOW_TYPE_MAP = {
     "anthropic": "workflow.anthropic",
     "gemini": "workflow.gemini",
     "litellm": "workflow.litellm",
+    "mistralai": "workflow.mistral",
+    "huggingface_hub": "workflow.huggingface"
 }
 
 FRAMEWORK_WORKFLOW_LIST = [
@@ -185,7 +187,12 @@ class SpanHandler:
                         accessor = attribute.get("accessor")
                         if accessor:
                             try:
-                                result = accessor(arguments)
+                                try:
+                                    result = accessor(arguments)
+                                except MonocleSpanException as e:
+                                    span.set_status(StatusCode.ERROR, e.message)
+                                    detected_error = True
+                                    result = e.get_err_code()
                                 if result and isinstance(result, dict):
                                     result = dict((key, value) for key, value in result.items() if value is not None)
                                 if result and isinstance(result, (int, str, list, dict)):
@@ -193,9 +200,6 @@ class SpanHandler:
                                         event_attributes[attribute_key] = result
                                     else:
                                         event_attributes.update(result)
-                            except MonocleSpanException as e:
-                                span.set_status(StatusCode.ERROR, e.message)
-                                detected_error = True
                             except Exception as e:
                                 logger.debug(f"Error evaluating accessor for attribute '{attribute_key}': {e}")
                     matching_timestamp = getattr(ret_result, "timestamps", {}).get(event_name, None)

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/common/utils.py

@@ -30,7 +30,7 @@ except Exception as e:
     logger.warning("Exception finding monocle-apptrace version.")
 
 class MonocleSpanException(Exception):
-    def __init__(self, err_message:str):
+    def __init__(self, err_message:str, err_code:str = None):
         """
         Monocle exeption to indicate error in span processing.        
         Parameters:
@@ -39,10 +39,15 @@ class MonocleSpanException(Exception):
         """
         super().__init__(err_message)
         self.message = err_message
+        self.err_code = err_code
 
     def __str__(self):
         """String representation of the exception."""
-        return f"[Monocle Span Error: {self.message} {self.status}"
+        return f"[Monocle Span Error: {self.message}"
+
+    def get_err_code(self):
+        """Retrieve the error code."""
+        return self.err_code
 
 def set_span_attribute(span, name, value):
     if value is not None:
@@ -98,6 +103,7 @@ def with_tracer_wrapper(func):
 
     return _with_tracer
 
+
 def resolve_from_alias(my_map, alias):
     """Find a alias that is not none from list of aliases"""
 
@@ -393,6 +399,7 @@ def get_exception_message(arguments):
     else:
         return ''
 
+
 def get_error_message(arguments):
     status_code = get_status_code(arguments)
     if status_code == 'success':
@@ -400,6 +407,7 @@ def get_error_message(arguments):
     else:
         return status_code
 
+
 def get_status_code(arguments):
     if arguments["exception"] is not None:
         return get_exception_status_code(arguments)

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/common/wrapper_method.py

@@ -5,6 +5,7 @@ from monocle_apptrace.instrumentation.common.span_handler import SpanHandler, No
 from monocle_apptrace.instrumentation.metamodel.azureaiinference.methods import AZURE_AI_INFERENCE_METHODS
 from monocle_apptrace.instrumentation.metamodel.botocore.methods import BOTOCORE_METHODS
 from monocle_apptrace.instrumentation.metamodel.botocore.handlers.botocore_span_handler import BotoCoreSpanHandler
+from monocle_apptrace.instrumentation.metamodel.hugging_face.methods import HUGGING_FACE_METHODS
 from monocle_apptrace.instrumentation.metamodel.langchain.methods import (
     LANGCHAIN_METHODS,
 )
@@ -37,6 +38,7 @@ from monocle_apptrace.instrumentation.metamodel.mcp.mcp_processor import MCPAgen
 from monocle_apptrace.instrumentation.metamodel.a2a.methods import A2A_CLIENT_METHODS
 from monocle_apptrace.instrumentation.metamodel.litellm.methods import LITELLM_METHODS
 from monocle_apptrace.instrumentation.metamodel.adk.methods import ADK_METHODS
+from monocle_apptrace.instrumentation.metamodel.mistral.methods import MISTRAL_METHODS
 
 class WrapperMethod:
     def __init__(
@@ -107,7 +109,9 @@ DEFAULT_METHODS_LIST = (
     MCP_METHODS + 
     A2A_CLIENT_METHODS +
     LITELLM_METHODS +
-    ADK_METHODS
+    ADK_METHODS +
+    MISTRAL_METHODS +
+    HUGGING_FACE_METHODS
 )
 
 MONOCLE_SPAN_HANDLERS: Dict[str, SpanHandler] = {

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/metamodel/adk/_helper.py

@@ -82,7 +82,7 @@ def extract_agent_input(arguments: Dict[str, Any]) -> Any:
     Returns:
         Any: The extracted input data
     """
-    return arguments['args'][0].user_content.parts[0].text
+    return [arguments['args'][0].user_content.parts[0].text]
 
 def extract_agent_request_input(arguments: Dict[str, Any]) -> Any:
     """
@@ -94,7 +94,7 @@ def extract_agent_request_input(arguments: Dict[str, Any]) -> Any:
     Returns:
         Any: The extracted input data
     """
-    return arguments['kwargs']['new_message'].parts[0].text if 'new_message' in arguments['kwargs'] else None
+    return [arguments['kwargs']['new_message'].parts[0].text] if 'new_message' in arguments['kwargs'] else []
 
 def extract_agent_response(result: Any) -> Any:
     """
@@ -107,7 +107,9 @@ def extract_agent_response(result: Any) -> Any:
         Any: The extracted response data
     """
     if result:
-        return result.content.parts[0].text
+        return str(result.content.parts[0].text)
+    else:
+        return ""
 
 def get_tool_name(instance: Any) -> str:
     """
@@ -179,7 +181,7 @@ def extract_tool_input(arguments: Dict[str, Any]) -> Any:
     Returns:
         Any: The extracted input data
     """
-    return str(arguments['kwargs'].get('args'))
+    return [str(arguments['kwargs'].get('args'))]
 
 def extract_tool_response(result: Any) -> Any:
     """

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/metamodel/adk/entities/agent.py

@@ -1,5 +1,7 @@
 from monocle_apptrace.instrumentation.common.constants import SPAN_SUBTYPES, SPAN_TYPES
+from monocle_apptrace.instrumentation.common.utils import get_error_message
 from monocle_apptrace.instrumentation.metamodel.adk import _helper
+from monocle_apptrace.instrumentation.common.utils import get_error_message
 AGENT = {
       "type": SPAN_TYPES.AGENTIC_INVOCATION,
       "subtype": SPAN_SUBTYPES.ROUTING,
@@ -33,7 +35,7 @@ AGENT = {
           "attributes": [
             {
                 "_comment": "this is Agent input",
-                "attribute": "query",
+                "attribute": "input",
                 "accessor": lambda arguments: _helper.extract_agent_input(arguments)
             }
           ]
@@ -41,10 +43,18 @@ AGENT = {
         {
           "name":"data.output",
           "attributes": [
+            {
+                    "attribute": "error_code",
+                    "accessor": lambda arguments: get_error_message(arguments)
+            },
             {
                 "_comment": "this is response from LLM",
                 "attribute": "response",
                 "accessor": lambda arguments: _helper.extract_agent_response(arguments['result'])
+            },
+            {
+                "attribute": "error_code",
+                "accessor": lambda arguments: get_error_message(arguments)
             }
           ]
         }
@@ -108,4 +118,4 @@ DELEGATION = {
               }
         ]
       ]
-}
+}

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/metamodel/adk/entities/tool.py

@@ -1,4 +1,5 @@
 from monocle_apptrace.instrumentation.common.constants import SPAN_SUBTYPES, SPAN_TYPES
+from monocle_apptrace.instrumentation.common.utils import get_error_message
 from monocle_apptrace.instrumentation.metamodel.adk import _helper
 TOOL = {
       "type": SPAN_TYPES.AGENTIC_TOOL_INVOCATION,
@@ -40,7 +41,7 @@ TOOL = {
           "attributes": [
             {
                 "_comment": "this is Tool input",
-                "attribute": "Inputs",
+                "attribute": "input",
                 "accessor": lambda arguments: _helper.extract_tool_input(arguments) 
             },
           ]
@@ -52,8 +53,12 @@ TOOL = {
                 "_comment": "this is response from Tool",
                 "attribute": "response",
                 "accessor": lambda arguments: _helper.extract_tool_response(arguments['result'])
-            }
+            },
+            {
+                "attribute": "error_code",
+                "accessor": lambda arguments: get_error_message(arguments)
+            },
           ]
         }
       ]
-}
+}

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/metamodel/agents/_helper.py

@@ -50,21 +50,21 @@ def extract_agent_input(arguments):
         if len(arguments["args"]) > 1:
             input_data = arguments["args"][1]
             if isinstance(input_data, str):
-                return input_data
+                return [input_data]
             elif isinstance(input_data, list):
                 # Handle list of input items
-                return get_json_dumps(input_data)
+                return input_data
 
         # Fallback to kwargs
         if "original_input" in arguments["kwargs"]:
             input_data = arguments["kwargs"]["original_input"]
             if isinstance(input_data, str):
-                return input_data
+                return [input_data]
             elif isinstance(input_data, list):
-                return get_json_dumps(input_data)
+                return input_data
     except Exception as e:
         logger.warning("Warning: Error occurred in extract_agent_input: %s", str(e))
-    return None
+    return []
 
 
 def get_agent_name(arguments) -> str:

{monocle_apptrace-0.5.2 → monocle_apptrace-0.6.0}/src/monocle_apptrace/instrumentation/metamodel/agents/entities/inference.py

@@ -1,5 +1,7 @@
 from monocle_apptrace.instrumentation.common.constants import AGENT_REQUEST_SPAN_NAME, SPAN_SUBTYPES, SPAN_TYPES
+from monocle_apptrace.instrumentation.common.utils import get_error_message
 from monocle_apptrace.instrumentation.metamodel.agents import _helper
+from monocle_apptrace.instrumentation.common.utils import get_error_message
 
 AGENT = {
     "type": SPAN_TYPES.AGENTIC_INVOCATION,
@@ -34,7 +36,7 @@ AGENT = {
             "attributes": [
                 {
                     "_comment": "this is Agent input",
-                    "attribute": "query",
+                    "attribute": "input",
                     "accessor": lambda arguments: _helper.extract_agent_input(
                         arguments
                     ),
@@ -44,12 +46,20 @@ AGENT = {
         {
             "name": "data.output",
             "attributes": [
+                {
+                    "attribute": "error_code",
+                    "accessor": lambda arguments: get_error_message(arguments)
+                },
                 {
                     "_comment": "this is response from Agent",
                     "attribute": "response",
                     "accessor": lambda arguments: _helper.extract_agent_response(
                         arguments["result"]
                     ),
+            },
+            {
+                "attribute": "error_code",
+                "accessor": lambda arguments: get_error_message(arguments)
                 }
             ],
         },
@@ -68,7 +78,7 @@ AGENT = {
 }
 
 AGENT_REQUEST = {
-    "type": AGENT_REQUEST_SPAN_NAME,
+    "type": SPAN_TYPES.AGENTIC_REQUEST,
     "subtype": SPAN_SUBTYPES.PLANNING,
     "attributes": [
         [
@@ -101,8 +111,11 @@ AGENT_REQUEST = {
                     "accessor": lambda arguments: _helper.extract_agent_response(
                         arguments["result"]
                     ),
-                }
-            ],
+            },
+            {
+                "attribute": "error_code",
+                "accessor": lambda arguments: get_error_message(arguments)
+            }],
         },
     ],
 }
@@ -151,7 +164,7 @@ TOOLS = {
             "attributes": [
                 {
                     "_comment": "this is Tool input",
-                    "attribute": "Inputs",
+                    "attribute": "input",
                     "accessor": lambda arguments: _helper.extract_tool_input(arguments),
                 },
             ],
@@ -165,6 +178,10 @@ TOOLS = {
                     "accessor": lambda arguments: _helper.extract_tool_response(
                         arguments["result"]
                     ),
+                },
+                {
+                "attribute": "error_code",
+                "accessor": lambda arguments: get_error_message(arguments)
                 }
             ],
         },