fix conflict

desktop_env/evaluators/metrics/__init__.py

@@ -77,6 +77,7 @@ from .general import (
     literal_match
 )
 from .gimp import (
+    check_structure_sim_resized,
     check_brightness_decrease_and_structure_sim,
     check_contrast_increase_and_structure_sim,
     check_saturation_increase_and_structure_sim,

desktop_env/evaluators/metrics/gimp.py

@@ -430,11 +430,11 @@ def check_image_size(src_path, rule):
     img = Image.open(src_path)
 
     # Check the size
-    if rule["height"] is not None:
+    if rule.get("height", None) is not None:
         height_same = img.size[1] == rule["height"]
     else:
         height_same = True
-    if rule["width"] is not None:
+    if rule.get("width", None) is not None:
         width_same = img.size[0] == rule["width"]
     else:
         width_same = True
@@ -568,3 +568,51 @@ def check_image_file_size(src_path, rule):
         return 1.0
     else:
         return 0.0
+
+
+if __name__ == "__main__":
+    actual_config_path = "../../../cache/sessionrc_test"
+    rule = {
+        "key": "hide-docks",
+        "value": "no"
+    }
+    print(check_config_status(actual_config_path, rule))
+
+    actual_config_path = "../../../cache/action-history_test"
+    rule = {
+        "key": ["history-item", "\"filters-vignette\""],
+        "value": "1"
+    }
+    print(check_config_status(actual_config_path, rule))
+
+    actual_config_path = "../../../cache/gimprc_test"
+    rule = {
+        "key": "undo-levels",
+        "value": "100"
+    }
+    print(check_config_status(actual_config_path, rule))
+
+    src_path = "../../../cache/734d6579-c07d-47a8-9ae2-13339795476b/green_background_with_object.png"
+    tgt_path = "../../../cache/734d6579-c07d-47a8-9ae2-13339795476b/white_background_with_object.png"
+    print(check_green_background(src_path, tgt_path))
+
+    tgt_path = "../../../cache/f4aec372-4fb0-4df5-a52b-79e0e2a5d6ce/Triangle_In_The_Middle.png"
+    print(check_triangle_position(tgt_path))
+
+    src_path = "../../../cache/bb7db4c2-30b5-4be7-8dd7-b8c4ec7d3108/anmi_sharper.png"
+    tgt_path = "../../../cache/bb7db4c2-30b5-4be7-8dd7-b8c4ec7d3108/anmi.png"
+    print(check_sharper(src_path, tgt_path))
+
+    src_path = "../../../cache/3c8f201a-009d-4bbe-8b65-a6f8b35bb57f/compressed.jpeg"
+    rule = {
+        "max_size": 500000
+    }
+    print(check_image_file_size(src_path, rule))
+
+    src_path = "../../../cache/d16c99dc-2a1e-46f2-b350-d97c86c85c15/resized.png"
+    tgt_path = "../../../cache/d16c99dc-2a1e-46f2-b350-d97c86c85c15/dog_with_background.png"
+    rule = {
+        "height": 512
+    }
+    print(check_image_size(src_path, rule))
+    print(check_structure_sim_resized(src_path, tgt_path))

desktop_env/evaluators/metrics/vscode.py

@@ -236,6 +236,9 @@ def check_html_background_image(src_path: str, rule: Dict = None) -> float:
     Check if the background image is correctly set.
     multi-app:bb7db4c2-30b5-4be7-8dd7-b8c4ec7d3108
     """
+    if not src_path:
+        return 0.0
+
     from bs4 import BeautifulSoup
     with open(src_path, 'r') as f:
         html_content = f.read()
@@ -252,6 +255,9 @@ def compare_result_files(src_path, tgt_path):
     Compare whether the content of two files are the same.
     multi-app:7f35355e-02a6-45b5-b140-f0be698bcf85
     """
+    if not src_path or not tgt_path:
+        return 0.0
+
     with open(src_path, 'r') as f:
         src_content = f.read().strip()
     with open(tgt_path, 'r') as f: