mosca 2.0.2__tar.gz → 2.0.7__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 (219) hide show
  1. {mosca-2.0.2 → mosca-2.0.7}/PKG-INFO +4 -1
  2. mosca-2.0.7/pyproject.toml +238 -0
  3. mosca-2.0.7/src/mosca/__init__.py +5 -0
  4. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/common/enums.py +1 -3
  5. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/common/logger.py +5 -19
  6. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/common/threads.py +15 -69
  7. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/common/utils.py +35 -0
  8. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/buffer.py +95 -179
  9. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/controller.py +2 -2
  10. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/datahandler.py +30 -34
  11. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/detectors.py +3 -8
  12. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/mosca.py +83 -150
  13. {mosca-2.0.2/src/mosca/tango → mosca-2.0.7/src/mosca/control}/shared.py +0 -1
  14. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/spectra.py +4 -9
  15. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/stats.py +4 -8
  16. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/tasks/background.py +1 -3
  17. mosca-2.0.7/src/mosca/control/tasks/rois.py +398 -0
  18. mosca-2.0.7/src/mosca/control/tasks/saving.py +580 -0
  19. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/tasks/task.py +7 -35
  20. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/tasks/taskmanager.py +5 -43
  21. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/__init__.py +3 -0
  22. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/hamamatsu/hamamatsu.py +1 -9
  23. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/hamamatsu/hamamatsuhw.py +27 -164
  24. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/oceanoptics/oceanopticshw.py +12 -15
  25. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/dante/simdante.py +0 -3
  26. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/dante/simdantehw.py +15 -58
  27. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/dummy/dummy.py +3 -32
  28. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/generator.py +23 -38
  29. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/xia/iniparser.py +2 -2
  30. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/xia/simfalconx.py +0 -1
  31. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/xia/simfalconxhw.py +41 -143
  32. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xglab/dante.py +5 -23
  33. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xglab/dantehw.py +28 -184
  34. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/falconx.py +32 -108
  35. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/handel/__init__.py +0 -1
  36. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/handel/_cffi.py +1 -0
  37. mosca-2.0.7/src/mosca/devices/xia/handel/error.py +213 -0
  38. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/handel/handel_inc/handel_constants.h +127 -127
  39. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/handel/handel_inc/handel_errors.h +254 -254
  40. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/handel/handel_inc/handel_generic.h +66 -66
  41. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/handel/interface.py +34 -128
  42. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/mercury.py +15 -42
  43. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/xia.py +72 -36
  44. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/xiads.py +35 -40
  45. mosca-2.0.7/src/mosca/devices/xia/xmap.py +103 -0
  46. mosca-2.0.7/src/mosca/rpc/devices.py +27 -0
  47. mosca-2.0.7/src/mosca/rpc/main.py +52 -0
  48. mosca-2.0.7/src/mosca/rpc/mosca.py +222 -0
  49. mosca-2.0.7/src/mosca/rpc/server.py +67 -0
  50. mosca-2.0.7/src/mosca/rpc/tasks/background.py +28 -0
  51. mosca-2.0.7/src/mosca/rpc/tasks/saving.py +89 -0
  52. mosca-2.0.7/src/mosca/rpc/utils.py +37 -0
  53. mosca-2.0.7/src/mosca/tango/controller.py +138 -0
  54. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/tango/main.py +25 -31
  55. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/tango/mosca.py +98 -147
  56. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/tango/moscav1.py +26 -83
  57. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/tango/tasks/background.py +2 -3
  58. mosca-2.0.7/src/mosca/tango/tasks/saving.py +146 -0
  59. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/tango/utils.py +23 -58
  60. mosca-2.0.2/.gitlab-ci.yml +0 -146
  61. mosca-2.0.2/MANIFEST.in +0 -8
  62. mosca-2.0.2/conda/meta.yaml +0 -79
  63. mosca-2.0.2/doc/docs/bliss.md +0 -9
  64. mosca-2.0.2/doc/docs/controllers.md +0 -2
  65. mosca-2.0.2/doc/docs/devel/buffer.md +0 -4
  66. mosca-2.0.2/doc/docs/devel/controller.md +0 -11
  67. mosca-2.0.2/doc/docs/devel/mosca.md +0 -7
  68. mosca-2.0.2/doc/docs/devel/overview.md +0 -132
  69. mosca-2.0.2/doc/docs/devel/tasks/background.md +0 -4
  70. mosca-2.0.2/doc/docs/hamamatsu.md +0 -100
  71. mosca-2.0.2/doc/docs/img/mosca.avif +0 -0
  72. mosca-2.0.2/doc/docs/img/mosca.ico +0 -0
  73. mosca-2.0.2/doc/docs/img/mosca1.png +0 -0
  74. mosca-2.0.2/doc/docs/img/mosca2.png +0 -0
  75. mosca-2.0.2/doc/docs/img/oo_hw_edge_trig.png +0 -0
  76. mosca-2.0.2/doc/docs/index.md +0 -35
  77. mosca-2.0.2/doc/docs/install.md +0 -15
  78. mosca-2.0.2/doc/docs/mosca.md +0 -50
  79. mosca-2.0.2/doc/docs/oceanoptics.md +0 -71
  80. mosca-2.0.2/doc/docs/quickstart.md +0 -222
  81. mosca-2.0.2/doc/docs/simulators.md +0 -20
  82. mosca-2.0.2/doc/docs/tasks/background.md +0 -16
  83. mosca-2.0.2/doc/docs/tasks/overview.md +0 -30
  84. mosca-2.0.2/doc/docs/tasks/rois.md +0 -1
  85. mosca-2.0.2/doc/docs/tasks/spectrasum.md +0 -1
  86. mosca-2.0.2/doc/docs/xglab.md +0 -60
  87. mosca-2.0.2/doc/docs/xia.md +0 -167
  88. mosca-2.0.2/doc/mkdocs.yml +0 -106
  89. mosca-2.0.2/doc/src/wavedrom/oo_hw_edge_trig.txt +0 -9
  90. mosca-2.0.2/doc/theme/bliss_logo_small.svg +0 -636
  91. mosca-2.0.2/packages/bliss_mosca/README.rst +0 -5
  92. mosca-2.0.2/packages/bliss_mosca/pyproject.toml +0 -28
  93. mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/__init__.py +0 -9
  94. mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/base.py +0 -982
  95. mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/calccounters.py +0 -366
  96. mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/channel.py +0 -70
  97. mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/compat.py +0 -24
  98. mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/counters.py +0 -169
  99. mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/simulation/generator.py +0 -221
  100. mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/simulation/moscans.py +0 -224
  101. mosca-2.0.2/packages/blissdata_mosca/README.rst +0 -4
  102. mosca-2.0.2/packages/blissdata_mosca/pyproject.toml +0 -31
  103. mosca-2.0.2/packages/blissdata_mosca/src/blissdata_mosca/__init__.py +0 -4
  104. mosca-2.0.2/packages/blissdata_mosca/src/blissdata_mosca/stream.py +0 -297
  105. mosca-2.0.2/packages/mosca_client/README.rst +0 -4
  106. mosca-2.0.2/packages/mosca_client/pyproject.toml +0 -28
  107. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/dante.py +0 -116
  108. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/danteplus.py +0 -8
  109. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/dummy.py +0 -9
  110. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/falconx.py +0 -71
  111. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/generator.py +0 -58
  112. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/simdante.py +0 -9
  113. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/simfalconx.py +0 -9
  114. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/simulation.py +0 -18
  115. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices/xia.py +0 -66
  116. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/mca.py +0 -96
  117. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/mosca.py +0 -639
  118. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/rois.py +0 -262
  119. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/saving.py +0 -135
  120. mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/utils.py +0 -78
  121. mosca-2.0.2/pyproject.toml +0 -186
  122. mosca-2.0.2/scripts/mosca.ps1 +0 -7
  123. mosca-2.0.2/setup.cfg +0 -12
  124. mosca-2.0.2/setup.py +0 -4
  125. mosca-2.0.2/src/mosca/__init__.py +0 -11
  126. mosca-2.0.2/src/mosca/control/tasks/__init__.py +0 -3
  127. mosca-2.0.2/src/mosca/control/tasks/rois.py +0 -466
  128. mosca-2.0.2/src/mosca/control/tasks/saving.py +0 -391
  129. mosca-2.0.2/src/mosca/control/tasks/spectrasums.py +0 -185
  130. mosca-2.0.2/src/mosca/devices/xia/handel/error.py +0 -272
  131. mosca-2.0.2/src/mosca/devices/xia/handel/parser.py +0 -62
  132. mosca-2.0.2/src/mosca/devices/xia/utils.py +0 -47
  133. mosca-2.0.2/src/mosca/tango/controller.py +0 -80
  134. mosca-2.0.2/src/mosca/tango/tasks/__init__.py +0 -0
  135. mosca-2.0.2/tests/__init__.py +0 -0
  136. mosca-2.0.2/tests/bliss/__init__.py +0 -0
  137. mosca-2.0.2/tests/bliss/bliss_utils.py +0 -20
  138. mosca-2.0.2/tests/bliss/conftest.py +0 -329
  139. mosca-2.0.2/tests/bliss/test_calcformula.py +0 -329
  140. mosca-2.0.2/tests/bliss/test_hdf5.py +0 -209
  141. mosca-2.0.2/tests/bliss/test_mosca.py +0 -87
  142. mosca-2.0.2/tests/bliss/test_moscastream.py +0 -57
  143. mosca-2.0.2/tests/bliss/test_simdante.py +0 -243
  144. mosca-2.0.2/tests/bliss/test_simfalconx.py +0 -1390
  145. mosca-2.0.2/tests/bliss/utils.py +0 -44
  146. mosca-2.0.2/tests/bliss/v1/__init__.py +0 -0
  147. mosca-2.0.2/tests/bliss/v1/test_calcformula_v1.py +0 -95
  148. mosca-2.0.2/tests/bliss/v1/test_dummy_v1.py +0 -10
  149. mosca-2.0.2/tests/bliss/v1/test_hdf5.py +0 -150
  150. mosca-2.0.2/tests/bliss/v1/test_moscav1.py +0 -779
  151. mosca-2.0.2/tests/bliss/v1/test_simfx_v1.py +0 -1206
  152. mosca-2.0.2/tests/conftest.py +0 -271
  153. mosca-2.0.2/tests/data/beacon/__init__.yml +0 -20
  154. mosca-2.0.2/tests/data/beacon/mosca/counters.yml +0 -17
  155. mosca-2.0.2/tests/data/beacon/mosca/dummy.yml +0 -11
  156. mosca-2.0.2/tests/data/beacon/mosca/simdante.yml +0 -24
  157. mosca-2.0.2/tests/data/beacon/mosca/simfx.yml +0 -63
  158. mosca-2.0.2/tests/data/beacon/sessions/__init__.yml +0 -1
  159. mosca-2.0.2/tests/data/beacon/sessions/session_simfx_w_counters_setup.py +0 -0
  160. mosca-2.0.2/tests/data/beacon/sessions/session_simfx_with_counters.yml +0 -15
  161. mosca-2.0.2/tests/data/beacon/sessions/test_dummy.yml +0 -5
  162. mosca-2.0.2/tests/data/beacon/sessions/test_dummy_setup.py +0 -0
  163. mosca-2.0.2/tests/data/beacon/sessions/test_dummy_v1.yml +0 -5
  164. mosca-2.0.2/tests/data/beacon/sessions/test_dummy_v1_setup.py +0 -0
  165. mosca-2.0.2/tests/data/beacon/sessions/test_simdante.yml +0 -5
  166. mosca-2.0.2/tests/data/beacon/sessions/test_simdante_setup.py +0 -0
  167. mosca-2.0.2/tests/data/beacon/sessions/test_simdante_v1.yml +0 -5
  168. mosca-2.0.2/tests/data/beacon/sessions/test_simdante_v1_setup.py +0 -0
  169. mosca-2.0.2/tests/data/beacon/sessions/test_simfx.yml +0 -5
  170. mosca-2.0.2/tests/data/beacon/sessions/test_simfx_setup.py +0 -0
  171. mosca-2.0.2/tests/data/beacon/sessions/test_simfx_v1.yml +0 -5
  172. mosca-2.0.2/tests/data/beacon/sessions/test_simfx_v1_setup.py +0 -0
  173. mosca-2.0.2/tests/data/beacon/tango/__init__.py +0 -0
  174. mosca-2.0.2/tests/data/beacon/tango/nexus_writer.yml +0 -8
  175. mosca-2.0.2/tests/data/dante/dante_16ch.hdf +0 -0
  176. mosca-2.0.2/tests/data/dante/dante_1ch.hdf +0 -0
  177. mosca-2.0.2/tests/data/falconx/falconx.ini +0 -86
  178. mosca-2.0.2/tests/data/falconx/falconx_18ch.ini +0 -938
  179. mosca-2.0.2/tests/data/falconx/falconx_1ch.ini +0 -86
  180. mosca-2.0.2/tests/data/falconx/falconx_2ch.ini +0 -136
  181. mosca-2.0.2/tests/data/falconx/falconx_6ch.ini +0 -342
  182. mosca-2.0.2/tests/mosca/__init__.py +0 -0
  183. mosca-2.0.2/tests/mosca/control/__init__.py +0 -0
  184. mosca-2.0.2/tests/mosca/control/common.py +0 -80
  185. mosca-2.0.2/tests/mosca/control/tasks/__init__.py +0 -0
  186. mosca-2.0.2/tests/mosca/control/tasks/test_rois.py +0 -517
  187. mosca-2.0.2/tests/mosca/control/tasks/test_tasks.py +0 -32
  188. mosca-2.0.2/tests/mosca/control/tasks/test_writer.py +0 -0
  189. mosca-2.0.2/tests/mosca/control/test_buffer.py +0 -258
  190. mosca-2.0.2/tests/mosca/control/test_datahandler.py +0 -152
  191. mosca-2.0.2/tests/mosca/tango/__init__.py +0 -0
  192. mosca-2.0.2/tests/mosca/tango/devices/__init__.py +0 -0
  193. mosca-2.0.2/tests/mosca/tango/devices/test_simdante.py +0 -260
  194. mosca-2.0.2/tests/mosca/tango/devices/test_simfalconx.py +0 -419
  195. mosca-2.0.2/tests/mosca/tango/test_mosca.py +0 -227
  196. mosca-2.0.2/tests/mosca/tango/test_rois.py +0 -349
  197. mosca-2.0.2/tests/perf/test_writer.py +0 -89
  198. {mosca-2.0.2 → mosca-2.0.7}/.gitignore +0 -0
  199. {mosca-2.0.2 → mosca-2.0.7}/LICENSE +0 -0
  200. {mosca-2.0.2 → mosca-2.0.7}/README.rst +0 -0
  201. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/common/__init__.py +0 -0
  202. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/control/__init__.py +0 -0
  203. {mosca-2.0.2/packages/bliss_mosca/src/bliss_mosca/simulation → mosca-2.0.7/src/mosca/control/tasks}/__init__.py +0 -0
  204. {mosca-2.0.2/packages/mosca_client/src/mosca_client → mosca-2.0.7/src/mosca/devices/hamamatsu}/__init__.py +0 -0
  205. {mosca-2.0.2/packages/mosca_client/src/mosca_client/tango → mosca-2.0.7/src/mosca/devices/oceanoptics}/__init__.py +0 -0
  206. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/oceanoptics/oceanoptics.py +0 -0
  207. {mosca-2.0.2/packages/mosca_client/src/mosca_client/tango/devices → mosca-2.0.7/src/mosca/devices/simulation}/__init__.py +0 -0
  208. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/dante/__init__.py +0 -0
  209. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/dummy/__init__.py +0 -0
  210. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/simulation/xia/__init__.py +0 -0
  211. {mosca-2.0.2/src/mosca/devices/hamamatsu → mosca-2.0.7/src/mosca/devices/xglab}/__init__.py +0 -0
  212. {mosca-2.0.2/src/mosca/devices/oceanoptics → mosca-2.0.7/src/mosca/devices/xia}/__init__.py +0 -0
  213. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/handel/mapping.py +0 -0
  214. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/devices/xia/handel/stats.py +0 -0
  215. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/mosca.py +0 -0
  216. {mosca-2.0.2/src/mosca/devices/simulation → mosca-2.0.7/src/mosca/rpc}/__init__.py +0 -0
  217. {mosca-2.0.2/src/mosca/devices/xglab → mosca-2.0.7/src/mosca/rpc/tasks}/__init__.py +0 -0
  218. {mosca-2.0.2 → mosca-2.0.7}/src/mosca/tango/__init__.py +0 -0
  219. {mosca-2.0.2/src/mosca/devices/xia → mosca-2.0.7/src/mosca/tango/tasks}/__init__.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: mosca
