Skip to content

Migrate typing for serializer and misc files#4522

Merged
sl0thentr0py merged 1 commit intoneel/typingfrom
neel/typing-3
Jun 25, 2025
Merged

Migrate typing for serializer and misc files#4522
sl0thentr0py merged 1 commit intoneel/typingfrom
neel/typing-3

Conversation

@sl0thentr0py
Copy link
Member

@sl0thentr0py sl0thentr0py commented Jun 25, 2025

No description provided.

@sl0thentr0py sl0thentr0py requested a review from a team as a code owner June 25, 2025 13:25
@codecov
Copy link

codecov bot commented Jun 25, 2025 •
edited
Loading

❌ 15 Tests Failed:

Tests completed Failed Passed Skipped
20697 15 20682 4368
View the top 3 failed test(s) by shortest run time 
tests.integrations.openai_agents.test_openai_agents::test_agent_invocation_span_sync
Stack Traces | 0.083s run time 
.../openai_agents/patches/runner.py:30: in wrapper
    result = await original_func(*args, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11.............../site-packages/agents/run.py:395: in run
    input_guardrail_results, turn_result = await asyncio.gather(
.../openai_agents/patches/agent_run.py:81: in patched_run_single_turn
    result = await original_run_single_turn(*args, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11.............../site-packages/agents/run.py:919: in _run_single_turn
    return await cls._get_single_step_result_from_response(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11.............../site-packages/agents/run.py:959: in _get_single_step_result_from_response
    return await RunImpl.execute_tools_and_side_effects(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11.../site-packages/agents/_run_impl.py:347: in execute_tools_and_side_effects
    return await cls.execute_final_output(
.../openai_agents/patches/agent_run.py:134: in patched_execute_final_output
    _end_invoke_agent_span(context_wrapper, agent, final_output)
.../openai_agents/patches/agent_run.py:45: in _end_invoke_agent_span
    update_invoke_agent_span(context_wrapper, agent, output)
.../openai_agents/spans/invoke_agent.py:34: in update_invoke_agent_span
    current_span.__exit__(None, None, None)
sentry_sdk/tracing.py:273: in __exit__
    self.deactivate()
sentry_sdk/tracing.py:251: in deactivate
    if self._ctx_token:
       ^^^^^^^^^^^^^^^
E   AttributeError: 'Span' object has no attribute '_ctx_token'

During handling of the above exception, another exception occurred:
.../integrations/openai_agents/test_openai_agents.py:151: in test_agent_invocation_span_sync
    result = agents.Runner.run_sync(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11.............../site-packages/agents/run.py:251: in run_sync
    return runner.run_sync(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11.............../site-packages/agents/run.py:489: in run_sync
    return asyncio.get_event_loop().run_until_complete(
.../hostedtoolcache/Python/3.11.12.../x64/lib/python3.11/asyncio/base_events.py:654: in run_until_complete
    return future.result()
           ^^^^^^^^^^^^^^^
.../openai_agents/patches/runner.py:38: in wrapper
    current_span.__exit__(None, None, None)
sentry_sdk/tracing.py:273: in __exit__
    self.deactivate()
sentry_sdk/tracing.py:251: in deactivate
    if self._ctx_token:
       ^^^^^^^^^^^^^^^
E   AttributeError: 'Span' object has no attribute '_ctx_token'
tests.integrations.openai_agents.test_openai_agents::test_error_handling
Stack Traces | 0.084s run time 
.../openai_agents/patches/runner.py:30: in wrapper
    result = await original_func(*args, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11............/site-packages/agents/run.py:395: in run
    input_guardrail_results, turn_result = await asyncio.gather(
.../openai_agents/patches/agent_run.py:81: in patched_run_single_turn
    result = await original_run_single_turn(*args, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11............/site-packages/agents/run.py:905: in _run_single_turn
    new_response = await cls._get_new_response(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11............/site-packages/agents/run.py:1066: in _get_new_response
    new_response = await model.get_response(
.../openai_agents/patches/models.py:40: in wrapped_get_response
    result = await original_get_response(*args, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.../hostedtoolcache/Python/3.11.12.../x64/lib/python3.11/unittest/mock.py:2240: in _execute_mock_call
    raise effect
E   Exception: Model Error

During handling of the above exception, another exception occurred:
.../integrations/openai_agents/test_openai_agents.py:556: in test_error_handling
    await agents.Runner.run(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11............/site-packages/agents/run.py:199: in run
    return await runner.run(
.../openai_agents/patches/runner.py:38: in wrapper
    current_span.__exit__(None, None, None)
sentry_sdk/tracing.py:273: in __exit__
    self.deactivate()
sentry_sdk/tracing.py:251: in deactivate
    if self._ctx_token:
       ^^^^^^^^^^^^^^^
E   AttributeError: 'Span' object has no attribute '_ctx_token'

During handling of the above exception, another exception occurred:
.../integrations/openai_agents/test_openai_agents.py:555: in test_error_handling
    with pytest.raises(Exception, match="Model Error"):
E   AssertionError: Regex pattern did not match.
E    Regex: 'Model Error'
E    Input: "'Span' object has no attribute '_ctx_token'"
tests.integrations.openai_agents.test_openai_agents::test_handoff_span
Stack Traces | 0.086s run time 
.../openai_agents/patches/runner.py:30: in wrapper
    result = await original_func(*args, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11............/site-packages/agents/run.py:395: in run
    input_guardrail_results, turn_result = await asyncio.gather(
.../openai_agents/patches/agent_run.py:81: in patched_run_single_turn
    result = await original_run_single_turn(*args, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11............/site-packages/agents/run.py:919: in _run_single_turn
    return await cls._get_single_step_result_from_response(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11............/site-packages/agents/run.py:959: in _get_single_step_result_from_response
    return await RunImpl.execute_tools_and_side_effects(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11.../site-packages/agents/_run_impl.py:279: in execute_tools_and_side_effects
    return await cls.execute_handoffs(
.../openai_agents/patches/agent_run.py:111: in patched_execute_handoffs
    _end_invoke_agent_span(context_wrapper, agent)
.../openai_agents/patches/agent_run.py:45: in _end_invoke_agent_span
    update_invoke_agent_span(context_wrapper, agent, output)
.../openai_agents/spans/invoke_agent.py:34: in update_invoke_agent_span
    current_span.__exit__(None, None, None)
sentry_sdk/tracing.py:273: in __exit__
    self.deactivate()
sentry_sdk/tracing.py:251: in deactivate
    if self._ctx_token:
       ^^^^^^^^^^^^^^^
E   AttributeError: 'Span' object has no attribute '_ctx_token'

During handling of the above exception, another exception occurred:
.../integrations/openai_agents/test_openai_agents.py:256: in test_handoff_span
    result = await agents.Runner.run(
.tox/py3.11-openai_agents-v0.0.19/lib/python3.11............/site-packages/agents/run.py:199: in run
    return await runner.run(
.../openai_agents/patches/runner.py:38: in wrapper
    current_span.__exit__(None, None, None)
sentry_sdk/tracing.py:273: in __exit__
    self.deactivate()
sentry_sdk/tracing.py:251: in deactivate
    if self._ctx_token:
       ^^^^^^^^^^^^^^^
E   AttributeError: 'Span' object has no attribute '_ctx_token'

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

antonpirker
antonpirker approved these changes Jun 25, 2025
View reviewed changes
Copy link
Contributor

@antonpirker antonpirker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks great! (ok, the Unions are ugly, but for stuff like str | int we need to have Python 3.10. so that is far out...)

@sl0thentr0py sl0thentr0py merged commit 8544214 into neel/typing Jun 25, 2025
120 of 124 checks passed
@sl0thentr0py sl0thentr0py deleted the neel/typing-3 branch June 25, 2025 13:47
sl0thentr0py added a commit that referenced this pull request Jun 26, 2025
@sl0thentr0py
Migrate typing for serializer and misc files (#4522)
34c2956
@sl0thentr0py sl0thentr0py mentioned this pull request Jun 26, 2025
Merged
sl0thentr0py added a commit that referenced this pull request Jun 27, 2025
@sl0thentr0py
Migrate typing for serializer and misc files (#4522)
c14e16f
sl0thentr0py added a commit that referenced this pull request Jun 30, 2025
@sl0thentr0py
Migrate typing (#4500)
b07438d 
extracted from
https://github.com/getsentry/sentry-python/pull/4487/files with lots of
manual fixes

* migrate old style `# type: bla` to inline types
* most importantly use
[`__future__.annotations`](https://peps.python.org/pep-0563/#enabling-the-future-behavior-in-python-3-7)
so that we can simply use forward annotations without wrapping them in
strings like we did before, this simplifies things substantially
* also guard only things that shouldn't be imported under
`TYPE_CHECKING`, in the future it seems we should avoid using
`TYPE_CHECKING` completely
* #4510
* #4522
* #4529
* #4530
* #4532
* #4533
* #4534

closes #2585
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sentrivana sentrivana sentrivana approved these changes

+1 more reviewer

@antonpirker antonpirker antonpirker approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sl0thentr0py @antonpirker @sentrivana