computer-use-ootb-internal 0.0.193__tar.gz → 0.0.195__tar.gz

{computer_use_ootb_internal-0.0.193 → computer_use_ootb_internal-0.0.195}/PKG-INFO

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

{computer_use_ootb_internal-0.0.193 → computer_use_ootb_internal-0.0.195}/pyproject.toml

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

{computer_use_ootb_internal-0.0.193 → computer_use_ootb_internal-0.0.195}/src/computer_use_ootb_internal/app_teachmode.py

@@ -26,48 +26,61 @@ import asyncio
 
 # --- App Logging Setup ---
 try:
-    # Log to user's AppData directory for better accessibility
-    log_dir_base = os.environ.get('APPDATA', os.path.expanduser('~'))
-    log_dir = os.path.join(log_dir_base, 'OOTBAppLogs')
-    os.makedirs(log_dir, exist_ok=True)
+    # NEW: Log to a subdirectory under ProgramData/OOTBGuardService, specific to the current user
+    program_data_dir = os.environ.get('PROGRAMDATA', 'C:/ProgramData') # Use C:/ProgramData as a fallback
+    guard_service_log_base_dir = os.path.join(program_data_dir, 'OOTBGuardService')
+    
+    current_username = os.getenv('USERNAME', 'unknown_user_app') # Get current username, fallback
+    app_logs_subfolder = "UserSessionLogs" # Subfolder for these app logs
+    
+    log_dir = os.path.join(guard_service_log_base_dir, app_logs_subfolder, current_username)
+    
+    os.makedirs(log_dir, exist_ok=True) # Create user-specific log directory
     log_file = os.path.join(log_dir, 'ootb_app.log')
 
     log_format = '%(asctime)s - %(levelname)s - %(process)d - %(threadName)s - %(message)s'
     log_level = logging.INFO # Or logging.DEBUG for more detail
 
-    # Use rotating file handler
-    handler = RotatingFileHandler(log_file, maxBytes=5*1024*1024, backupCount=2, encoding='utf-8')
-    handler.setFormatter(logging.Formatter(log_format))
+    # Setup the rotating file handler
+    rotating_file_handler = RotatingFileHandler(log_file, maxBytes=5*1024*1024, backupCount=2, encoding='utf-8')
+    rotating_file_handler.setFormatter(logging.Formatter(log_format))
 
-    # Configure root logger
-    logging.basicConfig(level=log_level, handlers=[handler])
-
-    # Add stream handler to see logs if running interactively (optional)
-    # logging.getLogger().addHandler(logging.StreamHandler(sys.stdout))
+    # Setup the console handler
+    console_handler_for_basic_config = logging.StreamHandler(sys.stdout)
+    console_handler_for_basic_config.setFormatter(logging.Formatter(log_format))
 
+    # Configure root logger with both file and console handlers
+    # This replaces the old basicConfig and the subsequent addHandler calls for file and console
+    logging.basicConfig(level=log_level, handlers=[rotating_file_handler, console_handler_for_basic_config])
+    
     logging.info("="*20 + " OOTB App Starting " + "="*20)
+    logging.info(f"Logging to file: {log_file}") # Explicitly log the path
     logging.info(f"Running with args: {sys.argv}")
     logging.info(f"Python Executable: {sys.executable}")
     logging.info(f"Working Directory: {os.getcwd()}")
-    logging.info(f"User: {os.getenv('USERNAME')}")
+    logging.info(f"User: {current_username}") # Log the username being used for the path
 
 except Exception as log_setup_e:
     print(f"FATAL: Failed to set up logging: {log_setup_e}")
-    # Fallback logging might be needed here if file logging fails
+    traceback.print_exc() # Print traceback for debugging log setup failure
 
 # --- Get the root logger ---
+# The root logger is now fully configured by basicConfig above.
+# The following sections for re-adding file handler and console handler are no longer needed.
 root_logger = logging.getLogger()
-root_logger.setLevel(log_level) # Ensure root logger level is set
+# root_logger.setLevel(log_level) # This was redundant as basicConfig sets the level.
 
 # --- File Handler (as before) ---
-file_handler = RotatingFileHandler(log_file, maxBytes=5*1024*1024, backupCount=2, encoding='utf-8')
-file_handler.setFormatter(logging.Formatter(log_format))
-root_logger.addHandler(file_handler)
+# REMOVED - This was redundant as rotating_file_handler is now passed to basicConfig.
+# file_handler = RotatingFileHandler(log_file, maxBytes=5*1024*1024, backupCount=2, encoding='utf-8')
+# file_handler.setFormatter(logging.Formatter(log_format))
+# root_logger.addHandler(file_handler)
 
 # --- Console Handler (New) ---
-console_handler = logging.StreamHandler(sys.stdout) # Log to standard output
-console_handler.setFormatter(logging.Formatter(log_format)) 
-root_logger.addHandler(console_handler)
+# REMOVED - This was redundant as console_handler_for_basic_config is now passed to basicConfig.
+# console_handler = logging.StreamHandler(sys.stdout) # Log to standard output
+# console_handler.setFormatter(logging.Formatter(log_format)) 
+# root_logger.addHandler(console_handler)
 
 # --- End App Logging Setup ---
 

{computer_use_ootb_internal-0.0.193 → computer_use_ootb_internal-0.0.195}/src/computer_use_ootb_internal/preparation/pr_prepare.py

@@ -93,21 +93,21 @@ def run_preparation(state):
             log.info(f"Executing command string with shell=True: {cmd_string}")
             print(f"[DEBUG] Attempting command string in pr_prepare: {cmd_string}")
 
-            # Execute with shell=True
-            result = subprocess.run(cmd_string, shell=True, check=False, capture_output=True, text=True)
+            # Use Popen with shell=True to launch and detach
+            try:
+                process = subprocess.Popen(cmd_string, shell=True,
+                                           creationflags=subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS,
+                                           stdout=subprocess.DEVNULL, # Suppress any potential stdout/stderr locking
+                                           stderr=subprocess.DEVNULL)
+                print(f"[DEBUG] Launched process via Popen, PID (may be cmd.exe): {process.pid}")
+                # Assume success if Popen doesn't throw immediately
+                log.info(f"Successfully dispatched command for Premiere Pro via Popen.")
+            except Exception as popen_err:
+                print(f"[DEBUG] Error launching with Popen: {popen_err}")
+                log.error(f"Error launching Premiere Pro with Popen: {popen_err}", exc_info=True)
 
-            # ADDED PRINTS for result
-            print(f"[DEBUG] pr_prepare command result:")
-            print(f"[DEBUG]   Return Code: {result.returncode}")
-            print(f"[DEBUG]   Stdout: {result.stdout.strip() if result.stdout else ''}")
-            print(f"[DEBUG]   Stderr: {result.stderr.strip() if result.stderr else ''}")
+            # No reliable return code check with Popen+start, assume dispatch success if no exception
 
-            if result.returncode == 0:
-                log.info(f"Successfully executed command for Premiere Pro.")
-            else:
-                log.error(f"Error executing command for Premiere Pro: {result.stderr.strip() if result else 'Command not run'}")
-                if result and result.stdout:
-                    log.error(f"Stdout from start command: {result.stdout.strip()}")
         except FileNotFoundError:
              log.error("Error: 'cmd' or 'start' command not found. Ensure system PATH is configured correctly.")
         except Exception as e: