Set up blueapi #95

noemifrisina · 2024-05-15T08:43:39Z

Closes #93

Set up blueapi config and start runner
Make all functions into plans and add typing
Call the plans using blueapi in the edm screens

Note. This should be a first step #45 . The blueapi worker need to be run on the control machine as gda2 for th permission issues to go away.

DominicOram

Thank you! Couple of comments

DominicOram · 2024-06-03T13:01:53Z

src/mx_bluesky/I24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py

@@ -65,7 +64,8 @@ def _coerce_to_path(path: Path | str) -> Path:


 @log.log_on_entry
-def initialise_extruderi24(args=None):
+def initialise_extruder() -> MsgGenerator:
+    setup_logging()


Comment: It's messy we have to set this up at the start of every plan, I have put DiamondLightSource/blueapi#494 on the i24 backlog to fix

I just linked the issue for now

DominicOram · 2024-06-03T13:03:47Z

src/mx_bluesky/I24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py

-def run_extruderi24(args=None):
-    # Get dodal devices
-    zebra = i24.zebra()
+def run_extruder_plan(zebra: Zebra) -> MsgGenerator:


Should: I think we can just default this so we don't need to always provide it https://diamondlightsource.github.io/blueapi/main/how-to/write-plans.html#injecting-defaults. There's only one zebra we would ever do this with after all.

I think this is probably true for most of the device arguments throughout actually

DominicOram · 2024-06-03T13:07:03Z

src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

+    # TODO have this in each function
+    # Really tempted to make a wrapper ...


Yes, you do need to add it for now but I think then prioritise the blueapi issue

DominicOram · 2024-06-03T13:08:11Z

src/mx_bluesky/I24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl

