Move logic pertaining to writing/controlling detectors from i22 branch #24

rosesyrett · 2023-10-06T16:42:37Z

@coretl has a branch, i22, which contains logic that we need merged into main in order to make a directory provider singleton that can be created in dodal and accessed in blueapi.

… areadetector

coretl

I think we have to discuss structuring again, but I think this is a larger discussion than just you and me, so let's get this ready to merge before we do. Thanks for doing this, look good.

src/ophyd_async/core/_detector/detector_control.py

src/ophyd_async/core/_detector/detector_writer.py

src/ophyd_async/core/_detector/standard_detector.py

src/ophyd_async/core/providers.py

src/ophyd_async/epics/areadetector/pilatus.py

tests/epics/areadetector/test_hdf_streamer_det.py

src/ophyd_async/core/_detector/standard_detector.py

tests/epics/areadetector/test_hdf_streamer_det.py

src/ophyd_async/core/_detector/standard_detector.py

Prevent a shortened string in a waveform from using the end of the old string. Should probably be fixed on the server side, but this is what EDM does so fix here for now

…nto add-detector-logic

coretl

Looks good thanks, just a few points

src/ophyd_async/core/detector.py

src/ophyd_async/core/sim_signal_backend.py

src/ophyd_async/epics/areadetector/controllers/pilatus_controller.py

src/ophyd_async/epics/areadetector/controllers/standard_controller.py

tests/core/test_flyer.py

rosesyrett · 2023-10-12T17:11:14Z

getting the following linting errors:

src/ophyd_async/core/detector.py:166: error: Return type "AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]" of "collect_asset_docs" incompatible with return type "Iterator[Iterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]] | AsyncIterator[Iterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]]" in supertype "WritesExternalAssets"  [override]
src/ophyd_async/core/detector.py:169: error: "Coroutine[Any, Any, AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]]" has no attribute "__aiter__" (not async iterable)  [attr-defined]
src/ophyd_async/core/detector.py:169: note: Maybe you forgot to use "await"?
src/ophyd_async/core/flyer.py:109: error: Argument 1 to "gather_list" has incompatible type "Awaitable[list[AsyncStatus]]"; expected "Iterable[Awaitable[Any]]"  [arg-type]
src/ophyd_async/core/flyer.py:109: note: Maybe you forgot to use "await"?
src/ophyd_async/core/flyer.py:113: error: Return type "AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]" of "collect_asset_docs" incompatible with return type "Coroutine[Any, Any, AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]]" in supertype "DetectorGroupLogic"  [override]
src/ophyd_async/core/flyer.py:124: error: "Coroutine[Any, Any, AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]]" has no attribute "__aiter__" (not async iterable)  [attr-defined]
src/ophyd_async/core/flyer.py:124: note: Maybe you forgot to use "await"?
src/ophyd_async/core/flyer.py:229: error: Return type "AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]" of "collect_asset_docs" incompatible with return type "Iterator[Iterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]] | AsyncIterator[Iterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]]" in supertype "WritesExternalAssets"  [override]
src/ophyd_async/core/flyer.py:231: error: "Coroutine[Any, Any, AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]]" has no attribute "__aiter__" (not async iterable)  [attr-defined]
src/ophyd_async/core/flyer.py:231: note: Maybe you forgot to use "await"?
tests/core/test_flyer.py:94: error: Return type "AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]" of "collect_stream_docs" incompatible with return type "Coroutine[Any, Any, AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]]" in supertype "DetectorWriter"  [override]
tests/core/test_async_status.py:68: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs  [annotation-unchecked]
src/ophyd_async/epics/areadetector/writers/hdf_writer.py:89: error: Return type "AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]" of "collect_stream_docs" incompatible with return type "Coroutine[Any, Any, AsyncIterator[tuple[Literal['resource'], Any] | tuple[Literal['datum'], Any] | tuple[Literal['stream_resource'], Any] | tuple[Literal['stream_datum'], Any]]]" in supertype "DetectorWriter"  [override]

rosesyrett · 2023-10-13T20:43:16Z

once tom's async-status branch is rebased on top of bluesky, lint will pass

docs/examples/ad_demo.py

src/ophyd_async/core/sim_signal_backend.py

src/ophyd_async/epics/areadetector/areadetector.py

src/ophyd_async/epics/areadetector/controllers/ad_controller.py

Add attribute xml

src/ophyd_async/epics/areadetector/areadetector.py

Co-authored-by: Tom C (DLS) <101418278+coretl@users.noreply.github.com>

…_value

…d connect methods

* Move missing types from i22 branch for Pandas * lint * expose seq_table_from_arrays * Document seq_table_from_ functions - Make seq_table_from_arrays kwarg only and make time2 a required argument - Add docstrings * Linting * Prevent exception on truthiness of non-empty array * Add tests for from_array * linting * Mypy formatting * Made correct path for saxs sum detector; see dodal commit * made flyer work * Renamed ADDriver to ADBase and removed ad aravis as not generic enough --------- Co-authored-by: Ware, Joseph (DLSLtd,RAL,LSCI) <joseph.ware@diamond.ac.uk>

Move logic pertaining to writing/controlling detectors from i22 branch

