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

computer_use_ootb_internal/guard_service.py

@@ -135,37 +135,37 @@ class GuardService(win32serviceutil.ServiceFramework):
 
     # --- Instance Helper Methods (Moved from module level) ---
     def get_base_python_executable(self):
-        """Tries to find python.exe instead of pythonservice.exe if running as service."""
+        """Tries to find pythonw.exe or python.exe instead of pythonservice.exe if running as service."""
         service_exe = sys.executable
         self.log_info(f"get_base_python_executable: sys.executable is {service_exe}")
-        # Normalize path for comparison
         service_exe_lower = service_exe.lower()
-        
-        # Check if running as pythonservice.exe
+        final_exe_to_use = service_exe # Default to sys.executable
+
         if 'pythonservice.exe' in os.path.basename(service_exe_lower):
-            # Construct expected python.exe path in the same directory
             dir_name = os.path.dirname(service_exe)
+            potential_pythonw_exe = os.path.join(dir_name, 'pythonw.exe')
             potential_python_exe = os.path.join(dir_name, 'python.exe')
-            self.log_info(f"get_base_python_executable: Checking for python.exe at {potential_python_exe}")
             
-            if os.path.exists(potential_python_exe):
-                self.log_info(f"get_base_python_executable: Found python.exe at {potential_python_exe}")
-                # Quote if necessary
-                final_exe = potential_python_exe
-                if " " in final_exe and not final_exe.startswith('"'):
-                    return f'"{final_exe}"'
-                return final_exe
+            self.log_info(f"get_base_python_executable: Checking for pythonw.exe at {potential_pythonw_exe}")
+            if os.path.exists(potential_pythonw_exe):
+                self.log_info(f"get_base_python_executable: Found pythonw.exe, preferring it.")
+                final_exe_to_use = potential_pythonw_exe
             else:
-                 self.log_error(f"get_base_python_executable: Could not find python.exe near pythonservice.exe (checked {potential_python_exe}). Falling back to using {service_exe}.")
-                 # Fallback to original sys.executable (quoted if needed)
-                 if " " in service_exe and not service_exe.startswith('"'):
-                     return f'"{service_exe}"'
-                 return service_exe
-        else: # Not running as pythonservice.exe, assume sys.executable is correct
+                self.log_info(f"get_base_python_executable: pythonw.exe not found. Checking for python.exe at {potential_python_exe}")
+                if os.path.exists(potential_python_exe):
+                     self.log_info(f"get_base_python_executable: Found python.exe.")
+                     final_exe_to_use = potential_python_exe
+                else:
+                    self.log_error(f"get_base_python_executable: Could not find pythonw.exe or python.exe near pythonservice.exe. Falling back to using {service_exe}.")
+                    # Keep final_exe_to_use as service_exe (default)
+        else:
             self.log_info(f"get_base_python_executable: sys.executable is not pythonservice.exe, using it directly.")
-            if " " in service_exe and not service_exe.startswith('"'):
-                 return f'"{service_exe}"'
-            return service_exe
+            # Keep final_exe_to_use as service_exe (default)
+
+        # Quote the final selected path if necessary
+        if " " in final_exe_to_use and not final_exe_to_use.startswith('"'):
+            return f'"{final_exe_to_use}"'
+        return final_exe_to_use
 
     def get_python_executable(self):
         # This method is now just an alias for clarity if needed elsewhere,

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 subprocess # Added for taskkill
+import pyautogui
 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.
-    Closes existing Edge browsers and opens the specified URL in a new Edge instance.
+    Opens the specified URL in Edge and performs initial clicks.
     """
     if platform.system() != "Windows":
         log.info("Star Rail preparation skipped: Not running on Windows.")
@@ -21,43 +21,45 @@ 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().")
+            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.")
 
-        # Removed pyautogui click logic
+        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?
 
-        log.info("Star Rail preparation completed (browser opened).")
+        log.info("Star Rail preparation clicks completed.")
 
     except Exception as e:
-        log.error(f"Error during Star Rail preparation: {e}", exc_info=True)
-    # No finally block needed anymore as pyautogui failsafe is removed 
+        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.") 

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

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

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

@@ -2,7 +2,7 @@ computer_use_ootb_internal/README.md,sha256=FxpW95lyub2iX73ZDfK6ML7SdEKg060H5I6G
 computer_use_ootb_internal/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 computer_use_ootb_internal/app_teachmode.py,sha256=ZZW98870QPNK76LN4f4k9RjBELYcF_3hl0w0fvxj3dY,22268
 computer_use_ootb_internal/dependency_check.py,sha256=y8RMEP6RXQzTgU1MS_1piBLtz4J-Hfn9RjUZg59dyvo,1333
-computer_use_ootb_internal/guard_service.py,sha256=rxTdjzhcZf-Osohnf9xnKFTiKUr-DJAgFHPEGfmFDVI,42789
+computer_use_ootb_internal/guard_service.py,sha256=5wmestMg86e-TxnUVRLdDOTzJ7tOB1R0YoxMO8UjEhs,42829
 computer_use_ootb_internal/requirements-lite.txt,sha256=5DAHomz4A_P2BmTIXNkNqkHbnIF0AyZ4_1XAlb1LaYs,290
 computer_use_ootb_internal/run_teachmode_ootb_args.py,sha256=HB7L9vuIPUXVqeTicyNJKArzTNAfgdpsyO3JEzmByIo,7315
 computer_use_ootb_internal/service_manager.py,sha256=SD8jzfn0VVXBOr_nP6zmBWSC2TzrU_sp2e5JJkSlQFU,9734
@@ -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=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,,
+computer_use_ootb_internal/preparation/star_rail_prepare.py,sha256=s1VWszcTnJAKxqCHFlaOEwPkqVSrkiFx_yKpWSnSbHs,2649
+computer_use_ootb_internal-0.0.127.dist-info/METADATA,sha256=gHp7WyAKyY3ctWvSuT1acMWsvqpxfnVQozEleBI15uI,1048
+computer_use_ootb_internal-0.0.127.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.127.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.127.dist-info/RECORD,,