Skip to content

Revert "Fix FastAPI discriminated union patch to be called consistently" #1257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xingyaoww merged 1 commit into from
Nov 25, 2025
Merged

Revert "Fix FastAPI discriminated union patch to be called consistently" #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions openhands-agent-server/openhands/agent_server/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@
)
from openhands.agent_server.sockets import sockets_router
from openhands.agent_server.tool_router import tool_router
from openhands.agent_server.utils import patch_fastapi_discriminated_union_support
from openhands.agent_server.vscode_router import vscode_router
from openhands.agent_server.vscode_service import get_vscode_service
from openhands.sdk.logger import DEBUG, get_logger


# Apply FastAPI patch for discriminated union support
patch_fastapi_discriminated_union_support()

logger = get_logger(__name__)


Expand Down
9 changes: 0 additions & 9 deletions openhands-agent-server/openhands/agent_server/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,7 @@ def patch_fastapi_discriminated_union_support():

Also extracts inline discriminated unions as separate schema components for
better OpenAPI documentation and Swagger UI display.

Skips patching if SKIP_FASTAPI_DISCRIMINATED_UNION_FIX environment variable is set.
"""
# Skip patching if environment variable flag is defined
if os.environ.get("SKIP_FASTAPI_DISCRIMINATED_UNION_FIX"):
logger.debug(
"Skipping FastAPI discriminated union patch due to environment variable"
)
return

try:
import fastapi._compat.v2 as fastapi_v2
from fastapi import FastAPI
Expand Down
6 changes: 0 additions & 6 deletions openhands-sdk/openhands/sdk/utils/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
TypeAdapter,
)

from openhands.agent_server.utils import patch_fastapi_discriminated_union_support


logger = logging.getLogger(__name__)
_rebuild_required = True
Expand Down Expand Up @@ -302,7 +300,3 @@ def __init_subclass__(cls, **kwargs):
def _rebuild_if_required():
if _rebuild_required:
rebuild_all()


# Always call the FastAPI patch after DiscriminatedUnionMixin definition
patch_fastapi_discriminated_union_support()
Loading