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

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

@@ -1,71 +1,219 @@
+import logging
+import random
+import time
+from types import SimpleNamespace
 from monocle_apptrace.instrumentation.metamodel.openai import (
     _helper,
 )
-from monocle_apptrace.instrumentation.common.utils import resolve_from_alias
+from monocle_apptrace.instrumentation.common.utils import (
+    patch_instance_method,
+    resolve_from_alias,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def process_stream(to_wrap, response, span_processor):
+    waiting_for_first_token = True
+    stream_start_time = time.time_ns()
+    first_token_time = stream_start_time
+    stream_closed_time = None
+    accumulated_response = ""
+    token_usage = None
+    accumulated_temp_list = []
+
+    if to_wrap and hasattr(response, "__iter__"):
+        original_iter = response.__iter__
+
+        def new_iter(self):
+            nonlocal waiting_for_first_token, first_token_time, stream_closed_time, accumulated_response, token_usage
+
+            for item in original_iter():
+                try:
+                    if (
+                        item.choices
+                        and item.choices[0].delta
+                        and item.choices[0].delta.content
+                    ):
+                        if waiting_for_first_token:
+                            waiting_for_first_token = False
+                            first_token_time = time.time_ns()
+
+                        accumulated_response += item.choices[0].delta.content
+                        # token_usage = item.usage
+                    elif item.object == "chat.completion.chunk" and item.usage:
+                        # Handle the case where the response is a chunk
+                        token_usage = item.usage
+                        stream_closed_time = time.time_ns()
+
+                except Exception as e:
+                    logger.warning(
+                        "Warning: Error occurred while processing item in new_iter: %s",
+                        str(e),
+                    )
+                finally:
+                    accumulated_temp_list.append(item)
+                    yield item
+
+            if span_processor:
+                ret_val = SimpleNamespace(
+                    type="stream",
+                    timestamps={
+                        "data.input": int(stream_start_time),
+                        "data.output": int(first_token_time),
+                        "metadata": int(stream_closed_time or time.time_ns()),
+                    },
+                    output_text=accumulated_response,
+                    usage=token_usage,
+                )
+                span_processor(ret_val)
+
+        patch_instance_method(response, "__iter__", new_iter)
+        
+    if to_wrap and hasattr(response, "__aiter__"):
+        original_iter = response.__aiter__
+
+        async def new_aiter(self):
+            nonlocal waiting_for_first_token, first_token_time, stream_closed_time, accumulated_response, token_usage
+
+            async for item in original_iter():
+                try:
+                    if (
+                        item.choices
+                        and item.choices[0].delta
+                        and item.choices[0].delta.content
+                    ):
+                        if waiting_for_first_token:
+                            waiting_for_first_token = False
+                            first_token_time = time.time_ns()
+
+                        accumulated_response += item.choices[0].delta.content
+                        # token_usage = item.usage
+                    elif item.object == "chat.completion.chunk" and item.usage:
+                        # Handle the case where the response is a chunk
+                        token_usage = item.usage
+                        stream_closed_time = time.time_ns()
+
+                except Exception as e:
+                    logger.warning(
+                        "Warning: Error occurred while processing item in new_aiter: %s",
+                        str(e),
+                    )
+                finally:
+                    accumulated_temp_list.append(item)
+                    yield item
+
+            if span_processor:
+                ret_val = SimpleNamespace(
+                    type="stream",
+                    timestamps={
+                        "data.input": int(stream_start_time),
+                        "data.output": int(first_token_time),
+                        "metadata": int(stream_closed_time or time.time_ns()),
+                    },
+                    output_text=accumulated_response,
+                    usage=token_usage,
+                )
+                span_processor(ret_val)
+
+        patch_instance_method(response, "__aiter__", new_aiter)
+
 
 INFERENCE = {
     "type": "inference",
+    "is_auto_close": lambda kwargs: kwargs.get("stream", False) is False,
+    "response_processor": process_stream,
     "attributes": [
         [
             {
                 "_comment": "provider type ,name , deployment , inference_endpoint",
                 "attribute": "type",
-                "accessor": lambda arguments: 'inference.' + (_helper.get_inference_type(arguments['instance'])) or 'openai'
+                "accessor": lambda arguments: "inference."
+                + (_helper.get_inference_type(arguments["instance"]))
+                or "openai",
             },
             {
                 "attribute": "provider_name",
-                "accessor": lambda arguments: _helper.extract_provider_name(arguments['instance'])
+                "accessor": lambda arguments: _helper.extract_provider_name(
+                    arguments["instance"]
+                ),
             },
             {
                 "attribute": "deployment",
-                "accessor": lambda arguments: resolve_from_alias(arguments['instance'].__dict__, ['engine', 'azure_deployment', 'deployment_name', 'deployment_id', 'deployment'])
+                "accessor": lambda arguments: resolve_from_alias(
+                    arguments["instance"].__dict__,
+                    [
+                        "engine",
+                        "azure_deployment",
+                        "deployment_name",
+                        "deployment_id",
+                        "deployment",
+                    ],
+                ),
             },
             {
                 "attribute": "inference_endpoint",
-                "accessor": lambda arguments: resolve_from_alias(arguments['instance'].__dict__, ['azure_endpoint', 'api_base', 'endpoint']) or _helper.extract_inference_endpoint(arguments['instance'])
-            }
+                "accessor": lambda arguments: resolve_from_alias(
+                    arguments["instance"].__dict__,
+                    ["azure_endpoint", "api_base", "endpoint"],
+                )
+                or _helper.extract_inference_endpoint(arguments["instance"]),
+            },
         ],
         [
             {
                 "_comment": "LLM Model",
                 "attribute": "name",
-                "accessor": lambda arguments: resolve_from_alias(arguments['kwargs'], ['model', 'model_name', 'endpoint_name', 'deployment_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'])
-            }
-        ]
+                "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.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": [
                 {
                     "_comment": "this is result from LLM",
                     "attribute": "response",
-                    "accessor": lambda arguments: _helper.extract_assistant_message(arguments['result'])
+                    "accessor": lambda arguments: _helper.extract_assistant_message(
+                        arguments["result"]
+                    ),
                 }
-            ]
+            ],
         },
         {
             "name": "metadata",
             "attributes": [
                 {
                     "_comment": "this is metadata usage from LLM",
-                    "accessor": lambda arguments: _helper.update_span_from_llm_response(arguments['result'])
+                    "accessor": lambda arguments: _helper.update_span_from_llm_response(
+                        arguments["result"]
+                    ),
                 }
-            ]
-        }
-    ]
+            ],
+        },
+    ],
 }

