Merge branch 'use-stringify-for-tracing' into 'main'

Use stringify instead of str() for event tracing

See merge request wayflow-dev/wayflow-public!223

Author: wayflow-bot

wayflowcore/src/wayflowcore/events/event.py

@@ -8,6 +8,7 @@
 from typing import TYPE_CHECKING, Any, Dict, Generic, List, Optional, TypeVar, Union
 
 from wayflowcore._utils.dataclass_utils import _required_attribute
+from wayflowcore._utils.formatting import stringify
 from wayflowcore.conversationalcomponent import ConversationalComponent
 from wayflowcore.serialization.context import SerializationContext
 from wayflowcore.serialization.serializer import serialize_any_to_dict, serialize_to_dict
@@ -258,7 +259,7 @@ def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str,
             "conversational_component.type": self.conversational_component.__class__.__name__,
             "conversational_component.id": self.conversational_component.id,
             "inputs": (
-                {key: str(value) for key, value in (self.inputs or {}).items()}
+                {key: stringify(value) for key, value in (self.inputs or {}).items()}
                 if not mask_sensitive_information
                 else _MASKING_TOKEN
             ),
@@ -309,7 +310,7 @@ def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str,
         return {
             **super().to_tracing_info(mask_sensitive_information=mask_sensitive_information),
             "tool_request.inputs": (
-                {key: str(value) for key, value in self.tool_request.args.items()}
+                {key: stringify(value) for key, value in self.tool_request.args.items()}
                 if not mask_sensitive_information
                 else _MASKING_TOKEN
             ),
@@ -332,7 +333,9 @@ def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str,
         return {
             **super().to_tracing_info(mask_sensitive_information=mask_sensitive_information),
             "tool_result.output": (
-                str(self.tool_result.content) if not mask_sensitive_information else _MASKING_TOKEN
+                stringify(self.tool_result.content)
+                if not mask_sensitive_information
+                else _MASKING_TOKEN
             ),
             "tool_result.tool_request_id": self.tool_result.tool_request_id,
         }
@@ -353,7 +356,7 @@ def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str,
         return {
             **super().to_tracing_info(mask_sensitive_information=mask_sensitive_information),
             "inputs": (
-                {key: str(value) for key, value in self.inputs.items()}
+                {key: stringify(value) for key, value in self.inputs.items()}
                 if not mask_sensitive_information
                 else _MASKING_TOKEN
             ),
@@ -372,10 +375,11 @@ class StepInvocationResultEvent(EndSpanEvent["StepInvocationSpan"]):
     """Result of the step invocation"""
 
     def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str, Any]:
+
         return {
             **super().to_tracing_info(mask_sensitive_information=mask_sensitive_information),
             "step_result.outputs": (
-                {key: str(value) for key, value in self.step_result.outputs.items()}
+                {key: stringify(value) for key, value in self.step_result.outputs.items()}
                 if not mask_sensitive_information
                 else _MASKING_TOKEN
             ),
@@ -412,7 +416,7 @@ class ContextProviderExecutionResultEvent(EndSpanEvent["ContextProviderExecution
     def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str, Any]:
         return {
             **super().to_tracing_info(mask_sensitive_information=mask_sensitive_information),
-            "output": str(self.output) if not mask_sensitive_information else _MASKING_TOKEN,
+            "output": stringify(self.output) if not mask_sensitive_information else _MASKING_TOKEN,
         }
 
 
@@ -520,7 +524,9 @@ def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str,
                 else _MASKING_TOKEN
             ),
             "execution_state.plan": (
-                str(self.execution_state.plan) if not mask_sensitive_information else _MASKING_TOKEN
+                stringify(self.execution_state.plan)
+                if not mask_sensitive_information
+                else _MASKING_TOKEN
             ),
             "execution_state.tool_call_queue": [
                 _serialize_tool_request(tool_request, mask_sensitive_information)
@@ -570,7 +576,9 @@ def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str,
                 else _MASKING_TOKEN
             ),
             "execution_state.plan": (
-                str(self.execution_state.plan) if not mask_sensitive_information else _MASKING_TOKEN
+                stringify(self.execution_state.plan)
+                if not mask_sensitive_information
+                else _MASKING_TOKEN
             ),
             "execution_state.tool_call_queue": [
                 _serialize_tool_request(tool_request, mask_sensitive_information)
@@ -610,7 +618,7 @@ def to_tracing_info(self, mask_sensitive_information: bool = True) -> Dict[str,
             **super().to_tracing_info(mask_sensitive_information=mask_sensitive_information),
             "exception.type": self.exception.__class__.__name__,
             "exception.message": (
-                str(self.exception) if not mask_sensitive_information else _MASKING_TOKEN
+                stringify(self.exception) if not mask_sensitive_information else _MASKING_TOKEN
             ),
             "exception.traceback": (
                 self.exception.__traceback__ if not mask_sensitive_information else _MASKING_TOKEN

wayflowcore/src/wayflowcore/models/ocigenaimodel.py

@@ -857,13 +857,15 @@ def _generation_config_to_cohere_oci_parameters(
 _UNSUPPORTED_ARGUMENT_PATTERNS_WITH_NAMES = [
     "Unsupported parameter: '{param_name}'",
     "Unsupported value: '{param_name}'",
-    "Argument not supported on this model: stop",
+    "Argument not supported on this model: {param_name}",
+    "does not support parameter {param_name}",
 ]
 
 _UNSUPPORTED_ARGUMENT_PATTERNS = [
     "Unsupported parameter:",
     "Unsupported value:",
     "Argument not supported on this model:",
+    "does not support parameter",
 ]
 
 

wayflowcore/tests/events/test_context_provider_execution_result_event.py

@@ -5,6 +5,7 @@
 
 import pytest
 
+from wayflowcore._utils.formatting import stringify
 from wayflowcore.contextproviders import ContextProvider
 from wayflowcore.contextproviders.constantcontextprovider import ConstantContextProvider
 from wayflowcore.contextproviders.flowcontextprovider import FlowContextProvider
@@ -86,7 +87,7 @@ def test_correct_event_serialization_to_tracing_format(
             if mask_sensitive_information:
                 assert _MASKING_TOKEN == serialized_event[attribute_name]
             else:
-                assert str(attr) == serialized_event[attribute_name]
+                assert stringify(attr) == serialized_event[attribute_name]
         else:
             assert attr == serialized_event[attribute_name]