Skip to content

Group metadata generated by queueserver under 'queue_server' key - #385

Merged
dmgav merged 5 commits into
bluesky:mainfrom
thopkins32:group-metadata
Oct 5, 2026
Merged

dmgav merged 5 commits into
bluesky:mainfrom
thopkins32:group-metadata

Conversation

@thopkins32

Copy link
Copy Markdown
Contributor

Assisted-by: oh-my-pi:claude-sonnet-5

Description

Closes #384

@thopkins32
thopkins32 requested a review from dmgav October 5, 2026 14:37
plan_args_parsed = plan_parsed["args"]
plan_kwargs_parsed = plan_parsed["kwargs"]
plan_meta_parsed = {**plan_parsed["meta"], "queue_item_uid": plan_info["item_uid"]}
plan_meta_parsed = {**plan_parsed["meta"], "queue_server": {"queue_item_uid": plan_info["item_uid"]}}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's a good idea to replace everything under the 'queue_server'. We need to add the queue_server key if it doesn't exist or replace queue_item_uid if the queue_server key exists.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use case: assume that HTTP server will add some additional data to queue_server, which needs to be passed through.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, every key is preserved except queue_item_uid. Also, if queue_server isn't a dict, it must be replaced.

Comment thread src/bluesky_queueserver/manager/tests/test_zmq_api_base.py Outdated
…em_uid

Assisted-by: oh-my-pi:claude-sonnet-5
@thopkins32
thopkins32 requested a review from dmgav October 5, 2026 15:34
Comment on lines +968 to +977
({"queue_server": {"queue_item_uid": 123}, "test_key": "test_value"}, {"test_key": "test_value"}),
# Queue Server-assigned metadata is merged into a submitted 'queue_server' dict: the conflicting
# 'queue_item_uid' is overridden, but other keys in the dict are preserved.
(
{
"queue_server": {"queue_item_uid": "submitted_item_uid", "custom_key": "custom_value"},
"test_key": "test_value",
},
{"test_key": "test_value"},
),

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dmgav don't these test the same thing now?

@dmgav
dmgav merged commit 3e88214 into bluesky:main Oct 5, 2026
79 of 109 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Group metadata generated by Queue Server to a dedicated queue_server key in RE.md

2 participants