ioa-observe-sdk 1.0.10__py3-none-any.whl → 1.0.12__py3-none-any.whl

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")
@@ -554,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
 

ioa_observe/sdk/instrumentations/slim.py

@@ -66,26 +66,71 @@ class SLIMInstrumentor(BaseInstrumentor):
             if traceparent and session_id:
                 baggage.set_baggage(f"execution.{traceparent}", session_id)
 
-            # Process message payload
+            # Process message payload and preserve original structure
             if isinstance(message, bytes):
                 try:
                     decoded_message = message.decode("utf-8")
                     try:
-                        json.loads(decoded_message)
-                        payload = decoded_message
+                        # If it's already a JSON structure, preserve it
+                        original_message = json.loads(decoded_message)
+                        if isinstance(original_message, dict):
+                            # Preserve all original fields and merge/update headers
+                            wrapped_message = original_message.copy()
+                            existing_headers = wrapped_message.get("headers", {})
+                            existing_headers.update(headers)
+                            wrapped_message["headers"] = existing_headers
+                        else:
+                            # If it's not a dict, wrap it as payload
+                            wrapped_message = {
+                                "headers": headers,
+                                "payload": original_message,
+                            }
                     except json.JSONDecodeError:
-                        payload = decoded_message
+                        # If it's not JSON, treat as raw payload
+                        wrapped_message = {
+                            "headers": headers,
+                            "payload": decoded_message,
+                        }
                 except UnicodeDecodeError:
-                    payload = base64.b64encode(message).decode("utf-8")
+                    # If it can't be decoded, base64 encode it
+                    wrapped_message = {
+                        "headers": headers,
+                        "payload": base64.b64encode(message).decode("utf-8"),
+                    }
             elif isinstance(message, str):
-                payload = message
+                try:
+                    # Try to parse as JSON first
+                    original_message = json.loads(message)
+                    if isinstance(original_message, dict):
+                        # Preserve all original fields and merge/update headers
+                        wrapped_message = original_message.copy()
+                        existing_headers = wrapped_message.get("headers", {})
+                        existing_headers.update(headers)
+                        wrapped_message["headers"] = existing_headers
+                    else:
+                        # If it's not a dict, wrap it as payload
+                        wrapped_message = {
+                            "headers": headers,
+                            "payload": original_message,
+                        }
+                except json.JSONDecodeError:
+                    # If it's not JSON, treat as raw payload
+                    wrapped_message = {
+                        "headers": headers,
+                        "payload": message,
+                    }
+            elif isinstance(message, dict):
+                # If it's already a dict, preserve all fields and merge headers
+                wrapped_message = message.copy()
+                existing_headers = wrapped_message.get("headers", {})
+                existing_headers.update(headers)
+                wrapped_message["headers"] = existing_headers
             else:
-                payload = json.dumps(message)
-
-            wrapped_message = {
-                "headers": headers,
-                "payload": payload,
-            }
+                # For other types, convert to JSON and wrap as payload
+                wrapped_message = {
+                    "headers": headers,
+                    "payload": json.dumps(message),
+                }
 
             message_to_send = json.dumps(wrapped_message).encode("utf-8")
 
@@ -152,20 +197,39 @@ class SLIMInstrumentor(BaseInstrumentor):
                             session_id = stored_session_id
                             set_session_id(session_id, traceparent=traceparent)
 
-                # Process payload
-                payload = message_dict.get("payload", raw_message)
-                if isinstance(payload, str):
-                    try:
-                        payload_dict = json.loads(payload)
-                        return recv_session, json.dumps(payload_dict).encode("utf-8")
-                    except json.JSONDecodeError:
-                        return recv_session, payload.encode("utf-8") if isinstance(
-                            payload, str
-                        ) else payload
-
-                return recv_session, json.dumps(payload).encode("utf-8") if isinstance(
-                    payload, (dict, list)
-                ) else payload
+                # Process the complete message structure
+                # Remove tracing headers before returning the message
+                message_to_return = message_dict.copy()
+                if "headers" in message_to_return:
+                    headers_copy = message_to_return["headers"].copy()
+                    # Remove tracing-specific headers but keep other headers
+                    headers_copy.pop("traceparent", None)
+                    headers_copy.pop("session_id", None)
+                    if headers_copy:
+                        message_to_return["headers"] = headers_copy
+                    else:
+                        message_to_return.pop("headers", None)
+
+                # If the message only contains a payload field and no other fields,
+                # return just the payload for backward compatibility
+                if len(message_to_return) == 1 and "payload" in message_to_return:
+                    payload = message_to_return["payload"]
+                    if isinstance(payload, str):
+                        try:
+                            payload_dict = json.loads(payload)
+                            return recv_session, json.dumps(payload_dict).encode(
+                                "utf-8"
+                            )
+                        except json.JSONDecodeError:
+                            return recv_session, payload.encode("utf-8") if isinstance(
+                                payload, str
+                            ) else payload
+                    return recv_session, json.dumps(payload).encode(
+                        "utf-8"
+                    ) if isinstance(payload, (dict, list)) else payload
+                else:
+                    # Return the complete message structure with all original fields
+                    return recv_session, json.dumps(message_to_return).encode("utf-8")
 
             except Exception as e:
                 print(f"Error processing message: {e}")

{ioa_observe_sdk-1.0.10.dist-info → ioa_observe_sdk-1.0.12.dist-info}/METADATA

@@ -1,38 +1,12 @@
 Metadata-Version: 2.4
 Name: ioa-observe-sdk