@@ -3834,7 +3834,7 @@ font "arial-bold-r-14.0"
 buttonLabel "Move on Click"
 numCmds 1
 command {
-  0 "python SCRIPTS_LOCATION/fixed_target/i24ssx_moveonclick.py"
+  0 "blueapi -c CONFIG_LOCATION controller run start_viewer '\{\"oav\":\"oav\",\"pmac\":\"pmac\"\}'"


Must: I don't think you can run this through BlueAPI because it has a GUI. I think you need to just keep it outside BlueAPI for now

Mmm, this is actually one of the things I tested on the beamline and the GUI seemed to work fine...

Edit: the GUI works fine, the issue comes when clicking on one of the move to buttons, which run other plans... Here blueAPI will fail with this error:

Traceback (most recent call last): File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/bin/blueapi", line 8, in <module> sys.exit(main()) ^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/click/core.py", line 1130, in __call__ return self.main(*args, **kwargs) ^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/click/core.py", line 1055, in main rv = self.invoke(ctx) ^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/click/core.py", line 1657, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/click/core.py", line 1657, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/click/core.py", line 1404, in invoke return ctx.invoke(self.callback, **ctx.params) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/click/core.py", line 760, in invoke return __callback(*args, **kwargs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/blueapi/cli/cli.py", line 107, in wrapper func(*args, **kwargs) File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/click/decorators.py", line 38, in new_func return f(get_current_context().obj, *args, **kwargs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/blueapi/cli/cli.py", line 212, in run_plan updated = client.update_worker_task(WorkerTask(task_id=task_id)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/blueapi/cli/rest.py", line 90, in update_worker_task return self._request_and_deserialize( ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/dls_sw/i24/software/bluesky/mx_bluesky_testing/mx_bluesky/.venv/lib/python3.11/site-packages/blueapi/cli/rest.py", line 124, in _request_and_deserialize raise BlueskyRemoteError(error_message) blueapi.cli.event_bus_client.BlueskyRemoteError: Response failed with text: {"detail":"Worker already active"}, with error code: 409 which corresponds to Conflict

The GUI won't work when it's being run by the BlueAPI server that's running on the control machine...

DominicOram · 2024-06-03T13:08:36Z

src/mx_bluesky/I24/serial/fixed_target/i24ssx_moveonclick.py

+# if __name__ == "__main__":
+# start_viewer()


Must: As above, I think this needs to stay and not be in BlueAPI

DominicOram · 2024-06-03T13:11:05Z

src/mx_bluesky/I24/serial/run_extruder.sh

+# Start the blueapi worker using the config file in this module
+echo "Starting the blueapi runner"
+blueapi -c "${current}/blueapi_config.yaml" serve &
+
+# Wait for blueapi to start
+for i in {1..30}
+do
+    echo "$(date)"
+    curl --head -X GET http://localhost:25565/status >/dev/null
+    ret_value=$?
+    if [ $ret_value -ne 0 ]; then
+        sleep 1
+    else
+        break
+    fi
+done
+
+if [ $ret_value -ne 0 ]; then
+    echo "$(date) BLUEAPI Failed to start!!!!"
+    exit 1
+else
+    echo "$(date) BLUEAPI started"
+fi


Should: Can we move all this into it's own script for starting the server? Then have this and run_fixed_target both call that script (which will eventually move to control machine)

…t and extruder

DominicOram

Thank you! Couple of small comments but generally good.

DominicOram · 2024-06-10T08:10:06Z

src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

@@ -243,13 +256,16 @@ def save_screen_map(litemap_path: Path | str = LITEMAP_PATH) -> MsgGenerator:
 @log.log_on_entry
 def upload_parameters(
    chipid: str = "oxford",
-    litemap_path: Path | str = LITEMAP_PATH,
+    map_path: Optional[str] = None,


Should: I think this string stuff is messy. Could you either add an issue here or on blueAPI to think of a nicer way to do it? It may be that using https://docs.pydantic.dev/latest/api/types/#pydantic.types.FilePath will help

Opened issue here #107 . I was going to open one in blueAPI but since the error came from pydantic, it might be worth to first try this.

DominicOram · 2024-06-10T08:11:17Z

src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

@@ -921,16 +939,15 @@ def check_dir(val):
    else:
        pmac.home_stages()
    logger.debug("CSmaker done.")
-    yield from bps.null()
+    yield from bps.sleep(5)


Should: Why is this sleep here?

Ah, that was from testing on the beamline, issue turned out to be somewhere else, should not have been committed. Removed now.

DominicOram

Great, thank you!

noemifrisina added 21 commits April 23, 2024 11:35

Add blueapi to pyproject

8a1e0ae

Merge branch 'main' into 93_use-blueapi

3f8e603

Add typing

e210ae9

Add explicit dependency pin for fastapi

99241a8

Fixt blueapi example

157d3ff

Edm fix

038109a

Add some bash scripts to start the bluesky worker and the edm screens

7ddba58

Move the extruder to blueapi

f2a5e3c

Rename for clarity

8158ba7

Start chip from collect

395eb05

Revert accidental save

ea2b282

Start on chip manager

09f8edc

Add initialise_stages to blueapi

f268ffb

Fix tests

532c7f2

Add some plans from manager

c396496

Moveto and fiducials to blueapi

9dc82c1

Custom chip to blueapi

87e1a54

Blueapi in mapping for oxford chip

b67d5d8

Chip pump probe to blueapi

efa2c98

Move viewer to blueapi

bf1b847

Add missing type

838d603

noemifrisina marked this pull request as ready for review May 15, 2024 09:59

noemifrisina added 6 commits May 15, 2024 11:12

Get devices as input for plan

3c87e36

Same for extruder

9382ba3

Fix test

91a6026

Tidy up a bit

8833f92

Remember to mock

9f4c2f8

Fix typo

89c5ee0

noemifrisina requested a review from DominicOram May 15, 2024 12:39

Fix typo in module name

b5391b2

Actually save the file

aace4ac

DominicOram requested changes Jun 3, 2024

View reviewed changes

noemifrisina added 19 commits June 4, 2024 10:03

Fix path to xml file for OAV after GAD update

a1f9442

Do not have OAV viewer as a plan

a2de650

Remove start_veiwer from list of plans

56d6e7a

Escape some more

92adb72

Add script for starting blueapi server

ad82cfd

Workaround for path input, TBC

be18aba

Update from beamline

e8af6c7

Path workaround

bd38c37

Export env variable to allow stage edms to work

4690511

Use dodal commit with correct OAV path

8a0e5d3

more beamline update

15b99a6

more paths

efab153

Merge branch 'main' into 93_use-blueapi

dc00602

Pin dodal back to main

0d24744

Uncomment set detector removed for testing

8ffe429

Add link to logging issue

0bf7b04

Have the common script for starting blueapi called by run_fixed_targe…

f5c6df1

…t and extruder

Use inject to pass devices to plans

9314ba8

Call setup logging in all the plans run by the blueapi cli

2839a54

noemifrisina requested a review from DominicOram June 4, 2024 16:46

DominicOram requested changes Jun 10, 2024

View reviewed changes

Remove sleep

946e0f7

noemifrisina mentioned this pull request Jun 10, 2024

I24ssx: Use hard coded paths for parameter/map file paths in plans #107

Closed

Add a comment with link to new issue!

3223cf5

noemifrisina requested a review from DominicOram June 10, 2024 08:42

DominicOram approved these changes Jun 10, 2024

View reviewed changes

DominicOram merged commit 06de4e8 into main Jun 10, 2024
13 checks passed

DominicOram deleted the 93_use-blueapi branch June 10, 2024 11:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set up blueapi #95

Set up blueapi #95

noemifrisina commented May 15, 2024

DominicOram left a comment

DominicOram Jun 3, 2024

noemifrisina Jun 4, 2024

DominicOram Jun 3, 2024

DominicOram Jun 3, 2024

DominicOram Jun 3, 2024

DominicOram Jun 3, 2024

noemifrisina Jun 4, 2024

noemifrisina Jun 4, 2024

DominicOram Jun 4, 2024

DominicOram Jun 3, 2024

DominicOram Jun 3, 2024

DominicOram left a comment

DominicOram Jun 10, 2024

noemifrisina Jun 10, 2024

DominicOram Jun 10, 2024

noemifrisina Jun 10, 2024

DominicOram left a comment

		# TODO have this in each function
		# Really tempted to make a wrapper ...

Set up blueapi #95

Set up blueapi #95

Conversation

noemifrisina commented May 15, 2024

DominicOram left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DominicOram left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DominicOram left a comment

Choose a reason for hiding this comment