computer-use-ootb-internal 0.0.125__py3-none-any.whl → 0.0.126__py3-none-any.whl

computer_use_ootb_internal/preparation/star_rail_prepare.py

@@ -1,7 +1,7 @@
 # src/computer_use_ootb_internal/preparation/star_rail_prepare.py
 import time
 import platform
-import pyautogui
+import subprocess # Added for taskkill
 import webbrowser
 import logging # Use logging instead of print for better practice
 
@@ -11,7 +11,7 @@ log = logging.getLogger(__name__)
 def run_preparation(state):
     """
     Performs environment preparation specific to Star Rail on Windows.
-    Opens the specified URL in Edge and performs initial clicks.
+    Closes existing Edge browsers and opens the specified URL in a new Edge instance.
     """
     if platform.system() != "Windows":
         log.info("Star Rail preparation skipped: Not running on Windows.")
@@ -21,45 +21,43 @@ def run_preparation(state):
     url = "https://sr.mihoyo.com/cloud/#/" # Consider making this configurable later
     browser_opened = False
     try:
+        # Attempt to close existing Microsoft Edge processes
+        log.info("Attempting to close existing Microsoft Edge processes...")
+        try:
+            # /F forces termination, /IM specifies image name
+            result = subprocess.run(['taskkill', '/F', '/IM', 'msedge.exe'], 
+                                    capture_output=True, text=True, check=False)
+            if result.returncode == 0:
+                log.info("Successfully sent termination signal to msedge.exe processes.")
+            elif "not found" in result.stderr.lower() or "not found" in result.stdout.lower():
+                 log.info("No running msedge.exe processes found to close.")
+            else:
+                 log.warning(f"taskkill command finished with return code {result.returncode}. Output: {result.stdout} Stderr: {result.stderr}")
+            time.sleep(2) # Give processes time to close
+        except FileNotFoundError:
+            log.error("Error: 'taskkill' command not found. Make sure it's in the system PATH.")
+        except Exception as e:
+            log.error(f"Error occurred while trying to close Edge: {e}", exc_info=True)
+
+
         # Use only webbrowser.open
         log.info(f"Attempting to open {url} using webbrowser.open()...")
         if webbrowser.open(url):
             log.info(f"Successfully requested browser to open {url} via webbrowser.open().")
             browser_opened = True
+            time.sleep(5) # Wait time for the browser to potentially load the page
         else:
             log.warning("webbrowser.open() returned False, indicating potential failure.")
+            # No need to error out completely if browser *request* failed, 
+            # but it's unlikely the rest of the process would work.
 
         if not browser_opened:
-            log.error("Failed to confirm browser opening via webbrowser.open(). Will still attempt clicks.")
-
-        # Add pyautogui click after attempting to open the browser
-        log.info("Proceeding with pyautogui actions...")
-        time.sleep(5) # Wait time for the browser to load
-
-        # Get screen size
-        screen_width, screen_height = pyautogui.size()
-        log.info(f"Detected screen size: {screen_width}x{screen_height}")
-
-        # Calculate click coordinates based on a reference resolution (e.g., 1280x720)
-        # TODO: Make these coordinates more robust or configurable
-        click_x = int(screen_width * (1036 / 1280))
-        click_y = int(screen_height * (500 / 720))
-        log.info(f"Calculated click coordinates: ({click_x}, {click_y})")
-
-        # Disable failsafe before clicking
-        pyautogui.FAILSAFE = False
-        log.info("PyAutoGUI failsafe temporarily disabled.")
+             log.error("Failed to confirm browser opening via webbrowser.open().")
 
-        log.info(f"Clicking at coordinates: ({click_x}, {click_y})")
-        pyautogui.click(click_x, click_y)
-        time.sleep(2)
-        pyautogui.click(click_x, click_y) # Double click?
+        # Removed pyautogui click logic
 
-        log.info("Star Rail preparation clicks completed.")
+        log.info("Star Rail preparation completed (browser opened).")
 
     except Exception as e:
-        log.error(f"Error during Star Rail preparation (browser/click): {e}", exc_info=True)
-    finally:
-         # Ensure failsafe is re-enabled
-         pyautogui.FAILSAFE = True
-         log.info("PyAutoGUI failsafe re-enabled.") 
+        log.error(f"Error during Star Rail preparation: {e}", exc_info=True)
+    # No finally block needed anymore as pyautogui failsafe is removed 

{computer_use_ootb_internal-0.0.125.dist-info → computer_use_ootb_internal-0.0.126.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: computer-use-ootb-internal
-Version: 0.0.125
+Version: 0.0.126
 Summary: Computer Use OOTB
 Author-email: Siyuan Hu <siyuan.hu.sg@gmail.com>
 Requires-Python: >=3.11

{computer_use_ootb_internal-0.0.125.dist-info → computer_use_ootb_internal-0.0.126.dist-info}/RECORD

@@ -32,8 +32,8 @@ computer_use_ootb_internal/computer_use_demo/tools/edit.py,sha256=b0PwUitxckHCQq
 computer_use_ootb_internal/computer_use_demo/tools/run.py,sha256=xhXdnBK1di9muaO44CEirL9hpGy3NmKbjfMpyeVmn8Y,1595
 computer_use_ootb_internal/computer_use_demo/tools/screen_capture.py,sha256=L8qfvtUkPPQGt92N-2Zfw5ZTDBzLsDps39uMnX3_uSA,6857
 computer_use_ootb_internal/preparation/__init__.py,sha256=AgtGHcBpiTkxJjF0xwcs3yyQ6SyUvhL3G0vD2XO-zJw,63
-computer_use_ootb_internal/preparation/star_rail_prepare.py,sha256=s1VWszcTnJAKxqCHFlaOEwPkqVSrkiFx_yKpWSnSbHs,2649
-computer_use_ootb_internal-0.0.125.dist-info/METADATA,sha256=lJj1xS-1SkLR50BD0oV7Aeaod0RnmFtCsX_1v0wTE1I,1048
-computer_use_ootb_internal-0.0.125.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.125.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.125.dist-info/RECORD,,
+computer_use_ootb_internal/preparation/star_rail_prepare.py,sha256=2Q1TcXE09F1-W7boTHfuQkGhaFD1YDuiQV8qvG83wOY,3000
+computer_use_ootb_internal-0.0.126.dist-info/METADATA,sha256=COh06SOLvlusAtDfKXDv5Rr_hxHwNgrSSQEI-qlcZW8,1048
+computer_use_ootb_internal-0.0.126.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.126.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.126.dist-info/RECORD,,