From 41a2bc110c1b346e503e1443e91285825e863d0d Mon Sep 17 00:00:00 2001 From: shashank40 Date: Tue, 18 Jun 2024 20:30:16 +0530 Subject: [PATCH 1/3] Fix : Local development failing due to changed function definition --- openadapt/start.py | 5 +++-- openadapt/strategies/vanilla.py | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/openadapt/start.py b/openadapt/start.py index 9e4db6b3d..afe5d932c 100644 --- a/openadapt/start.py +++ b/openadapt/start.py @@ -3,11 +3,12 @@ Usage: python3 -m openadapt.start """ + import subprocess from loguru import logger -from openadapt.app.main import run_app +from openadapt.app.main import start def main() -> None: @@ -24,7 +25,7 @@ def main() -> None: subprocess.run(["git", "pull", "-q"]) logger.info("Updated the OpenAdapt App") - run_app() # start gui + start() # start gui if __name__ == "__main__": diff --git a/openadapt/strategies/vanilla.py b/openadapt/strategies/vanilla.py index 75227d799..caf4f0f1a 100644 --- a/openadapt/strategies/vanilla.py +++ b/openadapt/strategies/vanilla.py @@ -35,20 +35,20 @@ class VanillaReplayStrategy(strategies.base.BaseReplayStrategy): def __init__( self, recording: models.Recording, - replay_instructions: str = "", + instructions: str = "", process_events: bool = PROCESS_EVENTS, ) -> None: """Initialize the VanillaReplayStrategy. Args: recording (models.Recording): The recording object. - replay_instructions (str): Natural language instructions + instructions (str): Natural language instructions for how recording should be replayed. process_events (bool): Flag indicating whether to process the events. Defaults to True. """ super().__init__(recording) - self.replay_instructions = replay_instructions + self.instructions = instructions self.process_events = process_events self.action_history = [] self.action_event_idx = 0 @@ -89,7 +89,7 @@ def get_next_action_event( window_event, action_events, self.action_history, - self.replay_instructions, + self.instructions, ) if not action_event: raise StopIteration() @@ -161,7 +161,7 @@ def generate_action_event( current_window_event: models.WindowEvent, recorded_actions: list[models.ActionEvent], replayed_actions: list[models.ActionEvent], - replay_instructions: str, + instructions: str, ) -> models.ActionEvent: """Modify the given ActionEvents according to the given replay instructions. @@ -176,7 +176,7 @@ def generate_action_event( recording replayed_actions (list[models.ActionEvent]): list of actions produced during current replay - replay_instructions (str): proposed modifications in natural language + instructions (str): proposed modifications in natural language instructions Returns: @@ -195,7 +195,7 @@ def generate_action_event( current_window=current_window_dict, recorded_actions=recorded_action_dicts, replayed_actions=replayed_action_dicts, - replay_instructions=replay_instructions, + instructions=instructions, ) prompt_adapter = adapters.get_default_prompt_adapter() content = prompt_adapter.prompt( From 748e08a6cc83bbd21db2c82791ba53f745da562b Mon Sep 17 00:00:00 2001 From: shashank40 Date: Tue, 18 Jun 2024 21:01:10 +0530 Subject: [PATCH 2/3] Moved start.py to deprecated --- openadapt/{ => deprecated}/start.py | 0 openadapt/strategies/vanilla.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename openadapt/{ => deprecated}/start.py (100%) diff --git a/openadapt/start.py b/openadapt/deprecated/start.py similarity index 100% rename from openadapt/start.py rename to openadapt/deprecated/start.py diff --git a/openadapt/strategies/vanilla.py b/openadapt/strategies/vanilla.py index caf4f0f1a..0f9fea9ba 100644 --- a/openadapt/strategies/vanilla.py +++ b/openadapt/strategies/vanilla.py @@ -195,7 +195,7 @@ def generate_action_event( current_window=current_window_dict, recorded_actions=recorded_action_dicts, replayed_actions=replayed_action_dicts, - instructions=instructions, + replay_instructions=instructions, ) prompt_adapter = adapters.get_default_prompt_adapter() content = prompt_adapter.prompt( From 98e74cd31066153bc63e787fdf8e624800572d02 Mon Sep 17 00:00:00 2001 From: shashank40 Date: Tue, 18 Jun 2024 23:10:12 +0530 Subject: [PATCH 3/3] User app failing in record playing --- openadapt/app/tray.py | 2 +- openadapt/visualize.py | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/openadapt/app/tray.py b/openadapt/app/tray.py index 1f7e52b55..34693e148 100644 --- a/openadapt/app/tray.py +++ b/openadapt/app/tray.py @@ -449,7 +449,7 @@ def populate_menu(self, menu: QMenu, action: Callable, action_type: str) -> None menu.addAction(no_recordings_action) self.recording_actions[action_type].append(no_recordings_action) else: - for idx, recording in enumerate(recordings): + for recording in recordings: formatted_timestamp = datetime.fromtimestamp( recording.timestamp ).strftime("%Y-%m-%d %H:%M:%S") diff --git a/openadapt/visualize.py b/openadapt/visualize.py index 850da09d8..e0f37ac4d 100644 --- a/openadapt/visualize.py +++ b/openadapt/visualize.py @@ -133,12 +133,18 @@ def dict2html( children = indicate_missing(children, all_children, "...") html_str = "\n".join(children) elif isinstance(obj, dict): - rows_html = "\n".join([f""" + rows_html = "\n".join( + [ + f""" {format_key(key, value)} {dict2html(value, max_children)} - """ for key, value in obj.items() if value not in EMPTY]) + """ + for key, value in obj.items() + if value not in EMPTY + ] + ) html_str = f"{rows_html}
" else: html_str = html.escape(str(obj)) @@ -154,8 +160,8 @@ def dict2html( @logger.catch def main( - recording: Recording = None, recording_id: int = None, + recording: Recording = None, diff_video: bool = False, cleanup: bool = True, ) -> bool: @@ -223,7 +229,8 @@ def main( if SCRUB: recording_dict = scrub.scrub_dict(recording_dict) - CSS = string.Template(""" + CSS = string.Template( + """ table { outline: 1px solid black; } @@ -257,7 +264,8 @@ def main( .screenshot:active img:nth-child(3) { display: block; } - """).substitute( + """ + ).substitute( IMG_WIDTH_PCT=IMG_WIDTH_PCT, ) @@ -381,11 +389,13 @@ def main( """, ), - Div(text=f""" + Div( + text=f""" {dict2html(action_event_dict)}
- """), + """ + ), ), ] )