3
- Version: 2.0.2
3
+ Version: 2.0.7
4
4
  Summary: A library for the unified control of MCA detectors
5
5
  Project-URL: Homepage, https://gitlab.esrf.fr/bliss/mosca
6
6
  Project-URL: Bug Tracker, https://gitlab.esrf.fr/bliss/mosca/issues
@@ -20,6 +20,9 @@ Requires-Dist: lark
20
20
  Requires-Dist: numpy
21
21
  Requires-Dist: pytango
22
22
  Requires-Dist: ruamel-yaml
23
+ Provides-Extra: zarr
24
+ Requires-Dist: s3fs; extra == 'zarr'
25
+ Requires-Dist: zarr; extra == 'zarr'
23
26
  Description-Content-Type: text/x-rst
24
27
 
25
28
  Mosca 2
@@ -0,0 +1,238 @@
1
+ [build-system]
2
+ requires = ["hatchling"]
3
+ build-backend = "hatchling.build"
4
+
5
+ [project]
6
+ name = "mosca"
7
+ version = "2.0.7"
8
+ description = "A library for the unified control of MCA detectors"
9
+ readme = "README.rst"
10
+ authors = [
11
+ { name = "BCU Team", email = "bliss@esrf.fr" },
12
+ ]
13
+ license-files = ["LICENSE"]
14
+ keywords = ["ESRF", "MCA"]
15
+ classifiers = [
16
+ "Development Status :: 2 - Pre-Alpha",
17
+ "Intended Audience :: Developers",
18
+ "Programming Language :: Python :: 3",
19
+ "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
20
+ "Operating System :: OS Independent",
21
+ ]
22
+ # 3.9 because currently the DANTE SDK only supports 3.9
23
+ requires-python = ">=3.9,<3.13"
24
+ dependencies = [
25
+ "pytango",
26
+ "numpy",
27
+ "h5py",
28
+ "ruamel.yaml",
29
+ "hdf5plugin",
30
+ "lark",
31
+ "cffi",
32
+ ]
33
+
34
+ [project.optional-dependencies]
35
+ # zarr_saving task (fast intermediate storage on an S3-compatible object
36
+ # store). Lazily imported, so their absence doesn't break the rest of mosca.
37
+ zarr = ["zarr", "s3fs"]
38
+
39
+ [project.scripts]
40
+ mosca = "mosca.tango.main:main"
41
+ mosca-rpc = "mosca.rpc.main:main"
42
+
43
+ [project.urls]
44
+ "Homepage" = "https://gitlab.esrf.fr/bliss/mosca"
45
+ "Bug Tracker" = "https://gitlab.esrf.fr/bliss/mosca/issues"
46
+
47
+ [tool.hatch.build.targets.sdist]
48
+ # by default hatchling ships the whole repository (tests, doc, packages/...)
49
+ include = ["/src/mosca", "/README.rst", "/LICENSE"]
50
+
51
+ [tool.coverage.run]
52
+ patch = ["subprocess", "_exit"]
53
+ parallel = true
54
+ sigterm = true
55
+ omit = ["tests/*"]
56
+
57
+ [tool.coverage.report]
58
+ omit = [
59
+ "*/sessions/test_dummy_v1_setup.py",
60
+ "*/sessions/test_dummy_setup.py",
61
+ "*/sessions/test_simfx_v1_setup.py",
62
+ "*/sessions/test_simfx_setup.py",
63
+ ]
64
+
65
+ [tool.pytest.ini_options]
66
+ # per-test (incl. fixtures) safety net: a hang fails that test with a stack
67
+ # dump instead of silently running into the CI job timeout
68
+ timeout = 300
69
+
70
+ [tool.pylint.messages_control]
71
+ disable = [
72
+ "R0914", # too-many-locals
73
+ ]
74
+
75
+ # --- pixi ---------------------------------------------------------------
76
+
77
+ [tool.pixi.workspace]
78
+ channels = ["conda-forge", "esrf-bcu"]
79
+ platforms = ["linux-64"]
80
+ preview = ["pixi-build"]
81
+
82
+ #[tool.pixi.dependencies]
83
+ #umodbus = ">=1.0.2.1,<2"
84
+
85
+ [tool.pixi.package]
86
+ name = "mosca"
87
+
88
+ [tool.pixi.package.build]
89
+ backend = { name = "pixi-build-python", version = "0.*" }
90
+
91
+ [tool.pixi.package.build.config]
92
+ # run dependencies are mapped from [project.dependencies]
93
+ ignore-pypi-mapping = false
94
+
95
+ [tool.pixi.package.host-dependencies]
96
+ hatchling = "==1.26.3"
97
+
98
+ [tool.pixi.feature.test.pypi-dependencies]
99
+ pytest = "<9.1"
100
+ pytest-timeout = "*"
101
+ coverage = "*"
102
+ nosqltangodb = "==1.0.6" # for beacon
103
+ build = ">=1.6.1, <2"
104
+
105
+ [tool.pixi.feature.server.pypi-dependencies]
106
+ mosca = { path = ".", editable = true }
107
+ mosca_client = { path = "packages/mosca_client", editable = true }
108
+
109
+ [tool.pixi.feature.bliss_mosca.pypi-dependencies]
110
+ mosca_client = { path = "packages/mosca_client", editable = true }
111
+ blissdata_mosca = { path = "packages/blissdata_mosca", editable = true }
112
+ bliss_mosca = { path = "packages/bliss_mosca", editable = true }
113
+
114
+ [tool.pixi.feature.blissdep.dependencies]
115
+ # generated by scripts/sync_blissdep.py from https://gitlab.esrf.fr/bliss/bliss/-/raw/2.4.x/conda-requirements.txt
116
+ python = ">=3.11"
117
+ graphviz = "*"
118
+ hkl = ">=5.0.0"
119
+ pyopengl = "==3.1.5" # see https://github.com/mcfletch/pyopengl/issues/88
120
+ pyqt = ">=5.12"
121
+ redis-server = ">=7"
122
+ redisearch = ">=2.6.5"
123
+ redisjson = ">=2.4.5"
124
+ tailon = ">=1.1.0"
125
+ tmux = ">=3.4,<=3.5" # 3.6 is unstable see https://github.com/tmux/tmux/issues/4710
126
+ cxx-compiler = "*" # to build wheels with c-extensions (pymca)
127
+
128
+ [tool.pixi.feature.bliss.pypi-dependencies]
129
+ bliss = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="2.4.x" }
130
+ blisswriter = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="2.4.x", subdirectory = "blisswriter" }
131
+ flint = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="2.4.x", subdirectory = "flint" }
132
+ #bliss = { path = "../bliss.git/", editable=true }
133
+ #blisswriter = { path = "../bliss.git/blisswriter", editable=true }
134
+ #flint = { path = "../bliss.git/flint", editable=true }
135
+
136
+ [tool.pixi.feature.bliss23.dependencies]
137
+ # bliss's 2.3.x line pins packaging<26; without this the conda solve picks
138
+ # the latest packaging (26.3 as of writing), which pypi resolution then
139
+ # can't override, making the whole environment unsatisfiable.
140
+ packaging = "<26"
141
+
142
+ [tool.pixi.feature.bliss23.pypi-dependencies]
143
+ bliss = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="4921-mosca-client-2.3.x" }
144
+ #blisswriter = { path = "../bliss.git23/blisswriter", editable=true }
145
+ blisswriter = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="4921-mosca-client-2.3.x", subdirectory = "blisswriter" }
146
+ flint = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="4921-mosca-client-2.3.x", subdirectory = "flint" }
147
+
148
+ #[tool.pixi.feature.zarr.pypi-dependencies]
149
+ #zarr = "*"
150
+ #s3fs = "*"
151
+
152
+ [tool.pixi.feature.blisswriter.pypi-dependencies]
153
+ blisswriter = { path = "../blisswriter.git", editable=true }
154
+ #blisswriter = { version = "*", extras = ["tango"] }
155
+ mosca_client = { path = "packages/mosca_client", editable = true }
156
+ blissdata_mosca = { path = "packages/blissdata_mosca", editable = true }
157
+
158
+ [tool.pixi.feature.rpc.pypi-dependencies]
159
+ # alternative, non-Tango transport for the control layer
160
+ zerorpc = "*"
161
+
162
+ #[tool.pixi.feature.blisszarr.pypi-dependencies]
163
+ #blissdata_zarr = { git = "https://gitlab.esrf.fr/felix/blissdata_zarr.git" }
164
+ #blissdata_zarr = { path = "../blissdata_zarr.git", editable = true }
165
+ #bliss = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="demo-fis"}
166
+ #bliss = { path = "../zarr/bliss.git", editable=true }
167
+ #blisswriter = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="demo-fis", subdirectory = "blisswriter" }
168
+ #flint = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="demo-fis", subdirectory = "flint" }
169
+
170
+ [tool.pixi.environments]
171
+ server = ["server"]
172
+ bliss = ["bliss_mosca", "bliss", "blissdep"]
173
+ blisswriter = ["blisswriter"]
174
+ testserver = ["test", "server"]
175
+ testblissmosca = ["test", "server", "bliss_mosca", "bliss", "blissdep"]
176
+ testbliss = ["test", "server", "bliss", "blissdep"]
177
+ testrpc = ["test", "server", "rpc"]
178
+ testblissmosca23 = ["test", "server", "bliss_mosca", "bliss23", "blissdep"]
179
+ #testserverzarr = ["test", "server", "zarr"]
180
+ #testblisszarr = ["test", "server", "bliss_mosca", "zarr", "blisszarr", "blissdep"]
181
+
182
+ [tool.pixi.tasks.cov_server]
183
+ cmd = "coverage run --source=mosca --branch --omit='*/mosca/tango/moscav1.py' -m pytest tests/mosca"
184
+ default-environment = "testserver"
185
+
186
+ [tool.pixi.tasks.cov_v1]
187
+ cmd = """
188
+ coverage run --data-file='v1cov/.coverage' --include='*/controllers/mosca/*' --branch -m pytest tests/bliss/v1 && \
189
+ cd v1cov && \
190
+ coverage combine && \
191
+ coverage html -d htmlcovv1 && \
192
+ coverage report && \
193
+ mv htmlcovv1 ..
194
+ """
195
+ default-environment = "testbliss"
196
+
197
+ [tool.pixi.tasks.cov_bliss]
198
+ cmd = "coverage run --source=mosca --omit='*/mosca/tango/moscav1.py' --branch -m pytest tests/bliss/ --ignore=tests/bliss/v1"
199
+ default-environment = "testblissmosca"
200
+
201
+ [tool.pixi.tasks.test_server]
202
+ cmd = "pytest tests/mosca --ignore=tests/mosca/rpc"
203
+ default-environment = "testserver"
204
+
205
+ [tool.pixi.tasks.test_rpc]
206
+ cmd = "pytest tests/mosca/rpc"
207
+ default-environment = "testrpc"
208
+
209
+ [tool.pixi.tasks.test_v1]
210
+ cmd = "pytest tests/bliss/v1"
211
+ default-environment = "testbliss"
212
+
213
+ [tool.pixi.tasks.test_bliss]
214
+ cmd = "pytest tests/bliss/"
215
+ default-environment = "testblissmosca"
216
+
217
+ [tool.pixi.tasks.bliss]
218
+ description = "Starts a bliss session: pixi run bliss <SESSION> [BEACON_HOST] [TANGO_HOST]"
219
+ cmd = "{% if beacon_host %}export BEACON_HOST={{ beacon_host }} && {% endif %} {% if tango_host %}export TANGO_HOST={{ tango_host }} && {% endif %}bliss -s {{ session }} --no-tmux"
220
+ args = ["session",
221
+ { arg = "tango_host", default = "" },
222
+ { arg = "beacon_host", default = "" },]
223
+ default-environment = "bliss"
224
+
225
+ [tool.pixi.tasks.test_bliss23]
226
+ cmd = "pytest tests/bliss"
227
+ default-environment = "testblissmosca23"
228
+
229
+ [tool.pixi.tasks.blisswriter]
230
+ description = "Run a BlissWriter Tango server: pixi run blisswriter <INSTANCE> [TANGO_HOST]"
231
+ cmd = "{% if tango_host %}export TANGO_HOST={{ tango_host }} && {% endif %}blisswriter tango run {{ instance }}"
232
+ args = ["instance", { arg = "tango_host", default = "" }]
233
+ default-environment = "blisswriter"
234
+
235
+ [tool.pixi.tasks.sync_blissdep]
236
+ description = "Regenerate the blissdep feature from bliss's conda-requirements.txt: pixi run sync_blissdep [BRANCH_OR_PATH]"
237
+ cmd = "python3 scripts/sync_blissdep.py {{ ref }}"
238
+ args = [{ arg = "ref", default = "2.4.x" }]
@@ -0,0 +1,5 @@
1
+ from pkgutil import extend_path
2
+
3
+ __path__ = extend_path(__path__, __name__)
4
+
5
+ from .common import logger
@@ -73,7 +73,5 @@ class AcquisitionModes(enum.IntEnum):
73
73
 
