monocle-apptrace 0.5.2__py3-none-any.whl → 0.6.0__py3-none-any.whl

monocle_apptrace/instrumentation/metamodel/fastapi/methods.py

@@ -1,23 +1,23 @@
-from monocle_apptrace.instrumentation.common.wrapper import atask_wrapper
+from monocle_apptrace.instrumentation.common.wrapper import atask_wrapper,task_wrapper
 from monocle_apptrace.instrumentation.metamodel.fastapi.entities.http import FASTAPI_HTTP_PROCESSOR, FASTAPI_RESPONSE_PROCESSOR
 
 FASTAPI_METHODS = [
-    # {
-    #     "package": "fastapi",
-    #     "object": "FastAPI",
-    #     "method": "__call__",
-    #     "wrapper_method": atask_wrapper,
-    #     "span_name": "fastapi.request",
-    #     "span_handler": "fastapi_handler",
-    #     "output_processor": FASTAPI_HTTP_PROCESSOR,
-    # },
-    # {
-    #     "package": "starlette.responses",
-    #     "object": "Response",
-    #     "method": "__call__",
-    #     "span_name": "fastapi.response",
-    #     "wrapper_method": atask_wrapper,
-    #     "span_handler": "fastapi_response_handler",
-    #     "output_processor": FASTAPI_RESPONSE_PROCESSOR
-    # }
+    {
+        "package": "fastapi",
+        "object": "FastAPI",
+        "method": "__call__",
+        "wrapper_method": task_wrapper,
+        "span_name": "fastapi.request",
+        "span_handler": "fastapi_handler",
+        "output_processor": FASTAPI_HTTP_PROCESSOR,
+    },
+    {
+        "package": "starlette.responses",
+        "object": "Response",
+        "method": "__call__",
+        "span_name": "fastapi.response",
+        "wrapper_method": task_wrapper,
+        "span_handler": "fastapi_response_handler",
+        "output_processor": FASTAPI_RESPONSE_PROCESSOR
+    }
 ]

monocle_apptrace/instrumentation/metamodel/finish_types.py

@@ -14,6 +14,7 @@ class FinishType(Enum):
     TOOL_CALL_ERROR = "tool_call_error"
     REFUSAL = "refusal"
     RATE_LIMITED = "rate_limited"
