Skip to content

fix(typing): manage one_of_resolve typing #1126

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
merged 9 commits into from
Aug 8, 2025
Merged

fix(typing): manage one_of_resolve typing #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e5ad8ab
feat: update generated APIs
scaleway-bot Jul 29, 2025
df203c3
fix(typing): manage one_of_resolve typing
Laure-di Jul 29, 2025
261023a
fix(typing): manage one_of_resolve typing
Laure-di Jul 29, 2025
a6e5868
fix(typing): manage one_of_resolve typing
Laure-di Jul 29, 2025
755dfe7
remove optional ProfileDefaults as it's not in marshal_func
Laure-di Jul 29, 2025
65babf9
remove optional ProfileDefaults in default
Laure-di Jul 29, 2025
95aaf30
remove optional ProfileDefaults in default
Laure-di Jul 29, 2025
4ce008f
fix ruff formatting
Laure-di Jul 29, 2025
7038426
fix import issue _typeshed and improve test
Laure-di Jul 29, 2025
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
52 changes: 43 additions & 9 deletions scaleway-async/scaleway_async/account/v3/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,17 +637,51 @@ def marshal_Qualification(
output.update(
resolve_one_of(
[
OneOfPossibility("host_website", request.host_website),
OneOfPossibility("host_application", request.host_application),
OneOfPossibility("deploy_software", request.deploy_software),
OneOfPossibility(
"set_scaleway_environment", request.set_scaleway_environment
param="host_website",
value=request.host_website,
marshal_func=marshal_QualificationHostWebsite,
),
OneOfPossibility(
param="host_application",
value=request.host_application,
marshal_func=marshal_QualificationHostApplication,
),
OneOfPossibility(
param="deploy_software",
value=request.deploy_software,
marshal_func=marshal_QualificationDeploySoftware,
),
OneOfPossibility(
param="set_scaleway_environment",
value=request.set_scaleway_environment,
marshal_func=marshal_QualificationSetScalewayEnvironment,
),
OneOfPossibility(
param="ai_machine",
value=request.ai_machine,
marshal_func=marshal_QualificationAiMachine,
),
OneOfPossibility(
param="container",
value=request.container,
marshal_func=marshal_QualificationContainer,
),
OneOfPossibility(
param="archive_data",
value=request.archive_data,
marshal_func=marshal_QualificationArchiveData,
),
OneOfPossibility(
param="share_data",
value=request.share_data,
marshal_func=marshal_QualificationShareData,
),
OneOfPossibility(
param="other_use_case",
value=request.other_use_case,
marshal_func=marshal_QualificationOtherUseCase,
),
OneOfPossibility("ai_machine", request.ai_machine),
OneOfPossibility("container", request.container),
OneOfPossibility("archive_data", request.archive_data),
OneOfPossibility("share_data", request.share_data),
OneOfPossibility("other_use_case", request.other_use_case),
]
),
)
Expand Down
50 changes: 41 additions & 9 deletions scaleway-async/scaleway_async/autoscaling/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,16 @@ def marshal_Metric(
output.update(
resolve_one_of(
[
OneOfPossibility("managed_metric", request.managed_metric),
OneOfPossibility("cockpit_metric_name", request.cockpit_metric_name),
OneOfPossibility(
param="managed_metric",
value=request.managed_metric,
marshal_func=None,
),
OneOfPossibility(
param="cockpit_metric_name",
value=request.cockpit_metric_name,
marshal_func=None,
),
]
),
)
Expand Down Expand Up @@ -642,7 +650,9 @@ def marshal_CreateInstancePolicyRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("metric", request.metric),
OneOfPossibility(
param="metric", value=request.metric, marshal_func=marshal_Metric
),
]
),
)
Expand Down Expand Up @@ -703,15 +713,25 @@ def marshal_VolumeInstanceTemplate(
output.update(
resolve_one_of(
[
OneOfPossibility("from_empty", request.from_empty),
OneOfPossibility("from_snapshot", request.from_snapshot),
OneOfPossibility(
param="from_empty",
value=request.from_empty,
marshal_func=marshal_VolumeInstanceTemplateFromEmpty,
),
OneOfPossibility(
param="from_snapshot",
value=request.from_snapshot,
marshal_func=marshal_VolumeInstanceTemplateFromSnapshot,
),
]
),
)
output.update(
resolve_one_of(
[
OneOfPossibility("perf_iops", request.perf_iops),
OneOfPossibility(
param="perf_iops", value=request.perf_iops, marshal_func=None
),
]
),
)
Expand Down Expand Up @@ -842,8 +862,16 @@ def marshal_UpdateInstancePolicyRequestMetric(
output.update(
resolve_one_of(
[
OneOfPossibility("managed_metric", request.managed_metric),
OneOfPossibility("cockpit_metric_name", request.cockpit_metric_name),
OneOfPossibility(
param="managed_metric",
value=request.managed_metric,
marshal_func=None,
),
OneOfPossibility(
param="cockpit_metric_name",
value=request.cockpit_metric_name,
marshal_func=None,
),
]
),
)
Expand Down Expand Up @@ -874,7 +902,11 @@ def marshal_UpdateInstancePolicyRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("metric", request.metric),
OneOfPossibility(
param="metric",
value=request.metric,
marshal_func=marshal_UpdateInstancePolicyRequestMetric,
),
]
),
)
Expand Down
12 changes: 8 additions & 4 deletions scaleway-async/scaleway_async/baremetal/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,12 +1575,16 @@ def marshal_CreateServerRequest(
resolve_one_of(
[
OneOfPossibility(
"project_id", request.project_id, defaults.default_project_id
param="project_id",
value=request.project_id,
default=defaults.default_project_id,
marshal_func=None,
),
OneOfPossibility(
"organization_id",
request.organization_id,
defaults.default_organization_id,
param="organization_id",
value=request.organization_id,
default=defaults.default_organization_id,
marshal_func=None,
),
]
),
Expand Down
16 changes: 13 additions & 3 deletions scaleway-async/scaleway_async/block/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,25 @@ def marshal_CreateVolumeRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("from_empty", request.from_empty),
OneOfPossibility("from_snapshot", request.from_snapshot),
OneOfPossibility(
param="from_empty",
value=request.from_empty,
marshal_func=marshal_CreateVolumeRequestFromEmpty,
),
OneOfPossibility(
param="from_snapshot",
value=request.from_snapshot,
marshal_func=marshal_CreateVolumeRequestFromSnapshot,
),
]
),
)
output.update(
resolve_one_of(
[
OneOfPossibility("perf_iops", request.perf_iops),
OneOfPossibility(
param="perf_iops", value=request.perf_iops, marshal_func=None
),
]
),
)
Expand Down
16 changes: 13 additions & 3 deletions scaleway-async/scaleway_async/block/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,15 +419,25 @@ def marshal_CreateVolumeRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("from_empty", request.from_empty),
OneOfPossibility("from_snapshot", request.from_snapshot),
OneOfPossibility(
param="from_empty",
value=request.from_empty,
marshal_func=marshal_CreateVolumeRequestFromEmpty,
),
OneOfPossibility(
param="from_snapshot",
value=request.from_snapshot,
marshal_func=marshal_CreateVolumeRequestFromSnapshot,
),
]
),
)
output.update(
resolve_one_of(
[
OneOfPossibility("perf_iops", request.perf_iops),
OneOfPossibility(
param="perf_iops", value=request.perf_iops, marshal_func=None
),
]
),
)
Expand Down
18 changes: 15 additions & 3 deletions scaleway-async/scaleway_async/cockpit/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,11 @@ def marshal_RegionalApiCreateContactPointRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("email", request.email),
OneOfPossibility(
param="email",
value=request.email,
marshal_func=marshal_ContactPointEmail,
),
]
),
)
Expand Down Expand Up @@ -971,7 +975,11 @@ def marshal_RegionalApiDeleteContactPointRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("email", request.email),
OneOfPossibility(
param="email",
value=request.email,
marshal_func=marshal_ContactPointEmail,
),
]
),
)
Expand Down Expand Up @@ -1080,7 +1088,11 @@ def marshal_RegionalApiUpdateContactPointRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("email", request.email),
OneOfPossibility(
param="email",
value=request.email,
marshal_func=marshal_ContactPointEmail,
),
]
),
)
Expand Down
59 changes: 47 additions & 12 deletions scaleway-async/scaleway_async/container/v1beta1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,8 +839,16 @@ def marshal_ContainerHealthCheckSpec(
output.update(
resolve_one_of(
[
OneOfPossibility("http", request.http),
OneOfPossibility("tcp", request.tcp),
OneOfPossibility(
param="http",
value=request.http,
marshal_func=marshal_ContainerHealthCheckSpecHTTPProbe,
),
OneOfPossibility(
param="tcp",
value=request.tcp,
marshal_func=marshal_ContainerHealthCheckSpecTCPProbe,
),
]
),
)
Expand All @@ -863,12 +871,19 @@ def marshal_ContainerScalingOption(
resolve_one_of(
[
OneOfPossibility(
"concurrent_requests_threshold",
request.concurrent_requests_threshold,
param="concurrent_requests_threshold",
value=request.concurrent_requests_threshold,
marshal_func=None,
),
OneOfPossibility("cpu_usage_threshold", request.cpu_usage_threshold),
OneOfPossibility(
"memory_usage_threshold", request.memory_usage_threshold
param="cpu_usage_threshold",
value=request.cpu_usage_threshold,
marshal_func=None,
),
OneOfPossibility(
param="memory_usage_threshold",
value=request.memory_usage_threshold,
marshal_func=None,
),
]
),
Expand Down Expand Up @@ -1057,8 +1072,12 @@ def marshal_CreateTokenRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("container_id", request.container_id),
OneOfPossibility("namespace_id", request.namespace_id),
OneOfPossibility(
param="container_id", value=request.container_id, marshal_func=None
),
OneOfPossibility(
param="namespace_id", value=request.namespace_id, marshal_func=None
),
]
),
)
Expand Down Expand Up @@ -1140,9 +1159,21 @@ def marshal_CreateTriggerRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("scw_sqs_config", request.scw_sqs_config),
OneOfPossibility("scw_nats_config", request.scw_nats_config),
OneOfPossibility("sqs_config", request.sqs_config),
OneOfPossibility(
param="scw_sqs_config",
value=request.scw_sqs_config,
marshal_func=marshal_CreateTriggerRequestMnqSqsClientConfig,
),
OneOfPossibility(
param="scw_nats_config",
value=request.scw_nats_config,
marshal_func=marshal_CreateTriggerRequestMnqNatsClientConfig,
),
OneOfPossibility(
param="sqs_config",
value=request.sqs_config,
marshal_func=marshal_CreateTriggerRequestSqsClientConfig,
),
]
),
)
Expand Down Expand Up @@ -1312,7 +1343,11 @@ def marshal_UpdateTriggerRequest(
output.update(
resolve_one_of(
[
OneOfPossibility("sqs_config", request.sqs_config),
OneOfPossibility(
param="sqs_config",
value=request.sqs_config,
marshal_func=marshal_UpdateTriggerRequestSqsClientConfig,
),
]
),
)
Expand Down
Loading
Loading