Undo activity output wrapping.

Author: philliphoff

azure/durable_functions/openai_agents/model_invocation_activity.py

@@ -179,20 +179,6 @@ def from_json(cls, json_str: str) -> 'ActivityModelInput':
         """Create an ActivityModelInput instance from a JSON string."""
         return cls.model_validate_json(json_str)
 
-class ActivityModelOutput(BaseModel):
-    """Output from the invoke_model_activity activity."""
-
-    response: ModelResponse
-
-    def to_json(self) -> str:
-        """Convert the ActivityModelOutput to a JSON string."""
-        return self.model_dump_json()
-    
-    @classmethod
-    def from_json(cls, json_str: str) -> 'ActivityModelOutput':
-        """Create an ActivityModelOutput instance from a JSON string."""
-        return cls.model_validate_json(json_str)
-
 class ModelInvoker:
     """Handles OpenAI model invocations for Durable Functions activities."""
 
@@ -379,9 +365,7 @@ def make_tool_info(tool: Tool) -> ToolInput:
                 self.activity_name, activity_input_json
             )
 
-        output = ActivityModelOutput.from_json(response)
-
-        return output.response
+        return response
 
     def stream_response(
         self,

azure/durable_functions/openai_agents/orchestrator_generator.py

@@ -4,7 +4,7 @@
 from agents.run import set_default_agent_runner
 from azure.durable_functions.models.DurableOrchestrationContext import DurableOrchestrationContext
 from azure.durable_functions.models.RetryOptions import RetryOptions
-from .model_invocation_activity import ActivityModelInput, ActivityModelOutput, ModelInvoker
+from .model_invocation_activity import ActivityModelInput, ModelInvoker
 from .task_tracker import TaskTracker
 from .runner import DurableOpenAIRunner
 from .context import DurableAIAgentContext
@@ -17,7 +17,7 @@ async def durable_openai_agent_activity(input: str, model_provider: ModelProvide
     activity_input = ActivityModelInput.from_json(input)
 
     model_invoker = ModelInvoker(model_provider=model_provider)
-    response = await model_invoker.invoke_model_activity(activity_input)
+    result = await model_invoker.invoke_model_activity(activity_input)
 
     # Use safe/public Pydantic API when possible. Prefer model_dump_json if result is a BaseModel
     # Otherwise handle common types (str/bytes/dict/list) and fall back to json.dumps.