74
74
  class DiscardMode(enum.IntEnum):
75
75
  NONE = 0
76
- # disabling until this is proven necessary...
77
- # ODD = enum.auto()
78
- # EVEN = enum.auto()
76
+ # DiscardMode.ODD/EVEN: not implemented (see git history).
79
77
  FIRST = enum.auto()
@@ -26,22 +26,20 @@ ASC_TIME = "%Y-%m-%d %H:%M:%S"
26
26
 
27
27
 
28
28
  class COLORS(enum.Enum):
29
- GREY = "\x1b[38;21m"
30
29
  BLUE = "\x1b[38;5;39m"
31
30
  YELLOW = "\x1b[38;5;226m"
32
31
  GREEN = "\x1b[32m"
33
32
  RED = "\x1b[38;5;196m"
34
33
  BOLD_RED = "\x1b[31;1m"
35
34
  RESET = "\x1b[0m"
36
- NONE = ""
37
35
 
38
36
 
39
37
  FORMATS = {
40
- logging.DEBUG: COLORS.BLUE,# + LOG_FORMAT + RESET,
41
- logging.INFO: COLORS.GREEN,# + LOG_FORMAT + RESET,
42
- logging.WARNING: COLORS.YELLOW,# + LOG_FORMAT + RESET,
43
- logging.ERROR: COLORS.RED,# + LOG_FORMAT + RESET,
44
- logging.CRITICAL: COLORS.BOLD_RED# + LOG_FORMAT + RESET,
38
+ logging.DEBUG: COLORS.BLUE,
39
+ logging.INFO: COLORS.GREEN,
40
+ logging.WARNING: COLORS.YELLOW,
41
+ logging.ERROR: COLORS.RED,
42
+ logging.CRITICAL: COLORS.BOLD_RED
45
43
  }
