Final review multi_apps fix the rest part
This commit is contained in:
@@ -29,8 +29,8 @@ def is_expected_active_tab(active_tab_info: Dict[str, str], rule: Dict[str, Any]
|
||||
actual_url = active_tab_info.get('url', None)
|
||||
else:
|
||||
actual_url = active_tab_info
|
||||
print("expected_url: {}".format(expected_url))
|
||||
print("actual_url: {}".format(actual_url))
|
||||
logger.info("expected_url: {}".format(expected_url))
|
||||
logger.info("actual_url: {}".format(actual_url))
|
||||
return 1 if compare_urls(expected_url, actual_url) else 0
|
||||
else:
|
||||
logger.error(f"Unknown type: {match_type}")
|
||||
@@ -76,23 +76,26 @@ def is_expected_url_pattern_match(result, rules) -> float:
|
||||
|
||||
if type(result) == dict:
|
||||
result_url = result["url"]
|
||||
print("result url: {}".format(result_url))
|
||||
logger.info("result url: {}".format(result_url))
|
||||
else:
|
||||
result_url = result
|
||||
# expect_regex = re.compile(rules["expected"])
|
||||
patterns = rules["expected"]
|
||||
print("expected_regex: {}".format(patterns))
|
||||
logger.info("expected_regex: {}".format(patterns))
|
||||
for pattern in patterns:
|
||||
match = re.search(pattern, result_url)
|
||||
print(match)
|
||||
logger.info("match: {}".format(match))
|
||||
if not match:
|
||||
return 0.
|
||||
return 1.
|
||||
|
||||
|
||||
def is_expected_installed_extensions(installed_extensions, expected) -> float:
|
||||
print("installed_extensions: ")
|
||||
print(installed_extensions)
|
||||
if not installed_extensions:
|
||||
return 0.
|
||||
|
||||
logger.info("installed_extensions: ")
|
||||
logger.info(installed_extensions)
|
||||
expected_extensions = expected["expected"]
|
||||
|
||||
# whether the expected extensions are installed
|
||||
@@ -109,6 +112,8 @@ def is_expected_tabs(open_tabs: List[Dict[str, str]], rule: Dict[str, Any]) -> f
|
||||
"""
|
||||
Checks if the expected tabs are open in Chrome.
|
||||
"""
|
||||
if not open_tabs:
|
||||
return 0.
|
||||
|
||||
match_type = rule['type']
|
||||
|
||||
@@ -146,8 +151,10 @@ def is_expected_bookmarks(bookmarks: List[str], rule: Dict[str, Any]) -> float:
|
||||
bookmark['type'] == 'folder' and bookmark['name'] == 'Liked Authors'), None)
|
||||
if liked_authors_folder:
|
||||
# Check if it contains the specified URLs
|
||||
logger.info("'Liked Authors' folder exists")
|
||||
liked_authors_urls = [bookmark['url'] for bookmark in liked_authors_folder['children'] if
|
||||
bookmark['type'] == 'url']
|
||||
logger.info("Here is the 'Liked Authors' folder's urls: {}".format(liked_authors_urls))
|
||||
|
||||
urls = rule['urls']
|
||||
|
||||
@@ -168,6 +175,9 @@ def is_expected_bookmarks(bookmarks: List[str], rule: Dict[str, Any]) -> float:
|
||||
|
||||
|
||||
def is_expected_search_query(active_tab_info: Dict[str, str], rules: Dict[str, Any]) -> float:
|
||||
if not active_tab_info:
|
||||
return 0.
|
||||
|
||||
expected = rules['expect']
|
||||
pattern = expected['pattern']
|
||||
matched = re.search(pattern, active_tab_info['url'])
|
||||
|
||||
@@ -396,7 +396,10 @@ def check_structure_sim_resized(src_path, tgt_path):
|
||||
|
||||
# Check if the structure is similar
|
||||
structure_same = structure_check_by_ssim(img_src_resized, img_tgt)
|
||||
return structure_same
|
||||
if structure_same:
|
||||
return 1.
|
||||
else:
|
||||
return 0.
|
||||
|
||||
|
||||
def check_contrast_increase_and_structure_sim(src_path, tgt_path):
|
||||
|
||||
@@ -83,21 +83,27 @@
|
||||
"urls": [
|
||||
[
|
||||
"https://jimfan.me/",
|
||||
"https://research.nvidia.com/person/linxi-jim-fan"
|
||||
"https://research.nvidia.com/person/linxi-jim-fan",
|
||||
"https://www.linkedin.com/in/drjimfan/"
|
||||
],
|
||||
[
|
||||
"https://research.nvidia.com/person/de-an-huang",
|
||||
"https://ai.stanford.edu/~dahuang/"
|
||||
"https://ai.stanford.edu/~dahuang/",
|
||||
"https://www.linkedin.com/in/de-an-huang-38242a69"
|
||||
],
|
||||
[
|
||||
"https://yukezhu.me/",
|
||||
"https://www.cs.utexas.edu/people/faculty-researchers/yuke-zhu",
|
||||
"https://experts.utexas.edu/yuke_zhu",
|
||||
"https://research.nvidia.com/person/yuke-zhu"
|
||||
"https://research.nvidia.com/person/yuke-zhu",
|
||||
"https://www.linkedin.com/in/yukez/"
|
||||
],
|
||||
[
|
||||
"https://tensorlab.cms.caltech.edu/users/anima/",
|
||||
"http://tensorlab.cms.caltech.edu/users/anima/",
|
||||
"https://www.eas.caltech.edu/people/anima"
|
||||
"https://www.eas.caltech.edu/people/anima",
|
||||
"https://en.wikipedia.org/wiki/Anima_Anandkumar",
|
||||
"https://www.linkedin.com/in/anima-anandkumar/"
|
||||
]
|
||||
]
|
||||
}
|
||||
|
||||
@@ -11,10 +11,6 @@
|
||||
{
|
||||
"url": "https://huggingface.co/datasets/xlangai/ubuntu_osworld_file_cache/resolve/main/multi_apps/e8172110-ec08-421b-a6f5-842e6451911f/character.png",
|
||||
"path": "/home/user/Desktop/character.png"
|
||||
},
|
||||
{
|
||||
"url": "https://huggingface.co/datasets/xlangai/ubuntu_osworld_file_cache/resolve/main/multi_apps/e8172110-ec08-421b-a6f5-842e6451911f/character_no_background_gold.png",
|
||||
"path": "/home/user/Desktop/character_no_background_gold.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -36,8 +32,8 @@
|
||||
],
|
||||
"evaluator": {
|
||||
"func": [
|
||||
"check_structure_sim_resized",
|
||||
"check_structure_sim_resized"
|
||||
"check_structure_sim",
|
||||
"check_structure_sim"
|
||||
],
|
||||
"result": [
|
||||
{
|
||||
@@ -53,13 +49,13 @@
|
||||
],
|
||||
"expected": [
|
||||
{
|
||||
"type": "vm_file",
|
||||
"path": "/home/user/Desktop/character_no_background_gold.png",
|
||||
"type": "cloud_file",
|
||||
"path": "https://huggingface.co/datasets/xlangai/ubuntu_osworld_file_cache/resolve/main/multi_apps/e8172110-ec08-421b-a6f5-842e6451911f/character_no_background_gold.png",
|
||||
"dest": "character_no_background_gold.png"
|
||||
},
|
||||
{
|
||||
"type": "vm_file",
|
||||
"path": "/home/user/Desktop/character_no_background_gold.png",
|
||||
"type": "cloud_file",
|
||||
"path": "https://huggingface.co/datasets/xlangai/ubuntu_osworld_file_cache/resolve/main/multi_apps/e8172110-ec08-421b-a6f5-842e6451911f/character_no_background_gold.png",
|
||||
"dest": "character_no_background_gold.png"
|
||||
}
|
||||
]
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
"type": "rule",
|
||||
"rules": {
|
||||
"expect": {
|
||||
"pattern": "https?://(www\\.?)?google\\.com/search\\?q=nereida(&|$)"
|
||||
"pattern": "(?i)https?://(?:www\\.)?google\\.com/search\\?q=nereida(?:&|$|#).*"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user