Allow OAV to Redis forwarder to use different OAV streams #808
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #808 +/- ##
=======================================
Coverage 95.02% 95.03%
=======================================
Files 117 117
Lines 4765 4771 +6
=======================================
+ Hits 4528 4534 +6
Misses 237 237 ☔ View full report in Codecov by Sentry. |
DominicOram
requested review from
rtuck99,
noemifrisina,
dperl-dls,
olliesilvester and
aragaod
4 tasks
olliesilvester
approved these changes
Oct 9, 2024
Comment on lines
71
to
74
| Source.FULL_SCREEN.value: epics_signal_r( | ||
| str, f"{prefix}MJPG:MJPG_URL_RBV" | ||
| ), | ||
| Source.ROI.value: epics_signal_r(str, f"{prefix}XTAL:MJPG_URL_RBV"), |
There was a problem hiding this comment.
Looking at the stream links, the XTL is a larger image than the MPJG - are these definitely the right way round?
There was a problem hiding this comment.
Good spot! Thanks!
| @@ -95,7 +110,8 @@ async def _get_frame_and_put_to_redis(self, response: ClientResponse): | |||
| async def _open_connection_and_do_function( | |||
| self, function_to_do: Callable[[ClientResponse, str | None], Awaitable] | |||
| ): | |||
| stream_url = await self.stream_url.get_value() | |||
| source = await self.selected_source.get_value() | |||
There was a problem hiding this comment.
Could: use asyncio.gather for consecutive reads
There was a problem hiding this comment.
I don't think I can here because the read of stream_url needs the value from the read of source. asyncio.gather will try and read them in parallel
Refactor the tests that are testing logic of one channel to be clearer that's what they're doing.
This reverts commit c6c6eca.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needed for DiamondLightSource/mx-bluesky#511
Instructions to reviewer on how to test:
Checks for reviewer
dodal connect ${BEAMLINE}