7a91511

rosesyrett requested a review from coretl October 6, 2023 16:42

Rename implementations of DetectorControl to Controllers, restructure…

016b0f3

… areadetector

rosesyrett marked this pull request as draft October 6, 2023 16:51

coretl reviewed Oct 9, 2023

View reviewed changes

Rose Yemelyanova added 3 commits October 9, 2023 11:47

Remove ShapeProvider in favour of enforcing controller behaviour

0c9f7f1

Lint

671fe38

Reinstate ShapeProvider

0d9e84f

rosesyrett commented Oct 9, 2023

View reviewed changes

src/ophyd_async/core/_detector/standard_detector.py Outdated Show resolved Hide resolved

Rose Yemelyanova and others added 10 commits October 9, 2023 16:19

Respond to comments

c329edd

Add in ShapeProvider in HDFWriter definition, remove redundant test

3469350

flattened core structure and added flyers

7666c31

Fixes to make it work with simDetector

dbe8f55

Null terminate CA long strings

07b725f

Prevent a shortened string in a waveform from using the end of the old string. Should probably be fixed on the server side, but this is what EDM does so fix here for now

Merge branch 'add-detector-logic' of github.com:bluesky/ophyd-async i…

0d888c4

…nto add-detector-logic

Add tests

45db338

Merge branch 'add-detector-logic-rose' into add-detector-logic

b9364ca

Add tests and rebase after Tom's changes

dc6d247

Add more test cases

75132a9

DiamondJoseph mentioned this pull request Oct 12, 2023

add directory provider and i22 example DiamondLightSource/dodal#193

Closed

Ensure tests pass

e36fc0e

rosesyrett marked this pull request as ready for review October 12, 2023 16:01

rosesyrett requested review from coretl and callumforrester October 12, 2023 16:01

coretl reviewed Oct 12, 2023

View reviewed changes

Rose Yemelyanova added 3 commits October 12, 2023 17:54

Lint and fix some mypy issues

dac36e7

made area detector test have larger tolerance for time checking

44e30de

Respond to comments

ed55521

Fix linting

334c5d7

Fixed failing writer tests and added them to suite

d61f3fa

Rose Yemelyanova and others added 3 commits October 13, 2023 21:48

placate codecov

9b71a06

remove pilatus detector (#28)

2d1e8e3

Fix lint and test

c7ef628

rosesyrett mentioned this pull request Oct 16, 2023

Add pilatus detector DiamondLightSource/dodal#206

Closed

coretl and others added 3 commits October 16, 2023 10:51

Fix flaky watcher test (#30)

07541e0

Add extra test and remove temporary fix for fixing flaky test

57b9fdc

Add attribute xml

9cd84f3

coretl reviewed Oct 16, 2023

View reviewed changes

Merge pull request #29 from bluesky/attribute-xml

cc0c4e2

Add attribute xml

coretl reviewed Oct 16, 2023

View reviewed changes

src/ophyd_async/epics/areadetector/areadetector.py Outdated Show resolved Hide resolved

rosesyrett and others added 3 commits October 16, 2023 13:49

Update src/ophyd_async/epics/areadetector/controllers/ad_controller.py

a296bb5

Co-authored-by: Tom C (DLS) <101418278+coretl@users.noreply.github.com>

Rename ad_controller to ad_sim_controller and expand set_and_wait_for…

2d4cdd6

…_value

fix tests

a08882a

DiamondJoseph mentioned this pull request Oct 16, 2023

Move util functions from i22 branch of ophyd_async that may be generally useful DiamondLightSource/dls-bluesky-core#10

Merged

Rose Yemelyanova and others added 9 commits October 16, 2023 17:02

Make util function stop_busy_record and add ad aravis detector

f5effd4

Add validation for config sigs, simplify StandardDetector set_name an…

5a328ff

…d connect methods

Modify Aravis driver/controller

7d1f39d

Fix name changing issues

1ef3737

Adding hints to detector

2f21474

Made flyer have hints

5ac3689

Linting

6173fec

Merge branch 'main' into add-detector-logic

5238c91

DiamondJoseph approved these changes Oct 20, 2023

View reviewed changes

rosesyrett merged commit 30ffafe into main Oct 20, 2023
14 checks passed

rosesyrett deleted the add-detector-logic branch October 20, 2023 15:29

This was referenced Apr 16, 2024

ValueChecker needs a default value for _last_value #7

Closed

signal puts don't always wait for callback, and preemptively raise timeout error. #6

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move logic pertaining to writing/controlling detectors from i22 branch #24

Move logic pertaining to writing/controlling detectors from i22 branch #24

rosesyrett commented Oct 6, 2023

coretl left a comment

coretl left a comment

rosesyrett commented Oct 12, 2023

rosesyrett commented Oct 13, 2023

Move logic pertaining to writing/controlling detectors from i22 branch #24

Move logic pertaining to writing/controlling detectors from i22 branch #24

Conversation

rosesyrett commented Oct 6, 2023

coretl left a comment

Choose a reason for hiding this comment

coretl left a comment

Choose a reason for hiding this comment

rosesyrett commented Oct 12, 2023

rosesyrett commented Oct 13, 2023