proper classmethod patching

Author: antonpirker

sentry_sdk/integrations/openai_agents/__init__.py

@@ -15,20 +15,28 @@
 
 def _patch_runner():
     # type: () -> None
-    agents.Runner.run = _create_run_wrapper(agents.Runner.run)
-    agents.Runner.run_sync = _create_run_wrapper(agents.Runner.run_sync)
-    agents.Runner.run_streamed = _create_run_wrapper(agents.Runner.run_streamed)
+    agents.Runner.run = classmethod(
+        _create_run_wrapper(agents.Runner.run),
+    )
+    agents.Runner.run_sync = classmethod(
+        _create_run_wrapper(agents.Runner.run_sync),
+    )
+    agents.Runner.run_streamed = classmethod(
+        _create_run_wrapper(agents.Runner.run_streamed),
+    )
 
 
 def _patch_model():
     # type: () -> None
-    agents.Runner._get_model = _create_get_model_wrapper(agents.Runner._get_model)
+    agents.Runner._get_model = classmethod(
+        _create_get_model_wrapper(agents.Runner._get_model),
+    )
 
 
 def _patch_tools():
     # type: () -> None
-    agents.Runner._get_all_tools = _create_get_all_tools_wrapper(
-        agents.Runner._get_all_tools
+    agents.Runner._get_all_tools = classmethod(
+        _create_get_all_tools_wrapper(agents.Runner._get_all_tools),
     )
 
 

sentry_sdk/integrations/openai_agents/patches/models.py

@@ -22,8 +22,11 @@ def _create_get_model_wrapper(original_get_model):
     Wraps the agents.Runner._get_model method to wrap the get_response method of the model to create a AI client span.
     """
 
-    @classmethod  # type: ignore[misc]
-    @wraps(original_get_model)
+    @wraps(
+        original_get_model.__func__
+        if hasattr(original_get_model, "__func__")
+        else original_get_model
+    )
     def wrapped_get_model(cls, agent, run_config):
         # type: (agents.Runner, agents.Agent, agents.RunConfig) -> agents.Model
 

sentry_sdk/integrations/openai_agents/patches/runner.py

@@ -25,8 +25,9 @@ def _create_run_wrapper(original_func):
     """
     is_async = asyncio.iscoroutinefunction(original_func)
 
-    @classmethod  # type: ignore[misc]
-    @wraps(original_func)
+    @wraps(
+        original_func.__func__ if hasattr(original_func, "__func__") else original_func
+    )
     async def async_wrapper(cls, *args, **kwargs):
         # type: (agents.Runner, *Any, **Any) -> Any
         agent = args[0]
@@ -37,8 +38,9 @@ async def async_wrapper(cls, *args, **kwargs):
 
         return result
 
-    @classmethod  # type: ignore[misc]
-    @wraps(original_func)
+    @wraps(
+        original_func.__func__ if hasattr(original_func, "__func__") else original_func
+    )
     def sync_wrapper(cls, *args, **kwargs):
         # type: (agents.Runner, *Any, **Any) -> Any
         agent = args[0]

sentry_sdk/integrations/openai_agents/patches/tools.py

@@ -21,8 +21,11 @@ def _create_get_all_tools_wrapper(original_get_all_tools):
     Wraps the agents.Runner._get_all_tools method of the Runner class to wrap all function tools with Sentry instrumentation.
     """
 
-    @classmethod  # type: ignore[misc]
-    @wraps(original_get_all_tools)
+    @wraps(
+        original_get_all_tools.__func__
+        if hasattr(original_get_all_tools, "__func__")
+        else original_get_all_tools
+    )
     async def wrapped_get_all_tools(cls, agent, context_wrapper):
         # type: (agents.Runner, agents.Agent, agents.RunContextWrapper) -> list[agents.Tool]