works

JHU-CLSP · Jan 25, 2024 · 9347c53 · 9347c53
1 parent 406d533
commit 9347c53
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/src/evaluation/baselines.py b/src/evaluation/baselines.py
@@ -354,8 +354,7 @@ def solve(self, input: Input, **kwargs) -> None:
         # simplify HTML
         # simplified_html = ActionUtils.simplify_html(html)
         actions = Actions()
-        actions.capture_screen("screenshot.png")
-        image_path = os.path.join("screenshots", "screenshot.png")
+        image_path = actions.capture_screen("screenshot.png")
 
         model = GPT4VModel()
         command = model.get_vision_text_baseline_action(input.name, html, image_path)

diff --git a/src/evaluation/screenshots/screenshot.png b/src/evaluation/screenshots/screenshot.png
diff --git a/src/evaluation/vision.py b/src/evaluation/vision.py
@@ -27,8 +27,8 @@ class Actions:
     def __init__(self):
         self.platform = platform.system()
 
-        if (self.platform == "Darwin" or self.platform == "Windows"):
-            self.width, self.height = pyautogui.size()
+        # if (self.platform == "Darwin" or self.platform == "Windows"):
+        self.width, self.height = pyautogui.size()
 
         self.dir = "screenshots"
 
@@ -239,7 +239,8 @@ class GPT4VModel(VisionModel):
     def __init__(self):
         super().__init__(Models.GPT4V)
         load_dotenv()
-        self.client = OpenAI(os.getenv("OPENAI_API_KEY"))
+        # api_key = os.getenv("OPENAI_API_KEY") 
+        self.client = OpenAI()
 
     def get_main_prompt(self, objective: str):
         pass

diff --git a/src/evaluation/img/ex1.png → src/img/ex1.png b/src/evaluation/img/ex1.png → src/img/ex1.png
diff --git a/src/evaluation/img/ex2.png → src/img/ex2.png b/src/evaluation/img/ex2.png → src/img/ex2.png
diff --git a/src/evaluation/img/ex3.png → src/img/ex3.png b/src/evaluation/img/ex3.png → src/img/ex3.png
diff --git a/src/screenshots/screenshot.png b/src/screenshots/screenshot.png
diff --git a/...valuation/screenshots/screenshot_grid.png → src/screenshots/screenshot_grid.png b/...valuation/screenshots/screenshot_grid.png → src/screenshots/screenshot_grid.png