computer-use-ootb-internal 0.0.185__tar.gz → 0.0.187__tar.gz

{computer_use_ootb_internal-0.0.185 → computer_use_ootb_internal-0.0.187}/PKG-INFO

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

{computer_use_ootb_internal-0.0.185 → computer_use_ootb_internal-0.0.187}/pyproject.toml

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

{computer_use_ootb_internal-0.0.185 → computer_use_ootb_internal-0.0.187}/src/computer_use_ootb_internal/app_teachmode.py

@@ -55,6 +55,20 @@ 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
 
+# --- Get the root logger ---
+root_logger = logging.getLogger()
+root_logger.setLevel(log_level) # Ensure root logger level is set
+
+# --- 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)
+
+# --- 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)
+
 # --- End App Logging Setup ---
 
 app = FastAPI()

{computer_use_ootb_internal-0.0.185 → computer_use_ootb_internal-0.0.187}/src/computer_use_ootb_internal/preparation/excel_prepare.py

@@ -79,17 +79,20 @@ def run_preparation(state):
             # Check if template exists and construct command accordingly
             if template_file.exists():
                 log.info(f"Template file found. Attempting to open {template_file} with Excel maximized...")
-                cmd_args = ['EXCEL.EXE', str(template_file)]
+                cmd = ['cmd', '/c', 'start', '/max', 'excel', str(template_file)]
             else:
                 log.info(f"Template file not found. Attempting to launch Excel maximized...")
-                cmd_args = ['EXCEL.EXE']
+                cmd = ['cmd', '/c', 'start', '/max', 'excel']
 
-            log.info(f"Executing command: {' '.join(cmd_args)}")
-            # Use Popen for more direct execution, don't wait for it
-            process = subprocess.Popen(cmd_args, creationflags=subprocess.DETACHED_PROCESS | subprocess.CREATE_NEW_PROCESS_GROUP)
-            log.info(f"Launched Excel process with PID: {process.pid}")
-            # Simulate success as Popen doesn't give immediate exit code
-            result = type('obj', (object,), {'returncode' : 0, 'stderr': '', 'stdout': ''})()
+            log.info(f"Executing command: {' '.join(cmd)}")
+            print(f"[DEBUG] Attempting command in excel_prepare: {' '.join(cmd)}")
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, creationflags=subprocess.CREATE_NO_WINDOW)
+
+            # ADDED PRINTS for result
+            print(f"[DEBUG] excel_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 ''}")
 
             if result.returncode == 0:
                 log.info(f"Successfully executed command for Excel.")

{computer_use_ootb_internal-0.0.185 → computer_use_ootb_internal-0.0.187}/src/computer_use_ootb_internal/preparation/powerpoint_prepare.py

@@ -81,17 +81,20 @@ def run_preparation(state):
             # Check if template exists and construct command accordingly
             if template_file.exists():
                 log.info(f"Template file found. Attempting to open {template_file} with PowerPoint maximized...")
-                cmd_args = ['POWERPNT.EXE', str(template_file)]
+                cmd = ['cmd', '/c', 'start', '/max', 'powerpnt', str(template_file)]
             else:
                 log.info(f"Template file not found. Attempting to launch PowerPoint maximized...")
-                cmd_args = ['POWERPNT.EXE']
+                cmd = ['cmd', '/c', 'start', '/max', 'powerpnt']
 
-            log.info(f"Executing command: {' '.join(cmd_args)}")
-            # Use Popen for more direct execution, don't wait for it
-            process = subprocess.Popen(cmd_args, creationflags=subprocess.DETACHED_PROCESS | subprocess.CREATE_NEW_PROCESS_GROUP)
-            log.info(f"Launched PowerPoint process with PID: {process.pid}")
-            # Simulate success as Popen doesn't give immediate exit code
-            result = type('obj', (object,), {'returncode' : 0, 'stderr': '', 'stdout': ''})()
+            log.info(f"Executing command: {' '.join(cmd)}")
+            print(f"[DEBUG] Attempting command in powerpoint_prepare: {' '.join(cmd)}")
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, creationflags=subprocess.CREATE_NO_WINDOW)
+
+            # ADDED PRINTS for result
+            print(f"[DEBUG] powerpoint_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 ''}")
 
             if result.returncode == 0:
                 log.info(f"Successfully executed command for PowerPoint.")

