- Sponsor
-
Notifications
You must be signed in to change notification settings - Fork 174
Feat/performance test #850
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
Open
Animesh404
wants to merge
13
commits into
OpenAdaptAI:main
Choose a base branch
from
Animesh404:feature/performance_test
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+393
−11
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
a70ef2c
extracting difference between two images
Animesh404 dda2699
feat:add combine segmentation in visual.py and extract difference in …
Animesh404 7dada60
fix: filter out the masked_image and the desc that are not relevant f…
Animesh404 65c876f
WIP
Animesh404 383002a
testing visual strategy
Animesh404 f745538
Merge remote-tracking branch 'upstream/main' into fix/avoid-unnecessa…
Animesh404 ca30b15
performance test using naivereplaystrategy
Animesh404 cb90893
Merge branch 'main' of https://github.com/OpenAdaptAI/OpenAdapt into …
Animesh404 aa9b901
Merge branch 'main' of https://github.com/OpenAdaptAI/OpenAdapt into …
Animesh404 8450cea
feat: performance test
Animesh404 da5d410
fix: remove unnecessary file changes
Animesh404 929c31b
fix: remove unnecessary file change
Animesh404 36e183f
feat: a11y for macos
Animesh404 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
"""This module provides platform-specific implementations for window and element | ||
interactions using accessibility APIs. It abstracts the platform differences | ||
and provides a unified interface for retrieving the active window, finding | ||
display elements, and getting element values. | ||
""" | ||
|
||
import sys | ||
|
||
from loguru import logger | ||
|
||
if sys.platform == "darwin": | ||
from . import _macos as impl | ||
|
||
role = "AXStaticText" | ||
elif sys.platform in ("win32", "linux"): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remove |
||
from . import _windows as impl | ||
|
||
role = "Text" | ||
else: | ||
raise Exception(f"Unsupported platform: {sys.platform}") | ||
|
||
|
||
def get_active_window(): | ||
"""Get the active window object. | ||
|
||
Returns: | ||
The active window object. | ||
""" | ||
try: | ||
return impl.get_active_window() | ||
except Exception as exc: | ||
logger.warning(f"{exc=}") | ||
return None | ||
|
||
|
||
def get_element_value(active_window, role=role): | ||
"""Find the display of active_window. | ||
|
||
Args: | ||
active_window: The parent window to search within. | ||
|
||
Returns: | ||
The found active_window. | ||
""" | ||
try: | ||
return impl.get_element_value(active_window, role) | ||
except Exception as exc: | ||
logger.warning(f"{exc=}") | ||
return None |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
import AppKit | ||
import ApplicationServices | ||
|
||
|
||
def get_attribute(element, attribute): | ||
result, value = ApplicationServices.AXUIElementCopyAttributeValue( | ||
element, attribute, None | ||
) | ||
if result == 0: | ||
return value | ||
return None | ||
|
||
|
||
def find_element_by_attribute(element, attribute, value): | ||
if get_attribute(element, attribute) == value: | ||
return element | ||
children = get_attribute(element, ApplicationServices.kAXChildrenAttribute) or [] | ||
for child in children: | ||
found = find_element_by_attribute(child, attribute, value) | ||
if found: | ||
return found | ||
return None | ||
|
||
|
||
def get_active_window(): | ||
"""Get the active window object. | ||
|
||
Returns: | ||
AXUIElement: The active window object. | ||
""" | ||
workspace = AppKit.NSWorkspace.sharedWorkspace() | ||
active_app = workspace.frontmostApplication() | ||
app_element = ApplicationServices.AXUIElementCreateApplication( | ||
active_app.processIdentifier() | ||
) | ||
|
||
error_code, focused_window = ApplicationServices.AXUIElementCopyAttributeValue( | ||
app_element, ApplicationServices.kAXFocusedWindowAttribute, None | ||
) | ||
if error_code: | ||
raise Exception("Could not get the active window.") | ||
return focused_window | ||
|
||
|
||
def get_element_value(element, role="AXStaticText"): | ||
"""Get the value of a specific element . | ||
|
||
Args: | ||
element: The AXUIElement to search within. | ||
|
||
Returns: | ||
str: The value of the element, or an error message if not found. | ||
""" | ||
target_element = find_element_by_attribute( | ||
element, ApplicationServices.kAXRoleAttribute, role | ||
) | ||
if not target_element: | ||
return f"AXStaticText element not found." | ||
|
||
value = get_attribute(target_element, ApplicationServices.kAXValueAttribute) | ||
return value if value else f"No value for AXStaticText element." |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
from loguru import logger | ||
import pywinauto | ||
import re | ||
|
||
|
||
def get_active_window() -> pywinauto.application.WindowSpecification: | ||
"""Get the active window object. | ||
|
||
Returns: | ||
pywinauto.application.WindowSpecification: The active window object. | ||
""" | ||
app = pywinauto.application.Application(backend="uia").connect(active_only=True) | ||
window = app.top_window() | ||
return window.wrapper_object() | ||
|
||
|
||
def get_element_value(active_window, role="Text"): | ||
"""Find the display element. | ||
|
||
Args: | ||
active_window: The parent window to search within. | ||
role (str): The role of the element to search for. | ||
|
||
Returns: | ||
The found display element value. | ||
|
||
Raises: | ||
ValueError: If the element is not found. | ||
""" | ||
try: | ||
elements = active_window.descendants() # Retrieve all descendants | ||
for elem in elements: | ||
if ( | ||
elem.element_info.control_type == role | ||
and elem.element_info.name.startswith("Display is") | ||
): | ||
# Extract the number from the element's name | ||
match = re.search(r"[-+]?\d*\.?\d+", elem.element_info.name) | ||
if match: | ||
return str(match.group()) | ||
raise ValueError("Display element not found") | ||
except Exception as exc: | ||
logger.warning(f"Error in get_element_value: {exc}") | ||
return None |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
"""Configuration module for OpenAdapt.""" | ||
|
||
|
||
from enum import Enum | ||
from typing import Any, ClassVar, Type, Union | ||
import json | ||
|
@@ -33,6 +32,7 @@ | |
CAPTURE_DIR_PATH = (DATA_DIR_PATH / "captures").absolute() | ||
VIDEO_DIR_PATH = DATA_DIR_PATH / "videos" | ||
DATABASE_LOCK_FILE_PATH = DATA_DIR_PATH / "openadapt.db.lock" | ||
DB_FILE_PATH = (DATA_DIR_PATH / "openadapt.db").absolute() | ||
|
||
STOP_STRS = [ | ||
"oa.stop", | ||
|
@@ -124,7 +124,8 @@ class SegmentationAdapter(str, Enum): | |
|
||
# Database | ||
DB_ECHO: bool = False | ||
DB_URL: ClassVar[str] = f"sqlite:///{(DATA_DIR_PATH / 'openadapt.db').absolute()}" | ||
DB_FILE_PATH: str = str(DB_FILE_PATH) | ||
DB_URL: ClassVar[str] = f"sqlite:///{DB_FILE_PATH}" | ||
|
||
# Error reporting | ||
ERROR_REPORTING_ENABLED: bool = True | ||
|
@@ -428,11 +429,13 @@ def show_alert() -> None: | |
"""Show an alert to the user.""" | ||
msg = QMessageBox() | ||
msg.setIcon(QMessageBox.Warning) | ||
msg.setText(""" | ||
msg.setText( | ||
""" | ||
An error has occurred. The development team has been notified. | ||
Please join the discord server to get help or send an email to | ||
[email protected] | ||
""") | ||
""" | ||
) | ||
discord_button = QPushButton("Join the discord server") | ||
discord_button.clicked.connect( | ||
lambda: webbrowser.open("https://discord.gg/yF527cQbDG") | ||
|
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,151 @@ | ||
from sqlalchemy import create_engine, inspect | ||
from openadapt.db.db import Base | ||
from openadapt.config import PARENT_DIR_PATH, RECORDING_DIR_PATH | ||
import openadapt.db.crud as crud | ||
from loguru import logger | ||
|
||
|
||
def get_session(): | ||
""" | ||
Establishes a database connection and returns a session and engine. | ||
Returns: | ||
tuple: A tuple containing the SQLAlchemy session and engine. | ||
""" | ||
db_url = RECORDING_DIR_PATH / "recording.db" | ||
logger.info(f"Database URL: {db_url}") | ||
engine = create_engine(f"sqlite:///{db_url}") | ||
Base.metadata.create_all(bind=engine) | ||
session = crud.get_new_session(read_only=True) | ||
logger.info("Database connection established.") | ||
return session, engine | ||
|
||
|
||
def check_tables_exist(engine): | ||
""" | ||
Checks if the expected tables exist in the database. | ||
Args: | ||
engine: SQLAlchemy engine object. | ||
Returns: | ||
list: A list of table names in the database. | ||
""" | ||
inspector = inspect(engine) | ||
tables = inspector.get_table_names() | ||
expected_tables = [ | ||
"recording", | ||
"action_event", | ||
"screenshot", | ||
"window_event", | ||
"performance_stat", | ||
"memory_stat", | ||
] | ||
for table_name in expected_tables: | ||
table_exists = table_name in tables | ||
logger.info(f"{table_name=} {table_exists=}") | ||
return tables | ||
|
||
|
||
def fetch_data(session): | ||
""" | ||
Fetches the most recent recordings and related data from the database. | ||
Args: | ||
session: SQLAlchemy session object. | ||
Returns: | ||
dict: A dictionary containing fetched data. | ||
""" | ||
# get the most recent three recordings | ||
recordings = crud.get_recordings(session, max_rows=3) | ||
|
||
action_events = [] | ||
screenshots = [] | ||
window_events = [] | ||
performance_stats = [] | ||
memory_stats = [] | ||
|
||
for recording in recordings: | ||
action_events.extend(crud.get_action_events(session, recording)) | ||
screenshots.extend(crud.get_screenshots(session, recording)) | ||
window_events.extend(crud.get_window_events(session, recording)) | ||
performance_stats.extend(crud.get_perf_stats(session, recording)) | ||
memory_stats.extend(crud.get_memory_stats(session, recording)) | ||
|
||
data = { | ||
"recordings": recordings, | ||
"action_events": action_events, | ||
"screenshots": screenshots, | ||
"window_events": window_events, | ||
"performance_stats": performance_stats, | ||
"memory_stats": memory_stats, | ||
} | ||
|
||
# Debug prints to verify data fetching | ||
logger.info(f"Recordings: {len(data['recordings'])} found.") | ||
logger.info(f"Action Events: {len(data['action_events'])} found.") | ||
logger.info(f"Screenshots: {len(data['screenshots'])} found.") | ||
logger.info(f"Window Events: {len(data['window_events'])} found.") | ||
logger.info(f"Performance Stats: {len(data['performance_stats'])} found.") | ||
logger.info(f"Memory Stats: {len(data['memory_stats'])} found.") | ||
|
||
return data | ||
|
||
|
||
def format_sql_insert(table_name, rows): | ||
""" | ||
Formats SQL insert statements for a given table and rows. | ||
Args: | ||
table_name (str): The name of the table. | ||
rows (list): A list of SQLAlchemy ORM objects representing the rows. | ||
Returns: | ||
str: A string containing the SQL insert statements. | ||
""" | ||
if not rows: | ||
return "" | ||
|
||
columns = rows[0].__table__.columns.keys() | ||
sql = f"INSERT INTO {table_name} ({', '.join(columns)}) VALUES\n" | ||
values = [] | ||
|
||
for row in rows: | ||
row_values = [getattr(row, col) for col in columns] | ||
row_values = [ | ||
f"'{value}'" if isinstance(value, str) else str(value) | ||
for value in row_values | ||
] | ||
values.append(f"({', '.join(row_values)})") | ||
|
||
sql += ",\n".join(values) + ";\n" | ||
return sql | ||
|
||
|
||
def dump_to_fixtures(filepath): | ||
""" | ||
Dumps the fetched data into an SQL file. | ||
Args: | ||
filepath (str): The path to the SQL file. | ||
""" | ||
session, engine = get_session() | ||
check_tables_exist(engine) | ||
rows_by_table_name = fetch_data(session) | ||
|
||
for table_name, rows in rows_by_table_name.items(): | ||
if not rows: | ||
logger.warning(f"No rows for {table_name=}") | ||
continue | ||
with open(filepath, "a", encoding="utf-8") as file: | ||
logger.info(f"Writing {len(rows)=} to {filepath=} for {table_name=}") | ||
file.write(f"-- Insert sample rows for {table_name}\n") | ||
file.write(format_sql_insert(table_name, rows)) | ||
|
||
|
||
if __name__ == "__main__": | ||
|
||
fixtures_path = PARENT_DIR_PATH / "tests/assets/fixtures.sql" | ||
|
||
dump_to_fixtures(fixtures_path) |
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
import pytest | ||
from loguru import logger | ||
from openadapt.db.crud import ( | ||
get_recordings_by_desc, | ||
get_new_session, | ||
) | ||
from openadapt.replay import replay | ||
from openadapt.a11y import ( | ||
get_active_window, | ||
get_element_value, | ||
) | ||
|
||
|
||
# parametrized tests | ||
@pytest.mark.parametrize( | ||
"task_description, replay_strategy, expected_value, instructions", | ||
[ | ||
("test_calculator", "VisualReplayStrategy", "6", " "), | ||
("test_calculator", "VisualReplayStrategy", "8", "calculate 9-8+7"), | ||
# ("test_spreadsheet", "NaiveReplayStrategy"), | ||
# ("test_powerpoint", "NaiveReplayStrategy") | ||
], | ||
) | ||
def test_replay(task_description, replay_strategy, expected_value, instructions): | ||
# Get recordings which contain the string "test_calculator" | ||
session = get_new_session(read_only=True) | ||
recordings = get_recordings_by_desc(session, task_description) | ||
|
||
assert ( | ||
len(recordings) > 0 | ||
), f"No recordings found with task description: {task_description}" | ||
recording = recordings[0] | ||
|
||
result = replay( | ||
strategy_name=replay_strategy, | ||
recording=recording, | ||
instructions=instructions, | ||
) | ||
assert result is True, f"Replay failed for recording: {recording.id}" | ||
|
||
active_window = get_active_window() | ||
element_value = get_element_value(active_window) | ||
logger.info(element_value) | ||
|
||
assert ( | ||
element_value == expected_value | ||
), f"Value mismatch: expected '{expected_value}', got '{element_value}'" | ||
|
||
result_message = f"Value match: '{element_value}' == '{expected_value}'" | ||
logger.info(result_message) | ||
|
||
|
||
if __name__ == "__main__": | ||
pytest.main() |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove unnecessary indent