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

monocle_apptrace/instrumentation/common/constants.py

@@ -14,10 +14,10 @@ GITHUB_CODESPACE_IDENTIFIER_ENV_NAME = "GITHUB_REPOSITORY"
 # Azure naming reference can be found here
 # https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/azure-best-practices/resource-abbreviations
 # https://docs.aws.amazon.com/resource-explorer/latest/userguide/supported-resource-types.html#services-lookoutmetrics
-AZURE_FUNCTION_NAME = "azure.func"
-AZURE_APP_SERVICE_NAME = "azure.asp"
-AZURE_ML_SERVICE_NAME = "azure.mlw"
-AWS_LAMBDA_SERVICE_NAME = "aws.lambda"
+AZURE_FUNCTION_NAME = "azure_func"
+AZURE_APP_SERVICE_NAME = "azure_webapp"
+AZURE_ML_SERVICE_NAME = "azure_ml"
+AWS_LAMBDA_SERVICE_NAME = "aws_lambda"
 GITHUB_CODESPACE_SERVICE_NAME = "github_codespace"
 
 # Env variables to identify infra service type

monocle_apptrace/instrumentation/common/span_handler.py

@@ -42,8 +42,17 @@ class SpanHandler:
     def skip_span(self, to_wrap, wrapped, instance, args, kwargs) -> bool:
         return False
 
-    def skip_processor(self, to_wrap, wrapped, instance, args, kwargs) -> bool:
-        return False
+    def skip_processor(self, to_wrap, wrapped, instance, span, args, kwargs) -> list[str]:
+        return []
+    
+    def set_span_type(self, to_wrap, wrapped, instance, output_processor, span:Span, args, kwargs) -> str:
+        span_type:str = None
+        if 'type' in output_processor:
+            span_type = output_processor['type']
+            span.set_attribute("span.type", span_type)
+        else:
+            logger.warning("type of span not found or incorrect written in entity json")
+        return span_type
 
     def pre_task_processing(self, to_wrap, wrapped, instance, args,kwargs, span):
         if "pipeline" in to_wrap['package']:
@@ -69,30 +78,32 @@ class SpanHandler:
         workflow_name = SpanHandler.get_workflow_name(span=span)
         if workflow_name:
             span.set_attribute("workflow.name", workflow_name)
+        span.set_attribute("span.type", "generic")
 
     def post_task_processing(self, to_wrap, wrapped, instance, args, kwargs, result, span:Span):
-        if span.status.status_code == StatusCode.UNSET:
-            span.set_status(StatusCode.OK)
+        pass
 
-    def hydrate_span(self, to_wrap, wrapped, instance, args, kwargs, result, span) -> bool:
-        detected_error_in_attribute = self.hydrate_attributes(to_wrap, wrapped, instance, args, kwargs, result, span)
-        detected_error_in_event = self.hydrate_events(to_wrap, wrapped, instance, args, kwargs, result, span)
-        if detected_error_in_attribute or detected_error_in_event:
-            span.set_attribute(MONOCLE_DETECTED_SPAN_ERROR, True)
+    def hydrate_span(self, to_wrap, wrapped, instance, args, kwargs, result, span, ex:Exception = None) -> bool:
+        try:
+            detected_error_in_attribute = self.hydrate_attributes(to_wrap, wrapped, instance, args, kwargs, result, span)
+            detected_error_in_event = self.hydrate_events(to_wrap, wrapped, instance, args, kwargs, result, span, ex)
+            if detected_error_in_attribute or detected_error_in_event:
+                span.set_attribute(MONOCLE_DETECTED_SPAN_ERROR, True)
+        finally:
+            if span.status.status_code == StatusCode.UNSET and ex is None:
+                span.set_status(StatusCode.OK)
 
     def hydrate_attributes(self, to_wrap, wrapped, instance, args, kwargs, result, span:Span) -> bool:
         detected_error:bool = False
         span_index = 0
         if SpanHandler.is_root_span(span):
             span_index = 2 # root span will have workflow and hosting entities pre-populated
-        if not self.skip_processor(to_wrap, wrapped, instance, args, kwargs) and (
-                'output_processor' in to_wrap and to_wrap["output_processor"] is not None):
+        if 'output_processor' in to_wrap and to_wrap["output_processor"] is not None:
             output_processor=to_wrap['output_processor']