+    TOOL_CALL = "tool_call"
 
 # OpenAI finish reason mapping
 OPENAI_FINISH_REASON_MAPPING = {
@@ -274,6 +275,24 @@ HAYSTACK_FINISH_REASON_MAPPING = {
     "OTHER": FinishType.ERROR.value,
 }
 
+MISTRAL_FINISH_REASON_MAPPING = {
+    "stop": FinishType.SUCCESS.value,
+    "tool_calls": FinishType.TOOL_CALL.value,  # New category for tool calls
+    "length": FinishType.TRUNCATED.value,
+    # Mistral's API documentation does not explicitly mention other finish reasons like "content_filter" or "refusal".
+    # However, in case of an API-level error, the response itself would likely be an HTTP error rather than a
+    # successful response with a specific finish reason.
+}
+
+HUGGING_FACE_FINISH_REASON_MAPPING = {
+    "stop": FinishType.SUCCESS.value,
+    "tool_calls": FinishType.TOOL_CALL.value,  # New category for tool calls
+    "length": FinishType.TRUNCATED.value,
+    # Hugging Face's API documentation does not explicitly mention other finish reasons like "content_filter" or "refusal".
+    # However, in case of an API-level error, the response itself would likely be an HTTP error rather than a
+    # successful response with a specific finish reason.
+}
+
 ADK_FINISH_REASON_MAPPING = GEMINI_FINISH_REASON_MAPPING
 
 def map_openai_finish_reason_to_finish_type(finish_reason):
@@ -462,4 +481,16 @@ def map_adk_finish_reason_to_finish_type(finish_reason):
     """Map ADK finish_reason to standardized finish_type."""
     if not finish_reason:
         return None
-    return ADK_FINISH_REASON_MAPPING.get(finish_reason, None)
+    return ADK_FINISH_REASON_MAPPING.get(finish_reason, None)
+
+def map_mistral_finish_reason_to_finish_type(finish_reason):
+    """Map Mistral finish_reason to standardized finish_type."""
+    if not finish_reason:
+        return None
+    return MISTRAL_FINISH_REASON_MAPPING.get(finish_reason, None)
+
+def map_hf_finish_reason_to_finish_type(finish_reason):
+    """Map Hugging Face finish_reason to standardized finish_type."""
+    if not finish_reason:
+        return None
+    return HUGGING_FACE_FINISH_REASON_MAPPING.get(finish_reason, None)

monocle_apptrace/instrumentation/metamodel/flask/_helper.py

@@ -1,6 +1,6 @@
 import logging
 from threading import local
-from monocle_apptrace.instrumentation.common.utils import extract_http_headers, clear_http_scopes
+from monocle_apptrace.instrumentation.common.utils import extract_http_headers, clear_http_scopes, get_exception_status_code
 from monocle_apptrace.instrumentation.common.span_handler import SpanHandler
 from monocle_apptrace.instrumentation.common.constants import HTTP_SUCCESS_CODES
 from monocle_apptrace.instrumentation.common.utils import MonocleSpanException
@@ -22,6 +22,14 @@ def get_params(args) -> dict:
     params = args[0]['QUERY_STRING'] if 'QUERY_STRING' in args[0] else ""
     return unquote(params)
 
+def get_url(args) -> str:
+    url = ""
+    if len(args) > 1 or not isinstance(args[0], dict):
+        if 'HTTP_HOST' in args[0]:
+            url = f"http://{args[0]['HTTP_HOST']}{args[0].get('REQUEST_URI', '')}"
+
+    return url
+
 def get_body(args) -> dict:
     return ""
 
@@ -32,11 +40,17 @@ def extract_response(instance) -> str:
         response = ""
     return response
 
-def extract_status(instance) -> str:
-    status = f"{instance.status_code}" if hasattr(instance, 'status_code') else ""
-    if status not in HTTP_SUCCESS_CODES:
-        error_message = extract_response(instance)
-        raise MonocleSpanException(f"error: {status} - {error_message}")
+def extract_status(arguments) -> str:
+    if arguments["exception"] is not None:
+        return get_exception_status_code(arguments)
+    instance = arguments['instance']
+    if hasattr(instance, 'status_code'):
+        status = f"{instance.status_code}"
+        if status not in HTTP_SUCCESS_CODES:
+            error_message = extract_response(instance)
+            raise MonocleSpanException(f"error: {status} - {error_message}", status)
+    else:
+        status = "success"
     return status
 
 def flask_pre_tracing(args):

monocle_apptrace/instrumentation/metamodel/flask/entities/http.py

@@ -14,6 +14,11 @@ FLASK_HTTP_PROCESSOR = {
                 "attribute": "route",
                 "accessor": lambda arguments: _helper.get_route(arguments['args'])
             },
+            {
+                "_comment": "request method, request URI",
+                "attribute": "url",
+                "accessor": lambda arguments: _helper.get_url(arguments['args'])
+            },
         ]
     ]
 }
