computer-use-ootb-internal 0.0.115__tar.gz → 0.0.116__tar.gz

{computer_use_ootb_internal-0.0.115 → computer_use_ootb_internal-0.0.116}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: computer-use-ootb-internal
-Version: 0.0.115
+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.115 → computer_use_ootb_internal-0.0.116}/pyproject.toml

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

{computer_use_ootb_internal-0.0.115 → computer_use_ootb_internal-0.0.116}/src/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():