46
44
 
47
45
 
@@ -112,18 +110,6 @@ def mosca_enable_log_file(filename, *args, **kwargs):
112
110
  MOSCA_LOGGER.addHandler(hdlr)
113
111
 
114
112
 
115
- def get_logger(name):
116
- """
117
- Return the mosca logger with the given name.
118
- If <logfile> file name is provided then logs will be written to the given file.
119
- """
120
- split_name = name.split(".")
121
- if split_name[0] != "mosca":
122
- split_name = ["mosca"] + split_name
123
- name = ".".join(split_name)
124
- return logging.getLogger(name)
125
-
126
-
127
113
  def mosca_logger_names(rx_pattern=None):
128
114
  logger_names = [name for name in logging.root.manager.loggerDict if name.startswith("mosca")]
129
115
  if rx_pattern:
@@ -2,59 +2,26 @@ import logging
2
2
  logger = logging.getLogger(__name__)
3
3
 
4
4
  import time
5
- import typing
6
5
  import queue
7
6
  import threading
8
7
  from contextlib import contextmanager
9
8
 
10
9
 
11
- USE_GEVENT = None
12
-
13
-
14
10
  def RLock(*args, **kwargs):
15
- if USE_GEVENT:
16
- raise NotImplementedError
17
- else:
18
- return threading.RLock(*args, **kwargs)
19
-
20
-
21
- def Lock(*args, **kwargs):
22
- if USE_GEVENT:
23
- raise NotImplementedError
24
- else:
25
- return threading.Lock(*args, **kwargs)
11
+ return threading.RLock(*args, **kwargs)
26
12
 