@@ -35,8 +40,8 @@ FLASK_RESPONSE_PROCESSOR = {
             "attributes": [
                 {
                     "_comment": "status from HTTP response",
-                    "attribute": "status",
-                    "accessor": lambda arguments: _helper.extract_status(arguments['instance'])
+                    "attribute": "error_code",
+                    "accessor": lambda arguments: _helper.extract_status(arguments)
                 },
                 {
                     "_comment": "this is result from LLM",

monocle_apptrace/instrumentation/metamodel/hugging_face/_helper.py

@@ -0,0 +1,138 @@
+import os
+import json
+import logging
+from opentelemetry.context import get_value
+from monocle_apptrace.instrumentation.common.constants import (
+    AGENT_PREFIX_KEY,
+    INFERENCE_AGENT_DELEGATION,
+    INFERENCE_TURN_END,
+    INFERENCE_TOOL_CALL,
+)
+from monocle_apptrace.instrumentation.common.utils import (
+    Option,
+    get_json_dumps,
+    try_option,
+)
+
+from monocle_apptrace.instrumentation.metamodel.finish_types import map_hf_finish_reason_to_finish_type
+
+logger = logging.getLogger(__name__)
+
+def update_input_span_events(kwargs):
+    input_text = ""
+    print("DEBUG kwargs:", kwargs)
+    if "inputs" in kwargs:
+        if isinstance(kwargs["inputs"], list):
+            input_text = " | ".join(str(i) for i in kwargs["inputs"])
+        else:
+            input_text = str(kwargs["inputs"])
+    elif "messages" in kwargs:
+        input_text = json.dumps(kwargs["messages"])
+    return {"input": input_text}  # always a dict with 'input'
+
+
+
+def update_output_span_events(result):
+    try:
+        if hasattr(result, "choices") and result.choices:
+            output = [c.message for c in result.choices]
+            output_str = json.dumps(output)
+            return output_str[:200] + "..." if len(output_str) > 200 else output_str
+    except Exception as e:
+        logger.warning("Error in update_output_span_events: %s", str(e))
+    return ""
+
+def extract_messages(kwargs):
+    """Extract system and user messages"""
+    try:
+        messages = []
+        if "system" in kwargs and isinstance(kwargs["system"], str):
+            messages.append({"system": kwargs["system"]})
+        if 'messages' in kwargs and kwargs['messages']:
+            for msg in kwargs['messages']:
+                if msg.get('content') and msg.get('role'):
+                    messages.append({msg['role']: msg['content']})
+        return [get_json_dumps(message) for message in messages]
+    except Exception as e:
+        logger.warning("Warning: Error occurred in extract_messages: %s", str(e))
+        return []
+
+def extract_assistant_message(arguments):
+    """
+    Extract the assistant message from a Mistral response or stream chunks.
+    Returns a JSON string like {"assistant": "<text>"}.
+    """
+    try:
+        result = arguments.get("result") if isinstance(arguments, dict) else arguments
+        if result is None:
+            return ""
+
+        # Handle full response
+        if hasattr(result, "choices") and result.choices:
+            msg_obj = result.choices[0].message
+            return get_json_dumps({msg_obj.role: msg_obj.content})
+
+        # Handle streaming: result might be a list of CompletionEvent chunks
+        if isinstance(result, list):
+            content = []
+            for chunk in result:
+                if hasattr(chunk, "data") and hasattr(chunk.data, "choices") and chunk.data.choices:
+                    choice = chunk.data.choices[0]
+                    if hasattr(choice, "delta") and hasattr(choice.delta, "content"):
+                        content.append(choice.delta.content or "")
+            return get_json_dumps({"assistant": "".join(content)})
+
+        return ""
+
+    except Exception as e:
+        logger.warning("Warning in extract_assistant_message: %s", str(e))
+        return ""
+    
+def update_span_from_llm_response(result, include_token_counts=False):
+    tokens = {
+        "completion_tokens": getattr(result.usage, "completion_tokens", 0),
+        "prompt_tokens": getattr(result.usage, "prompt_tokens", 0),
+        "total_tokens": getattr(result.usage, "total_tokens", 0),
+    } if include_token_counts else {}
+    # Add other metadata fields like finish_reason, etc.
+    return {**tokens, "inference_sub_type": "turn_end"}
+
+
+def get_exception_status_code(exc):
+    if exc is None:
+        return "success"
+    code = getattr(exc, "status_code", None)
+    if code == 401:
+        return "unauthorized"
+    elif code == 403:
+        return "forbidden"
+    elif code == 404:
+        return "not_found"
+    return "error"
+
+def map_finish_reason_to_finish_type(finish_reason):
+    """Map Hugging Face finish_reason to finish_type, similar to OpenAI mapping."""
+    return map_hf_finish_reason_to_finish_type(finish_reason)
+
+
+def agent_inference_type(result):
+    """
+    Simple agent inference type logic: if message contains AGENT_PREFIX_KEY,
+    mark as delegation; otherwise it's a normal turn_end.
+    """
+    try:
+        assistant_msg = extract_assistant_message(result)
+        if assistant_msg and AGENT_PREFIX_KEY in assistant_msg:
+            return INFERENCE_AGENT_DELEGATION
+    except Exception as e:
+        logger.warning("Error in agent_inference_type: %s", str(e))
+    return INFERENCE_TURN_END
+
+
+def extract_finish_reason(result):
+    try:
+        return getattr(result, "finish_reason", None)
+    except Exception:
+        return None
+
+

monocle_apptrace/instrumentation/metamodel/hugging_face/entities/inference.py

@@ -0,0 +1,97 @@
+from monocle_apptrace.instrumentation.common.constants import SPAN_TYPES
+from monocle_apptrace.instrumentation.common.utils import get_error_message, resolve_from_alias
+from monocle_apptrace.instrumentation.metamodel.hugging_face import _helper
+
+
+INFERENCE = {
+    "type": SPAN_TYPES.INFERENCE,
+    "attributes": [
+        [
+            {
+                "_comment": "provider type, name, deployment, inference_endpoint",
+                "attribute": "type",
+                "accessor": lambda arguments: "inference.huggingface"
+            },
+            {
+                "attribute": "provider_name",
+                "accessor": lambda arguments: "huggingface"
+            },
+            {
+                "attribute": "inference_endpoint",
+                "accessor": lambda arguments: "https://api-inference.huggingface.co/v1/"
+            }
+        ],
+        [
+            {
+                "_comment": "LLM Model (repo ID on Hugging Face hub)",
+                "attribute": "name",
+                "accessor": lambda arguments: resolve_from_alias(
+                    arguments["kwargs"],
+                    ["model", "model_name", "endpoint_name", "deployment_name"]
+                )
+            },
+            {
+                "attribute": "type",
+                "accessor": lambda arguments: (
+                    "model.llm." +
+                    resolve_from_alias(
+                        arguments["kwargs"],
+                        ["model", "model_name", "endpoint_name", "deployment_name"]
+                    )
+                )
+            }
+        ]
+    ],
+    "events": [
+        {
+            "name": "data.input",
+            "attributes": [
+                {
+                    "_comment": "this is instruction and user query to LLM",
+                    "attribute": "input",
+                    "accessor": lambda arguments: _helper.extract_messages(arguments["kwargs"])
+                }
+            ]
+        },
+        {
+            "name": "data.output",
+            "attributes": [
+                {
+                    "attribute": "error_code",
+                    "accessor": lambda arguments: get_error_message(arguments)
+                },
+                {
+                    "_comment": "result from Hugging Face inference",
+                    "attribute": "response",
+                    "accessor": lambda arguments: _helper.extract_assistant_message(arguments)
+                }
+            ]
+        },
+        {
+            "name": "metadata",
+            "attributes": [
+                {
+                    "_comment": "this is metadata usage from LLM, includes token counts",
+                    "accessor": lambda arguments: _helper.update_span_from_llm_response(
+                        arguments.get("result"),
+                        include_token_counts=True  # new flag for streaming handling
+                    )
+                },
+                {
+                    "_comment": "finish reason from Hugging Face response",
+                    "attribute": "finish_reason",
+                    "accessor": lambda arguments: _helper.extract_finish_reason(arguments)
+                },
+                {
+                    "_comment": "finish type mapped from finish reason",
+                    "attribute": "finish_type",
+                    "accessor": lambda arguments: _helper.map_finish_reason_to_finish_type(_helper.extract_finish_reason(arguments))
+                },
+                {
+                    "attribute": "inference_sub_type",
+                    "accessor": lambda arguments: _helper.agent_inference_type(arguments)
+                }
+            ]
+        }
+    ]
+}

monocle_apptrace/instrumentation/metamodel/hugging_face/methods.py

@@ -0,0 +1,23 @@
+from monocle_apptrace.instrumentation.common.wrapper import atask_wrapper, task_wrapper
+from monocle_apptrace.instrumentation.metamodel.hugging_face.entities.inference import (
+    INFERENCE,
+)
+
+HUGGING_FACE_METHODS = [
+    {
+        "package": "huggingface_hub",
+        "object": "InferenceClient",
+        "method": "chat_completion",  # sync
+        "wrapper_method": task_wrapper,
+        "span_handler": "non_framework_handler",
+        "output_processor": INFERENCE,
+    },
+    {
+        "package": "huggingface_hub",
+        "object": "AsyncInferenceClient",
+        "method": "chat_completion",  # async
+        "wrapper_method": atask_wrapper,
+        "span_handler": "non_framework_handler",
+        "output_processor": INFERENCE,
+    },
+]

monocle_apptrace/instrumentation/metamodel/lambdafunc/_helper.py

@@ -1,6 +1,7 @@
 import logging
 from threading import local
-from monocle_apptrace.instrumentation.common.utils import extract_http_headers, clear_http_scopes, try_option, Option, \
+from unittest import result
+from monocle_apptrace.instrumentation.common.utils import extract_http_headers, clear_http_scopes, get_exception_status_code, try_option, Option, \
     MonocleSpanException
 from monocle_apptrace.instrumentation.common.span_handler import SpanHandler
 from monocle_apptrace.instrumentation.common.constants import HTTP_SUCCESS_CODES
@@ -11,13 +12,18 @@ MAX_DATA_LENGTH = 1000
 token_data = local()
 token_data.current_token = None
 
-def get_url(kwargs) -> ParseResult:
-    url_str = try_option(lambda k: k.get('path'), kwargs['event'])
-    url = url_str.unwrap_or(None)
-    if url is not None:
-        return urlparse(url)
-    else:
-        return None
+def get_url(args) -> str:
+    event = args[1]
+    host = event.get('headers', {}).get('Host', '')
+    stage = event.get('requestContext', {}).get('stage', '')
+    path = event.get('path', '')
+    query_params = event.get('queryStringParameters', {})
+    scheme = 'https' if event.get('headers', {}).get('X-Forwarded-Proto', 'http') == 'https' else 'http'
+    url = f"{scheme}://{host}/{stage}{path}"
+    if query_params:
+        from urllib.parse import urlencode
+        url += '?' + urlencode(query_params)
+    return url
 
 def get_route(args) -> str:
     event = args[1]
@@ -53,14 +59,19 @@ def extract_response(result) -> str:
     return response
 
 
-def extract_status(result) -> str:
-    status = f"{result['statusCode']}" if isinstance(result, dict) and 'statusCode' in result else ""
-    if status not in HTTP_SUCCESS_CODES:
-        error_message = extract_response(result)
-        raise MonocleSpanException(f"error: {status} - {error_message}")
+def extract_status(arguments) -> str:
+    if arguments["exception"] is not None:
+        return get_exception_status_code(arguments)
+    result = arguments['result']
+    if isinstance(result, dict) and 'statusCode' in result:
+        status = f"{result['statusCode']}"
+        if status not in HTTP_SUCCESS_CODES:
+            error_message = extract_response(result)
+            raise MonocleSpanException(f"error: {status} - {error_message}", status)
+    else:
+        status = "success"
     return status
 
-
 def lambda_func_pre_tracing(kwargs):
     headers = kwargs['event'].get('headers', {}) if 'event' in kwargs else {}
     return extract_http_headers(headers)

monocle_apptrace/instrumentation/metamodel/lambdafunc/entities/http.py

@@ -19,6 +19,11 @@ LAMBDA_HTTP_PROCESSOR = {
                 "attribute": "body",
                 "accessor": lambda arguments: _helper.get_body(arguments['args'])
             },
+        {
+                "_comment": "request method, request URI",
+                "attribute": "url",
+                "accessor": lambda arguments: _helper.get_url(arguments['args'])
+            },
         ]
     ],
     "events": [
@@ -37,8 +42,8 @@ LAMBDA_HTTP_PROCESSOR = {
             "attributes": [
                 {
                     "_comment": "status from HTTP response",
-                    "attribute": "status",
-                    "accessor": lambda arguments: _helper.extract_status(arguments['result'])
+                    "attribute": "error_code",
+                    "accessor": lambda arguments: _helper.extract_status(arguments)
                 },
                 {
                     "_comment": "this is result from LLM",

monocle_apptrace/instrumentation/metamodel/langgraph/_helper.py

@@ -25,10 +25,12 @@ def agent_instructions(arguments):
 def extract_agent_input(arguments):
     if arguments['result'] is not None and 'messages' in arguments['result']:
         history = arguments['result']['messages']
+        messages = []
         for message in history:
             if hasattr(message, 'content') and hasattr(message, 'type') and message.type == "human":  # Check if the message is a HumanMessage
-                return message.content
-    return None
+                messages.append(message.content)
+        return messages
+    return []
 
 def get_inference_endpoint(arguments):
     inference_endpoint = resolve_from_alias(arguments['instance'].client.__dict__, ['azure_endpoint', 'api_base', '_base_url'])

monocle_apptrace/instrumentation/metamodel/langgraph/entities/inference.py

@@ -2,6 +2,7 @@ from monocle_apptrace.instrumentation.common.constants import AGENT_REQUEST_SPAN
 from monocle_apptrace.instrumentation.metamodel.langgraph import (
     _helper
 )
+from monocle_apptrace.instrumentation.common.utils import get_error_message
 
 AGENT = {
       "type": SPAN_TYPES.AGENTIC_INVOCATION,
@@ -31,7 +32,7 @@ AGENT = {
           "attributes": [
             {
                 "_comment": "this is Agent input",
-                "attribute": "query",
+                "attribute": "input",
                 "accessor": lambda arguments: _helper.extract_agent_input(arguments)
             }
           ]
@@ -39,6 +40,10 @@ AGENT = {
         {
           "name":"data.output",
           "attributes": [
+            {
+                    "attribute": "error_code",
+                    "accessor": lambda arguments: get_error_message(arguments)
+            },
             {
                 "_comment": "this is response from LLM",
                 "attribute": "response",
@@ -50,7 +55,7 @@ AGENT = {
     }
 
 AGENT_REQUEST = {
-      "type": AGENT_REQUEST_SPAN_NAME,
+      "type": SPAN_TYPES.AGENTIC_REQUEST,
       "subtype": SPAN_SUBTYPES.PLANNING,
       "attributes": [
         [
@@ -125,7 +130,7 @@ TOOLS = {
           "attributes": [
             {
                 "_comment": "this is Tool input",
-                "attribute": "Inputs",
+                "attribute": "input",
                 "accessor": lambda arguments: _helper.extract_tool_input(arguments) 
             },
           ]

monocle_apptrace/instrumentation/metamodel/llamaindex/entities/agent.py

@@ -126,7 +126,7 @@ TOOLS = {
           "attributes": [
             {
                 "_comment": "this is Tool input",
-                "attribute": "Inputs",
+                "attribute": "input",
                 "accessor": lambda arguments: _helper.extract_tool_args(arguments) 
             }
           ]

monocle_apptrace/instrumentation/metamodel/mcp/_helper.py

@@ -22,7 +22,7 @@ def get_output_text(arguments):
         for tool in arguments["result"].tools:
             if hasattr(tool, "name"):
                 tools.append(tool.name)
-        return tools
+        return ", ".join(tools)  
     if (
         "result" in arguments
         and hasattr(arguments["result"], "content")
@@ -32,7 +32,7 @@ def get_output_text(arguments):
         for content in arguments["result"].content:
             if hasattr(content, "text"):
                 ret_val.append(content.text)
-        return ret_val
+        return " ".join(ret_val)
 
 
 def get_name(arguments):
@@ -63,17 +63,18 @@ def get_params_arguments(arguments):
 
     args = arguments["args"]
     if (
-        args
+       args
         and hasattr(args[0], "root")
         and hasattr(args[0].root, "params")
         and hasattr(args[0].root.params, "arguments")
     ):
         # If the first argument has a root with params and arguments, return those arguments
         try:
-            return json.dumps(args[0].root.params.arguments)
+            return [json.dumps(args[0].root.params.arguments)]
         except (TypeError, ValueError) as e:
             logger.error(f"Error serializing arguments: {e}")
-            return str(args[0].root.params.arguments)
+            return [str(args[0].root.params.arguments)]
+    return []
 
 
 def get_url(arguments):

monocle_apptrace/instrumentation/metamodel/mcp/entities/inference.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.mcp import _helper
 
 TOOLS = {
@@ -44,6 +45,10 @@ TOOLS = {
                     "attribute": "output",
                     "accessor": lambda arguments: _helper.get_output_text(arguments)
                 },
+                {
+                    "attribute": "error_code",
+                    "accessor": lambda arguments: get_error_message(arguments)
+                }
             ],
         },
     ],