monocle-apptrace 0.3.1b1__py3-none-any.whl → 0.4.0__py3-none-any.whl

monocle_apptrace/instrumentation/metamodel/openai/methods.py

@@ -12,7 +12,7 @@ OPENAI_METHODS = [
         "object": "Completions",
         "method": "create",
         "wrapper_method": task_wrapper,
-        "span_handler": "non_framework_handler",
+        "span_handler": "openai_handler",
         "output_processor": INFERENCE
     },
     {
@@ -20,7 +20,7 @@ OPENAI_METHODS = [
         "object": "AsyncCompletions",
         "method": "create",
         "wrapper_method": atask_wrapper,
-        "span_handler": "non_framework_handler",
+        "span_handler": "openai_handler",
         "output_processor": INFERENCE
     },
     {
@@ -28,8 +28,7 @@ OPENAI_METHODS = [
         "object": "Embeddings",
         "method": "create",
         "wrapper_method": task_wrapper,
-        "span_name": "openai_embeddings",
-        "span_handler": "non_framework_handler",
+        "span_handler": "openai_handler",
         "output_processor": RETRIEVAL
     },
     {
@@ -37,8 +36,7 @@ OPENAI_METHODS = [
         "object": "AsyncEmbeddings",
         "method": "create",
         "wrapper_method": atask_wrapper,
-        "span_name": "openai_embeddings",
-        "span_handler": "non_framework_handler",
+        "span_handler": "openai_handler",
         "output_processor": RETRIEVAL
     },
     {
@@ -46,7 +44,7 @@ OPENAI_METHODS = [
         "object": "Responses",
         "method": "create",
         "wrapper_method": task_wrapper,
-        "span_handler": "non_framework_handler",
+        "span_handler": "openai_handler",
         "output_processor": INFERENCE
     },
     {
@@ -54,7 +52,7 @@ OPENAI_METHODS = [
         "object": "AsyncResponses",
         "method": "create",
         "wrapper_method": atask_wrapper,
-        "span_handler": "non_framework_handler",
+        "span_handler": "openai_handler",
         "output_processor": INFERENCE
     }
 

monocle_apptrace/instrumentation/metamodel/requests/_helper.py

@@ -2,6 +2,36 @@ import os
 from  monocle_apptrace.instrumentation.metamodel.requests import allowed_urls
 from opentelemetry.propagate import inject
 from monocle_apptrace.instrumentation.common.span_handler import SpanHandler
+from monocle_apptrace.instrumentation.common.utils import add_monocle_trace_state
+from urllib.parse import urlparse, ParseResult
+
+
+def get_route(kwargs):
+    url:str = kwargs['url']
+    parsed_url:ParseResult = urlparse(url)
+    return f"{parsed_url.netloc}{parsed_url.path}"
+
+def get_method(kwargs) -> str:
+    return kwargs['method'] if 'method' in kwargs else 'GET'
+
+def get_params(kwargs) -> dict:
+    url:str = kwargs['url']
+    parsed_url:ParseResult = urlparse(url)
+    return parsed_url.query
+
+def get_headers(kwargs) -> dict:
+    return kwargs['headers'] if 'headers' in kwargs else {}
+
+def get_body(kwargs) -> dict:
+    body = {}
+    return body
+
+def extract_response(result) -> str:
+    return result.text if hasattr(result, 'text') else str(result)
+
+def extract_status(result) -> str:
+    return f"{result.status_code}"
+
 
 def request_pre_task_processor(kwargs):
     # add traceparent to the request headers in kwargs
@@ -9,6 +39,7 @@ def request_pre_task_processor(kwargs):
         headers = {}
     else:
         headers = kwargs['headers'].copy()
+    add_monocle_trace_state(headers)
     inject(headers)
     kwargs['headers'] = headers
 

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

@@ -0,0 +1,51 @@
+from monocle_apptrace.instrumentation.metamodel.requests import _helper
+REQUEST_HTTP_PROCESSOR = {
+    "type": "http.send",
+    "attributes": [
+        [
+            {
+                "_comment": "request method, request URI",
+                "attribute": "method",
+                "accessor": lambda arguments: _helper.get_method(arguments['kwargs'])
+            },
+            {
+                "_comment": "request method, request URI",
+                "attribute": "URL",
+                "accessor": lambda arguments: _helper.get_route(arguments['kwargs'])
+            }
+
+        ]
+    ],
+    "events": [
+        {"name": "data.input",
+         "attributes": [
+             {
+                 "_comment": "route params",
+                 "attribute": "http.params",
+                 "accessor": lambda arguments: _helper.get_params(arguments['kwargs'])
+             },
+             {
+                 "_comment": "route body",
+                 "attribute": "body",
+                 "accessor": lambda arguments: _helper.get_body(arguments['kwargs'])
+             },
+
+         ]
+         },
+        {
+            "name": "data.output",
+            "attributes": [
+                {
+                    "_comment": "status from HTTP response",
+                    "attribute": "status",
+                    "accessor": lambda arguments: _helper.extract_status(arguments['result'])
+                },
+                {
+                    "_comment": "this is result from LLM",
+                    "attribute": "response",
+                    "accessor": lambda arguments: _helper.extract_response(arguments['result'])
+                }
+            ]
+        }
+    ]
+}

monocle_apptrace/instrumentation/metamodel/requests/methods.py

@@ -1,12 +1,13 @@
 from monocle_apptrace.instrumentation.common.wrapper import task_wrapper
+from monocle_apptrace.instrumentation.metamodel.requests.entities.http import REQUEST_HTTP_PROCESSOR
 
 REQUESTS_METHODS = [
     {
         "package": "requests.sessions",
         "object": "Session",
         "method": "request",
-        "span_name": "http_requests",
         "wrapper_method": task_wrapper,
         "span_handler":"request_handler",
+        "output_processor": REQUEST_HTTP_PROCESSOR
     }
 ]

monocle_apptrace/instrumentation/metamodel/teamsai/_helper.py

@@ -1,4 +1,12 @@
 from monocle_apptrace.instrumentation.common.utils import MonocleSpanException
+from monocle_apptrace.instrumentation.common.utils import (
+    Option,
+    get_keys_as_tuple,
+    get_nested_value,
+    try_option,
+    get_exception_message,
+    get_exception_status_code
+)
 def capture_input(arguments):
     """
     Captures the input from Teams AI state.
@@ -51,8 +59,50 @@ def capture_prompt_info(arguments):
     except Exception as e:
         return f"Error capturing prompt: {str(e)}"
 
-def status_check(arguments):
-    if hasattr(arguments["result"], "error") and arguments["result"].error is not None:
-        error_msg:str = arguments["result"].error
-        error_code:str = arguments["result"].status if hasattr(arguments["result"], "status") else "unknown"
-        raise MonocleSpanException(f"Error: {error_code} - {error_msg}")
+def get_status_code(arguments):
+    if arguments["exception"] is not None:
+        return get_exception_status_code(arguments)
+    elif hasattr(arguments["result"], "status"):
+        return arguments["result"].status
+    else:
+        return 'success'
+
+def get_status(arguments):
+    if arguments["exception"] is not None:
+        return 'error'
+    elif get_status_code(arguments) == 'success':
+        return 'success'
+    else:
+        return 'error'
+    
+def get_response(arguments) -> str:
+    status = get_status_code(arguments)
+    response:str = ""
+    if status == 'success':
+        if hasattr(arguments["result"], "message"):
+            response = arguments["result"].message.content 
+        else:
+            response = str(arguments["result"])
+    else:
+        if arguments["exception"] is not None:
+            response = get_exception_message(arguments)
+        elif hasattr(arguments["result"], "error"):
+            response = arguments["result"].error
+    return response
+
+def check_status(arguments):
+    status = get_status_code(arguments)
+    if status != 'success':
+        raise MonocleSpanException(f"{status}")   
+
+def extract_provider_name(instance):
+    provider_url: Option[str] = try_option(getattr, instance._client.base_url, 'host')
+    return provider_url.unwrap_or(None)
+
+
+def extract_inference_endpoint(instance):
+    inference_endpoint: Option[str] = try_option(getattr, instance._client, 'base_url').map(str)
+    if inference_endpoint.is_none() and "meta" in instance.client.__dict__:
+        inference_endpoint = try_option(getattr, instance.client.meta, 'endpoint_url').map(str)
+
+    return inference_endpoint.unwrap_or(extract_provider_name(instance))

monocle_apptrace/instrumentation/metamodel/teamsai/entities/inference/actionplanner_output_processor.py

@@ -2,7 +2,7 @@ from monocle_apptrace.instrumentation.metamodel.teamsai import (
     _helper,
 )
 ACTIONPLANNER_OUTPUT_PROCESSOR = {
-    "type": "inference",
+    "type": "generic",
     "attributes": [
         [
             {
@@ -28,42 +28,22 @@ ACTIONPLANNER_OUTPUT_PROCESSOR = {
             {
                 "attribute": "tokenizer",
                 "accessor": lambda arguments: arguments["instance"]._options.tokenizer.__class__.__name__ if hasattr(arguments["instance"], "_options") else "GPTTokenizer"
+            },
+            {
+                "attribute": "prompt_name",
+                "accessor": _helper.capture_prompt_info
+            },
+            {
+                "attribute": "validator",
+                "accessor": lambda arguments: arguments["kwargs"].get("validator").__class__.__name__ if arguments.get("kwargs", {}).get("validator") else "DefaultResponseValidator"
+            },
+            {
+                "attribute": "memory_type",
+                "accessor": lambda arguments: arguments["kwargs"].get("memory").__class__.__name__ if arguments.get("kwargs", {}).get("memory") else "unknown"
             }
         ]
     ],
     "events": [
-        {
-            "name": "data.input",
-            "_comment": "input configuration to ActionPlanner",
-            "attributes": [
-                {
-                    "attribute": "prompt_name",
-                    "accessor": _helper.capture_prompt_info
-                },
-                {
-                    "attribute": "validator",
-                    "accessor": lambda arguments: arguments["kwargs"].get("validator").__class__.__name__ if arguments.get("kwargs", {}).get("validator") else "DefaultResponseValidator"
-                },
-                {
-                    "attribute": "memory_type",
-                    "accessor": lambda arguments: arguments["kwargs"].get("memory").__class__.__name__ if arguments.get("kwargs", {}).get("memory") else "unknown"
-                }
-            ]
-        },
-        {
-            "name": "data.output",
-            "_comment": "output from ActionPlanner",
-            "attributes": [
-                {
-                    "attribute": "status",
-                    "accessor": lambda arguments: _helper.status_check(arguments)
-                },
-                {
-                    "attribute": "response",
-                    "accessor": lambda arguments: arguments["result"].message.content if hasattr(arguments["result"], "message") else str(arguments["result"])
-                }
-            ]
-        },
         {
             "name": "metadata",
             "attributes": [

monocle_apptrace/instrumentation/metamodel/teamsai/entities/inference/teamsai_output_processor.py

@@ -1,22 +1,23 @@
 from monocle_apptrace.instrumentation.metamodel.teamsai import (
     _helper,
 )
+from monocle_apptrace.instrumentation.common.utils import get_llm_type
 TEAMAI_OUTPUT_PROCESSOR = {
-    "type": "inference",
+    "type": "inference.framework",
     "attributes": [
         [
             {
                 "_comment": "provider type, name, deployment",
                 "attribute": "type",
-                "accessor": lambda arguments: "teams.openai"
+                "accessor": lambda arguments: 'inference.' + (get_llm_type(arguments['instance']._client) or 'generic')
             },
             {
                 "attribute": "provider_name",
-                "accessor": lambda arguments: "Microsoft Teams AI"
+                "accessor": lambda arguments: _helper.extract_provider_name(arguments['instance'])
             },
             {
-                "attribute": "deployment",
-                "accessor": lambda arguments: arguments["instance"]._options.default_model if hasattr(arguments["instance"], "_options") else "unknown"
+                "attribute": "inference_endpoint",
+                "accessor": lambda arguments: _helper.extract_inference_endpoint(arguments['instance'])
             }
         ],
         [
@@ -25,6 +26,11 @@ TEAMAI_OUTPUT_PROCESSOR = {
                 "attribute": "name",
                 "accessor": lambda arguments: arguments["instance"]._options.default_model if hasattr(arguments["instance"], "_options") else "unknown"
             },
+            {
+                "_comment": "LLM Model",
+                "attribute": "type",
+                "accessor": lambda arguments: 'model.llm.'+ arguments["instance"]._options.default_model if hasattr(arguments["instance"], "_options") else "unknown"
+            },
             {
                 "attribute": "is_streaming",
                 "accessor": lambda arguments: arguments["instance"]._options.stream if hasattr(arguments["instance"], "_options") else False
@@ -46,25 +52,23 @@ TEAMAI_OUTPUT_PROCESSOR = {
             "name": "data.output",
             "_comment": "output from Teams AI",
             "attributes": [
+                {
+                    "attribute": "status",
+                    "accessor": lambda arguments: _helper.get_status(arguments)
+                },
+                {
+                    "attribute": "status_code",
+                    "accessor": lambda arguments: _helper.get_status_code(arguments)
+                },
                 {
                     "attribute": "response",
-                    "accessor": lambda arguments: arguments["result"].message.content if hasattr(arguments["result"], "message") else str(arguments["result"])
-                }
-            ]
-        },
-        {
-            "name": "metadata",
-            "attributes": [
+                    "accessor": lambda arguments: _helper.get_response(arguments)
+                },
                 {
-                    "_comment": "metadata from Teams AI response",
-                    "accessor": lambda arguments: {
-                        "prompt_tokens": arguments["result"].get("usage", {}).get("prompt_tokens", 0),
-                        "completion_tokens": arguments["result"].get("usage", {}).get("completion_tokens", 0),
-                        "total_tokens": arguments["result"].get("usage", {}).get("total_tokens", 0),
-                        "latency_ms": arguments.get("latency_ms")
-                    }
+                    "attribute": "check_status",
+                    "accessor": lambda arguments: _helper.check_status(arguments)
                 }
             ]
-        }
+        },
     ]
 }

monocle_apptrace/instrumentation/metamodel/teamsai/methods.py

@@ -1,26 +1,72 @@
-from monocle_apptrace.instrumentation.common.wrapper import atask_wrapper, task_wrapper
+from monocle_apptrace.instrumentation.common.wrapper import (
+    ascopes_wrapper,
+    atask_wrapper,
+    task_wrapper,
+    ascope_wrapper,
+)
 from monocle_apptrace.instrumentation.metamodel.teamsai.entities.inference.teamsai_output_processor import (
     TEAMAI_OUTPUT_PROCESSOR,
 )
 from monocle_apptrace.instrumentation.metamodel.teamsai.entities.inference.actionplanner_output_processor import (
     ACTIONPLANNER_OUTPUT_PROCESSOR,
-)
+) 
+def get_id(args, kwargs):
+    """
+    Extracts the ID from the context.
+    """
+    scopes: dict[str, dict[str:str]] = {}
+    context = kwargs.get("context")
+    if context and context.activity and context.activity.channel_id:
+        channel_id = context.activity.channel_id or ""
+        if channel_id == "msteams":
+            scopes[f"msteams.activity.type"] = context.activity.type or ""
+
+            if hasattr(context.activity,"conversation"):
+                scopes[f"msteams.conversation.id"] = context.activity.conversation.id or ""
+                scopes[f"msteams.conversation.type"] = context.activity.conversation.conversation_type or ""
+                scopes[f"msteams.conversation.name"] = context.activity.conversation.name or ""
+
+            if hasattr(context.activity,"from_property"):
+                scopes[f"msteams.user.from_property.id"] = context.activity.from_property.id or ""
+                scopes[f"msteams.user.from_property.name"] = context.activity.from_property.name or ""
+                scopes[f"msteams.user.from_property.role"] = context.activity.from_property.role or ""
+
+            if hasattr(context.activity,"recipient"):
+                scopes[f"msteams.recipient.id"] = context.activity.recipient.id or ""
+
+            if hasattr(context.activity,"channel_data"):
+                if "tenant" in context.activity.channel_data:
+                    scopes[f"msteams.channel_data.tenant.id"] = context.activity.channel_data['tenant']['id'] or ""
+                if "team" in context.activity.channel_data:
+                    scopes[f"msteams.channel_data.team.id"] = context.activity.channel_data['team']['id'] or ""
+                    if "name" in context.activity.channel_data['team']:
+                        scopes[f"msteams.channel_data.team.name"] = context.activity.channel_data['team']['name'] or ""
+                if "channel" in context.activity.channel_data:
+                    scopes[f"msteams.channel_data.channel.id"] = context.activity.channel_data['channel']['id'] or ""
+                    if "name" in context.activity.channel_data['channel']:
+                        scopes[f"msteams.channel_data.channel.name"] = context.activity.channel_data['channel']['name'] or ""
+    return scopes
 
-TEAMAI_METHODS =[
+TEAMAI_METHODS = [
     {
         "package": "teams.ai.models.openai_model",
         "object": "OpenAIModel",
         "method": "complete_prompt",
-        "span_name": "teamsai.workflow",
         "wrapper_method": atask_wrapper,
-        "output_processor": TEAMAI_OUTPUT_PROCESSOR
+        "output_processor": TEAMAI_OUTPUT_PROCESSOR,
     },
     {
         "package": "teams.ai.planners.action_planner",
         "object": "ActionPlanner",
         "method": "complete_prompt",
-        "span_name": "teamsai.workflow",
         "wrapper_method": atask_wrapper,
-        "output_processor": ACTIONPLANNER_OUTPUT_PROCESSOR
+        "output_processor": ACTIONPLANNER_OUTPUT_PROCESSOR,
+    },
+    {
+        "package": "teams.ai.planners.action_planner",
+        "object": "ActionPlanner",
+        "method": "complete_prompt",
+        "scope_values": get_id,
+        "wrapper_method": ascopes_wrapper,  
     }
-]
+]

{monocle_apptrace-0.3.1b1.dist-info → monocle_apptrace-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.3.1b1
+Version: 0.4.0
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
@@ -16,40 +16,44 @@ Requires-Dist: opentelemetry-sdk>=1.21.0
 Requires-Dist: requests
 Requires-Dist: wrapt>=1.14.0
 Provides-Extra: aws
-Requires-Dist: boto3==1.35.19; 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: anthropic==0.49.0; extra == 'dev'
+Requires-Dist: anthropic-haystack; extra == 'dev'
+Requires-Dist: anthropic==0.52.0; extra == 'dev'
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'dev'
-Requires-Dist: boto3==1.34.131; extra == 'dev'
-Requires-Dist: chromadb==0.4.22; extra == 'dev'
+Requires-Dist: boto3==1.37.24; extra == 'dev'
+Requires-Dist: chromadb==1.0.10; extra == 'dev'
 Requires-Dist: datasets==2.20.0; extra == 'dev'
 Requires-Dist: faiss-cpu==1.8.0; extra == 'dev'
 Requires-Dist: flask; extra == 'dev'
 Requires-Dist: haystack-ai==2.3.0; extra == 'dev'
 Requires-Dist: instructorembedding==1.0.1; extra == 'dev'
-Requires-Dist: langchain-aws==0.1.10; extra == 'dev'
-Requires-Dist: langchain-chroma==0.1.1; extra == 'dev'
-Requires-Dist: langchain-community==0.2.5; extra == 'dev'
-Requires-Dist: langchain-mistralai==0.1.13; extra == 'dev'
-Requires-Dist: langchain-openai==0.1.8; extra == 'dev'
-Requires-Dist: langchain==0.2.5; 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-mistralai==0.2.10; extra == 'dev'
+Requires-Dist: langchain-openai==0.3.18; extra == 'dev'
+Requires-Dist: langchain==0.3.25; extra == 'dev'
 Requires-Dist: langchainhub==0.1.21; extra == 'dev'
 Requires-Dist: langgraph==0.2.68; extra == 'dev'
-Requires-Dist: llama-index-embeddings-huggingface==0.2.0; extra == 'dev'
-Requires-Dist: llama-index-llms-azure-openai==0.1.9; extra == 'dev'
-Requires-Dist: llama-index-llms-mistralai==0.1.20; extra == 'dev'
-Requires-Dist: llama-index-vector-stores-chroma==0.1.9; extra == 'dev'
-Requires-Dist: llama-index-vector-stores-opensearch==0.1.10; extra == 'dev'
-Requires-Dist: llama-index==0.10.30; extra == 'dev'
+Requires-Dist: llama-index-embeddings-huggingface==0.5.4; extra == 'dev'
+Requires-Dist: llama-index-llms-anthropic==0.6.19; extra == 'dev'
+Requires-Dist: llama-index-llms-azure-openai==0.3.2; extra == 'dev'
+Requires-Dist: llama-index-llms-mistralai==0.4.0; extra == 'dev'
+Requires-Dist: llama-index-vector-stores-chroma==0.4.1; extra == 'dev'
+Requires-Dist: llama-index-vector-stores-opensearch==0.5.4; extra == 'dev'
+Requires-Dist: llama-index==0.12.37; extra == 'dev'
 Requires-Dist: mistral-haystack==0.0.2; extra == 'dev'
 Requires-Dist: numpy==1.26.4; extra == 'dev'
 Requires-Dist: opendal==0.45.14; extra == 'dev'
 Requires-Dist: opensearch-haystack==1.2.0; extra == 'dev'
 Requires-Dist: opentelemetry-instrumentation-flask; extra == 'dev'
 Requires-Dist: parameterized==0.9.0; extra == 'dev'
-Requires-Dist: pytest==8.0.0; extra == 'dev'
+Requires-Dist: pytest-asyncio==0.26.0; extra == 'dev'
+Requires-Dist: pytest==8.3.5; extra == 'dev'
 Requires-Dist: requests-aws4auth==1.2.3; extra == 'dev'
 Requires-Dist: sentence-transformers==2.6.1; extra == 'dev'
 Requires-Dist: types-requests==2.31.0.20240106; extra == 'dev'