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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.6.0
+Version: 0.6.6
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
@@ -14,6 +14,7 @@ Requires-Dist: opentelemetry-api>=1.21.0
 Requires-Dist: opentelemetry-instrumentation
 Requires-Dist: opentelemetry-sdk>=1.21.0
 Requires-Dist: requests
+Requires-Dist: rfc3986>=2.0.0
 Requires-Dist: wrapt>=1.14.0
 Provides-Extra: ai-test
 Requires-Dist: bert-score; extra == 'ai-test'
@@ -21,20 +22,22 @@ Requires-Dist: transformers; extra == 'ai-test'
 Provides-Extra: aws
 Requires-Dist: boto3==1.37.24; extra == 'aws'
 Provides-Extra: azure
+Requires-Dist: azure-ai-inference; extra == 'azure'
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'azure'
 Provides-Extra: dev
 Requires-Dist: a2a-sdk==0.3.6; extra == 'dev'
 Requires-Dist: anthropic-haystack; extra == 'dev'
 Requires-Dist: anthropic==0.57.1; extra == 'dev'
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'dev'
-Requires-Dist: boto3==1.37.24; extra == 'dev'
+Requires-Dist: boto3==1.39.0; extra == 'dev'
 Requires-Dist: chromadb==1.0.15; extra == 'dev'
 Requires-Dist: click==8.2.1; extra == 'dev'
-Requires-Dist: datasets==2.20.0; extra == 'dev'
+Requires-Dist: datasets==4.3.0; extra == 'dev'
 Requires-Dist: faiss-cpu==1.8.0; extra == 'dev'
 Requires-Dist: fastapi>=0.115.0; extra == 'dev'
 Requires-Dist: flask; extra == 'dev'
 Requires-Dist: google-adk==1.10.0; extra == 'dev'
+Requires-Dist: google-ai-haystack; extra == 'dev'
 Requires-Dist: google-generativeai==0.8.5; extra == 'dev'
 Requires-Dist: haystack-ai==2.3.0; extra == 'dev'
 Requires-Dist: httpx==0.28.1; extra == 'dev'
@@ -52,6 +55,7 @@ Requires-Dist: langchain==0.3.25; extra == 'dev'
 Requires-Dist: langchainhub==0.1.21; extra == 'dev'
 Requires-Dist: langgraph-supervisor==0.0.28; extra == 'dev'
 Requires-Dist: langgraph==0.5.4; extra == 'dev'
+Requires-Dist: litellm==1.77.5; extra == 'dev'
 Requires-Dist: llama-index-embeddings-huggingface==0.6.0; extra == 'dev'
 Requires-Dist: llama-index-llms-anthropic==0.8.1; extra == 'dev'
 Requires-Dist: llama-index-llms-azure-openai==0.4.0; extra == 'dev'
@@ -72,12 +76,19 @@ Requires-Dist: opentelemetry-instrumentation-flask; extra == 'dev'
 Requires-Dist: parameterized==0.9.0; extra == 'dev'
 Requires-Dist: pydantic==2.11.7; extra == 'dev'
 Requires-Dist: pytest-asyncio==0.26.0; extra == 'dev'
+Requires-Dist: pytest-venv; extra == 'dev'
 Requires-Dist: pytest==8.3.5; extra == 'dev'
 Requires-Dist: python-dotenv>=1.1.0; 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'
 Requires-Dist: uvicorn==0.35.0; extra == 'dev'
+Provides-Extra: dev-gemini
+Requires-Dist: llama-index-llms-gemini==0.6.0; extra == 'dev-gemini'
+Provides-Extra: dev-strands
+Requires-Dist: strands-agents-tools==0.2.10; extra == 'dev-strands'
+Requires-Dist: strands-agents==1.11.0; extra == 'dev-strands'
+Provides-Extra: dev-tranformers
+Requires-Dist: sentence-transformers==3.3.0; extra == 'dev-tranformers'
 Description-Content-Type: text/markdown
 
 # Monocle Apptrace

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