-            if 'type' in output_processor:
-                span.set_attribute("span.type", output_processor['type'])
-            else:
-                logger.warning("type of span not found or incorrect written in entity json")
-            if 'attributes' in output_processor:
+            self.set_span_type(to_wrap, wrapped, instance, output_processor, span, args, kwargs)
+            skip_processors:list[str] = self.skip_processor(to_wrap, wrapped, instance, span, args, kwargs) or []
+
+            if 'attributes' in output_processor and 'attributes' not in skip_processors:
                 for processors in output_processor["attributes"]:
                     for processor in processors:
                         attribute = processor.get('attribute')
@@ -113,10 +124,6 @@ class SpanHandler:
                         else:
                             logger.debug(f"{' and '.join([key for key in ['attribute', 'accessor'] if not processor.get(key)])} not found or incorrect in entity JSON")
                     span_index += 1
-            else:
-                logger.debug("attributes not found or incorrect written in entity json")
-        else:
-            span.set_attribute("span.type", "generic")
 
         # set scopes as attributes by calling get_scopes()
         # scopes is a Mapping[str:object], iterate directly with .items()
@@ -127,16 +134,19 @@ class SpanHandler:
             span.set_attribute("entity.count", span_index)
         return detected_error
 
-    def hydrate_events(self, to_wrap, wrapped, instance, args, kwargs, ret_result, span) -> bool:
+    def hydrate_events(self, to_wrap, wrapped, instance, args, kwargs, ret_result, span, ex:Exception=None) -> bool:
         detected_error:bool = False
-        if not self.skip_processor(to_wrap, wrapped, instance, args, kwargs) and (
-                'output_processor' in to_wrap and to_wrap["output_processor"] is not None):
+        if 'output_processor' in to_wrap and to_wrap["output_processor"] is not None:
             output_processor=to_wrap['output_processor']
-            arguments = {"instance": instance, "args": args, "kwargs": kwargs, "result": ret_result}
-            if 'events' in output_processor:
+            skip_processors:list[str] = self.skip_processor(to_wrap, wrapped, instance, span, args, kwargs) or []
+
+            arguments = {"instance": instance, "args": args, "kwargs": kwargs, "result": ret_result, "exception":ex}
+            if 'events' in output_processor and 'events' not in skip_processors:
                 events = output_processor['events']
                 for event in events:
                     event_name = event.get("name")
+                    if 'events.'+event_name in skip_processors:
+                        continue
                     event_attributes = {}
                     attributes = event.get("attributes", [])
                     for attribute in attributes:
@@ -231,7 +241,7 @@ class SpanHandler:
 
     @staticmethod
     @contextmanager
-    def workflow_type(to_wrap=None):
+    def workflow_type(to_wrap=None, span:Span=None):
         token = SpanHandler.attach_workflow_type(to_wrap)
         try:
             yield
@@ -241,6 +251,20 @@ class SpanHandler:
 
 class NonFrameworkSpanHandler(SpanHandler):
 
+    def get_workflow_name_in_progress(self) -> str:
+        return get_value(WORKFLOW_TYPE_KEY)
+
+    def is_framework_span_in_progess(self) -> bool:
+        return self.get_workflow_name_in_progress() in WORKFLOW_TYPE_MAP.values()
+
     # If the language framework is being executed, then skip generating direct openAI attributes and events
-    def skip_processor(self, to_wrap, wrapped, instance, args, kwargs) -> bool:
-        return get_value(WORKFLOW_TYPE_KEY) in WORKFLOW_TYPE_MAP.values()
+    def skip_processor(self, to_wrap, wrapped, instance, span, args, kwargs) -> list[str]:
+        if self.is_framework_span_in_progess():
+            return ["attributes", "events"]
+    
+    def set_span_type(self, to_wrap, wrapped, instance, output_processor, span:Span, args, kwargs) -> str:
+        span_type = super().set_span_type(to_wrap, wrapped, instance, output_processor, span, args, kwargs)
+        if self.is_framework_span_in_progess() and span_type is not None:
+            span_type = span_type+".modelapi"
+            span.set_attribute("span.type", span_type)
+        return span_type

monocle_apptrace/instrumentation/common/utils.py

@@ -362,6 +362,21 @@ def get_llm_type(instance):
     except:
         pass
 