{computer_use_ootb_internal-0.0.185 → computer_use_ootb_internal-0.0.187}/src/computer_use_ootb_internal/preparation/pr_prepare.py

@@ -77,26 +77,31 @@ def run_preparation(state):
 
         # Open the file with Premiere Pro maximized on Windows
         try:
+            pr_executable = r"C:\Program Files\Adobe\Adobe Premiere Pro 2024\Adobe Premiere Pro.exe"
             # Check if template exists and construct command accordingly
             if template_file.exists():
                 log.info(f"Template file found. Attempting to open {template_file} with Premiere Pro maximized...")
-                # Use full path for the executable
-                pr_executable = r"C:\Program Files\Adobe\Adobe Premiere Pro 2024\Adobe Premiere Pro.exe"
-                cmd = ['cmd', '/c', 'start', '/max', '""', pr_executable, str(template_file)] # Use empty title "" for start
+                # Use empty title "" for start when executable path has spaces
+                cmd = ['cmd', '/c', 'start', '/max', '""', pr_executable, str(template_file)]
             else:
                 log.info(f"Template file not found. Attempting to launch Premiere Pro maximized...")
-                # Use full path for the executable
-                pr_executable = r"C:\Program Files\Adobe\Adobe Premiere Pro 2024\Adobe Premiere Pro.exe"
                 cmd = ['cmd', '/c', 'start', '/max', '""', pr_executable]
 
             log.info(f"Executing command: {' '.join(cmd)}")
-            result = subprocess.run(cmd, check=False, capture_output=True, text=True, creationflags=subprocess.CREATE_NO_WINDOW) # Add CREATE_NO_WINDOW
-            
+            print(f"[DEBUG] Attempting command in pr_prepare: {' '.join(cmd)}")
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, creationflags=subprocess.CREATE_NO_WINDOW)
+
+            # 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 ''}")
+
             if result.returncode == 0:
                 log.info(f"Successfully executed command for Premiere Pro.")
             else:
-                log.error(f"Error opening Premiere Pro: {result.stderr.strip()}")
-                if result.stdout:
+                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.")

{computer_use_ootb_internal-0.0.185 → computer_use_ootb_internal-0.0.187}/src/computer_use_ootb_internal/preparation/word_prepare.py

@@ -79,17 +79,20 @@ def run_preparation(state):
             # Check if template exists and construct command accordingly
             if template_file.exists():
                 log.info(f"Template file found. Attempting to open {template_file} with Word maximized...")
-                cmd_args = ['WINWORD.EXE', str(template_file)]
+                cmd = ['cmd', '/c', 'start', '/max', 'winword', str(template_file)]
             else:
                 log.info(f"Template file not found. Attempting to launch Word maximized...")
-                cmd_args = ['WINWORD.EXE']
+                cmd = ['cmd', '/c', 'start', '/max', 'winword']
 
-            log.info(f"Executing command: {' '.join(cmd_args)}")
-            # Use Popen for more direct execution, don't wait for it
-            process = subprocess.Popen(cmd_args, creationflags=subprocess.DETACHED_PROCESS | subprocess.CREATE_NEW_PROCESS_GROUP)
-            log.info(f"Launched Word process with PID: {process.pid}")
-            # Simulate success as Popen doesn't give immediate exit code
-            result = type('obj', (object,), {'returncode' : 0, 'stderr': '', 'stdout': ''})()
+            log.info(f"Executing command: {' '.join(cmd)}")
+            print(f"[DEBUG] Attempting command in word_prepare: {' '.join(cmd)}")
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, creationflags=subprocess.CREATE_NO_WINDOW)
+
+            # ADDED PRINTS for result
+            print(f"[DEBUG] word_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 ''}")
 
             if result.returncode == 0:
                 log.info(f"Successfully executed command for Word.")