monocle_apptrace/instrumentation/metamodel/openai/methods.py

@@ -28,7 +28,6 @@ OPENAI_METHODS = [
         "object": "Embeddings",
         "method": "create",
         "wrapper_method": task_wrapper,
-        "span_name": "openai_embeddings",
         "span_handler": "non_framework_handler",
         "output_processor": RETRIEVAL
     },
@@ -37,7 +36,6 @@ OPENAI_METHODS = [
         "object": "AsyncEmbeddings",
         "method": "create",
         "wrapper_method": atask_wrapper,
-        "span_name": "openai_embeddings",
         "span_handler": "non_framework_handler",
         "output_processor": RETRIEVAL
     },

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,10 @@
 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,
+)
 def capture_input(arguments):
     """
     Captures the input from Teams AI state.
@@ -55,4 +61,16 @@ 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}")
+        raise MonocleSpanException(f"Error: {error_code} - {error_msg}")
+
+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": [
         [
             {

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

@@ -1,6 +1,7 @@
 from monocle_apptrace.instrumentation.metamodel.teamsai import (
     _helper,
 )
+from monocle_apptrace.instrumentation.common.utils import get_llm_type
 TEAMAI_OUTPUT_PROCESSOR = {
     "type": "inference",
     "attributes": [
@@ -8,15 +9,15 @@ TEAMAI_OUTPUT_PROCESSOR = {
             {
                 "_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
@@ -52,19 +58,19 @@ TEAMAI_OUTPUT_PROCESSOR = {
                 }
             ]
         },
-        {
-            "name": "metadata",
-            "attributes": [
-                {
-                    "_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")
-                    }
-                }
-            ]
-        }
+        # {
+        #     "name": "metadata",
+        #     "attributes": [
+        #         {
+        #             "_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")
+        #             }
+        #         }
+        #     ]
+        # }
     ]
 }

monocle_apptrace/instrumentation/metamodel/teamsai/methods.py

@@ -1,4 +1,9 @@
-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,
 )
@@ -6,21 +11,50 @@ from monocle_apptrace.instrumentation.metamodel.teamsai.entities.inference.actio
     ACTIONPLANNER_OUTPUT_PROCESSOR,
 )
 
-TEAMAI_METHODS =[
+
+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.conversation.id:
+        conversation_id = context.activity.conversation.id or ""
+        user_aad_object_id = context.activity.from_property.aad_object_id or ""
+        user_teams_id = context.activity.from_property.id or ""
+        channel_id = context.activity.channel_id or ""
+        recipient_id = context.activity.recipient.id or ""
+        recipient_aad_object_id = context.activity.recipient.aad_object_id or ""
+        scopes[f"teams.conversation.conversation.id"] = conversation_id
+        scopes[f"teams.user.from_property.aad_object_id"] = user_aad_object_id
+        scopes[f"teams.user.from_property.id"] = user_teams_id
+        scopes[f"teams.channel.channel_id"] = channel_id
+        scopes[f"teams.channel.recipient.id"] = recipient_id
+        scopes[f"teams.channel.recipient.aad_object_id"] = recipient_aad_object_id
+
+    return scopes
+
+
+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.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.3.1b1
+Version: 0.4.0b1
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues