ioa-observe-sdk 1.0.13__py3-none-any.whl → 1.0.15__py3-none-any.whl

ioa_observe/sdk/decorators/__init__.py

@@ -21,6 +21,7 @@ def task(
     name: Optional[str] = None,
     description: Optional[str] = None,
     version: Optional[int] = None,
+    protocol: Optional[str] = None,
     method_name: Optional[str] = None,
     tlp_span_kind: Optional[ObserveSpanKindValues] = ObserveSpanKindValues.TASK,
 ) -> Callable[[F], F]:
@@ -29,6 +30,7 @@ def task(
             name=name,
             description=description,
             version=version,
+            protocol=protocol,
             tlp_span_kind=tlp_span_kind,
         )
     else:
@@ -36,6 +38,7 @@ def task(
             name=name,
             description=description,
             version=version,
+            protocol=protocol,
             method_name=method_name,
             tlp_span_kind=tlp_span_kind,
         )
@@ -45,6 +48,7 @@ def workflow(
     name: Optional[str] = None,
     description: Optional[str] = None,
     version: Optional[int] = None,
+    protocol: Optional[str] = None,
     method_name: Optional[str] = None,
     tlp_span_kind: Optional[
         Union[ObserveSpanKindValues, str]
@@ -57,6 +61,7 @@ def workflow(
                 name=name,
                 description=description,
                 version=version,
+                protocol=protocol,
                 method_name=method_name,
                 tlp_span_kind=tlp_span_kind,
             )(target)
@@ -66,6 +71,7 @@ def workflow(
                 name=name,
                 description=description,
                 version=version,
+                protocol=protocol,
                 tlp_span_kind=tlp_span_kind,
             )(target)
 
@@ -77,14 +83,18 @@ def graph(
     description: Optional[str] = None,
     version: Optional[int] = None,
     method_name: Optional[str] = None,
+    protocol: Optional[str] = None,
 ) -> Callable[[F], F]:
     if method_name is None:
-        return entity_method(name=name, version=version, tlp_span_kind="graph")
+        return entity_method(
+            name=name, version=version, protocol=protocol, tlp_span_kind="graph"
+        )
     else:
         return entity_class(
             name=name,
             version=version,
             method_name=method_name,
+            protocol=protocol,
             tlp_span_kind="graph",
         )
 
@@ -93,12 +103,14 @@ def agent(
     name: Optional[str] = None,
     description: Optional[str] = None,
     version: Optional[int] = None,
+    protocol: Optional[str] = None,
     method_name: Optional[str] = None,
 ) -> Callable[[F], F]:
     return workflow(
         name=name,
         description=description,
         version=version,
+        protocol=protocol,
         method_name=method_name,
         tlp_span_kind=ObserveSpanKindValues.AGENT,
     )

ioa_observe/sdk/decorators/base.py

@@ -7,7 +7,7 @@ import traceback
 from functools import wraps
 import os
 import types
-from typing import Optional, TypeVar, Callable, Awaitable, Any, cast, Union
+from typing import Optional, TypeVar, Callable, Awaitable, Any, Union
 import inspect
 
 from ioa_observe.sdk.decorators.helpers import (
@@ -285,13 +285,23 @@ def _cleanup_span(span, ctx_token):
     context_api.detach(ctx_token)
 
 
+def _unwrap_structured_tool(fn):
+    # Unwraps StructuredTool or similar wrappers to get the underlying function
+    if hasattr(fn, "func") and callable(fn.func):
+        return fn.func
+    return fn
+
+
 def entity_method(
     name: Optional[str] = None,
     description: Optional[str] = None,
     version: Optional[int] = None,
+    protocol: Optional[str] = None,
     tlp_span_kind: Optional[ObserveSpanKindValues] = ObserveSpanKindValues.TASK,
 ) -> Callable[[F], F]:
     def decorate(fn: F) -> F:
+        # Unwrap StructuredTool if present
+        fn = _unwrap_structured_tool(fn)
         is_async = _is_async_method(fn)
         entity_name = name or _get_original_function_name(fn)
         if is_async:
@@ -367,7 +377,7 @@ def entity_method(
                                     agent_recovery_tracker.record_agent_recovery(
                                         entity_name
                                     )
-                        _handle_graph_response(span, res, tlp_span_kind)
+                        _handle_graph_response(span, res, protocol, tlp_span_kind)
                         # span will be ended in the generator
                         if isinstance(res, types.GeneratorType):
                             return _handle_generator(span, res)
@@ -413,7 +423,7 @@ def entity_method(
                         _cleanup_span(span, ctx_token)
                     return res
 
-                return cast(F, async_wrap)
+            decorated = async_wrap
         else:
 
             @wraps(fn)
@@ -477,7 +487,7 @@ def entity_method(
                                 agent_recovery_tracker.record_agent_recovery(
                                     entity_name
                                 )
-                    _handle_graph_response(span, res, tlp_span_kind)
+                    _handle_graph_response(span, res, protocol, tlp_span_kind)
 
                     # span will be ended in the generator
                     if isinstance(res, types.GeneratorType):
@@ -524,7 +534,12 @@ def entity_method(
                     _cleanup_span(span, ctx_token)
                 return res
 
-            return cast(F, sync_wrap)
+            decorated = sync_wrap
+        # # If the original fn was a StructuredTool, re-wrap
+        if hasattr(fn, "func") and callable(fn.func):
+            fn.func = decorated
+            return fn
+        return decorated
 
     return decorate
 
@@ -533,6 +548,7 @@ def entity_class(
     name: Optional[str],
     description: Optional[str],
     version: Optional[int],
+    protocol: Optional[str],
     method_name: Optional[str],
     tlp_span_kind: Optional[ObserveSpanKindValues] = ObserveSpanKindValues.TASK,
 ):
@@ -577,16 +593,18 @@ def entity_class(
             if hasattr(cls, method_to_wrap):
                 original_method = getattr(cls, method_to_wrap)
                 # Only wrap actual functions defined in this class
-                if inspect.isfunction(original_method):
+                unwrapped_method = _unwrap_structured_tool(original_method)
+                if inspect.isfunction(unwrapped_method):
                     try:
                         # Verify the method has a proper signature
-                        sig = inspect.signature(original_method)
+                        sig = inspect.signature(unwrapped_method)
                         wrapped_method = entity_method(
                             name=f"{task_name}.{method_to_wrap}",
                             description=description,
                             version=version,
+                            protocol=protocol,
                             tlp_span_kind=tlp_span_kind,
-                        )(original_method)
+                        )(unwrapped_method)
                         # Set the wrapped method on the class
                         setattr(cls, method_to_wrap, wrapped_method)
                     except Exception:
@@ -646,15 +664,17 @@ def _handle_execution_result(span, success):
     return
 
 
-def _handle_graph_response(span, res, tlp_span_kind):
+def _handle_graph_response(span, res, protocol, tlp_span_kind):
     if tlp_span_kind == "graph":
+        if protocol:
+            protocol = protocol.upper()
+            span.set_attribute("gen_ai.ioa.graph.protocol", protocol)
         # Check if the response is a Llama Index Workflow object
         graph = determine_workflow_type(res)
         if graph is not None:
             # Convert the graph to JSON string
             graph_json = json.dumps(graph, indent=2)
             span.set_attribute("gen_ai.ioa.graph", graph_json)
-
             # get graph dynamism
             dynamism = topology_dynamism(graph)
             span.set_attribute("gen_ai.ioa.graph_dynamism", dynamism)

ioa_observe/sdk/decorators/util.py

@@ -13,7 +13,7 @@ from llama_index.core.workflow.utils import (
 )
 
 
-def _serialize_object(obj, max_depth=5, current_depth=0):
+def _serialize_object(obj, max_depth=3, current_depth=0):
     """
     Intelligently serialize an object to a more meaningful representation
     """

{ioa_observe_sdk-1.0.13.dist-info → ioa_observe_sdk-1.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ioa-observe-sdk
-Version: 1.0.13
+Version: 1.0.15
 Summary: IOA Observability SDK
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -15,17 +15,28 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.33.1
 Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.33.1
 Requires-Dist: opentelemetry-instrumentation
 Requires-Dist: opentelemetry-instrumentation-logging==0.54b1
-Requires-Dist: opentelemetry-instrumentation-openai==0.40.8
-Requires-Dist: opentelemetry-instrumentation-llamaindex==0.40.8
-Requires-Dist: opentelemetry-instrumentation-ollama==0.40.8
-Requires-Dist: opentelemetry-instrumentation-anthropic==0.40.8
-Requires-Dist: opentelemetry-instrumentation-langchain==0.40.8
-Requires-Dist: opentelemetry-instrumentation-threading==00.54b1
+Requires-Dist: opentelemetry-instrumentation-openai==0.43.1
+Requires-Dist: opentelemetry-instrumentation-llamaindex==0.43.1
+Requires-Dist: opentelemetry-instrumentation-ollama==0.43.1
+Requires-Dist: opentelemetry-instrumentation-anthropic==0.43.1
+Requires-Dist: opentelemetry-instrumentation-langchain==0.43.1
+Requires-Dist: opentelemetry-instrumentation-bedrock==0.43.1
+Requires-Dist: opentelemetry-instrumentation-cohere==0.43.1
+Requires-Dist: opentelemetry-instrumentation-crewai==0.43.1
+Requires-Dist: opentelemetry-instrumentation-google-generativeai==0.43.1
+Requires-Dist: opentelemetry-instrumentation-groq==0.43.1
+Requires-Dist: opentelemetry-instrumentation-mistralai==0.43.1
+Requires-Dist: opentelemetry-instrumentation-requests==0.54b1
+Requires-Dist: opentelemetry-instrumentation-sagemaker==0.43.1
+Requires-Dist: opentelemetry-instrumentation-threading==0.54b1
+Requires-Dist: opentelemetry-instrumentation-together==0.43.1
+Requires-Dist: opentelemetry-instrumentation-transformers==0.43.1
 Requires-Dist: opentelemetry-instrumentation-urllib3==0.54b1
+Requires-Dist: opentelemetry-instrumentation-vertexai==0.43.1
 Requires-Dist: opentelemetry-proto==1.33.1
 Requires-Dist: opentelemetry-sdk==1.33.1
 Requires-Dist: opentelemetry-semantic-conventions==0.54b1
-Requires-Dist: opentelemetry-semantic-conventions-ai==0.4.9
+Requires-Dist: opentelemetry-semantic-conventions-ai>=0.4.11
 Requires-Dist: opentelemetry-util-http==0.54b1
 Requires-Dist: langgraph>=0.3.2
 Requires-Dist: langchain>=0.3.19

{ioa_observe_sdk-1.0.13.dist-info → ioa_observe_sdk-1.0.15.dist-info}/RECORD

@@ -9,10 +9,10 @@ ioa_observe/sdk/client/http.py,sha256=LdLYSQPFIhKN5BTB-N78jLO7ITl7jGjA0-qpewEIvO
 ioa_observe/sdk/config/__init__.py,sha256=8aVNaw0yRNLFPxlf97iOZLlJVcV81ivSDnudH2m1OIo,572
 ioa_observe/sdk/connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ioa_observe/sdk/connectors/slim.py,sha256=NwbKEV7d5NIOqmG8zKqtgGigSJl7kf3QJ65z2gxpsY8,8498
-ioa_observe/sdk/decorators/__init__.py,sha256=Lv5EbouBazvWaYB0N82v26pqKtj2FAqlwfLKEh5e8Q0,3251
-ioa_observe/sdk/decorators/base.py,sha256=wdllPcsb_vtq8Kbu1oF7eg2Z5e-Rgv8XUu1Shsk1Fp4,29395
+ioa_observe/sdk/decorators/__init__.py,sha256=c8gzCG-CASNI61RiTpNiTvMfguWvn4zc25fhBBgbHFA,3626
+ioa_observe/sdk/decorators/base.py,sha256=KbSxFUTP_qpZA0gzt_xe4pFTu9SLpAo1MbHskQ3BQ9A,30208
 ioa_observe/sdk/decorators/helpers.py,sha256=I9HXMBivkZpGDtPe9Ad_UU35p_m_wEPate4r_fU0oOA,2705
-ioa_observe/sdk/decorators/util.py,sha256=v0dBY-ynyiLFHwQSteBfoCZ-rxwPUTgfczokKlevSKM,30068
+ioa_observe/sdk/decorators/util.py,sha256=IebvH9gwZN1en3LblYJUh4bAV2STl6xmp8WpZzBDH2g,30068
 ioa_observe/sdk/instrumentations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ioa_observe/sdk/instrumentations/a2a.py,sha256=ov_9ckkymf_qFXG0iXVWfxlW-3kFcP-knrM_t-Cf72w,4414
 ioa_observe/sdk/instrumentations/slim.py,sha256=J5e6XeshH55xXaUiT9_j4R_n6VQELzBjgRAU-AgZGOg,11435
@@ -39,8 +39,8 @@ ioa_observe/sdk/utils/const.py,sha256=GwbHakKPjBL4wLqAVkDrSoKB-8p18EUrbaqPuRuV_x
 ioa_observe/sdk/utils/in_memory_span_exporter.py,sha256=H_4TRaThMO1H6vUQ0OpQvzJk_fZH0OOsRAM1iZQXsR8,2112
 ioa_observe/sdk/utils/json_encoder.py,sha256=g4NQ0tTqgWssY6I1D7r4zo0G6PiUo61jhofTAw5-jno,639
 ioa_observe/sdk/utils/package_check.py,sha256=1d1MjxhwoEZIx9dumirT2pRsEWgn-m-SI4npDeEalew,576
-ioa_observe_sdk-1.0.13.dist-info/licenses/LICENSE.md,sha256=55VjUfgjWOS4vv3Cf55gfq-RxjPgRIO2vlgYPUuC5lA,11362
-ioa_observe_sdk-1.0.13.dist-info/METADATA,sha256=h0RjY4epTI6SNW15L-Lxlv0OjN9L0UrfQyQJYGk6lCg,6109
-ioa_observe_sdk-1.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ioa_observe_sdk-1.0.13.dist-info/top_level.txt,sha256=Yt-6Y1olZEDqCs2REeqI30WjYx0pLGQSVqzYmDd67N8,12
-ioa_observe_sdk-1.0.13.dist-info/RECORD,,
+ioa_observe_sdk-1.0.15.dist-info/licenses/LICENSE.md,sha256=55VjUfgjWOS4vv3Cf55gfq-RxjPgRIO2vlgYPUuC5lA,11362
+ioa_observe_sdk-1.0.15.dist-info/METADATA,sha256=WwtaLg1AX6BXTs0ar7ru1rJ2GRKfoFMMpv8raR1FNLM,6799
+ioa_observe_sdk-1.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ioa_observe_sdk-1.0.15.dist-info/top_level.txt,sha256=Yt-6Y1olZEDqCs2REeqI30WjYx0pLGQSVqzYmDd67N8,12
+ioa_observe_sdk-1.0.15.dist-info/RECORD,,