@@ -10,7 +10,7 @@ commands = [
 
 [project]
 name = "monocle_apptrace"
-version = "0.6.0"
+version = "0.6.6"
 authors = [
   { name="Okahu Inc.", email="okahu-pypi@okahu.ai" },
 ]
@@ -26,17 +26,18 @@ classifiers = [
 dependencies = [
    'requests',
    'wrapt>=1.14.0',
+   'rfc3986>=2.0.0',
    'opentelemetry-api>=1.21.0',
    'opentelemetry-sdk>=1.21.0',
    'opentelemetry-instrumentation',
 ]
 
 [tool.pytest.ini_options]
-#log_cli = true
-#log_cli_level = "INFO"
+log_cli = true
+log_cli_level = "INFO"
 # Enable file logging
-log_file = "traces.log"
-log_file_level = "INFO"
+#log_file = "traces.log"
+#log_file_level = "INFO"
 log_format = "%(asctime)s %(levelname)s %(pathname)s:%(lineno)d %(message)s"
 log_date_format = "%Y-%m-%d %H:%M:%S"
 
@@ -44,8 +45,27 @@ pythonpath = [
   "src",
   "tests"
 ]
-markers = [
-  "integration"
+
+# Simple ignore patterns - uncomment lines to ignore specific tests
+# Just uncomment the patterns you want to ignore:
+
+#ignore = [
+#  "tests/integration/",                    # Ignore ALL integration tests
+#  "tests/unit/",                          # Ignore ALL unit tests
+#]
+
+# Or ignore specific test files/patterns:
+#ignore = [
+#  "tests/integration/test_langchain_bedrock_sample.py",
+#  "tests/integration/test_anthropic_*.py",
+#  "tests/integration/test_azure_*.py", 
+#  "tests/integration/test_openai_*.py",
+#  "tests/unit/*_processor_test.py",
+#]
+
+# Test discovery patterns
+testpaths = [
+  "tests"
 ]
 
 [project.optional-dependencies]
@@ -59,13 +79,13 @@ dev = [
   'langchain-chroma==0.2.4',
   'langchain-community==0.3.24',
   'langchain==0.3.25',
-  'datasets==2.20.0',
+  'datasets==4.3.0',
   'numpy==1.26.4',
   'types-requests==2.31.0.20240106',
   'InstructorEmbedding==1.0.1',
-  'sentence-transformers==2.6.1',
   'faiss-cpu==1.8.0',
   'pytest==8.3.5',
+  'pytest-venv',
   'llama-index==0.13.0',
   'llama-index-llms-openai==0.5.0',
   'llama-index-tools-mcp==0.3.0',
@@ -77,7 +97,7 @@ dev = [
   'mistral-haystack==0.0.2',
   'langchain-aws==0.2.23',
   'azure-storage-blob==12.22.0', # this is for blob exporter
-  'boto3==1.37.24', # this is for aws exporter
+  'boto3==1.39.0', # this is for aws exporter
   'llama-index-vector-stores-opensearch==0.6.0',
   'haystack-ai==2.3.0',
   'llama-index-llms-azure-openai==0.4.0',
@@ -109,11 +129,27 @@ dev = [
   'google-generativeai==0.8.5',
   'openai-agents==0.2.6',
   'mistralai==1.9.9',
-  'huggingface_hub==0.35.3'
+  'huggingface_hub==0.35.3',
+  'litellm==1.77.5',
+  'google-ai-haystack'
+]
+
+dev_tranformers = [
+    'sentence-transformers==3.3.0'
+]
+
+dev_gemini = [
+  'llama-index-llms-gemini==0.6.0'
+]
+
+dev_strands = [
+  'strands-agents==1.11.0',
+  'strands-agents-tools==0.2.10'
 ]
 
 azure = [
     'azure-storage-blob==12.22.0',
+    'azure-ai-inference'
 ]
 
 aws = [

{monocle_apptrace-0.6.0 → monocle_apptrace-0.6.6}/src/monocle_apptrace/instrumentation/common/constants.py

@@ -92,6 +92,9 @@ CHILD_ERROR_CODE = "child.error.code"
 
 AGENT_PREFIX_KEY = "monocle.agent.prefix"
 
+MONOCLE_SKIP_EXECUTIONS = "monocle.skip_executions"
+SKIPPED_EXECUTION = "monocle.skipped_execution"
+
 # agentic sub types
 INFERENCE_AGENT_DELEGATION = "delegation"
 INFERENCE_TOOL_CALL = "tool_call"
@@ -178,3 +181,8 @@ MAP_ATTRIBUTES_TO_SPAN_SUBTYPE = {
     
     
 }
+
+PROVIDER_BASE_URLS = {
+    "deepseek": "https://api.deepseek.com",
+    # Add more providers here later
+}

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

@@ -1,6 +1,7 @@
 import logging
 import os
 from contextlib import contextmanager
+from typing import Union
 from opentelemetry.context import get_value, set_value, attach, detach
 from opentelemetry.sdk.trace import Span
 from opentelemetry.trace.status import Status, StatusCode
@@ -10,8 +11,8 @@ from monocle_apptrace.instrumentation.common.constants import (
     service_type_map,
     MONOCLE_SDK_VERSION, MONOCLE_SDK_LANGUAGE, MONOCLE_DETECTED_SPAN_ERROR
 )
-from monocle_apptrace.instrumentation.common.utils import set_attribute, get_scopes, MonocleSpanException, get_monocle_version
-from monocle_apptrace.instrumentation.common.constants import WORKFLOW_TYPE_KEY, WORKFLOW_TYPE_GENERIC, CHILD_ERROR_CODE
+from monocle_apptrace.instrumentation.common.utils import set_attribute, get_scopes, MonocleSpanException, get_monocle_version, replace_placeholders
+from monocle_apptrace.instrumentation.common.constants import WORKFLOW_TYPE_KEY, WORKFLOW_TYPE_GENERIC, CHILD_ERROR_CODE, MONOCLE_SKIP_EXECUTIONS, SKIPPED_EXECUTION
 
 logger = logging.getLogger(__name__)
 
@@ -49,7 +50,7 @@ class SpanHandler:
         pass
 
     def pre_tracing(self, to_wrap, wrapped, instance, args, kwargs):
-        pass
+        return None, None
 
     def post_tracing(self, to_wrap, wrapped, instance, args, kwargs, return_value, token=None):
         pass
@@ -67,8 +68,6 @@ class SpanHandler:
             span.set_attribute("span.type", span_type)
         else:
             logger.warning("type of span not found or incorrect written in entity json")
-        if "subtype" in output_processor:
-            span.set_attribute("span.subtype", output_processor["subtype"])
         return span_type
 
     def pre_task_processing(self, to_wrap, wrapped, instance, args,kwargs, span):
@@ -103,28 +102,32 @@ class SpanHandler:
     def post_task_processing(self, to_wrap, wrapped, instance, args, kwargs, result, ex, span:Span, parent_span:Span):
         pass
 
-    def should_skip(self, processor, instance, args, kwargs) -> bool:
+    def should_skip(self, processor, instance, span, parent_span, args, kwargs) -> bool:
         should_skip = False
         accessor = processor.get('should_skip')
         if accessor:
-            arguments = {"instance":instance, "args":args, "kwargs":kwargs}
-            should_skip = accessor(arguments)
-            if not isinstance(should_skip, bool):
-                logger.warning("Warning: 'should_skip' accessor did not return a boolean value")
-                return True
+            arguments = {"instance":instance, "span":span, "parent_span":parent_span, "args":args, "kwargs":kwargs}
+            try:
+                should_skip = accessor(arguments)
+                if not isinstance(should_skip, bool):
+                    logger.warning("Warning: 'should_skip' accessor did not return a boolean value")
+                    return False
+            except Exception as e:
+                logger.warning("Warning: Error occurred in 'should_skip' accessor: %s", str(e))
         return should_skip
 
-    def hydrate_span(self, to_wrap, wrapped, instance, args, kwargs, result, span, parent_span = None, ex:Exception = None) -> bool:
+    def hydrate_span(self, to_wrap, wrapped, instance, args, kwargs, result, span, parent_span = None,
+                    ex:Exception = None, is_post_exec:bool= False) -> bool:
         try:
-            detected_error_in_attribute = self.hydrate_attributes(to_wrap, wrapped, instance, args, kwargs, result, span, parent_span)
-            detected_error_in_event = self.hydrate_events(to_wrap, wrapped, instance, args, kwargs, result, span, parent_span, ex)
+            detected_error_in_attribute = self.hydrate_attributes(to_wrap, wrapped, instance, args, kwargs, result, span, parent_span, is_post_exec)
+            detected_error_in_event = self.hydrate_events(to_wrap, wrapped, instance, args, kwargs, result, span, parent_span, ex, is_post_exec)
             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:
+            if is_post_exec and 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, parent_span:Span) -> bool:
+    def hydrate_attributes(self, to_wrap, wrapped, instance, args, kwargs, result, span:Span, parent_span:Span, is_post_exec:bool) -> bool:
         detected_error:bool = False
         span_index = 0
         if SpanHandler.is_root_span(span):
@@ -133,7 +136,6 @@ class SpanHandler:
             output_processor=to_wrap['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:
                 arguments = {"instance":instance, "args":args, "kwargs":kwargs, "result":result, "parent_span":parent_span, "span":span}
                 for processors in output_processor["attributes"]:
@@ -144,9 +146,10 @@ class SpanHandler:
                         if attribute and accessor:
                             attribute_name = f"entity.{span_index+1}.{attribute}"
                             try:
-                                processor_result = accessor(arguments)
-                                if processor_result and isinstance(processor_result, (str, list)):
-                                    span.set_attribute(attribute_name, processor_result)
+                                if (not is_post_exec and processor.get('phase', '') != 'post_execution') or (is_post_exec and processor.get('phase', '') == 'post_execution'):
+                                    processor_result = accessor(arguments)
+                                    if processor_result and isinstance(processor_result, (str, list)):
+                                        span.set_attribute(attribute_name, processor_result)
                             except MonocleSpanException as e:
                                 span.set_status(StatusCode.ERROR, e.message)
                                 detected_error = True
@@ -165,13 +168,27 @@ 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: Span, parent_span=None, ex:Exception=None) -> bool:
+    def hydrate_events(self, to_wrap, wrapped, instance, args, kwargs, ret_result, span: Span, parent_span=None, ex:Exception=None,
+                       is_post_exec: bool = False) -> bool:
         detected_error:bool = False
         if 'output_processor' in to_wrap and to_wrap["output_processor"] is not None:
             output_processor=to_wrap['output_processor']
-            skip_processors:list[str] = self.skip_processor(to_wrap, wrapped, instance, span, args, kwargs) or []
-
+            if is_post_exec:
+                skip_events:list[str] = ['events.data.input']
+            else:
+                skip_events:list[str] = ['events.data.output', 'events.metadata']
+            skip_processors:list[str] = list(set(self.skip_processor(to_wrap, wrapped, instance, span, args, kwargs) or []).union(set(skip_events)))
             arguments = {"instance": instance, "args": args, "kwargs": kwargs, "result": ret_result, "exception":ex, "parent_span":parent_span, "span": span}
+            subtype = output_processor.get('subtype')
+            if subtype:
+                if callable(subtype):
+                    try:
+                        subtype_result = subtype(arguments)
+                        span.set_attribute("span.subtype", subtype_result)
+                    except Exception as e:
+                        logger.debug(f"Error processing subtype: {e}")
+                else:
+                    span.set_attribute("span.subtype", subtype)
             # Process events if they are defined in the output_processor.
             # In case of inference.modelapi skip the event processing unless the span has an exception
             if 'events' in output_processor and ('events' not in skip_processors or ex is not None):
@@ -200,6 +217,13 @@ class SpanHandler:
                                         event_attributes[attribute_key] = result
                                     else:
                                         event_attributes.update(result)
+                                if not is_post_exec and event_name == "data.input" and attribute_key == "input" and result:
+                                    # append memory to input if available
+                                    # update the result with new input
+                                    pass
+                                elif not detected_error and is_post_exec and event_name == "data.output" and attribute_key == "response" and result:
+                                    # capture memory
+                                    pass
                             except Exception as e:
                                 logger.debug(f"Error evaluating accessor for attribute '{attribute_key}': {e}")
                     matching_timestamp = getattr(ret_result, "timestamps", {}).get(event_name, None)
@@ -299,6 +323,32 @@ class SpanHandler:
         finally:
             SpanHandler.detach_workflow_type(token)
 
+    @staticmethod
+    def get_iput_entity_type(span: Span) -> str:
+        for event in span.events:
+            if event.name == "data.input":
+                return event.attributes.get("entity.type", "")
+
+    @staticmethod
+    def skip_execution(span:Span) -> tuple[bool, Union[dict, list, str, None]]:
+        skip_execs = get_value(MONOCLE_SKIP_EXECUTIONS)
+        if skip_execs is not None:
+            skip_exec_entity = skip_execs.get(span.attributes.get("entity.1.name", ""),{})
+            if ((span.attributes.get("span.type") is not None and skip_exec_entity.get("span.type", "") == span.attributes.get("span.type")) and
+                (span.attributes.get("entity.1.type") is not None and skip_exec_entity.get("entity.type", "") == span.attributes.get("entity.1.type"))):
+                span.set_attribute(SKIPPED_EXECUTION, True)
+                if skip_exec_entity.get("raise_error", False):
+                    raise MonocleSpanException(skip_exec_entity.get("error_message", ""))
+                response = skip_exec_entity.get("response", None)
+                response = replace_placeholders(response, span)
+                return True, response
+        return False, None
+
+    @staticmethod
+    def replace_placeholders_in_response(response: Union[dict, list, str], span:Span) -> Union[dict, list, str]:
+        if span.attributes.get(SKIPPED_EXECUTION, False):
+            return replace_placeholders(response, span)
+        return response
 
 class NonFrameworkSpanHandler(SpanHandler):
     # If the language framework is being executed, then skip generating direct openAI attributes and events

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

@@ -1,7 +1,8 @@
+import ast
 import logging, json
 import os
 import traceback
-from typing import Callable, Generic, Optional, TypeVar, Mapping
+from typing import Callable, Generic, Optional, TypeVar, Mapping, Union
 
 from opentelemetry.context import attach, detach, get_current, get_value, set_value, Context
 from opentelemetry.trace import NonRecordingSpan, Span
@@ -217,13 +218,16 @@ def remove_scopes(token:object) -> None:
     if token is not None:
         detach(token)
 
-def get_scopes() -> dict[str, object]:
+def get_scopes(scope_name: Optional[str] = None) -> dict[str, object]:
     monocle_scopes:dict[str, object] = {}
     for key, val in baggage.get_all().items():
-        if key.startswith(MONOCLE_SCOPE_NAME_PREFIX):
+        if key.startswith(MONOCLE_SCOPE_NAME_PREFIX) and (scope_name is None or key == f"{MONOCLE_SCOPE_NAME_PREFIX}{scope_name}"):
             monocle_scopes[key[len(MONOCLE_SCOPE_NAME_PREFIX):]] = val
     return monocle_scopes
 
+def is_scope_set(scepe_name: str) -> bool:
+    return len(get_scopes(scepe_name)) > 0
+
 def get_baggage_for_scopes():
     baggage_context:Context = None
     for scope_key, scope_value in get_scopes():
@@ -357,7 +361,7 @@ class Option(Generic[T]):
 
     def and_then(self, func: Callable[[T], 'Option[U]']) -> 'Option[U]':
         if self.is_some():
-            return func(self.value)
+            return Option(func(self.value))
         return Option(None)
 
 # Example usage
@@ -409,7 +413,7 @@ def get_error_message(arguments):
 
 
 def get_status_code(arguments):
-    if arguments["exception"] is not None:
+    if "exception" in arguments and arguments["exception"] is not None:
         return get_exception_status_code(arguments)
     elif hasattr(arguments["result"], "status"):
         return arguments["result"].status
@@ -467,4 +471,57 @@ def get_current_monocle_span(context: Optional[Context] = None) -> Span:
     span = get_value(_MONOCLE_SPAN_KEY, context=context)
     if span is None or not isinstance(span, Span):
         return INVALID_SPAN
-    return span
+    return span
+
+def get_input_event_from_span(events: list[dict], search_key:str) -> Optional[Mapping]:
+    """Extract the 'data.input' event from the span if it exists.
+
+    Args:
+        span: The Span to extract the event from.
+
+    Returns:
+        The 'data.input' event if it exists, None otherwise.
+    """
+    input_request = None
+    for event in events:
+        if event.name == "data.input":
+            try:
+                #load the input attribute as dictionary from string
+                try:
+                    input_dict = json.loads(event.attributes.get("input", "{}"))
+                except Exception as e:
+                    if isinstance(e, json.JSONDecodeError):
+                        input_dict = ast.literal_eval(event.attributes.get("input", {}))
+                    else:
+                        raise
+                if search_key in input_dict:
+                    input_request = input_dict[search_key]
+            except Exception as e:
+                logger.debug(f"Error parsing input event attribute: {e}")
+            break
+    return input_request
+
+def replace_placeholders(obj: Union[dict, list, str], span: Span) -> Union[dict, list, str]:
+    """Replace placeholders in strings with span context values."""
+    if isinstance(obj, dict):
+        return {k: replace_placeholders(v, span) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        return [replace_placeholders(item, span) for item in obj]
+    elif isinstance(obj, str):
+        startIndex = 0
+        while True:
+            start = obj.find("{{", startIndex)
+            end = obj.find("}}", start + 2)
+            if start == -1 or end == -1:
+                break
+            key = obj[start + 2:end].strip()
+            value = get_input_event_from_span(span.events, key)
+            if value is not None:
+                obj = obj[:start] + str(value) + obj[end + 2:]
+            startIndex = start + len(str(value))
+            if startIndex >= len(obj):
+                break
+        return obj
+    else:
+        return obj
+