+def get_exception_status_code(arguments):
+    if arguments['exception'] is not None and hasattr(arguments['exception'], 'code'):
+        return arguments['exception'].code
+    else:
+        return 'error'
+
+def get_exception_message(arguments):
+    if arguments['exception'] is not None:
+        if hasattr(arguments['exception'], 'message'):
+            return arguments['exception'].message
+        else:
+            return arguments['exception'].__str__()
+    else:
+        return ''
+
 def patch_instance_method(obj, method_name, func):
     """
     Patch a special method (like __iter__) for a single instance.

monocle_apptrace/instrumentation/common/wrapper.py

@@ -30,12 +30,22 @@ def pre_process_span(name, tracer, handler, add_workflow_span, to_wrap, wrapped,
         SpanHandler.set_workflow_properties(span, to_wrap)
     else:
         SpanHandler.set_non_workflow_properties(span)
-        handler.pre_task_processing(to_wrap, wrapped, instance, args, kwargs, span)
+        try:
+            handler.pre_task_processing(to_wrap, wrapped, instance, args, kwargs, span)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in pre_task_processing: {e}")
 
-def post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span):
+def post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span, ex = None):
     if not (SpanHandler.is_root_span(span) or get_value(ADD_NEW_WORKFLOW) == True):
-        handler.hydrate_span(to_wrap, wrapped, instance, args, kwargs, return_value, span)
-        handler.post_task_processing(to_wrap, wrapped, instance, args, kwargs, return_value, span)
+        try:
+            handler.hydrate_span(to_wrap, wrapped, instance, args, kwargs, return_value, span, ex)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in hydrate_span: {e}")
+        
+        try:
+            handler.post_task_processing(to_wrap, wrapped, instance, args, kwargs, return_value, span)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in post_task_processing: {e}")
 
 def get_span_name(to_wrap, instance):
     if to_wrap.get("span_name"):
@@ -58,9 +68,15 @@ def monocle_wrapper_span_processor(tracer: Tracer, handler: SpanHandler, to_wrap
                 return_value, span_status = monocle_wrapper_span_processor(tracer, handler, to_wrap, wrapped, instance, source_path, False, args, kwargs)
                 span.set_status(span_status)
             else:
-                with SpanHandler.workflow_type(to_wrap):
-                    return_value = wrapped(*args, **kwargs)
-                post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span)
+                ex:Exception = None
+                try:
+                    with SpanHandler.workflow_type(to_wrap, span):
+                        return_value = wrapped(*args, **kwargs)
+                except Exception as e:
+                    ex = e
+                    raise
+                finally:
+                    post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span, ex)
                 span_status = span.status
     else:
         span = tracer.start_span(name)
@@ -72,13 +88,15 @@ def monocle_wrapper_span_processor(tracer: Tracer, handler: SpanHandler, to_wrap
             post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, ret_val, span)
             span.end()
                     
-        with SpanHandler.workflow_type(to_wrap):
-            return_value = wrapped(*args, **kwargs)
-        if to_wrap.get("output_processor") and to_wrap.get("output_processor").get("response_processor"):
-            # Process the stream
-            to_wrap.get("output_processor").get("response_processor")(to_wrap, return_value, post_process_span_internal)
-        else: 
-            span.end()
+        try:
+            with SpanHandler.workflow_type(to_wrap, span):
+                return_value = wrapped(*args, **kwargs)
+        finally:
+            if to_wrap.get("output_processor") and to_wrap.get("output_processor").get("response_processor"):
+                # Process the stream
+                to_wrap.get("output_processor").get("response_processor")(to_wrap, return_value, post_process_span_internal)
+            else: 
+                span.end()
         span_status = span.status
     return return_value, span_status
 
@@ -86,7 +104,10 @@ def monocle_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, inst
     return_value = None
     token = None
     try:
-        handler.pre_tracing(to_wrap, wrapped, instance, args, kwargs)
+        try:
+            handler.pre_tracing(to_wrap, wrapped, instance, args, kwargs)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in pre_tracing: {e}")
         if to_wrap.get('skip_span', False) or handler.skip_span(to_wrap, wrapped, instance, args, kwargs):
             return_value = wrapped(*args, **kwargs)
         else:
@@ -98,8 +119,10 @@ def monocle_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, inst
                 detach(token)
         return return_value
     finally:
-        handler.post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)
-
+        try:
+            handler.post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in post_tracing: {e}")
 
 async def amonocle_wrapper_span_processor(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, instance, source_path, add_workflow_span, args, kwargs):
     # Main span processing logic
@@ -115,10 +138,16 @@ async def amonocle_wrapper_span_processor(tracer: Tracer, handler: SpanHandler,
                 return_value, span_status = await amonocle_wrapper_span_processor(tracer, handler, to_wrap, wrapped, instance, source_path, False, args, kwargs)
                 span.set_status(span_status)
             else:
-                with SpanHandler.workflow_type(to_wrap):
-                    return_value = await wrapped(*args, **kwargs)
+                ex:Exception = None
+                try:
+                    with SpanHandler.workflow_type(to_wrap, span):
+                        return_value = await wrapped(*args, **kwargs)
+                except Exception as e:
+                    ex = e
+                    raise
+                finally:
+                    post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span, ex)
                 span_status = span.status
-            post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span)
     else:
         span = tracer.start_span(name)
         
@@ -129,14 +158,15 @@ async def amonocle_wrapper_span_processor(tracer: Tracer, handler: SpanHandler,
             post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, ret_val, span)
             span.end()
 
-        with SpanHandler.workflow_type(to_wrap):
-            return_value = await wrapped(*args, **kwargs)
-           
-        if to_wrap.get("output_processor") and to_wrap.get("output_processor").get("response_processor"):
-            # Process the stream
-            to_wrap.get("output_processor").get("response_processor")(to_wrap, return_value, post_process_span_internal)
-        else: 
-            span.end()
+        try:
+            with SpanHandler.workflow_type(to_wrap, span):
+                return_value = await wrapped(*args, **kwargs)
+        finally:
+            if to_wrap.get("output_processor") and to_wrap.get("output_processor").get("response_processor"):
+                # Process the stream
+                to_wrap.get("output_processor").get("response_processor")(to_wrap, return_value, post_process_span_internal)
+            else: 
+                span.end()
         span_status = span.status
     return return_value, span.status
 
@@ -144,7 +174,10 @@ async def amonocle_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrappe
     return_value = None
     token = None
     try:
-        handler.pre_tracing(to_wrap, wrapped, instance, args, kwargs)
+        try:
+            handler.pre_tracing(to_wrap, wrapped, instance, args, kwargs)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in pre_tracing: {e}")
         if to_wrap.get('skip_span', False) or handler.skip_span(to_wrap, wrapped, instance, args, kwargs):
             return_value = await wrapped(*args, **kwargs)
         else:
@@ -156,7 +189,10 @@ async def amonocle_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrappe
                 detach(token)
         return return_value
     finally:
-        handler.post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)
+        try:
+            handler.post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in post_tracing: {e}")
 
 @with_tracer_wrapper
 def task_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, instance, source_path, args, kwargs):

monocle_apptrace/instrumentation/common/wrapper_method.py

@@ -10,6 +10,7 @@ from monocle_apptrace.instrumentation.metamodel.langchain.methods import (
 from monocle_apptrace.instrumentation.metamodel.llamaindex.methods import (LLAMAINDEX_METHODS, )
 from monocle_apptrace.instrumentation.metamodel.haystack.methods import (HAYSTACK_METHODS, )
 from monocle_apptrace.instrumentation.metamodel.openai.methods import (OPENAI_METHODS,)
+from monocle_apptrace.instrumentation.metamodel.openai._helper import OpenAISpanHandler
 from monocle_apptrace.instrumentation.metamodel.langgraph.methods import LANGGRAPH_METHODS
 from monocle_apptrace.instrumentation.metamodel.flask.methods import (FLASK_METHODS, )
 from monocle_apptrace.instrumentation.metamodel.flask._helper import FlaskSpanHandler, FlaskResponseSpanHandler
@@ -76,5 +77,6 @@ MONOCLE_SPAN_HANDLERS: Dict[str, SpanHandler] = {
     "flask_handler": FlaskSpanHandler(),
     "flask_response_handler": FlaskResponseSpanHandler(),
     "request_handler": RequestSpanHandler(),
-    "non_framework_handler": NonFrameworkSpanHandler()
+    "non_framework_handler": NonFrameworkSpanHandler(),
+    "openai_handler": OpenAISpanHandler(),
 }

monocle_apptrace/instrumentation/metamodel/haystack/_helper.py

@@ -121,7 +121,7 @@ def update_span_from_llm_response(response, instance):
     if response is not None and isinstance(response, dict):
         if "meta" in response:
             token_usage = response["meta"][0]["usage"]
-        if "replies" in response:
+        elif "replies" in response:  # and "meta" in response["replies"][0]:
             token_usage = response["replies"][0].meta["usage"]
         if token_usage is not None:
             temperature = instance.__dict__.get("temperature", None)

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

@@ -4,7 +4,7 @@ from monocle_apptrace.instrumentation.metamodel.haystack import (
 from monocle_apptrace.instrumentation.common.utils import get_llm_type
 
 INFERENCE = {
-    "type": "inference",
+    "type": "inference.framework",
     "attributes": [
         [
             {

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

@@ -4,7 +4,7 @@ from monocle_apptrace.instrumentation.metamodel.langchain import (
 from monocle_apptrace.instrumentation.common.utils import resolve_from_alias, get_llm_type
 
 INFERENCE = {
-    "type": "inference",
+    "type": "inference.framework",
     "attributes": [
         [
             {

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

@@ -4,7 +4,7 @@ from monocle_apptrace.instrumentation.metamodel.llamaindex import (
 from monocle_apptrace.instrumentation.common.utils import resolve_from_alias, get_llm_type
 
 INFERENCE = {
-    "type": "inference",
+    "type": "inference.framework",
     "attributes": [
         [
             {

monocle_apptrace/instrumentation/metamodel/openai/_helper.py

@@ -10,7 +10,7 @@ from monocle_apptrace.instrumentation.common.utils import (
     get_nested_value,
     try_option,
 )
-
+from monocle_apptrace.instrumentation.common.span_handler import NonFrameworkSpanHandler
 
 logger = logging.getLogger(__name__)
 
@@ -114,4 +114,12 @@ def get_inference_type(instance):
     if inference_type.unwrap_or(None):
         return 'azure_openai'
     else:
-        return 'openai'
+        return 'openai'
+
+class OpenAISpanHandler(NonFrameworkSpanHandler):
+    # If openAI is being called by Teams AI SDK, then retain the metadata part of the span events
+    def skip_processor(self, to_wrap, wrapped, instance, span, args, kwargs) -> list[str]:
+        if self.is_framework_span_in_progess() and self.get_workflow_name_in_progress() == "workflow.teams_ai":
+            return ["attributes", "events.data.input", "events.data.output"]
+        else:
+            return super().skip_processor(to_wrap, wrapped, instance, span, args, kwargs)

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,7 +28,7 @@ OPENAI_METHODS = [
         "object": "Embeddings",
         "method": "create",
         "wrapper_method": task_wrapper,
-        "span_handler": "non_framework_handler",
+        "span_handler": "openai_handler",
         "output_processor": RETRIEVAL
     },
     {
@@ -36,7 +36,7 @@ OPENAI_METHODS = [
         "object": "AsyncEmbeddings",
         "method": "create",
         "wrapper_method": atask_wrapper,
-        "span_handler": "non_framework_handler",
+        "span_handler": "openai_handler",
         "output_processor": RETRIEVAL
     },
     {
@@ -44,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
     },
     {
@@ -52,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/teamsai/_helper.py

@@ -4,6 +4,8 @@ from monocle_apptrace.instrumentation.common.utils import (
     get_keys_as_tuple,
     get_nested_value,
     try_option,
+    get_exception_message,
+    get_exception_status_code
 )
 def capture_input(arguments):
     """
