Skip to content

NAS-138384 / 26.04 / Properly handle oneOf schema case #124

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
Qubad786 merged 1 commit into from
Nov 4, 2025
Merged

NAS-138384 / 26.04 / Properly handle oneOf schema case #124

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
5 changes: 4 additions & 1 deletion midcli/command/generic_call/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ def _process_method(self, method):
def _create_arguments(self):
for i, item in enumerate(self.method["accepts"] or []):
if i == self.splice_kwargs:
if "anyOf" in item and all(option.get("type") == "object" for option in item["anyOf"]):
# Handle discriminated unions (oneOf with discriminator) and anyOf unions
if ("anyOf" in item or "oneOf" in item) and all(
option.get("type") == "object" for option in item.get("anyOf") or item.get("oneOf")
):
# FIXME: Remove this when we use proper field discriminators in API
item = {"type": "object", "_attrs_order_": []}

Expand Down
4 changes: 3 additions & 1 deletion midcli/gui/base/steps/input_delegate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ def create_input_delegate(input: "Input", schema: dict) -> "InputDelegate":
type.add("null")
elif isinstance(v, str):
type.add("string")
elif "anyOf" in schema and (type := {s["type"] for s in schema["anyOf"]}):
elif ("anyOf" in schema or "oneOf" in schema) and (
type := {s["type"] for s in schema.get("anyOf", []) or schema.get("oneOf", [])}
):
pass
else:
raise ValueError(f"Unable to create input delegate for schema {schema!r}")
Expand Down