computer-use-ootb-internal 0.0.100.post1__py3-none-any.whl → 0.0.102.post1__py3-none-any.whl

computer_use_ootb_internal/app_teachmode.py

@@ -8,6 +8,7 @@ import platform  # Add platform import
 import subprocess  # Add subprocess import
 import pyautogui  # Add pyautogui import
 import webbrowser # Add webbrowser import
+import os # Import os for path joining
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse
 from fastapi.middleware.cors import CORSMiddleware
@@ -104,14 +105,50 @@ def prepare_environment(state):
         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 webbrowser.open to open the URL in the default browser
-                print(f"Attempting to open {url} in browser...")
-                webbrowser.open(url)
-                print(f"Successfully requested browser to open {url}")
-
-                # Add pyautogui click after opening the browser
-                time.sleep(5) # Increased wait time for the browser to load
+                print(f"Attempting to open {url} using specific Edge paths...")
+                # Common paths for msedge.exe
+                edge_paths = [
+                    os.path.join(os.environ.get("ProgramFiles(x86)", "C:\Program Files (x86)"), "Microsoft\Edge\Application\msedge.exe"),
+                    os.path.join(os.environ.get("ProgramFiles", "C:\Program Files"), "Microsoft\Edge\Application\msedge.exe")
+                ]
+                
+                opened_with_subprocess = False
+                for edge_path in edge_paths:
+                    if os.path.exists(edge_path):
+                        try:
+                            print(f"Trying path: {edge_path}")
+                            subprocess.Popen([edge_path, url])
+                            print(f"Successfully launched Edge with Popen using path: {edge_path}")
+                            opened_with_subprocess = True
+                            browser_opened = True
+                            break # Exit loop once successfully opened
+                        except Exception as sub_e:
+                            print(f"Failed to launch Edge with Popen using {edge_path}: {sub_e}")
+                    else:
+                        print(f"Edge path not found: {edge_path}")
+
+                # Fallback to webbrowser.open if subprocess failed
+                if not opened_with_subprocess:
+                    print("Subprocess launch failed, falling back to webbrowser.open()...")
+                    try:
+                         if webbrowser.open(url):
+                             print("Successfully opened browser using webbrowser.open() as fallback.")
+                             browser_opened = True
+                         else:
+                             print("webbrowser.open() also failed to indicate success.")
+                    except Exception as web_e:
+                         print(f"webbrowser.open() fallback failed: {web_e}")
+
+                if not browser_opened:
+                    print("ERROR: Failed to open browser using both subprocess and webbrowser.")
+                    # Decide if you want to proceed without the browser or raise an error
+                    # For now, we'll proceed to the click attempt but it might fail
+
+                # 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()
@@ -127,19 +164,22 @@ def prepare_environment(state):
 
                 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 FileNotFoundError:
-                # This error is less likely with webbrowser.open
-                print("Error: Could not find a web browser to open the URL.")
+                # This specific error might occur if edge_path exists but execution fails
+                print("Error: Could not execute the browser command (FileNotFound). Check permissions or path.")
             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.")

{computer_use_ootb_internal-0.0.100.post1.dist-info → computer_use_ootb_internal-0.0.102.post1.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.100.post1.dist-info → computer_use_ootb_internal-0.0.102.post1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 computer_use_ootb_internal/README.md,sha256=FxpW95lyub2iX73ZDfK6ML7SdEKg060H5I6Grub7li4,31
-computer_use_ootb_internal/app_teachmode.py,sha256=Ya8EnJAA6YfkcbaSEtoiGQ39_63IzJj1yawaSBuoZuk,18613
+computer_use_ootb_internal/app_teachmode.py,sha256=k4Y5ecIPmgQrtBkSV_xPHb0C6tssdEWfqI7uQsW2ku8,20963
 computer_use_ootb_internal/app_teachmode_gradio.py,sha256=zAw-n3s20j1Jr0S4TzXHwllKV6APJ8HEHB1KqBuzriY,7907
 computer_use_ootb_internal/dependency_check.py,sha256=y8RMEP6RXQzTgU1MS_1piBLtz4J-Hfn9RjUZg59dyvo,1333
 computer_use_ootb_internal/example_websocket_js.html,sha256=BLYwDExVlgiAX4vXVXW3RuP5KD8FXE4EFXIl54bwF7w,1322
@@ -38,7 +38,7 @@ computer_use_ootb_internal/computer_use_demo/tools/computer_marbot.py,sha256=zZu
 computer_use_ootb_internal/computer_use_demo/tools/edit.py,sha256=b0PwUitxckHCQqFP3ZwlthWdqNkn7WETeTHeB6-o98c,11486
 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-0.0.100.post1.dist-info/METADATA,sha256=ascLHbLvpwRApjH4FAoNsNuES-GNyoIm5pmc96lqNWQ,943
-computer_use_ootb_internal-0.0.100.post1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.100.post1.dist-info/entry_points.txt,sha256=-AbmawU7IRQuDZihgVMVDrFoY4E6rnXYOUB-5vSeBKs,93
-computer_use_ootb_internal-0.0.100.post1.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.102.post1.dist-info/METADATA,sha256=Wu4c7JCwLWtGWf96CQAh37Pfs4y8Rf1lOO_Jc4jnXEc,943
+computer_use_ootb_internal-0.0.102.post1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.102.post1.dist-info/entry_points.txt,sha256=-AbmawU7IRQuDZihgVMVDrFoY4E6rnXYOUB-5vSeBKs,93
+computer_use_ootb_internal-0.0.102.post1.dist-info/RECORD,,