computer-use-ootb-internal 0.0.118__py3-none-any.whl → 0.0.119__py3-none-any.whl

computer_use_ootb_internal/guard_service.py

@@ -93,16 +93,33 @@ def get_python_executable():
     return python_exe
 
 def get_pip_executable():
-    python_path = pathlib.Path(sys.executable)
-    pip_path = python_path.parent / "Scripts" / "pip.exe"
-    if pip_path.exists():
-        pip_exe = str(pip_path)
-        if " " in pip_exe and not pip_exe.startswith('"'):
-            pip_exe = f'"{pip_exe}"'
-        return pip_exe
-    else:
-        logging.warning("pip.exe not found in Scripts directory. Falling back to 'python -m pip'.")
-        return f"{get_python_executable()} -m pip"
+    """Tries to locate the pip executable in the same environment."""
+    try:
+        current_python = sys.executable
+        log_info(f"get_pip_executable: sys.executable = {current_python}")
+        python_path = pathlib.Path(current_python)
+        # Common location is ../Scripts/pip.exe relative to python.exe
+        pip_path = python_path.parent / "Scripts" / "pip.exe"
+        log_info(f"get_pip_executable: Checking for pip at {pip_path}")
+
+        if pip_path.exists():
+            log_info(f"get_pip_executable: pip.exe found at {pip_path}")
+            # Quote if necessary
+            pip_exe = str(pip_path)
+            if " " in pip_exe and not pip_exe.startswith('"'):
+                pip_exe = f'"{pip_exe}"'
+            return pip_exe
+        else:
+            log_error(f"get_pip_executable: pip.exe NOT found at {pip_path}. Falling back to 'python -m pip'.")
+            # Fallback is intended here
+            pass # Explicitly pass to reach the fallback return outside the else
+
+    except Exception as e:
+        log_error(f"get_pip_executable: Error determining pip path: {e}", exc_info=True)
+        log_error("get_pip_executable: Falling back to 'python -m pip' due to error.")
+    
+    # Fallback return statement if 'exists' is false or an exception occurred
+    return f"{get_python_executable()} -m pip"
 
 def log_info(msg):
     thread_name = threading.current_thread().name
@@ -250,7 +267,7 @@ class GuardService(win32serviceutil.ServiceFramework):
     def report_command_status(self, command_id, status, details=""):
         """Sends command status back to the server."""
         if not _SERVER_STATUS_REPORT_URL:
-            log_warning("No server status report URL configured. Skipping report.")
+            log_error("No server status report URL configured. Skipping report.")
             return
 
         payload = {
@@ -352,7 +369,7 @@ class GuardService(win32serviceutil.ServiceFramework):
                     log_info(f"Process PID={proc.pid} terminated successfully.")
                     stopped_count += 1
                 except psutil.TimeoutExpired:
-                    log_warning(f"Process PID={proc.pid} did not terminate gracefully, killing.")
+                    log_error(f"Process PID={proc.pid} did not terminate gracefully, killing.")
                     proc.kill()
                     stopped_count += 1
             except psutil.NoSuchProcess:
@@ -385,7 +402,7 @@ class GuardService(win32serviceutil.ServiceFramework):
                               normalized_user = user.lower()
                               active_sessions[normalized_user] = session['SessionId']
                     except Exception as query_err:
-                         log_warning(f"Could not query session {session['SessionId']}: {query_err}")
+                         log_error(f"Could not query session {session['SessionId']}: {query_err}")
 
             log_info(f"Found active user sessions: {active_sessions}")
 
@@ -397,7 +414,7 @@ class GuardService(win32serviceutil.ServiceFramework):
                 if normalized_target in active_sessions:
                      target_session_map[normalized_target] = active_sessions[normalized_target]
                 else:
-                     log_warning(f"Target user '{target_user}' not found in active sessions.")
+                     log_error(f"Target user '{target_user}' not found in active sessions.")
                      return "failed_user_not_active"
 
             if not target_session_map:
@@ -451,7 +468,7 @@ class GuardService(win32serviceutil.ServiceFramework):
                          started_count += 1
                          target_users_started.add(user)
                      else:
-                         log_warning(f"Process PID {dwPid} reported by CreateProcessAsUser does NOT exist shortly after creation. It likely exited immediately.")
+                         log_error(f"Process PID {dwPid} reported by CreateProcessAsUser does NOT exist shortly after creation. It likely exited immediately.")
                          users_failed_to_start.add(user)
                          # Attempt to get exit code? Difficult without waiting.
 

{computer_use_ootb_internal-0.0.118.dist-info → computer_use_ootb_internal-0.0.119.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.118.dist-info → computer_use_ootb_internal-0.0.119.dist-info}/RECORD

@@ -3,7 +3,7 @@ computer_use_ootb_internal/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4Tv
 computer_use_ootb_internal/app_teachmode.py,sha256=PClMS7X6zRGzY7YPOV6Zxkfv5BajLVqmBiv-mOBVxkw,22164
 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=z9GQdPJCd_Ds1xwCUn7hJBqPuto_FLhE1F5xqrvgh98,23496
+computer_use_ootb_internal/guard_service.py,sha256=d0tZgzjmS8UQGHx2Yf5HuMtRxdJIgy2zLpUTFQF5JF8,24378
 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=xbLIxQ4jzMr8AdZdxKw-QcAGm2Y86vudDzSf3hGjOM4,7595
@@ -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.118.dist-info/METADATA,sha256=hXxBaos02qZPHK7UQIFaRPJsCjTCmhZuL2Z7WMPRMA0,1048
-computer_use_ootb_internal-0.0.118.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.118.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.118.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.119.dist-info/METADATA,sha256=9FKAgkb-tPT3TpODW9nONQUvFwGnX7NwXOJvBKZGAAk,1048
+computer_use_ootb_internal-0.0.119.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.119.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.119.dist-info/RECORD,,