daq-queuing-service 0.2.1__tar.gz → 0.2.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (152) hide show
  1. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/PKG-INFO +1 -1
  2. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/_version.py +3 -3
  3. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/tiled/tiled.py +11 -8
  4. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/plugins/i15_1/tiled_interaction.py +3 -2
  5. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/task_queue/queue.py +12 -4
  6. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service.egg-info/PKG-INFO +1 -1
  7. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service.egg-info/SOURCES.txt +0 -1
  8. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service.egg-info/scm_file_list.json +0 -1
  9. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service.egg-info/scm_version.json +2 -2
  10. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/external_interaction/tiled/test_tiled.py +16 -18
  11. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/plugins/i15_1/test_tiled_interaction.py +14 -27
  12. daq_queuing_service-0.2.1/docs/explanations/beamlines/i15-1/image.png +0 -0
  13. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.copier-answers.yml +0 -0
  14. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.devcontainer/devcontainer.json +0 -0
  15. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/CONTRIBUTING.md +0 -0
  16. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/ISSUE_TEMPLATE/bug_report.md +0 -0
  17. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/ISSUE_TEMPLATE/issue.md +0 -0
  18. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +0 -0
  19. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/pages/index.html +0 -0
  20. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/pages/make_switcher.py +0 -0
  21. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/_container.yml +0 -0
  22. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/_dist.yml +0 -0
  23. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/_docs.yml +0 -0
  24. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/_pypi.yml +0 -0
  25. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/_release.yml +0 -0
  26. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/_test.yml +0 -0
  27. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/_tox.yml +0 -0
  28. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/ci.yml +0 -0
  29. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.github/workflows/periodic.yml +0 -0
  30. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.gitignore +0 -0
  31. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.gitleaks.toml +0 -0
  32. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.pre-commit-config.yaml +0 -0
  33. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.python-version +0 -0
  34. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.vscode/extensions.json +0 -0
  35. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.vscode/launch.json +0 -0
  36. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.vscode/settings.json +0 -0
  37. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/.vscode/tasks.json +0 -0
  38. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/Dockerfile +0 -0
  39. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/LICENSE +0 -0
  40. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/README.md +0 -0
  41. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/catalog-info.yaml +0 -0
  42. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/_api.rst +0 -0
  43. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/_templates/custom-module-template.rst +0 -0
  44. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/conf.py +0 -0
  45. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/beamlines/i15-1/auxiliary_scans.md +0 -0
  46. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/beamlines/i15-1/i15-1.md +0 -0
  47. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/beamlines/i15-1/i15-1_aux_scans.drawio.png +0 -0
  48. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/beamlines.md +0 -0
  49. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/converters.md +0 -0
  50. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/decisions/0001-record-architecture-decisions.md +0 -0
  51. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/decisions/0002-switched-to-python-copier-template.md +0 -0
  52. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/decisions/COPYME +0 -0
  53. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/decisions.md +0 -0
  54. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/queue.md +0 -0
  55. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations/worker.md +0 -0
  56. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/explanations.md +0 -0
  57. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/genindex.md +0 -0
  58. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/how-to/contribute.md +0 -0
  59. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/how-to/notify-to-slack.md +0 -0
  60. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/how-to/run-container.md +0 -0
  61. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/how-to.md +0 -0
  62. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/images/dls-logo.svg +0 -0
  63. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/images/worker_logic.drawio.png +0 -0
  64. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/index.md +0 -0
  65. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/reference/log.rst +0 -0
  66. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/reference/queue-plugin.rst +0 -0
  67. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/reference/queue.rst +0 -0
  68. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/reference/reference.md +0 -0
  69. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/reference/rest-api.rst +0 -0
  70. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/reference/rest_api.json +0 -0
  71. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/reference.md +0 -0
  72. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/tutorials/installation.md +0 -0
  73. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/docs/tutorials.md +0 -0
  74. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/helm/daq-queuing-service/.helmignore +0 -0
  75. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/helm/daq-queuing-service/Chart.yaml +0 -0
  76. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/helm/daq-queuing-service/templates/_helpers.tpl +0 -0
  77. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/helm/daq-queuing-service/templates/configmap.yaml +0 -0
  78. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/helm/daq-queuing-service/templates/deployment.yaml +0 -0
  79. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/helm/daq-queuing-service/templates/ingress.yaml +0 -0
  80. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/helm/daq-queuing-service/templates/service.yaml +0 -0
  81. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/helm/daq-queuing-service/values.yaml +0 -0
  82. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/pyproject.toml +0 -0
  83. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/renovate.json +0 -0
  84. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/setup.cfg +0 -0
  85. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/__init__.py +0 -0
  86. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/__main__.py +0 -0
  87. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/api/__init__.py +0 -0
  88. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/api/api.py +0 -0
  89. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/api/errors.py +0 -0
  90. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/app/__init__.py +0 -0
  91. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/app/app.py +0 -0
  92. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/app/authentication.py +0 -0
  93. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/app/authorisation.py +0 -0
  94. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/app/config.py +0 -0
  95. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/broadcaster.py +0 -0
  96. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/__init__.py +0 -0
  97. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/blueapi/__init__.py +0 -0
  98. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/blueapi/blueapi_adapter.py +0 -0
  99. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/blueapi/blueapi_call.py +0 -0
  100. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/blueapi/get_client.py +0 -0
  101. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/blueapi/token_source.py +0 -0
  102. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/runtime_estimator/client.py +0 -0
  103. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/external_interaction/tiled/__init__.py +0 -0
  104. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/log.py +0 -0
  105. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/plugins/converter.py +0 -0
  106. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/plugins/i15_1/auxiliary.py +0 -0
  107. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/plugins/i15_1/i15_1_converter.py +0 -0
  108. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/plugins/i15_1/plans.py +0 -0
  109. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/task_queue/__init__.py +0 -0
  110. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/task_queue/queue_utils.py +0 -0
  111. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/task_queue/task.py +0 -0
  112. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/worker/__init__.py +0 -0
  113. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service/worker/worker.py +0 -0
  114. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service.egg-info/dependency_links.txt +0 -0
  115. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service.egg-info/entry_points.txt +0 -0
  116. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service.egg-info/requires.txt +0 -0
  117. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/src/daq_queuing_service.egg-info/top_level.txt +0 -0
  118. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/conftest.py +0 -0
  119. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/constants.py +0 -0
  120. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/system_tests/compose.yaml +0 -0
  121. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/system_tests/config_with_auth.yaml +0 -0
  122. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/system_tests/services/rabbitmq_plugins +0 -0
  123. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/test_data/i15_1/test_blueapi_config.yaml +0 -0
  124. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/test_data/i15_1/test_daq_queue_config.yaml +0 -0
  125. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/test_data/test_blueapi_config.yaml +0 -0
  126. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/test_data/test_config.yaml +0 -0
  127. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/test_data/test_config_with_auth.yaml +0 -0
  128. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/__init__.py +0 -0
  129. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/conftest.py +0 -0
  130. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/external_interaction/blueapi/test_blueapi_adapter.py +0 -0
  131. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/external_interaction/blueapi/test_blueapi_call.py +0 -0
  132. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/external_interaction/blueapi/test_get_blueapi_client.py +0 -0
  133. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/external_interaction/runtime_estimator/test_client.py +0 -0
  134. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/plugins/__init__.py +0 -0
  135. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/plugins/i15_1/__init__.py +0 -0
  136. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/plugins/i15_1/conftest.py +0 -0
  137. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/plugins/i15_1/test_auxiliary.py +0 -0
  138. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/plugins/i15_1/test_i15_1_converter.py +0 -0
  139. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/plugins/test_converter.py +0 -0
  140. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_api.py +0 -0
  141. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_app.py +0 -0
  142. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_authentication.py +0 -0
  143. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_authorisation.py +0 -0
  144. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_broadcaster.py +0 -0
  145. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_cli.py +0 -0
  146. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_log.py +0 -0
  147. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_queue.py +0 -0
  148. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_task.py +0 -0
  149. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_udc_token_source.py +0 -0
  150. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/tests/unit_tests/test_worker.py +0 -0
  151. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/utility_scripts/generate_api_docs.py +0 -0
  152. {daq_queuing_service-0.2.1 → daq_queuing_service-0.2.2}/uv.lock +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: daq-queuing-service
