computer-use-ootb-internal 0.0.125__tar.gz → 0.0.126__tar.gz

{computer_use_ootb_internal-0.0.125 → computer_use_ootb_internal-0.0.126}/.gitignore

@@ -5,4 +5,4 @@
 screenshot*.png
 *dist*
 *.toml
-*.sh
+ootb_lite_pypi/ootb_lite_pypi/deploy.sh

{computer_use_ootb_internal-0.0.125 → computer_use_ootb_internal-0.0.126}/PKG-INFO

@@ -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.126/deploy.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Clean previous builds
+rm -rf dist
+
+# Build the package
+python -m build
+
+# Upload to PyPI using API key
+python -m twine upload dist/* -u __token__ -p pypi-AgEIcHlwaS5vcmcCJDkwMTlkNmE2LWFkZmYtNGU2ZC1hYzUwLWFiYmRjYTg4YTNkYgACIlsxLFsiY29tcHV0ZXItdXNlLW9vdGItaW50ZXJuYWwiXV0AAixbMixbIjllNmQ5NTRjLTgxZGEtNGRkNy05Yjk5LWVjYzMzOGUwN2NlZSJdXQAABiBFIKbytGELyFb1-i20Cu4tSo8cAUlX1DCLmUALq0mcPA

{computer_use_ootb_internal-0.0.125 → computer_use_ootb_internal-0.0.126}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "computer-use-ootb-internal"
-version = "0.0.125"
+version = "0.0.126"
 description = "Computer Use OOTB"
 authors = [{ name = "Siyuan Hu", email = "siyuan.hu.sg@gmail.com" }]
 requires-python = ">=3.11"

computer_use_ootb_internal-0.0.126/src/computer_use_ootb_internal/preparation/star_rail_prepare.py

@@ -0,0 +1,63 @@
+# src/computer_use_ootb_internal/preparation/star_rail_prepare.py
+import time
+import platform
+import subprocess # Added for taskkill
+import webbrowser
+import logging # Use logging instead of print for better practice
+
+# Set up logging for this module if needed, or rely on root logger
+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.
+    """
+    if platform.system() != "Windows":
+        log.info("Star Rail preparation skipped: Not running on Windows.")
+        return
+
+    log.info("Star Rail preparation: Starting environment setup on Windows...")
+    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().")
+
+        # Removed pyautogui click logic
+
+        log.info("Star Rail preparation completed (browser opened).")
+
+    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 

computer_use_ootb_internal-0.0.125/src/computer_use_ootb_internal/preparation/star_rail_prepare.py

@@ -1,65 +0,0 @@
-# src/computer_use_ootb_internal/preparation/star_rail_prepare.py
-import time
-import platform
-import pyautogui
-import webbrowser
-import logging # Use logging instead of print for better practice
-
-# Set up logging for this module if needed, or rely on root logger
-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.
-    """
-    if platform.system() != "Windows":
-        log.info("Star Rail preparation skipped: Not running on Windows.")
-        return
-
-    log.info("Star Rail preparation: Starting environment setup on Windows...")
-    url = "https://sr.mihoyo.com/cloud/#/" # Consider making this configurable later
-    browser_opened = False
-    try:
-        # 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
-        else:
-            log.warning("webbrowser.open() returned False, indicating potential failure.")
-
-        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.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 clicks completed.")
-
-    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.")