27
13
 
28
- def Event(*args, **kwargs):
29
- if USE_GEVENT:
30
- raise NotImplementedError
31
- else:
32
- return threading.Event(*args, **kwargs)
14
+ def Lock(*args, **kwargs):
15
+ return threading.Lock(*args, **kwargs)
33
16
 
34
17
 
35
18
  def Queue(*args, **kwargs):
36
- if USE_GEVENT:
37
- raise NotImplementedError
38
- else:
39
- return queue.Queue(*args, **kwargs)
40
-
41
-
42
- def run(target, *args, **kwargs):
43
- if USE_GEVENT:
44
- raise NotImplementedError
45
- else:
46
- thread = threading.Thread(target=target, args=args, kwargs=kwargs)
47
- thread.daemon=True
48
- thread.start()
49
- return thread
19
+ return queue.Queue(*args, **kwargs)
50
20
 
51
21
 
52
22
  def sleep(time_s):
53
- if USE_GEVENT:
54
- raise NotImplementedError
55
- else:
56
- return time.sleep(time_s)
57
-
23
+ return time.sleep(time_s)
24
+
58
25
 
59
26
  class Timeout:
60
27
  timeout = property(lambda self: self._timeout)
@@ -82,26 +49,17 @@ def get_lock(lock, timeout=-1):
82
49
 
