Skip to content

Remove unnecessary list from json parameters output #12557

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
xjules merged 1 commit into from
Jan 5, 2026
Merged

Remove unnecessary list from json parameters output #12557

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: 2 additions & 2 deletions src/ert/dark_storage/endpoints/experiments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def get_experiments(
priors=create_priors(experiment),
userdata={},
parameters={
group: [config.model_dump()]
group: config.model_dump()
for group, config in experiment.parameter_configuration.items()
if not isinstance(config, SurfaceConfig)
},
Expand Down Expand Up @@ -65,7 +65,7 @@ def get_experiment_by_id(
priors=create_priors(experiment),
userdata={},
parameters={
group: [config.model_dump()]
group: config.model_dump()
for group, config in experiment.parameter_configuration.items()
},
responses={
Expand Down
2 changes: 1 addition & 1 deletion src/ert/dark_storage/json_schema/experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ class ExperimentOut(_Experiment):
ensemble_ids: list[UUID]
priors: Mapping[str, dict[str, Any]]
userdata: Mapping[str, Any]
parameters: Mapping[str, list[dict[str, Any]]]
parameters: Mapping[str, dict[str, Any]]
responses: Mapping[str, list[dict[str, Any]]]
observations: Mapping[str, dict[str, list[str]]]
31 changes: 15 additions & 16 deletions src/ert/gui/tools/plot/plot_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,22 +144,21 @@ def parameters_api_key_defs(self) -> list[PlotApiKeyDefinition]:
self._check_response(response)

for experiment in response.json():
for param_metadatas in experiment["parameters"].values():
for metadata in param_metadatas:
param_cfg = parameter_config_adapter.validate_python(metadata)
if group := metadata.get("group"):
param_key = f"{group}:{metadata['name']}"
else:
param_key = metadata["name"]
all_keys[param_key] = PlotApiKeyDefinition(
key=param_key,
index_type=None,
observations=False,
dimensionality=metadata["dimensionality"],
metadata={"data_origin": metadata["type"]},
parameter=param_cfg,
)
all_params[param_key] = all_keys[param_key]
for metadata in experiment["parameters"].values():
param_cfg = parameter_config_adapter.validate_python(metadata)
if group := metadata.get("group"):
param_key = f"{group}:{metadata['name']}"
else:
param_key = metadata["name"]
all_keys[param_key] = PlotApiKeyDefinition(
key=param_key,
index_type=None,
observations=False,
dimensionality=metadata["dimensionality"],
metadata={"data_origin": metadata["type"]},
parameter=param_cfg,
)
all_params[param_key] = all_keys[param_key]

return list(all_keys.values())

Expand Down
90 changes: 42 additions & 48 deletions tests/ert/unit_tests/dark_storage/test_http_endpoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,54 +186,48 @@ def test_get_ensemble_parameters(poly_example_tmp_dir, dark_storage_client):
experiment_json = resp.json()[0]

assert experiment_json["parameters"] == {
"a": [
{
"dimensionality": 1,
"distribution": {
"max": 1.0,
"min": 0.0,
"name": "uniform",
},
"forward_init": False,
"group": "COEFFS",
"input_source": "sampled",
"name": "a",
"type": "gen_kw",
"update": True,
}
],
"b": [
{
"dimensionality": 1,
"distribution": {
"max": 2.0,
"min": 0.0,
"name": "uniform",
},
"forward_init": False,
"group": "COEFFS",
"input_source": "sampled",
"name": "b",
"type": "gen_kw",
"update": True,
}
],
"c": [
{
"dimensionality": 1,
"distribution": {
"max": 5.0,
"min": 0.0,
"name": "uniform",
},
"forward_init": False,
"group": "COEFFS",
"input_source": "sampled",
"name": "c",
"type": "gen_kw",
"update": True,
}
],
"a": {
"dimensionality": 1,
"distribution": {
"max": 1.0,
"min": 0.0,
"name": "uniform",
},
"forward_init": False,
"group": "COEFFS",
"input_source": "sampled",
"name": "a",
"type": "gen_kw",
"update": True,
},
"b": {
"dimensionality": 1,
"distribution": {
"max": 2.0,
"min": 0.0,
"name": "uniform",
},
"forward_init": False,
"group": "COEFFS",
"input_source": "sampled",
"name": "b",
"type": "gen_kw",
"update": True,
},
"c": {
"dimensionality": 1,
"distribution": {
"max": 5.0,
"min": 0.0,
"name": "uniform",
},
"forward_init": False,
"group": "COEFFS",
"input_source": "sampled",
"name": "c",
"type": "gen_kw",
"update": True,
},
}


Expand Down
62 changes: 30 additions & 32 deletions tests/ert/unit_tests/gui/tools/plot/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,38 +189,36 @@ def mocked_requests_get(*args, **kwargs):
"ens_id_uninitialized",
],
"parameters": {
"default": [
{
"type": "gen_kw",
"name": "BPR_138_PERSISTENCE",
"forward_init": False,
"update": True,
"dimensionality": 1,
"distribution": {"name": "uniform", "min": 0.2, "max": 0.7},
"group": "SNAKE_OIL_PARAM",
"input_source": "sampled",
},
{
"type": "gen_kw",
"name": "OP1_DIVERGENCE_SCALE",
"forward_init": False,
"update": True,
"dimensionality": 1,
"distribution": {"name": "uniform", "min": 0.5, "max": 1.5},
"group": "SNAKE_OIL_PARAM",
"input_source": "sampled",
},
{
"type": "gen_kw",
"name": "I_AM_A_PARAM",
"forward_init": False,
"update": True,
"dimensionality": 1,
"distribution": {"name": "normal", "mean": 0.0, "std": 1.0},
"group": "SNAKE_OIL_PARAM",
"input_source": "sampled",
},
]
"BPR_138_PERSISTENCE": {
"type": "gen_kw",
"name": "BPR_138_PERSISTENCE",
"forward_init": False,
"update": True,
"dimensionality": 1,
"distribution": {"name": "uniform", "min": 0.2, "max": 0.7},
"group": "SNAKE_OIL_PARAM",
"input_source": "sampled",
},
"OP1_DIVERGENCE_SCALE": {
"type": "gen_kw",
"name": "OP1_DIVERGENCE_SCALE",
"forward_init": False,
"update": True,
"dimensionality": 1,
"distribution": {"name": "uniform", "min": 0.5, "max": 1.5},
"group": "SNAKE_OIL_PARAM",
"input_source": "sampled",
},
"I_AM_A_PARAM": {
"type": "gen_kw",
"name": "I_AM_A_PARAM",
"forward_init": False,
"update": True,
"dimensionality": 1,
"distribution": {"name": "normal", "mean": 0.0, "std": 1.0},
"group": "SNAKE_OIL_PARAM",
"input_source": "sampled",
},
},
"responses": {
"summary": [
Expand Down
Loading