3
- Version: 0.2.1
3
+ Version: 0.2.2
4
4
  Summary: A service to queue tasks and chain BlueAPI calls
5
5
  Author-email: Jacob Williamson <jacob.williamson@diamond.ac.uk>
6
6
  License: Apache License
@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
18
18
  commit_id: str | None
19
19
  __commit_id__: str | None
20
20
 
21
- __version__ = version = '0.2.1'
22
- __version_tuple__ = version_tuple = (0, 2, 1)
21
+ __version__ = version = '0.2.2'
22
+ __version_tuple__ = version_tuple = (0, 2, 2)
23
23
 
24
- __commit_id__ = commit_id = 'g178927ec3'
24
+ __commit_id__ = commit_id = 'gfddbbda69'
@@ -55,16 +55,19 @@ def get_tiled_client(
55
55
 
56
56
 
57
57
  def get_metadata_from_tiled(
58
- tiled_client: Container, instrument_session: str, blueapi_task_id: str
58
+ tiled_client: Container,
59
+ instrument: str,
60
+ instrument_session: str,
61
+ blueapi_task_id: str,
59
62
  ) -> list[tuple[str, dict[str, Any]]]:
60
63
 
61
64
  @cached(cache)
62
65
  def _query_tiled(
63
- instrument_session: str, blueapi_task_id: str
66
+ instrument: str, instrument_session: str, blueapi_task_id: str
64
67
  ) -> list[tuple[str, dict[str, Any]]]:
65
- result: Container = tiled_client.search(
66
- Eq("start.instrument_session", instrument_session)
67
- ).search(Eq("start.blueapi_task_id", blueapi_task_id))
68
+ result: Container = tiled_client[
69
+ f"{instrument}/{instrument_session.split('-')[0]}/{instrument_session}"
70
+ ].search(Eq("start.blueapi_task_id", blueapi_task_id))
68
71
 
69
72
  items = sorted(
70
73
  ((key, dict(value.metadata)) for key, value in result.items()),
@@ -72,10 +75,10 @@ def get_metadata_from_tiled(
72
75
  )
73
76
  return items
74
77
 
75
- return _query_tiled(instrument_session, blueapi_task_id)
78
+ return _query_tiled(instrument, instrument_session, blueapi_task_id)
76
79
 
77
80
 
78
- def get_tiled_and_scan_ids(tiled_client: Container, call: BlueapiCall):
81
+ def get_tiled_and_scan_ids(tiled_client: Container, instrument: str, call: BlueapiCall):
79
82
  tiled_ids: list[str] = []
80
83
  scan_ids: list[int] = []
81
84
 
@@ -84,7 +87,7 @@ def get_tiled_and_scan_ids(tiled_client: Container, call: BlueapiCall):
84
87
  return tiled_ids, scan_ids
85
88
 
86
89
  scan_metadatas = get_metadata_from_tiled(
87
- tiled_client, call.task_request.instrument_session, call.blueapi_id
90
+ tiled_client, instrument, call.task_request.instrument_session, call.blueapi_id
88
91
  )
89
92
 
90
93
  for item in scan_metadatas:
@@ -31,8 +31,9 @@ def get_suitable_tiled_scan(
31
31
 
32
32
  oldest_valid_time = time.time() - stale_time_s
33
33
  result: Container = (
34
- tiled_client.search(Eq("start.instrument", "i15-1"))
35
- .search(Eq("start.instrument_session", instrument_session))
34
+ tiled_client[
35
+ f"i15-1/{instrument_session.split('-')[0]}/{instrument_session}"
36
+ ]
36
37
  .search(Eq("stop.exit_status", "success"))
37
38
  .search(Comparison("ge", "stop.time", oldest_valid_time))
38
39
  .search(In("start.scan_type", list(AuxiliaryScanType)))
@@ -293,6 +293,7 @@ class TaskQueue:
293
293
  self._broadcaster.broadcast(
294
294
  Event(type="call_history_update", data=self._get_call_history())
295
295
  )
296
+ self._broadcaster.broadcast(Event(type="state_update", data=self._state))
296
297
 
297
298
  async def get_next_call_once_available(self) -> BlueapiCall:
298
299
  """Waits until a call is available before returning the call. A call is
@@ -353,7 +354,11 @@ class TaskQueue:
353
354
  result (TaskResult): The result of the task from blueapi
354
355
  """
355
356
  with add_session_to_logger(call.task_request.instrument_session):
356
- tiled_ids, scan_ids = get_tiled_and_scan_ids(self._tiled_client, call)
357
+ tiled_ids, scan_ids = (
358
+ get_tiled_and_scan_ids(self._tiled_client, self.instrument, call)
359
+ if self.instrument
360
+ else ([], [])
361
+ )
357
362
  should_pause = self._converter.pause_on_complete_blueapi_call(
358
363
  call.model_copy(), result
359
364
  )
@@ -382,7 +387,12 @@ class TaskQueue:
382
387
  should_pause = self._converter.pause_on_fail_blueapi_call(
383
388
  call.model_copy(), errors
384
389
  )
385
- tiled_ids, scan_ids = get_tiled_and_scan_ids(self._tiled_client, call)
390
+
391
+ tiled_ids, scan_ids = (
392
+ get_tiled_and_scan_ids(self._tiled_client, self.instrument, call)
393
+ if self.instrument
394
+ else ([], [])
395
+ )
386
396
  LOGGER.error(f"Plan {call} has failed with the following errors: {errors}")
387
397
 
388
398
  async with self._modifying:
@@ -555,7 +565,6 @@ class TaskQueue:
555
565
  )
556
566
  self._state.paused = True
557
567
  self._state.last_pause_reason = reason
558
- self._broadcaster.broadcast(Event(type="state_update", data=self._state))
559
568
  notify(f"Queue paused: {reason}", "INFO")
560
569
 
561
570
  async def pause_queue(self, reason: PauseReason) -> QueueState:
@@ -581,7 +590,6 @@ class TaskQueue:
581
590
  LOGGER.info("Resuming queue")
582
591
  async with self._modifying:
583
592
  self._state.paused = False
584
- self._broadcaster.broadcast(Event(type="state_update", data=self._state))
585
593
  return self._state
586
594
 
587
595
  @property
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: daq-queuing-service
3
- Version: 0.2.1
3
+ Version: 0.2.2
4
4
  Summary: A service to queue tasks and chain BlueAPI calls
5
5
  Author-email: Jacob Williamson <jacob.williamson@diamond.ac.uk>
6
6
  License: Apache License
@@ -47,7 +47,6 @@ docs/explanations/worker.md
47
47
  docs/explanations/beamlines/i15-1/auxiliary_scans.md
48
48
  docs/explanations/beamlines/i15-1/i15-1.md
49
49
  docs/explanations/beamlines/i15-1/i15-1_aux_scans.drawio.png
50
- docs/explanations/beamlines/i15-1/image.png
51
50
  docs/explanations/decisions/0001-record-architecture-decisions.md
52
51
  docs/explanations/decisions/0002-switched-to-python-copier-template.md
53
52
  docs/explanations/decisions/COPYME
@@ -37,7 +37,6 @@
37
37
  "docs/explanations/beamlines/i15-1/auxiliary_scans.md",
38
38
  "docs/explanations/beamlines/i15-1/i15-1.md",
39
39
  "docs/explanations/beamlines/i15-1/i15-1_aux_scans.drawio.png",
40
- "docs/explanations/beamlines/i15-1/image.png",
41
40
  "docs/explanations/converters.md",
42
41
  "docs/explanations/decisions.md",
43
42
  "docs/explanations/decisions/0001-record-architecture-decisions.md",
@@ -1,7 +1,7 @@
1
1
  {
2
- "tag": "0.2.1",
2
+ "tag": "0.2.2",
3
3
  "distance": 0,
4
- "node": "g178927ec361a1c352bd24b84512214abdeab46cd",
4
+ "node": "gfddbbda69525a09291d16d6e97f3e3e28642a2b1",
5
5
  "dirty": false,
6
6
  "branch": "HEAD",
7
7
  "node_date": "2026-11-10"
@@ -39,14 +39,13 @@ def mock_tiled_search(
39
39
  }
40
40
  }
41
41
 
42
- search_result = MagicMock()
43
- search_result.search = MagicMock(
42
+ search_result = MagicMock(
44
43
  return_value={"tiled_id_1": result_1, "tiled_id_2": result_2}
45
44
  )
46
45
 
47
- tiled_client.search = MagicMock(return_value=search_result)
46
+ tiled_client["ixx/cm12345/cm12345-1"].search = search_result
48
47
 
49
- return (tiled_client, search_result)
48
+ return tiled_client
50
49
 
51
50
 
52
51
  def test_get_tiled_client_instantiates_client_from_uri():
@@ -104,22 +103,21 @@ def test_get_tiled_client_adds_tiled_auth_with_client_id_and_secret_if_found(
104
103
  )
105
104
 
106
105
 
107
- def test_get_metadata_from_tiled_makes_expected_searches(
108
- mock_tiled_search: tuple[MagicMock, MagicMock],
106
+ def test_get_metadata_from_tiled_makes_expected_search(
107
+ mock_tiled_search: MagicMock,
109
108
  ):
110
- client, result = mock_tiled_search
111
- get_metadata_from_tiled(client, "cm12345-1", "bapi_task_id")
112
- client.search.assert_called_once_with(
113
- Eq(key="start.instrument_session", value="cm12345-1")
109
+ client = mock_tiled_search
110
+ get_metadata_from_tiled(client, "ixx", "cm12345-1", "bapi_task_id")
111
+ client["ixx/cm12345/cm12345-1"].search.assert_called_once_with( # type:ignore
112
+ Eq("start.blueapi_task_id", "bapi_task_id")
114
113
  )
115
- result.search.assert_called_once_with(Eq("start.blueapi_task_id", "bapi_task_id"))
116
114
 
117
115
 
118
116
  def test_get_metadata_from_tiled_returns_expected_result(
119
- mock_tiled_search: tuple[MagicMock, MagicMock],
117
+ mock_tiled_search: MagicMock,
120
118
  ):
121
- client, _ = mock_tiled_search
122
- result = get_metadata_from_tiled(client, "cm12345-1", "bapi_task_id")
119
+ client = mock_tiled_search
120
+ result = get_metadata_from_tiled(client, "ixx", "cm12345-1", "bapi_task_id")
123
121
  assert result == [ # Should be in chronological order
124
122
  (
125
123
  "tiled_id_2",
@@ -149,9 +147,9 @@ def test_get_metadata_from_tiled_returns_expected_result(
149
147
 
150
148
 
151
149
  def test_get_metadata_from_tiled_returns_empty_list_if_no_result_found(
152
- mock_tiled_search: tuple[MagicMock, MagicMock],
150
+ mock_tiled_search: MagicMock,
153
151
  ):
154
- client, search = mock_tiled_search
155
- search.search = MagicMock(return_value={})
156
- result = get_metadata_from_tiled(client, "cm12345-1", "bapi_task_id")
152
+ client = mock_tiled_search
153
+ client["ixx/cm12345/cm12345-1"].search = MagicMock(return_value={})
154
+ result = get_metadata_from_tiled(client, "ixx", "cm12345-1", "bapi_task_id")
157
155
  assert result == []
@@ -29,7 +29,7 @@ def mock_current_time():
29
29
  @pytest.fixture()
30
30
  def mock_tiled_searches(
31
31
  tiled_client: MagicMock,
32
- ) -> tuple[MagicMock, MagicMock, MagicMock, MagicMock, MagicMock, MagicMock]:
32
+ ) -> tuple[MagicMock, MagicMock, MagicMock, MagicMock]:
33
33
  result_1 = MagicMock()
34
34
 
35
35
  result_1.metadata = {
@@ -142,8 +142,8 @@ def mock_tiled_searches(
142
142
  }
143
143
  }
144
144
 
145
- search_result_6 = MagicMock()
146
- search_result_6.search = MagicMock(
145
+ search_result_4 = MagicMock()
146
+ search_result_4.search = MagicMock(
147
147
  return_value={
148
148
  "tiled_id_1": result_1,
149
149
  "tiled_id_2": result_2,
@@ -153,51 +153,38 @@ def mock_tiled_searches(
153
153
  }
154
154
  )
155
155
 
156
- search_result_5 = MagicMock()
157
- search_result_5.search = MagicMock(return_value=search_result_6)
158
- search_result_4 = MagicMock()
159
- search_result_4.search = MagicMock(return_value=search_result_5)
160
156
  search_result_3 = MagicMock()
161
157
  search_result_3.search = MagicMock(return_value=search_result_4)
162
158
  search_result_2 = MagicMock()
163
159
  search_result_2.search = MagicMock(return_value=search_result_3)
164
160
 
165
- tiled_client.search = MagicMock(return_value=search_result_2)
166
-
167
- return (
168
- tiled_client,
169
- search_result_2,
170
- search_result_3,
171
- search_result_4,
172
- search_result_5,
173
- search_result_6,
161
+ tiled_client["i15-1/cm12345/cm12345-1"].search = MagicMock(
162
+ return_value=search_result_2
174
163
  )
175
164
 
165
+ return (tiled_client, search_result_2, search_result_3, search_result_4)
166
+
176
167
 
177
168
  def test_get_suitable_tiled_background_makes_expected_searches(
178
- mock_tiled_searches: tuple[
179
- MagicMock, MagicMock, MagicMock, MagicMock, MagicMock, MagicMock
180
- ],
169
+ mock_tiled_searches: tuple[MagicMock, MagicMock, MagicMock, MagicMock],
181
170
  queue_params: QueueParameters,
182
171
  ):
183
- client, search_2, search_3, search_4, search_5, search_6 = mock_tiled_searches
172
+ client, search_2, search_3, search_4 = mock_tiled_searches
184
173
  get_suitable_tiled_scan(
185
174
  client,
186
175
  AuxiliaryScan(instrument_session="cm12345-1", pin=None, time_per_pdf=10),
187
176
  queue_params.tiled_stale_time_s,
188
177
  )
189
- client.search.assert_called_once_with(Eq(key="start.instrument", value="i15-1"))
190
- search_2.search.assert_called_once_with(
191
- Eq(key="start.instrument_session", value="cm12345-1")
178
+ client["i15-1/cm12345/cm12345-1"].search.assert_called_once_with( # type: ignore
179
+ Eq("stop.exit_status", "success")
192
180
  )
193
- search_3.search.assert_called_once_with(Eq("stop.exit_status", "success"))
194
- search_4.search.assert_called_once_with(
181
+ search_2.search.assert_called_once_with(
195
182
  Comparison("ge", "stop.time", 30 - queue_params.tiled_stale_time_s)
196
183
  )
197
- search_5.search.assert_called_once_with(
184
+ search_3.search.assert_called_once_with(
198
185
  In(key="start.scan_type", value=["Air", "Empty Capillary", "Standard Sample"])
199
186
  )
200
- search_6.search.assert_called_once_with(
187
+ search_4.search.assert_called_once_with(
201
188
  KeyPresent("start.experiment_definition.data.time_per_pdf")
202
189
  )
203
190