computer-use-ootb-internal 0.0.121__py3-none-any.whl → 0.0.122__py3-none-any.whl

computer_use_ootb_internal/guard_service.py

@@ -134,20 +134,54 @@ class GuardService(win32serviceutil.ServiceFramework):
     # --- End Instance Logging --- 
 
     # --- Instance Helper Methods (Moved from module level) ---
+    def get_base_python_executable(self):
+        """Tries to find python.exe instead of pythonservice.exe if running as service."""
+        service_exe = sys.executable
+        self.log_info(f"get_base_python_executable: sys.executable is {service_exe}")
+        # Normalize path for comparison
+        service_exe_lower = service_exe.lower()
+        
+        # Check if running as pythonservice.exe
+        if 'pythonservice.exe' in os.path.basename(service_exe_lower):
+            # Construct expected python.exe path in the same directory
+            dir_name = os.path.dirname(service_exe)
+            potential_python_exe = os.path.join(dir_name, 'python.exe')
+            self.log_info(f"get_base_python_executable: Checking for python.exe at {potential_python_exe}")
+            
+            if os.path.exists(potential_python_exe):
+                self.log_info(f"get_base_python_executable: Found python.exe at {potential_python_exe}")
+                # Quote if necessary
+                final_exe = potential_python_exe
+                if " " in final_exe and not final_exe.startswith('"'):
+                    return f'"{final_exe}"'
+                return final_exe
+            else:
+                 self.log_error(f"get_base_python_executable: Could not find python.exe near pythonservice.exe (checked {potential_python_exe}). Falling back to using {service_exe}.")
+                 # Fallback to original sys.executable (quoted if needed)
+                 if " " in service_exe and not service_exe.startswith('"'):
+                     return f'"{service_exe}"'
+                 return service_exe
+        else: # Not running as pythonservice.exe, assume sys.executable is correct
+            self.log_info(f"get_base_python_executable: sys.executable is not pythonservice.exe, using it directly.")
+            if " " in service_exe and not service_exe.startswith('"'):
+                 return f'"{service_exe}"'
+            return service_exe
+
     def get_python_executable(self):
-        python_exe = sys.executable
-        if " " in python_exe and not python_exe.startswith('"'):
-            python_exe = f'"{python_exe}"'
-        return python_exe
+        # This method is now just an alias for clarity if needed elsewhere,
+        # but primary logic uses get_base_python_executable directly.
+        # Keep for potential compatibility if anything still calls it.
+        return self.get_base_python_executable()
 
     def get_pip_executable(self):
         """Tries to locate the pip executable in the same environment."""
         try:
-            current_python = sys.executable
-            self.log_info(f"get_pip_executable: sys.executable = {current_python}")
-            python_path = pathlib.Path(current_python)
+            # Use the potentially corrected python path to find pip's location
+            # Note: This assumes pip is relative to python.exe, not pythonservice.exe
+            base_python = self.get_base_python_executable()
+            python_path = pathlib.Path(base_python.strip('"')) # Use unquoted path
             pip_path = python_path.parent / "Scripts" / "pip.exe"
-            self.log_info(f"get_pip_executable: Checking for pip at {pip_path}")
+            self.log_info(f"get_pip_executable: Checking for pip relative to {python_path.parent} at {pip_path}")
 
             if pip_path.exists():
                 self.log_info(f"get_pip_executable: pip.exe found at {pip_path}")
@@ -156,14 +190,14 @@ class GuardService(win32serviceutil.ServiceFramework):
                     pip_exe = f'"{pip_exe}"'
                 return pip_exe
             else:
-                self.log_error(f"get_pip_executable: pip.exe NOT found at {pip_path}. Falling back to 'python -m pip'.")
+                self.log_error(f"get_pip_executable: pip.exe NOT found at {pip_path}. Falling back to '{base_python} -m pip'.")
                 pass
-
         except Exception as e:
             self.log_error(f"get_pip_executable: Error determining pip path: {e}", exc_info=True)
