ioa-observe-sdk 1.0.9__py3-none-any.whl → 1.0.11__py3-none-any.whl

ioa_observe/sdk/decorators/__init__.py

@@ -1,6 +1,6 @@
 # Copyright AGNTCY Contributors (https://github.com/agntcy)
 # SPDX-License-Identifier: Apache-2.0
-
+import inspect
 from typing import Optional, Union, TypeVar, Callable, Awaitable
 
 from typing_extensions import ParamSpec
@@ -50,18 +50,31 @@ def workflow(
         Union[ObserveSpanKindValues, str]
     ] = ObserveSpanKindValues.WORKFLOW,
 ) -> Callable[[F], F]:
-    # Always use entity_class for class decorators
-    return entity_class(
-        name=name,
-        description=description,
-        version=version,
-        method_name=method_name,
-        tlp_span_kind=tlp_span_kind,
-    )
+    def decorator(target):
+        # Check if target is a class
+        if inspect.isclass(target):
+            return entity_class(
+                name=name,
+                description=description,
+                version=version,
+                method_name=method_name,
+                tlp_span_kind=tlp_span_kind,
+            )(target)
+        else:
+            # Target is a function/method
+            return entity_method(
+                name=name,
+                description=description,
+                version=version,
+                tlp_span_kind=tlp_span_kind,
+            )(target)
+
+    return decorator
 
 
 def graph(
     name: Optional[str] = None,
+    description: Optional[str] = None,
     version: Optional[int] = None,
     method_name: Optional[str] = None,
 ) -> Callable[[F], F]:

ioa_observe/sdk/decorators/base.py

@@ -43,7 +43,6 @@ from ioa_observe.sdk.utils.const import (
 from ioa_observe.sdk.utils.json_encoder import JSONEncoder
 from ioa_observe.sdk.metrics.agent import topology_dynamism, determinism_score
 
-
 P = ParamSpec("P")
 
 R = TypeVar("R")
@@ -158,15 +157,41 @@ def _handle_span_input(span, args, kwargs, cls=None):
     """Handles entity input logging in JSON for both sync and async functions"""
     try:
         if _should_send_prompts():
-            json_input = json.dumps(
-                {"args": args, "kwargs": kwargs}, **({"cls": cls} if cls else {})
-            )
+            # Use a safer serialization approach to avoid recursion
+            safe_args = []
+            safe_kwargs = {}
+
+            # Safely convert args
+            for arg in args:
+                try:
+                    # Test if the object can be JSON serialized
+                    json.dumps(arg)
+                    safe_args.append(arg)
+                except (TypeError, ValueError, PydanticSerializationError):
+                    # If it can't be serialized, use string representation
+                    safe_args.append(str(arg))
+
+            # Safely convert kwargs
+            for key, value in kwargs.items():
+                try:
+                    # Test if the object can be JSON serialized
+                    json.dumps(value)
+                    safe_kwargs[key] = value
+                except (TypeError, ValueError, PydanticSerializationError):
+                    # If it can't be serialized, use string representation
+                    safe_kwargs[key] = str(value)
+
+            # Create the JSON without custom encoder to avoid recursion
+            json_input = json.dumps({"args": safe_args, "kwargs": safe_kwargs})
+
             if _is_json_size_valid(json_input):
                 span.set_attribute(
                     OBSERVE_ENTITY_INPUT,
                     json_input,
                 )
-    except TypeError as e:
+    except Exception as e:
+        # Log the exception but don't fail the actual function call
+        print(f"Warning: Failed to serialize input for span: {e}")
         Telemetry().log_exception(e)
 
 
@@ -219,27 +244,32 @@ def _handle_span_output(span, tlp_span_kind, res, cls=None):
                             "gen_ai.ioa.agent.connection_reliability", reliability
                         )
 
-        if _should_send_prompts():
-            try:
-                json_output = json.dumps(res, **({"cls": cls} if cls else {}))
-            except (TypeError, PydanticSerializationError):
-                # Fallback for objects that can't be directly serialized
+            if _should_send_prompts():
                 try:
-                    # Try to serialize a string representation
-                    safe_output = str(res)
-                    json_output = json.dumps({"__str_representation__": safe_output})
-                except Exception:
-                    # If all serialization fails, skip output attribute
-                    json_output = None
-            if _is_json_size_valid(json_output):
-                span.set_attribute(
-                    OBSERVE_ENTITY_OUTPUT,
-                    json_output,
-                )
-                TracerWrapper().span_processor_on_ending(
-                    span
-                )  # record the response latency
-    except TypeError as e:
+                    # Try direct JSON serialization first (without custom encoder)
+                    json_output = json.dumps(res)
+                except (TypeError, PydanticSerializationError, ValueError):
+                    # Fallback for objects that can't be directly serialized
+                    try:
+                        # Try to serialize a string representation
+                        safe_output = str(res)
+                        json_output = json.dumps(
+                            {"__str_representation__": safe_output}
+                        )
+                    except Exception:
+                        # If all serialization fails, skip output attribute
+                        json_output = None
+
+                if json_output and _is_json_size_valid(json_output):
+                    span.set_attribute(
+                        OBSERVE_ENTITY_OUTPUT,
+                        json_output,
+                    )
+                    TracerWrapper().span_processor_on_ending(
+                        span
+                    )  # record the response latency
+    except Exception as e:
+        print(f"Warning: Failed to serialize output for span: {e}")
         Telemetry().log_exception(e)
 
 
@@ -286,7 +316,7 @@ def entity_method(
                         entity_name,
                         tlp_span_kind,
                         version,
-                        description if description else None,
+                        description,
                     )
                     _handle_span_input(span, args, kwargs, cls=JSONEncoder)
 
@@ -307,8 +337,12 @@ def entity_method(
                         entity_name,
                         tlp_span_kind,
                         version,
-                        description if description else None,
+                        description,
                     )
+
+                    # Handle case where span setup failed
+                    if span is None:
+                        return fn(*args, **kwargs)
                     _handle_span_input(span, args, kwargs, cls=JSONEncoder)
                     success = False
                     try:
@@ -399,9 +433,13 @@ def entity_method(
                     entity_name,
                     tlp_span_kind,
                     version,
-                    description if description else None,
+                    description,
                 )
 
+                # Handle case where span setup failed
+                if span is None:
+                    return fn(*args, **kwargs)
+
                 _handle_span_input(span, args, kwargs, cls=JSONEncoder)
                 _handle_agent_span(span, entity_name, description, tlp_span_kind)
                 success = False
@@ -515,30 +553,53 @@ def entity_class(
             # Specific method specified - existing behavior
             methods_to_wrap = [method_name]
         else:
-            # No method specified - wrap all public methods
+            # No method specified - wrap all public methods defined in this class
             for attr_name in dir(cls):
                 if (
                     not attr_name.startswith("_")  # Skip private/built-in methods
                     and attr_name != "mro"  # Skip class method
                     and hasattr(cls, attr_name)
-                    and callable(getattr(cls, attr_name))
-                    and not isinstance(
-                        getattr(cls, attr_name), (classmethod, staticmethod, property)
-                    )
                 ):
-                    methods_to_wrap.append(attr_name)
+                    attr = getattr(cls, attr_name)
+                    # Only wrap functions defined in this class (not inherited methods or built-ins)
+                    if (
+                        inspect.isfunction(attr)  # Functions defined in the class
+                        and not isinstance(attr, (classmethod, staticmethod, property))
+                        and hasattr(attr, "__qualname__")  # Has qualname attribute
+                        and attr.__qualname__.startswith(
+                            cls.__name__ + "."
+                        )  # Defined in this class
+                    ):
+                        # Additional check: ensure the function has a proper signature with 'self' parameter
+                        try:
+                            sig = inspect.signature(attr)
+                            params = list(sig.parameters.keys())
+                            if params and params[0] == "self":
+                                methods_to_wrap.append(attr_name)
+                        except (ValueError, TypeError):
+                            # Skip methods that can't be inspected
+                            continue
 
         # Wrap all detected methods
         for method_to_wrap in methods_to_wrap:
             if hasattr(cls, method_to_wrap):
-                method = getattr(cls, method_to_wrap)
-                wrapped_method = entity_method(
-                    name=f"{task_name}.{method_to_wrap}",
-                    description=description,
-                    version=version,
-                    tlp_span_kind=tlp_span_kind,
-                )(method)
-                setattr(cls, method_to_wrap, wrapped_method)
+                original_method = getattr(cls, method_to_wrap)
+                # Only wrap actual functions defined in this class
+                if inspect.isfunction(original_method):
+                    try:
+                        # Verify the method has a proper signature
+                        sig = inspect.signature(original_method)
+                        wrapped_method = entity_method(
+                            name=f"{task_name}.{method_to_wrap}",
+                            description=description,
+                            version=version,
+                            tlp_span_kind=tlp_span_kind,
+                        )(original_method)
+                        # Set the wrapped method on the class
+                        setattr(cls, method_to_wrap, wrapped_method)
+                    except Exception:
+                        # Don't wrap methods that can't be properly decorated
+                        continue
 
         return cls
 
@@ -571,15 +632,15 @@ def _handle_agent_failure_event(res, span, tlp_span_kind):
         # Skip if span is already ended
         return
     if tlp_span_kind == ObserveSpanKindValues.AGENT:
-        TracerWrapper().failing_agents_counter.add(
-            1,
-            attributes={
-                "agent_name": span.attributes["observe.workflow.name"]
-                if "observe.workflow.name" in span.attributes
-                else span.attributes["traceloop.workflow.name"],
-                "failure_reason": res,  # or could be "none" if you don't want to specify
-            },
-        )
+        attributes = {}
+        attributes["failure_reason"] = res
+
+        if "observe.workflow.name" in span.attributes:
+            attributes["agent_name"] = span.attributes["observe.workflow.name"]
+        elif "traceloop.workflow.name" in span.attributes:
+            attributes["agent_name"] = span.attributes["traceloop.workflow.name"]
+
+        TracerWrapper().failing_agents_counter.add(1, attributes=attributes)
 
 
 def _handle_execution_result(span, success):

{ioa_observe_sdk-1.0.9.dist-info → ioa_observe_sdk-1.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ioa-observe-sdk
-Version: 1.0.9
+Version: 1.0.11
 Summary: IOA Observability SDK
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -44,6 +44,7 @@ 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-urllib3==0.54b1

{ioa_observe_sdk-1.0.9.dist-info → ioa_observe_sdk-1.0.11.dist-info}/RECORD

@@ -9,8 +9,8 @@ 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=nopDcih_VW0GeDlgwA2y4gkHP9PZ2sQKdjfG6Iyn0LE,2805
-ioa_observe/sdk/decorators/base.py,sha256=4ytlog5Ub02BqmhWO5csXvplxp5k1AzheSDwRb7P2SA,26821
+ioa_observe/sdk/decorators/__init__.py,sha256=Lv5EbouBazvWaYB0N82v26pqKtj2FAqlwfLKEh5e8Q0,3251
+ioa_observe/sdk/decorators/base.py,sha256=kR_0KWMMbOdJ_t9m5EZ9ZUj3pmKWEgkj0-E1F3c-nIE,29969
 ioa_observe/sdk/decorators/util.py,sha256=WMkzmwD7Js0g1BbId9_qR4pwhnaIJdW588zVc5dpqdQ,25399
 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
@@ -38,8 +38,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.9.dist-info/licenses/LICENSE.md,sha256=55VjUfgjWOS4vv3Cf55gfq-RxjPgRIO2vlgYPUuC5lA,11362
-ioa_observe_sdk-1.0.9.dist-info/METADATA,sha256=A1X5wIkGUPhTgxRUJZEXRd8G4bNr_phxw2tTa1SBVw4,7746
-ioa_observe_sdk-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ioa_observe_sdk-1.0.9.dist-info/top_level.txt,sha256=Yt-6Y1olZEDqCs2REeqI30WjYx0pLGQSVqzYmDd67N8,12
-ioa_observe_sdk-1.0.9.dist-info/RECORD,,
+ioa_observe_sdk-1.0.11.dist-info/licenses/LICENSE.md,sha256=55VjUfgjWOS4vv3Cf55gfq-RxjPgRIO2vlgYPUuC5lA,11362
+ioa_observe_sdk-1.0.11.dist-info/METADATA,sha256=5YMHTWQw2c6VwUQG4K-15klct9thZBw6cJ0rO_Hs2zg,7810
+ioa_observe_sdk-1.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ioa_observe_sdk-1.0.11.dist-info/top_level.txt,sha256=Yt-6Y1olZEDqCs2REeqI30WjYx0pLGQSVqzYmDd67N8,12
+ioa_observe_sdk-1.0.11.dist-info/RECORD,,