Hide invoke_model_activity registration

Author: AnatoliB

samples-v2/openai_agents/durable_decorators.py

@@ -1,14 +1,70 @@
 from functools import wraps
 import inspect
+import sys
+import azure.functions as func
 from agents.run import set_default_agent_runner
 from azure.durable_functions.models.DurableOrchestrationContext import DurableOrchestrationContext
 from durable_openai_runner import DurableOpenAIRunner
 from yield_exception import YieldException
 from durable_ai_agent_context import DurableAIAgentContext
 import event_loop
+from model_activity import create_invoke_model_activity
+
+
+# Global registry to track which apps have been set up
+_registered_apps = set()
+
+
+def _setup_durable_openai_agent(app: func.FunctionApp):
+    """
+    Set up the Durable OpenAI Agent framework for the given FunctionApp.
+    This is automatically called when using the framework decorators.
+    """
+    app_id = id(app)
+    if app_id not in _registered_apps:
+        create_invoke_model_activity(app)
+        _registered_apps.add(app_id)
+
+
+def _find_function_app_in_module(module):
+    """
+    Find a FunctionApp instance in the given module.
+    Returns the first FunctionApp instance found, or None if none found.
+    """
+    if not hasattr(module, '__dict__'):
+        return None
+    
+    for name, obj in module.__dict__.items():
+        if isinstance(obj, func.FunctionApp):
+            return obj
+    return None
+
+
+def _auto_setup_durable_openai_agent(decorated_func):
+    """
+    Automatically detect and setup the FunctionApp for Durable OpenAI Agents.
+    This finds the FunctionApp in the same module as the decorated function.
+    """
+    try:
+        # Get the module where the decorated function is defined
+        func_module = sys.modules.get(decorated_func.__module__)
+        if func_module is None:
+            return
+        
+        # Find the FunctionApp instance in that module
+        app = _find_function_app_in_module(func_module)
+        if app is not None:
+            _setup_durable_openai_agent(app)
+    except Exception:
+        # Silently fail if auto-setup doesn't work
+        # The user can still manually call create_invoke_model_activity if needed
+        pass
 
 
 def durable_openai_agent_orchestrator(func):
+    # Auto-setup: Find and configure the FunctionApp when decorator is applied
+    _auto_setup_durable_openai_agent(func)
+    
     @wraps(func)
     def wrapper(durable_orchestration_context: DurableOrchestrationContext):
         event_loop.ensure_event_loop()

samples-v2/openai_agents/function_app.py

@@ -6,7 +6,6 @@
 from agents import Agent, Runner, set_default_openai_client, function_tool, WebSearchTool
 from agents.model_settings import ModelSettings
 from durable_decorators import durable_openai_agent_orchestrator
-from model_activity import create_invoke_model_activity
 from azure.identity import DefaultAzureCredential
 from tools import activity_as_tool
 from pydantic import BaseModel
@@ -226,10 +225,3 @@ def triage_agent() -> Agent:
 def routing(context):
     result = Runner.run_sync(triage_agent(), input="Hello, how are you?")
     return result.final_output
-
-
-#region Implementation details
-
-create_invoke_model_activity(app) # TODO: Can we hide this line?
-
-#endregion