83
50
  class AsyncTask:
84
51
  stop_set = property(lambda self: self._stop_event.is_set())
85
- start_lock = property(lambda self: self._start_lock)
86
52
  queue = property(lambda self: self._queue)
87
53
 
88
- def __init__(self, *args, run_func=None, prepare_func=None, cleanup_func=None, use_gevent=USE_GEVENT, rlock=True, start=True, **kwargs):
54
+ def __init__(self, *args, run_func=None, prepare_func=None, cleanup_func=None, start=True, **kwargs):
89
55
  super().__init__()
90
56
 
91
57
  self._thread = None
92
- self._use_gevent = use_gevent
93
- if use_gevent:
94
- raise NotImplementedError
95
- else:
96
- if rlock:
97
- self._lock = threading.RLock()
98
- else:
99
- self._lock = threading.Lock()
100
- self._start_lock = threading.Lock()
101
- self._start_event = threading.Event()
102
- self._stop_event = threading.Event()
103
- self._queue = queue.Queue()
104
- self._sleep = time.sleep
58
+ self._start_lock = threading.Lock()
59
+ self._start_event = threading.Event()
60
+ self._stop_event = threading.Event()
61
+ self._queue = queue.Queue()
62
+ self._sleep = time.sleep
105
63
 
106
64
  self._prepare_fn = prepare_func