-Version: 1.0.10
+Version: 1.0.12
 Summary: IOA Observability SDK
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: aiohappyeyeballs>=2.4.8
-Requires-Dist: aiohttp>=3.11.18
-Requires-Dist: aiosignal>=1.3.2
-Requires-Dist: annotated-types>=0.7.0
-Requires-Dist: anyio>=4.8.0
-Requires-Dist: async-timeout>=4.0.3
-Requires-Dist: attrs>=25.1.0
-Requires-Dist: backoff>=2.2.1
-Requires-Dist: certifi>=2025.1.31
-Requires-Dist: charset-normalizer>=3.4.1
 Requires-Dist: colorama==0.4.6
-Requires-Dist: Deprecated>=1.2.18
-Requires-Dist: distro>=1.9.0
-Requires-Dist: exceptiongroup>=1.2.2
-Requires-Dist: frozenlist>=1.5.0
-Requires-Dist: googleapis-common-protos>=1.69.0
-Requires-Dist: grpcio>=1.70.0
-Requires-Dist: h11>=0.16.0
-Requires-Dist: httpcore>=1.0.9
-Requires-Dist: httpx>=0.28.1
-Requires-Dist: idna>=3.10
-Requires-Dist: importlib_metadata>=8.5.0
-Requires-Dist: Jinja2>=3.1.6
-Requires-Dist: jiter>=0.8.2
-Requires-Dist: MarkupSafe>=3.0.2
-Requires-Dist: monotonic>=1.6
-Requires-Dist: multidict>=6.1.0
-Requires-Dist: openai>=1.75.0
+Requires-Dist: requests>=2.32.3
 Requires-Dist: opentelemetry-api==1.33.1
 Requires-Dist: opentelemetry-distro
 Requires-Dist: opentelemetry-exporter-otlp==1.33.1
@@ -44,6 +18,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
@@ -52,33 +27,10 @@ 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-util-http==0.54b1
-Requires-Dist: packaging>=24.2
-Requires-Dist: propcache>=0.3.0
-Requires-Dist: protobuf>=5.29.3
-Requires-Dist: pydantic>=2.10.6
-Requires-Dist: pydantic_core>=2.27.2
-Requires-Dist: python-dateutil>=2.9.0.post0
-Requires-Dist: regex==2024.11.6
-Requires-Dist: requests>=2.32.3
-Requires-Dist: six>=1.17.0
-Requires-Dist: sniffio>=1.3.1
-Requires-Dist: tenacity>=9.0.0
-Requires-Dist: tiktoken>=0.9.0
-Requires-Dist: tqdm>=4.67.1
-Requires-Dist: typing_extensions>=4.12.2
-Requires-Dist: urllib3>=2.3.0
-Requires-Dist: wrapt>=1.17.2
-Requires-Dist: yarl>=1.18.3
-Requires-Dist: zipp>=3.21.0
 Requires-Dist: langgraph>=0.3.2
 Requires-Dist: langchain>=0.3.19
 Requires-Dist: langchain-openai>=0.3.8
-Requires-Dist: langchain-community>=0.3.25
 Requires-Dist: llama-index>=0.12.34
-Requires-Dist: opentelemetry-instrumentation-requests
-Requires-Dist: opentelemetry-instrumentation-transformers>=0.40.8
-Requires-Dist: opentelemetry-instrumentation-crewai>=0.40.8
-Requires-Dist: llama-index-utils-workflow>=0.3.1
 Requires-Dist: pytest
 Requires-Dist: pytest-vcr
 Dynamic: license-file

{ioa_observe_sdk-1.0.10.dist-info → ioa_observe_sdk-1.0.12.dist-info}/RECORD

@@ -10,11 +10,11 @@ ioa_observe/sdk/config/__init__.py,sha256=8aVNaw0yRNLFPxlf97iOZLlJVcV81ivSDnudH2
 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=vZuF9bsaMhH0BAJjPvmPA-cvdgaXucRuSvGHhvc_8tc,28483
+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
-ioa_observe/sdk/instrumentations/slim.py,sha256=w2-1JRB-I05bqH_Y4-98XMOh0x7xgAJWUYUBpe2alXQ,7656
+ioa_observe/sdk/instrumentations/slim.py,sha256=J5e6XeshH55xXaUiT9_j4R_n6VQELzBjgRAU-AgZGOg,11435
 ioa_observe/sdk/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ioa_observe/sdk/logging/logging.py,sha256=HZxW9s8Due7jgiNkdI38cIjv5rC9D-Flta3RQMOnpow,2891
 ioa_observe/sdk/metrics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.10.dist-info/licenses/LICENSE.md,sha256=55VjUfgjWOS4vv3Cf55gfq-RxjPgRIO2vlgYPUuC5lA,11362
-ioa_observe_sdk-1.0.10.dist-info/METADATA,sha256=eNDXQNsig6-m56PqwvFuYH6XUtYG8konoqFk2UUHW9w,7747
-ioa_observe_sdk-1.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ioa_observe_sdk-1.0.10.dist-info/top_level.txt,sha256=Yt-6Y1olZEDqCs2REeqI30WjYx0pLGQSVqzYmDd67N8,12
-ioa_observe_sdk-1.0.10.dist-info/RECORD,,
+ioa_observe_sdk-1.0.12.dist-info/licenses/LICENSE.md,sha256=55VjUfgjWOS4vv3Cf55gfq-RxjPgRIO2vlgYPUuC5lA,11362
+ioa_observe_sdk-1.0.12.dist-info/METADATA,sha256=3owAgvI_xgARwMohc3ticBRqKwju2w-poBOu1SILHC4,6109
+ioa_observe_sdk-1.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ioa_observe_sdk-1.0.12.dist-info/top_level.txt,sha256=Yt-6Y1olZEDqCs2REeqI30WjYx0pLGQSVqzYmDd67N8,12
+ioa_observe_sdk-1.0.12.dist-info/RECORD,,