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

Fix/window event race condition #842

Open
wants to merge 43 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
4f68487
add joinedload to eagerly load related entities
Animesh404 Jul 3, 2024
85d0100
change get_active_window_data to return empty dict when state is none
Animesh404 Jul 4, 2024
1feea90
add eager as parameter in _get
Animesh404 Jul 4, 2024
418fdef
chore: try pygetwindows
Animesh404 Jul 5, 2024
3410e32
window-event performance test
Animesh404 Jul 8, 2024
b0a66ed
remove unwanted changes from other files
Animesh404 Jul 8, 2024
7ad454b
Merge branch 'main' into fix/WindowEvent-race-condition
Animesh404 Jul 8, 2024
51986f7
fix: add new A11yEvent model
Animesh404 Jul 16, 2024
8b0937d
Merge branch 'main' into fix/WindowEvent-race-condition
Animesh404 Jul 16, 2024
bba8101
remove unnecessary comment
Animesh404 Jul 16, 2024
f770251
Merge branch 'fix/WindowEvent-race-condition' of https://github.com/A…
Animesh404 Jul 16, 2024
a9ecc15
fix: change WindowEvent Model
Animesh404 Jul 16, 2024
ed43695
fixing crud and record.py for a11yevents
Animesh404 Jul 16, 2024
1543390
remove unnecessary test file as we are not using pygetwindow
Animesh404 Jul 16, 2024
28fe26d
fix: fixing data removal logic in WindowEvent model
Animesh404 Jul 17, 2024
8dabc63
add handle and remove window_id
Animesh404 Jul 18, 2024
bbe0c47
chore: db revision
Animesh404 Jul 18, 2024
488bf4b
fix: remove state from window_event and add a11y_counter
Animesh404 Jul 21, 2024
e89710c
remove state from window_event
Animesh404 Jul 22, 2024
574e133
fix: add a11y_event in visualize
Animesh404 Jul 23, 2024
51db67d
Merge branch 'main' into fix/WindowEvent-race-condition
Animesh404 Jul 23, 2024
6e60017
fix: replay error fix and black error fix
Animesh404 Jul 23, 2024
950c1a0
Merge branch 'main' of https://github.com/OpenAdaptAI/OpenAdapt into …
Animesh404 Jul 23, 2024
8b125e4
fix: formatting
Animesh404 Jul 23, 2024
4841c50
Merge branch 'fix/WindowEvent-race-condition' of https://github.com/A…
Animesh404 Jul 23, 2024
31c270f
fix: flake8 error
Animesh404 Jul 23, 2024
32a42ec
Update models.py
abrichr Jul 24, 2024
27e8c75
Update record.py: add a11y_event_reader
abrichr Jul 24, 2024
db6b05a
fix: add read_a11y_data in config
Animesh404 Jul 25, 2024
b275f35
conflict resolve
Animesh404 Jul 25, 2024
6623bb9
resolve conflicts
Animesh404 Jul 25, 2024
597f6c0
remove unnecessry comments and items
Animesh404 Jul 25, 2024
403750a
remove duplicate values from merge resolution
Animesh404 Jul 25, 2024
1148967
rename RECORD_WINDOW_DATA to RECORD_A11Y_DATA and state to a11y_data
Animesh404 Jul 25, 2024
85e23bb
fix: change to_prompt_dict in WindowEvent
Animesh404 Jul 25, 2024
5bfb833
resolve conflict
Animesh404 Jul 25, 2024
d402968
change to_prompt_dict in WindowEvent model
Animesh404 Jul 25, 2024
4147c1c
Merge branch 'main' into fix/WindowEvent-race-condition
Animesh404 Jul 25, 2024
25b830a
update to_prompt_dict
Animesh404 Jul 25, 2024
bf04f51
Merge branch 'fix/WindowEvent-race-condition' of https://github.com/A…
Animesh404 Jul 25, 2024
8c0d2e6
add a11y_data in dashboard
Animesh404 Jul 26, 2024
78ae338
Merge branch 'main' into fix/WindowEvent-race-condition
Animesh404 Jul 26, 2024
3b0ada0
use pygetwindow for window and pywinauto for a11y and display a11y on…
Animesh404 Jul 29, 2024
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
fix: formatting
  • Loading branch information
Animesh404 committed Jul 23, 2024
commit 8b125e4ac0d208374dabbd2cfc4f955b0dbd36c1
9 changes: 8 additions & 1 deletion openadapt/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,14 @@ def to_prompt_dict(self, include_data: bool = True) -> dict[str, Any]:
if "state" in window_dict:
if include_data:
key_suffixes = [
"value", "h", "w", "x", "y", "description", "title", "help",
"value",
"h",
"w",
"x",
"y",
"description",
"title",
"help",
]
if sys.platform == "win32":
logger.warning(
Expand Down