computer-use-ootb-internal 0.0.111__tar.gz → 0.0.112__tar.gz

{computer_use_ootb_internal-0.0.111 → computer_use_ootb_internal-0.0.112}/PKG-INFO

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

{computer_use_ootb_internal-0.0.111 → computer_use_ootb_internal-0.0.112}/pyproject.toml

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

{computer_use_ootb_internal-0.0.111 → computer_use_ootb_internal-0.0.112}/src/computer_use_ootb_internal/app_teachmode.py

@@ -8,6 +8,9 @@ import platform  # Add platform import
 import pyautogui  # Add pyautogui import
 import webbrowser # Add webbrowser import
 import os # Import os for path joining
+import logging # Import logging
+import importlib # For dynamic imports
+import pkgutil # To find modules
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse
 from fastapi.middleware.cors import CORSMiddleware
@@ -90,68 +93,47 @@ class SharedState:
 shared_state = None
 rate_limiter = RateLimiter(interval_seconds=2)
 
-# Add the new prepare_environment function here
+# Set up logging for this module
+log = logging.getLogger(__name__)
+
 def prepare_environment(state):
-    """Prepares the environment before starting the main processing loop, e.g., opening specific apps."""
-    if platform.system() == "Windows":
-        # Assuming Star Rail mode is indicated by user_id containing "star_rail"
-        # You might need to adjust this condition based on the actual logic in run_teachmode_args
-        is_star_rail = "star_rail" in state.user_id.lower() or \
-                       "star_rail" in state.trace_id.lower() or \
-                       "hero_case" in state.user_id.lower() or \
-                       "hero_case" in state.trace_id.lower()
-        
-        if is_star_rail:
-            print("Star Rail mode detected on Windows. Opening Edge browser...")
-            url = "https://sr.mihoyo.com/cloud/#/"
-            browser_opened = False
-            try:
-                # Use only webbrowser.open
-                print(f"Attempting to open {url} using webbrowser.open()...")
-                if webbrowser.open(url):
-                    print(f"Successfully requested browser to open {url} via webbrowser.open().")
-                    browser_opened = True
-                else:
-                    print("webbrowser.open() returned False, indicating potential failure.")
-
-                if not browser_opened:
-                    print("ERROR: Failed to confirm browser opening via webbrowser.open().")
-                    # Still proceed to click attempt
-
-                # Add pyautogui click after attempting to open the browser
-                print("Proceeding with pyautogui actions...")
-                time.sleep(5) # Wait time for the browser to load
-                
-                # Print detected screen size
-                screen_width, screen_height = pyautogui.size()
-                print(f"Detected screen size: {screen_width}x{screen_height}")
-
-                click_x = int(screen_width * (1036 / 1280))
-                click_y = int(screen_height * (500 / 720))
-                print(f"Calculated click coordinates: ({click_x}, {click_y})")
-
-                # Disable failsafe before clicking
-                pyautogui.FAILSAFE = False
-                print("PyAutoGUI failsafe temporarily disabled.")
-
-                print(f"Clicking at coordinates: ({click_x}, {click_y})")
-                pyautogui.click(click_x, click_y)
-                time.sleep(2)
-                pyautogui.click(click_x, click_y)
-                
-                # Re-enable failsafe (optional, as script might end anyway)
-                # pyautogui.FAILSAFE = True 
-                # print("PyAutoGUI failsafe re-enabled.")
-
-            except Exception as e:
-                print(f"Error during environment preparation (browser/click): {e}")
-            finally:
-                 # Ensure failsafe is re-enabled if an error occurs after disabling it
-                 pyautogui.FAILSAFE = True
-                 print("PyAutoGUI failsafe re-enabled.")
-    else:
-        # Placeholder for potential preparations on other OS or non-Star Rail modes
-        print("Environment preparation: No specific actions required for this OS/mode.")
+    """Dynamically loads and runs preparation logic based on software name."""
+    # TODO: Replace hardcoded software name with value from shared_state when available
+    software_name = "star rail"
+    # Normalize the software name to be a valid Python module name
+    # Replace spaces/hyphens with underscores, convert to lowercase
+    module_name_base = software_name.replace(" ", "_").replace("-", "_").lower()
+    module_to_run = f"{module_name_base}_prepare"
+
+    log.info(f"Attempting preparation for software: '{software_name}' (Module: '{module_to_run}')")
+
+    try:
+        # Construct the full module path within the package
+        prep_package = "computer_use_ootb_internal.preparation"
+        full_module_path = f"{prep_package}.{module_to_run}"
+
+        # Dynamically import the module
+        # Check if module exists first using pkgutil to avoid import errors
+        # Note: pkgutil.find_loader might be deprecated, consider importlib.util.find_spec
+        loader = pkgutil.find_loader(full_module_path)
+        if loader is None:
+            log.warning(f"Preparation module '{full_module_path}' not found. Skipping preparation.")
+            return
+
+        prep_module = importlib.import_module(full_module_path)
+
+        # Check if the module has the expected function
+        if hasattr(prep_module, "run_preparation") and callable(prep_module.run_preparation):
+            log.info(f"Running preparation function from {full_module_path}...")
+            prep_module.run_preparation(state)
+            log.info(f"Preparation function from {full_module_path} completed.")
+        else:
+            log.warning(f"Module {full_module_path} found, but does not have a callable 'run_preparation' function. Skipping.")
+
+    except ModuleNotFoundError:
+        log.warning(f"Preparation module '{full_module_path}' not found. Skipping preparation.")
+    except Exception as e:
+        log.error(f"Error during dynamic preparation loading/execution for '{module_to_run}': {e}", exc_info=True)
 
 
 @app.post("/update_params")
@@ -178,7 +160,7 @@ async def update_parameters(request: Request):
     
     log_ootb_request(shared_state.server_url, "update_params", data)
 
-    # Call the preparation function here, after parameters are updated
+    # Call the (now dynamic) preparation function here, after parameters are updated
     prepare_environment(shared_state)
 
     return JSONResponse(

{computer_use_ootb_internal-0.0.111 → computer_use_ootb_internal-0.0.112}/src/computer_use_ootb_internal/guard_service.py

@@ -31,7 +31,7 @@ _PACKAGE_NAME = "computer-use-ootb-internal"
 # Main module to start/stop for users
 _OOTB_MODULE = "computer_use_ootb_internal.app_teachmode"
 # Server endpoint to poll for commands (replace with your actual URL)
-_SERVER_COMMAND_URL = "https://52.160.105.102/api/guard/commands" # EXAMPLE URL - Verify protocol/port/path
+_SERVER_COMMAND_URL = "http://52.160.105.102:7000/api/guard" # Using HTTP as port was specified
 # How often to poll the server (in seconds)
 _POLLING_INTERVAL = 60
 # Placeholder for a machine identifier or API key for the server

computer_use_ootb_internal-0.0.112/src/computer_use_ootb_internal/preparation/__init__.py

@@ -0,0 +1 @@
+# This file makes the 'preparation' directory a Python package 

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

@@ -0,0 +1,65 @@
+# 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.")