computer-use-ootb-internal 0.0.114__py3-none-any.whl → 0.0.116__py3-none-any.whl

computer_use_ootb_internal/guard_service.py

@@ -31,7 +31,7 @@ _PACKAGE_NAME = "computer-use-ootb-internal"
 _OOTB_MODULE = "computer_use_ootb_internal.app_teachmode"
 # --- Server POST Configuration ---
 _LISTEN_HOST = "0.0.0.0" # Listen on all interfaces
-_LISTEN_PORT = 13999 # Port for server to POST commands TO
+_LISTEN_PORT = 14000 # Port for server to POST commands TO
 # _SHARED_SECRET = "YOUR_SECRET_HERE" # !! REMOVED !! - No secret check implemented now
 # --- End Server POST Configuration ---
 _SERVER_STATUS_REPORT_URL = "http://52.160.105.102:7000/api/guard/status" # URL to POST status back TO

computer_use_ootb_internal/service_manager.py

@@ -107,19 +107,29 @@ def run_service_command(command_args, check_errors=True):
 
 def install_and_start():
     """Installs and starts the Guard Service."""
-    print(f"Attempting to install/update service: '{_SERVICE_NAME}' ('{_SERVICE_DISPLAY_NAME}')")
-    # Use 'update' which handles install or updates display name/path if needed
-    if run_service_command(['--startup', 'auto', 'update']): # Set startup to auto, then update
-        print(f"\nAttempting to start service: '{_SERVICE_NAME}' (waiting a few seconds first)")
-        time.sleep(3) # Give SCM time to register the update
-        if run_service_command(['start']):
-            print(f"\nService '{_SERVICE_NAME}' installed/updated and started successfully.")
+    print(f"Attempting to install service: '{_SERVICE_NAME}' ('{_SERVICE_DISPLAY_NAME}')")
+    # Call 'install' command first.
+    # We pass check_errors=True to stop if installation fails fundamentally.
+    install_success = run_service_command(['--startup', 'auto', 'install'], check_errors=True)
+
+    if install_success:
+        # Note: Even if install_success is True, pywin32 might have printed internal errors
+        # like 'service already installed'. We proceed to start anyway in that case.
+        print(f"\nInstallation command finished. Attempting to start service: '{_SERVICE_NAME}' (waiting a few seconds first)")
+        time.sleep(3) # Give SCM time to register the install/update
+        start_success = run_service_command(['start'], check_errors=True)
+
+        if start_success:
+            # Similar caveat: start might succeed according to subprocess, but pywin32 could print internal errors.
+            print(f"\nService '{_SERVICE_NAME}' install command executed and start command executed.")
+            print(f"Please verify service status in 'services.msc' and check logs.")
         else:
-             print(f"\nWarning: Service '{_SERVICE_NAME}' installed/updated but failed to start.", file=sys.stderr)
-             print(f" Check service logs ('C:\ProgramData\OOTBGuardService\guard.log') or Windows Event Viewer for details.", file=sys.stderr)
-             print(f" You may need to start it manually via 'services.msc' or `net start {_SERVICE_NAME}`.")
+             # This path is taken if run_service_command returned False (subprocess error occurred)
+             print(f"\nService '{_SERVICE_NAME}' installed/updated but the 'start' command failed with an error.", file=sys.stderr)
+             print(f" Check output above, service logs ('C:\ProgramData\OOTBGuardService\guard_post_mode.log'), or Windows Event Viewer.", file=sys.stderr)
     else:
-        print(f"\nService '{_SERVICE_NAME}' installation/update failed.", file=sys.stderr)
+        # This path is taken if the initial 'install' command failed critically (subprocess error)
+        print(f"\nService '{_SERVICE_NAME}' installation failed critically. See errors above.", file=sys.stderr)
 
 
 def stop_and_remove():

{computer_use_ootb_internal-0.0.114.dist-info → computer_use_ootb_internal-0.0.116.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.114.dist-info → computer_use_ootb_internal-0.0.116.dist-info}/RECORD

@@ -3,10 +3,10 @@ computer_use_ootb_internal/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4Tv
 computer_use_ootb_internal/app_teachmode.py,sha256=U0vHAEHeDMDioYatLQkzesT1Hy0aI6kKjhAlV86zxfc,17902
 computer_use_ootb_internal/app_teachmode_gradio.py,sha256=cmFpBrkdlZxOQADWveVdIaaNqaBD8IVs-xNLJogU7F8,7909
 computer_use_ootb_internal/dependency_check.py,sha256=y8RMEP6RXQzTgU1MS_1piBLtz4J-Hfn9RjUZg59dyvo,1333
-computer_use_ootb_internal/guard_service.py,sha256=TPwbfRDlbRI69uP8vSR0oKBXv0BqipdEqYrUmkMTd4M,22575
+computer_use_ootb_internal/guard_service.py,sha256=_tPhlciqXmtWViOeZSsiNhYdBsvqrN9yoFhI9Zojc64,22575
 computer_use_ootb_internal/requirements-lite.txt,sha256=5DAHomz4A_P2BmTIXNkNqkHbnIF0AyZ4_1XAlb1LaYs,290
 computer_use_ootb_internal/run_teachmode_ootb_args.py,sha256=7Dj0iY4GG7P03tRKYJ2x9Yvt-PE-b7uyjCAed3SaF3Y,7086
-computer_use_ootb_internal/service_manager.py,sha256=sesbSUBBqm6W77Dykaw-HGARU-yNdK9DqOHPiR2TbkE,6920
+computer_use_ootb_internal/service_manager.py,sha256=xbLIxQ4jzMr8AdZdxKw-QcAGm2Y86vudDzSf3hGjOM4,7595
 computer_use_ootb_internal/computer_use_demo/animation/click_animation.py,sha256=tP1gsayFy-CKk10UlrE9RlexwlHWiHQUe5Ogg4vQvSg,3234
 computer_use_ootb_internal/computer_use_demo/animation/icons8-select-cursor-transparent-96.gif,sha256=4LfwsfFQnREXrNRs32aJU2jO65JXianJoL_8q7-8elg,30966
 computer_use_ootb_internal/computer_use_demo/animation/test_animation.py,sha256=2R1u98OLKYalSZ5nt5vvyZ71FL5R5vLv-n8zM8jVdV8,1183
@@ -34,7 +34,7 @@ computer_use_ootb_internal/computer_use_demo/tools/run.py,sha256=xhXdnBK1di9muaO
 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.114.dist-info/METADATA,sha256=ZV81pn7geurOXDnPpS22ucrVryl5IVxmpBQbgoBhnAo,1048
-computer_use_ootb_internal-0.0.114.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.114.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.114.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.116.dist-info/METADATA,sha256=G0NAawsykkNRak5u6LkuMy95KGNa1SJhVm1nKhmU-XM,1048
+computer_use_ootb_internal-0.0.116.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.116.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.116.dist-info/RECORD,,