107
65
  self._run_fn = run_func
@@ -113,10 +71,7 @@ class AsyncTask:
113
71
  def ready(self):
114
72
  if self._thread is None:
115
73
  return True
116
- if self._use_gevent:
117
- raise NotImplementedError
118
- else:
119
- return not self._thread.is_alive()
74
+ return not self._thread.is_alive()
120
75
 
121
76
  def put(self, data):
122
77
  self._queue.put(data)
@@ -125,11 +80,8 @@ class AsyncTask:
125
80
  return self._queue.get(timeout=timeout)
126
81
 
127
82
  def _thread_run(self, *args, **kwargs):
128
- if self._use_gevent:
129
- raise NotImplementedError
130
- else:
131
- thread = threading.Thread(target=self._run_target, args=args, kwargs=kwargs)
132
- thread.start()
83
+ thread = threading.Thread(target=self._run_target, args=args, kwargs=kwargs)
84
+ thread.start()
133
85
  return thread
134
86
 
135
87
  def __call__(self, *args, **kwargs):
@@ -182,12 +134,6 @@ class AsyncTask:
182
134
  def _cleanup(self, *args, **kwargs):
183
135
  if self._cleanup_fn:
184
136
  self._cleanup_fn(self, *args, **kwargs)
185
- if self._use_gevent:
186
- import gevent
187
- gevent.get_hub().destroy(True)
188
-
189
- def wait_started(self):
190
- self._start_event.wait()
191
137
 