@@ -57,11 +59,41 @@ 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')

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

@@ -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

@@ -3,7 +3,7 @@ from monocle_apptrace.instrumentation.metamodel.teamsai import (
 )
 from monocle_apptrace.instrumentation.common.utils import get_llm_type
 TEAMAI_OUTPUT_PROCESSOR = {
-    "type": "inference",
+    "type": "inference.framework",
     "attributes": [
         [
             {
@@ -52,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"])
+                    "accessor": lambda arguments: _helper.get_response(arguments)
+                },
+                {
+                    "attribute": "check_status",
+                    "accessor": lambda arguments: _helper.check_status(arguments)
                 }
             ]
         },
-        # {
-        #     "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-0.4.0b1.dist-info → monocle_apptrace-0.4.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.4.0b1
+Version: 0.4.0b2
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
@@ -20,6 +20,7 @@ Requires-Dist: boto3==1.35.19; extra == 'aws'
 Provides-Extra: azure
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'azure'
 Provides-Extra: dev
+Requires-Dist: anthropic-haystack; extra == 'dev'
 Requires-Dist: anthropic==0.49.0; extra == 'dev'
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'dev'
 Requires-Dist: boto3==1.34.131; extra == 'dev'

{monocle_apptrace-0.4.0b1.dist-info → monocle_apptrace-0.4.0b2.dist-info}/RECORD

@@ -12,13 +12,13 @@ monocle_apptrace/exporters/azure/blob_exporter_opendal.py,sha256=wQUtciyFMD28tpW
 monocle_apptrace/exporters/okahu/okahu_exporter.py,sha256=wFkHd87nOXzFMRejrUiO6N0mNIWkxAyRzob6o82lr_c,4765
 monocle_apptrace/instrumentation/__init__.py,sha256=oa412OuokRm9Vf3XlCJLqpZjz9ZcuxAKxnEBvOK7u2M,21
 monocle_apptrace/instrumentation/common/__init__.py,sha256=oNEcgw4N36_XzPeN1gc7wxhPjVg-Vhh8EjvUIQZ7pDM,224
-monocle_apptrace/instrumentation/common/constants.py,sha256=14-y6MpJ48NEjUickDlbeHPBXcBdxs2gBVei1aGuGUk,3206
+monocle_apptrace/instrumentation/common/constants.py,sha256=XxxPUg0tQGQLM12Z3yzLa-shgU8ZZwlAGsFg9MT7mao,3208
 monocle_apptrace/instrumentation/common/instrumentor.py,sha256=CwQT1oiPyzv_xe8HhdOH7Ucmd18r2Wk3ortOTx6bhpQ,16324
-monocle_apptrace/instrumentation/common/span_handler.py,sha256=9GOV8Q0xiG25qEOhA60K0kLESp8_jnRk8lsjnGKBlgg,11737
+monocle_apptrace/instrumentation/common/span_handler.py,sha256=ajW1hkb_gUefJ5dMOVyXY1GcdHxpFkYajNJrmjq9iVg,12965
 monocle_apptrace/instrumentation/common/tracing.md,sha256=6Lr8QGxEFHKhj-mMvLV3xjFnplKSs6HEdwl0McPK47M,7577
-monocle_apptrace/instrumentation/common/utils.py,sha256=SVOQTnucdYiGbpSxeoY8Y6DXXmY58vEeL21OPVRjhPo,13032
-monocle_apptrace/instrumentation/common/wrapper.py,sha256=IK_Y3qOhAAGH_D1jWZClbvhb0x7SK1zlKTvO1ewahNU,10684
-monocle_apptrace/instrumentation/common/wrapper_method.py,sha256=tty1JdGGF8VnzWeo2rcwvh-ppUgNdNs-CbGOJn7sjN8,3881
+monocle_apptrace/instrumentation/common/utils.py,sha256=wAN3J6H5wxQZgOrK31oWyq1mzxLogkG-Du31GoPcPIo,13519
+monocle_apptrace/instrumentation/common/wrapper.py,sha256=YF2f7j9Z1RPmY69OwdUIhyR8hCLSEk-xRGWbZlowl3c,12079
+monocle_apptrace/instrumentation/common/wrapper_method.py,sha256=ig98if45QDU-N76uNAxcb1O7xL8YpwtxJLcb5Dh71bc,4013
 monocle_apptrace/instrumentation/metamodel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/aiohttp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/aiohttp/_helper.py,sha256=h-zrif2vgPL9JbCf1eKHbKBYHAxMdHxOdY-soIDGti8,2361
@@ -40,16 +40,16 @@ monocle_apptrace/instrumentation/metamodel/flask/_helper.py,sha256=Z0mBGDXP_-Dcc
 monocle_apptrace/instrumentation/metamodel/flask/methods.py,sha256=dWCMEDk-HWHiD0vlMoAVYbIFclstmVkUpRrCtqDWyFE,739
 monocle_apptrace/instrumentation/metamodel/flask/entities/http.py,sha256=wIudpNk6-DY72k0p90XtvjKt8BilvOd-87Q2iqJnWa8,1525
 monocle_apptrace/instrumentation/metamodel/haystack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-monocle_apptrace/instrumentation/metamodel/haystack/_helper.py,sha256=47dGZqz1HCe7jj15a-p4UAcRmq1JnzQ7Ijc_RNWMt6g,5396
+monocle_apptrace/instrumentation/metamodel/haystack/_helper.py,sha256=HjPZUA9K2dPUcQQNzMN3jX8UV0OHF9N7tQ6kSl1OvxM,5439
 monocle_apptrace/instrumentation/metamodel/haystack/methods.py,sha256=Zd70ycMQ5qWsjPXnQL6qoThNKrQA80P6t11sFyEbQR4,1585
 monocle_apptrace/instrumentation/metamodel/haystack/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-monocle_apptrace/instrumentation/metamodel/haystack/entities/inference.py,sha256=p8zemjFl4kNoDGlOj3PImHQ7imOOjqvYPkVRcQlIU5c,3207
+monocle_apptrace/instrumentation/metamodel/haystack/entities/inference.py,sha256=FzUg66WRYAcPbWqdq8iqfv7inkry9L_MrC1o5wd96bg,3217
 monocle_apptrace/instrumentation/metamodel/haystack/entities/retrieval.py,sha256=nq3lsk2qFxXqwrAHsBt8zrh4ZVGAJABkPtylrjUCCqc,2357
 monocle_apptrace/instrumentation/metamodel/langchain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/langchain/_helper.py,sha256=CziW8KUmRqGCi_y2fcC9YMsP2wP11OMUitqKupSXStg,5315
 monocle_apptrace/instrumentation/metamodel/langchain/methods.py,sha256=sQLrji0NLuG8i8q5UdbgzPUjWh_WmromfvWL3pGZdCk,2941
 monocle_apptrace/instrumentation/metamodel/langchain/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-monocle_apptrace/instrumentation/metamodel/langchain/entities/inference.py,sha256=2CNHloheb4LG7rPEUIF3E3M1cuc8CWVZf9J6l_hvK1E,2764
+monocle_apptrace/instrumentation/metamodel/langchain/entities/inference.py,sha256=RrLPoYLfn3AB9-siwo1NFLT2aPDJtJm9Hgoj6ad2S7Y,2774
 monocle_apptrace/instrumentation/metamodel/langchain/entities/retrieval.py,sha256=r4UqTCT5vOfkbz9lwoTRoiMkUUJtPMwqOYbqo53A6K8,2039
 monocle_apptrace/instrumentation/metamodel/langgraph/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/langgraph/_helper.py,sha256=-XmAbhkgqwaunFZa-BP0zWZ3e-uD-ihSszbn5Cz75yc,2043
@@ -61,11 +61,11 @@ monocle_apptrace/instrumentation/metamodel/llamaindex/_helper.py,sha256=1Rq2sfoL
 monocle_apptrace/instrumentation/metamodel/llamaindex/methods.py,sha256=p2mDYF_Izgz9M919n3Do5tlc5XRAZt_rnkFRqqIO5yo,3001
 monocle_apptrace/instrumentation/metamodel/llamaindex/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/llamaindex/entities/agent.py,sha256=g7IEwFMLjYvxljX7iHoYSPJW6k-wC7Z3i_y2qlNEZcs,1338
-monocle_apptrace/instrumentation/metamodel/llamaindex/entities/inference.py,sha256=Hich1AoEHnCUvh0MIISNOjbH9t71eex_IsY_4j3JN5U,2727
+monocle_apptrace/instrumentation/metamodel/llamaindex/entities/inference.py,sha256=XJI6CbGdsogQLQC41KEJqkRe1THEN_vu8pA_H5RGNww,2737
 monocle_apptrace/instrumentation/metamodel/llamaindex/entities/retrieval.py,sha256=QBF1nrqog5KHh925jiY2V-kejL6iVLKUowZmqUDoiJ4,1870
 monocle_apptrace/instrumentation/metamodel/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-monocle_apptrace/instrumentation/metamodel/openai/_helper.py,sha256=G_2-FafJGjTY0lU5OXQFNGCP2Z7OmgUMbTgNa37AVec,4256
-monocle_apptrace/instrumentation/metamodel/openai/methods.py,sha256=gH8ZFN_x1nRM45F4FUVqoj9dao52247MSgOCxtzCpmA,1838
+monocle_apptrace/instrumentation/metamodel/openai/_helper.py,sha256=8kQhU-QuqQR_SPJs9KKE-32jBJyk2kB91VNtirYX1yI,4878
+monocle_apptrace/instrumentation/metamodel/openai/methods.py,sha256=jpqZyfiJbzMz1r3W3fwMCGiQsbiDSkhqgADJextGxFQ,1796
 monocle_apptrace/instrumentation/metamodel/openai/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/openai/entities/inference.py,sha256=JV6favZumCWBx5GCgirQ-txACeOGzb8N_-SZdSY0nOE,7910
 monocle_apptrace/instrumentation/metamodel/openai/entities/retrieval.py,sha256=LU7aec302ZqPrs9MzFWU-JTnhK8OpYfgQKMmktlD6-8,1457
@@ -74,14 +74,14 @@ monocle_apptrace/instrumentation/metamodel/requests/_helper.py,sha256=GS03VbT9Li
 monocle_apptrace/instrumentation/metamodel/requests/methods.py,sha256=O7lkglRvV97zqnCu6r2JwvW8WQqi4uvlpmNkAPpXigE,440
 monocle_apptrace/instrumentation/metamodel/requests/entities/http.py,sha256=TlY4NZtPleewbF5W0qV61L2ByDOf44EOZhKQgwzRIKc,1669
 monocle_apptrace/instrumentation/metamodel/teamsai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-monocle_apptrace/instrumentation/metamodel/teamsai/_helper.py,sha256=cfay3DXm_JuUgHTfXpJYnY-9xIMH6CURTiQLl9FfMzc,2970
+monocle_apptrace/instrumentation/metamodel/teamsai/_helper.py,sha256=mrN-AQ0Nn59_jKidyvibP76JI17SdVFAdpBw_ouuu2U,3821
 monocle_apptrace/instrumentation/metamodel/teamsai/methods.py,sha256=i0Rz6Gn_Skey9uuCtJftNfMjGBbMMhuMMQcx7TPYQXU,2214
 monocle_apptrace/instrumentation/metamodel/teamsai/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monocle_apptrace/instrumentation/metamodel/teamsai/entities/inference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-monocle_apptrace/instrumentation/metamodel/teamsai/entities/inference/actionplanner_output_processor.py,sha256=Xh7rRKllIMCvP6sMBZBXP-CP9ERm_Wg4KD2bVRif6vA,3166
-monocle_apptrace/instrumentation/metamodel/teamsai/entities/inference/teamsai_output_processor.py,sha256=nCCqR1H57wL5vuYA2IQQembQjXVGTiBOiom7MEp06dU,2987
-monocle_apptrace-0.4.0b1.dist-info/METADATA,sha256=s6ad8nexvx3FSZ55HSdPsJpnYBXamEvjMozxUYM2CfU,6363
-monocle_apptrace-0.4.0b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-monocle_apptrace-0.4.0b1.dist-info/licenses/LICENSE,sha256=ay9trLiP5I7ZsFXo6AqtkLYdRqe5S9r-DrPOvsNlZrg,9136
-monocle_apptrace-0.4.0b1.dist-info/licenses/NOTICE,sha256=9jn4xtwM_uUetJMx5WqGnhrR7MIhpoRlpokjSTlyt8c,112
-monocle_apptrace-0.4.0b1.dist-info/RECORD,,
+monocle_apptrace/instrumentation/metamodel/teamsai/entities/inference/actionplanner_output_processor.py,sha256=6rb75bFKh_hvgD8dJzcIeXeJjLjhm9nXuxHI3F-icqo,2405
+monocle_apptrace/instrumentation/metamodel/teamsai/entities/inference/teamsai_output_processor.py,sha256=M5uPEbP5c57txrd7BDRXhK5rvRJfyNyvqavtkXuPjXU,2738
+monocle_apptrace-0.4.0b2.dist-info/METADATA,sha256=Zjevvr0oyO-NM8uz0h5JTcTUNXtHnPV0LrLtiOtZk0E,6413
+monocle_apptrace-0.4.0b2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+monocle_apptrace-0.4.0b2.dist-info/licenses/LICENSE,sha256=ay9trLiP5I7ZsFXo6AqtkLYdRqe5S9r-DrPOvsNlZrg,9136
+monocle_apptrace-0.4.0b2.dist-info/licenses/NOTICE,sha256=9jn4xtwM_uUetJMx5WqGnhrR7MIhpoRlpokjSTlyt8c,112
+monocle_apptrace-0.4.0b2.dist-info/RECORD,,