computer-use-ootb-internal 0.0.194__py3-none-any.whl → 0.0.196__py3-none-any.whl

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/computer_use_demo/gui_agent/gui_parser/simple_parser/gui_capture.py

@@ -11,6 +11,7 @@ import time
 import win32gui
 from typing import List, Tuple, Dict
 from screeninfo import get_monitors
+import pyautogui
 
 
 class Rectangle:
@@ -240,15 +241,27 @@ class GUICapture:
 
         # Get monitor dimensions from visibility_checker
         monitor = self.visibility_checker.monitor
-        # Capture screenshot of the specific monitor
-        # screenshot = auto.GetRootControl().ToBitmap(monitor.left, monitor.top, 
-        #                                            monitor.right - monitor.left, 
-        #                                            monitor.bottom - monitor.top)
-        bbox=(monitor.left, monitor.top, 
-                monitor.right, monitor.bottom)
-        screenshot = ImageGrab.grab(bbox=bbox, all_screens=True)
         
-        screenshot = screenshot.convert('RGB')
+        # Define the bounding box for pyautogui
+        # bbox for ImageGrab is (left, top, right, bottom)
+        # region for pyautogui is (left, top, width, height)
+        pyautogui_region = (
+            monitor.left,
+            monitor.top,
+            monitor.right - monitor.left,
+            monitor.bottom - monitor.top
+        )
+
+        # Capture screenshot of the specific monitor region using pyautogui
+        try:
+            screenshot = pyautogui.screenshot(region=pyautogui_region)
+        except Exception as e:
+            # Add logging or raise a more specific exception if needed
+            print(f"Error during pyautogui.screenshot: {e}")
+            # Fallback or re-raise, depending on desired error handling
+            # For now, let's re-raise to make it clear an error occurred.
+            raise
+
         screenshot.save(screenshot_path)
         return screenshot_path
     

{computer_use_ootb_internal-0.0.194.dist-info → computer_use_ootb_internal-0.0.196.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.194.dist-info → computer_use_ootb_internal-0.0.196.dist-info}/RECORD

@@ -1,6 +1,6 @@
 computer_use_ootb_internal/README.md,sha256=FxpW95lyub2iX73ZDfK6ML7SdEKg060H5I6Grub7li4,31
 computer_use_ootb_internal/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-computer_use_ootb_internal/app_teachmode.py,sha256=BUq78BvYZtlcE16qPB-3I-p7hi_-iVTxK5Vw7DMg5Jc,28277
+computer_use_ootb_internal/app_teachmode.py,sha256=GV6Bi2TGDSMRmf6AA_UDFvc66iaryQDXhXbLlVj4bvk,29449
 computer_use_ootb_internal/dependency_check.py,sha256=y8RMEP6RXQzTgU1MS_1piBLtz4J-Hfn9RjUZg59dyvo,1333
 computer_use_ootb_internal/guard_service.py,sha256=8tJA7MAZgzqfTXHtbiNVwUCQj_dkHg3vDmgisd5TyIM,51642
 computer_use_ootb_internal/requirements-lite.txt,sha256=5DAHomz4A_P2BmTIXNkNqkHbnIF0AyZ4_1XAlb1LaYs,290
@@ -13,7 +13,7 @@ computer_use_ootb_internal/computer_use_demo/animation/icons8-select-cursor-tran
 computer_use_ootb_internal/computer_use_demo/animation/test_animation.py,sha256=2R1u98OLKYalSZ5nt5vvyZ71FL5R5vLv-n8zM8jVdV8,1183
 computer_use_ootb_internal/computer_use_demo/executor/teachmode_executor.py,sha256=7wG3K4s2HkLznXPRER4jOo20qakFA9Iw_tYMg9d3r9s,16154
 computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/simple_parser/__init__.py,sha256=h2CNeuACklxVpJC65QR8_6AvSybEZLmeO45hY_-lLBs,61
-computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/simple_parser/gui_capture.py,sha256=CxFJbsSb68ERKH7-C4RaaZy7FIhhzrzGx5qQJ4C37cA,13907
+computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/simple_parser/gui_capture.py,sha256=idoCVRKPQ-2MealPrEHULMHSIlVtHzbpX3uwR4nFI8o,14251
 computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/simple_parser/utils.py,sha256=OOVxy4Qlbk5q-X9kXFXqt6AmuOMl6FWWqtH269DvJJA,10005
 computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/uia_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/uia_tools/screenshot_cli.py,sha256=hrUBH3aeUe9t4EDsMhaUZLPpNLKeEaG4ZvikrFy-bOU,1313
@@ -39,7 +39,7 @@ computer_use_ootb_internal/preparation/powerpoint_prepare.py,sha256=eHaDOIJnBJ9Q
 computer_use_ootb_internal/preparation/pr_prepare.py,sha256=_4wHv0-q7D_kY6_niggulWxahZqIafQHGyWxcFSPzcc,6136
 computer_use_ootb_internal/preparation/star_rail_prepare.py,sha256=r0b19M_c1sXkN3_MRFjql8w_ThC9nZUe8zbSLYUvKS8,4635
 computer_use_ootb_internal/preparation/word_prepare.py,sha256=-SKbzckosEcOI5v2M5Pg7iFw9jTS5INJ6EoT5cHIqko,5172
-computer_use_ootb_internal-0.0.194.dist-info/METADATA,sha256=ahg-tUsM9T0pB5_YkHFsMWtevCH8W2Qa-Sqn5m9nSt8,1048
-computer_use_ootb_internal-0.0.194.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.194.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.194.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.196.dist-info/METADATA,sha256=p_2H7YTPhMizlvbsR1tuCBD5ChqZ8_Ke8r06j-eJwF0,1048
+computer_use_ootb_internal-0.0.196.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.196.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.196.dist-info/RECORD,,