-            self.log_error("get_pip_executable: Falling back to 'python -m pip' due to error.")
+            self.log_error(f"get_pip_executable: Falling back to 'python -m pip' due to error.")
         
-        return f"{self.get_python_executable()} -m pip"
+        # Fallback uses the potentially corrected python path
+        return f"{self.get_base_python_executable()} -m pip"
 
     # --- PowerShell Methods (Moved from module level) ---
     def run_powershell_command(self, command, log_output=True):
@@ -250,11 +284,13 @@ class GuardService(win32serviceutil.ServiceFramework):
         self.command_processor_thread = None
         self.session = requests.Session()
 
-        # Initialize paths using instance methods
-        self.python_exe = self.get_python_executable()
+        # Initialize paths using instance methods that prefer python.exe
+        self.python_exe = self.get_base_python_executable()
         self.pip_command_base = self.get_pip_executable()
+        # Construct command using the potentially corrected python.exe path
         self.ootb_command = f"{self.python_exe} -m {_OOTB_MODULE}"
         _service_instance = self
+        self.log_info(f"Service initialized. OOTB command set to: {self.ootb_command}")
 
     def SvcStop(self):
         self.log_info(f"Service stop requested.")
@@ -413,10 +449,11 @@ class GuardService(win32serviceutil.ServiceFramework):
                       target_users.add(username.lower())
             else:
                  target_users.add(target_user.lower())
-
             self.log_info(f"Searching for OOTB processes for users: {target_users}")
-
-            python_exe_path = self.python_exe.strip('"') # Get unquoted path for comparison
+            
+            # Use the potentially corrected python.exe path for matching
+            python_exe_path_for_check = self.python_exe.strip('"') 
+            self.log_info(f"_get_ootb_processes: Checking against python path: {python_exe_path_for_check}")
 
             for proc in psutil.process_iter(['pid', 'name', 'username', 'cmdline', 'exe']):
                 try:
@@ -427,12 +464,11 @@ class GuardService(win32serviceutil.ServiceFramework):
 
                     if proc_username in target_users:
                         cmdline = ' '.join(pinfo['cmdline']) if pinfo['cmdline'] else ''
-                        # Check if the process executable matches our python path AND module is in cmdline
-                        if pinfo['exe'] and pinfo['exe'] == python_exe_path and _OOTB_MODULE in cmdline:
+                        # Check if the process executable matches our corrected python path AND module is in cmdline
+                        if pinfo['exe'] and pinfo['exe'] == python_exe_path_for_check and _OOTB_MODULE in cmdline:
                             self.log_info(f"Found matching OOTB process: PID={pinfo['pid']}, User={pinfo['username']}, Cmd={cmdline}")
                             ootb_procs.append(proc)
                             target_pid_list.append(pinfo['pid'])
-
                 except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
                     continue
             self.log_info(f"Found {len(ootb_procs)} OOTB process(es) matching criteria: {target_pid_list}")

{computer_use_ootb_internal-0.0.121.dist-info → computer_use_ootb_internal-0.0.122.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.121.dist-info → computer_use_ootb_internal-0.0.122.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=rDAoNd2g14bq9bZ57A1MgmBSlrjrzcXUEw9m-dm2XBU,40119
+computer_use_ootb_internal/guard_service.py,sha256=rxTdjzhcZf-Osohnf9xnKFTiKUr-DJAgFHPEGfmFDVI,42789
 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=SD8jzfn0VVXBOr_nP6zmBWSC2TzrU_sp2e5JJkSlQFU,9734
@@ -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.121.dist-info/METADATA,sha256=nFXcxghQx78Ukkgbzl6-RNyU4yEhdzNKSb_HAlr86DU,1048
-computer_use_ootb_internal-0.0.121.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.121.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.121.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.122.dist-info/METADATA,sha256=l4cD__IPEj-hiKqiaFO49w016NHjVZ1y7cza5WHKDYc,1048
+computer_use_ootb_internal-0.0.122.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.122.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.122.dist-info/RECORD,,