192
138
  def sleep(self, time_s):
193
139
  self._sleep(time_s)
@@ -1,11 +1,46 @@
1
+ import io
2
+ import os
1
3
  import inspect
2
4
  from weakref import WeakMethod
3
5
  import logging
4
6
  logger = logging.getLogger(__name__)
5
7
 
8
+ from ruamel.yaml import YAML
9
+ from ruamel.yaml.representer import RoundTripRepresenter
10
+ import numpy
11
+
6
12
  from .threads import Lock
7
13
 
8
14
 
15
+ class _Representer(RoundTripRepresenter):
16
+ """ Represents numpy scalars and arrays as plain python values. """
17
+
18
+
19
+ _Representer.add_multi_representer(
20
+ numpy.generic, lambda rep, data: rep.represent_data(data.item()))
21
+ _Representer.add_multi_representer(
22
+ numpy.ndarray, lambda rep, data: rep.represent_data(data.tolist()))
23
+
24
+
25
+ def yaml_str(obj):
26
+ """ Dumps obj to a YAML string. """
27
+ stream = io.StringIO()
28
+ yaml = YAML()
29
+ yaml.Representer = _Representer
30
+ yaml.dump(obj, stream=stream)
31
+ return stream.getvalue()
32
+
33
+
34
+ def list_files(path, ext, strip):
35
+ """ Returns the sorted paths (relative to path, stripped of the leading
36
+ strip characters) of the files ending with ext found under path. """
37
+ return sorted([
38
+ os.path.relpath(os.path.join(dp, f), path).lstrip(strip)
39
+ for dp, dn, fn in os.walk(path)
40
+ for f in fn
41
+ if f.endswith(ext)])
42
+
43
+
9
44
 
10
45
  # TODO: allow multiple callback
11
46