Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(api, robot-server): Refactor ProtocolRunner per protocol type #12343

Merged
merged 36 commits into from
Apr 17, 2023
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2410782
WIP: created an abstract interface for ProtocolRunner. started JsonRu…
TamarZanzouri Mar 14, 2023
290e860
WIP create_protocol_runner
TamarZanzouri Mar 16, 2023
842a99e
test json_runner and finished logic for json_runner
TamarZanzouri Mar 17, 2023
f5b5325
WIP python and legacy runner
TamarZanzouri Mar 17, 2023
7de1dae
python and legacy runner implementation
TamarZanzouri Mar 20, 2023
8f30fa7
create_simulating_runner.py
TamarZanzouri Mar 20, 2023
c73922c
fixed robot server dependencies.py
TamarZanzouri Mar 21, 2023
33c260a
MaintenanceRunner
TamarZanzouri Mar 21, 2023
b727804
wip robot-server
TamarZanzouri Mar 21, 2023
5ecd3cb
changed create_simulating_runner to monkeypatch
TamarZanzouri Mar 22, 2023
037f322
removed set_run_started_at and fixed test failing on started_at
TamarZanzouri Mar 22, 2023
d54c1ec
rollback depends for protocol_analyzer.py and moved runner creation i…
TamarZanzouri Mar 22, 2023
af5aaac
reorganize prtocol_runner tests and text fixes
TamarZanzouri Mar 23, 2023
3a870b0
removed task_queue from maintenance runner
TamarZanzouri Mar 23, 2023
4009a37
Merge branch 'edge' into RSS-200-refactor-protocol-runner
TamarZanzouri Mar 23, 2023
50978e3
linting
TamarZanzouri Mar 23, 2023
20d3c3f
fixed failing test in actions router
TamarZanzouri Mar 23, 2023
08524fd
fixed maintenance test with task runner
TamarZanzouri Mar 23, 2023
da0fdba
Update api/src/opentrons/protocol_runner/protocol_runner.py
TamarZanzouri Mar 27, 2023
b38aaf7
pr feedback
TamarZanzouri Mar 27, 2023
14e2fa0
changed ProtocolRunResult to RunnerRunResult
TamarZanzouri Mar 27, 2023
5aa7899
added linting ignore
TamarZanzouri Mar 28, 2023
f36be33
fixed g-code testing
TamarZanzouri Mar 28, 2023
a81df1d
g-code testing fix
TamarZanzouri Mar 28, 2023
b647315
linting
TamarZanzouri Mar 28, 2023
e802d65
linting
TamarZanzouri Mar 28, 2023
923e00c
added pe.play for run live commands
TamarZanzouri Mar 28, 2023
e1e9ddd
added tavern test for posting protocol commands
TamarZanzouri Mar 29, 2023
88cae89
addressed PR comments, fixed live runner bug, updated tests
sanni-t Apr 5, 2023
742e292
updated tests, fixed linter errors
sanni-t Apr 5, 2023
93be36f
Merge branch 'edge' into RSS-200-refactor-protocol-runner
sanni-t Apr 7, 2023
56a1b2f
correct docstring
sanni-t Apr 7, 2023
b272e10
Apply suggestions from code review
sanni-t Apr 13, 2023
433ca47
fix runner smoke tests and linter errors, some renaming from PR review
sanni-t Apr 14, 2023
b6e7385
update runner typing & type naming, renamed set_task_queue_wait() to …
sanni-t Apr 14, 2023
5789c41
address all remaining review comments
sanni-t Apr 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added linting ignore
  • Loading branch information
TamarZanzouri committed Mar 28, 2023
commit 5aa78999bf3f5e2a1bd67d70888ec2b2ae020c7a
4 changes: 2 additions & 2 deletions api/tests/opentrons/protocol_runner/test_protocol_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ async def test_create_protocol_runner(
legacy_context_creator: LegacyContextCreator,
legacy_executor: LegacyExecutor,
config: Optional[Union[JsonProtocolConfig, PythonProtocolConfig]],
runner_type: AbstractRunner,
runner_type: Union[JsonRunner, PythonAndLegacyRunner, LiveRunner],
) -> None:
"""It should return protocol runner type depending on the config."""
assert isinstance(
Expand All @@ -186,7 +186,7 @@ async def test_create_protocol_runner(
json_file_reader=json_file_reader,
json_translator=json_translator,
),
runner_type,
runner_type, # type: ignore[arg-type]
SyntaxColoring marked this conversation as resolved.
Show resolved Hide resolved
)


Expand Down