Skip to content

Ensure position in argument in MasterImageCommandArgument for analysis models #87

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

Ensure position in argument in MasterImageCommandArgument for analysis models #87

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
10 changes: 8 additions & 2 deletions flame_hub/_core_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class CreateAnalysis(BaseModel):
image_command_arguments: t.Annotated[
list[MasterImageCommandArgument],
Field(default_factory=list),
BeforeValidator(lambda value: [] if value is None else value),
BeforeValidator(lambda args: [] if args is None else ensure_position_none(args)),
]


Expand Down Expand Up @@ -258,7 +258,13 @@ class UpdateAnalysis(BaseModel):
description: str | None | UNSET_T = UNSET
name: str | None | UNSET_T = UNSET
master_image_id: t.Annotated[uuid.UUID | None | UNSET_T, Field(), WrapValidator(uuid_validator)] = UNSET
image_command_arguments: list[MasterImageCommandArgument] | UNSET_T = UNSET
image_command_arguments: (
t.Annotated[
list[MasterImageCommandArgument],
BeforeValidator(lambda args: ensure_position_none(args)),
]
| UNSET_T
) = UNSET


AnalysisCommand = t.Literal[
Expand Down
18 changes: 16 additions & 2 deletions tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import random
import string
import typing as t

Expand Down Expand Up @@ -100,7 +101,15 @@ def project_node_includables():

@pytest.fixture()
def analysis(core_client, project, master_image):
new_analysis = core_client.create_analysis(project, master_image_id=master_image.id)
args = [
{"value": next_random_string()},
{"value": next_random_string(), "position": random.choice(("before", "after"))},
]
new_analysis = core_client.create_analysis(
project,
master_image_id=master_image.id,
image_command_arguments=args,
)
yield new_analysis
core_client.delete_analysis(new_analysis)

Expand Down Expand Up @@ -402,11 +411,16 @@ def test_get_analysis_not_found(core_client):


def test_update_analysis(core_client, analysis):
args = [
{"value": next_random_string()},
{"value": next_random_string(), "position": random.choice(("before", "after"))},
]
new_name = next_random_string()
new_analysis = core_client.update_analysis(analysis.id, name=new_name)
new_analysis = core_client.update_analysis(analysis.id, name=new_name, image_command_arguments=args)

assert analysis != new_analysis
assert new_analysis.name == new_name
assert new_analysis.image_command_arguments == args # Note that args is modified during updating the analysis.


def test_unlock_analysis(core_client, configured_analysis):
Expand Down