computer-use-ootb-internal 0.0.117__tar.gz → 0.0.118__tar.gz

{computer_use_ootb_internal-0.0.117 → computer_use_ootb_internal-0.0.118}/PKG-INFO

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

{computer_use_ootb_internal-0.0.117 → computer_use_ootb_internal-0.0.118}/pyproject.toml

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

{computer_use_ootb_internal-0.0.117 → computer_use_ootb_internal-0.0.118}/src/computer_use_ootb_internal/app_teachmode.py

@@ -467,31 +467,20 @@ def process_input():
 def main():
     # Logging is set up at the top level now
     logging.info("App main() function starting setup.")
-    global app, shared_state, rate_limiter
-    
-    parser = argparse.ArgumentParser(
-        description="Run a synchronous sampling loop for assistant/tool interactions in teach-mode."
-    )
-    parser.add_argument("--model", default="teach-mode-gpt-4o")
-    parser.add_argument("--task", default="Create a claim on the SAP system, using Receipt.pdf as attachment.")
-    parser.add_argument("--selected_screen", type=int, default=0)
-    parser.add_argument("--user_id", default="star_rail_dev")
-    parser.add_argument("--trace_id", default="scroll")
-    parser.add_argument("--api_key_file", default="api_key.json")
-    parser.add_argument("--api_keys", default="")
-    parser.add_argument(
-        "--server_url",
-        default="http://ec2-44-234-43-86.us-west-2.compute.amazonaws.com",
-        help="Server URL for the session"
-    )
-    parser.add_argument("--host", type=str, default="127.0.0.1", help="Host to bind the server to")
-    parser.add_argument("--port", type=int, default=8000, help="Port to bind the server to") # Default port
+    global app, shared_state, rate_limiter # Ensure app is global if needed by uvicorn
+    parser = argparse.ArgumentParser()
+    # Add arguments, but NOT host and port
+    parser.add_argument("--model", type=str, default="teach-mode-gpt-4o", help="Model name")
+    parser.add_argument("--task", type=str, default="Following the instructions to complete the task.", help="Initial task description")
+    parser.add_argument("--selected_screen", type=int, default=0, help="Selected screen index")
+    parser.add_argument("--user_id", type=str, default="hero_cases", help="User ID for the session")
+    parser.add_argument("--trace_id", type=str, default="build_scroll_combat", help="Trace ID for the session")
+    parser.add_argument("--api_keys", type=str, default="sk-proj-1234567890", help="API keys")
+    parser.add_argument("--server_url", type=str, default="http://ec2-44-234-43-86.us-west-2.compute.amazonaws.com", help="Server URL for the session")
 
     args = parser.parse_args()
-    shared_state = SharedState(args)
-    rate_limiter = RateLimiter(interval_seconds=2)
 
-    # Validate args or set defaults if needed
+    # Validate args or set defaults if needed (keep these)
     if not hasattr(args, 'model'): args.model = "default_model"
     if not hasattr(args, 'task'): args.task = "default_task"
     if not hasattr(args, 'selected_screen'): args.selected_screen = 0
@@ -500,11 +489,40 @@ def main():
     if not hasattr(args, 'api_keys'): args.api_keys = "none"
     if not hasattr(args, 'server_url'): args.server_url = "none"
 
-    logging.info(f"Shared state initialized. Host={args.host}, Port={args.port}")
+    shared_state = SharedState(args)
+    rate_limiter = RateLimiter(interval_seconds=2) # Re-initialize rate limiter
+    logging.info(f"Shared state initialized for user: {args.user_id}")
+
+    # --- Restore original port calculation logic --- 
+    port = 7888 # Default port
+    host = "0.0.0.0" # Listen on all interfaces
+    
+    if platform.system() == "Windows":
+        try:
+            username = os.environ["USERNAME"].lower()
+            logging.info(f"Determining port based on Windows username: {username}")
+            if username == "altair":
+                port = 14000
+            elif username.startswith("guest") and username[5:].isdigit():
+                num = int(username[5:])
+                if 1 <= num <= 10: # Assuming max 10 guests for this range
+                    port = 14000 + num
+                else:
+                     logging.warning(f"Guest user number {num} out of range (1-10), using default port {port}.")
+            else:
+                logging.info(f"Username '{username}' doesn't match specific rules, using default port {port}.")
+        except Exception as e:
+             logging.error(f"Error determining port from username: {e}. Using default port {port}.", exc_info=True)
+    else:
+         logging.info(f"Not running on Windows, using default port {port}.")
+    # --- End of restored port calculation --- 
+
+    logging.info(f"Final Host={host}, Port={port}")
 
     try:
-        logging.info(f"Starting Uvicorn server on {args.host}:{args.port}")
-        uvicorn.run(app, host=args.host, port=args.port)
+        logging.info(f"Starting Uvicorn server on {host}:{port}")
+        # Use the calculated port and specific host
+        uvicorn.run(app, host=host, port=port)
         logging.info("Uvicorn server stopped.")
     except Exception as main_e:
         logging.error("Error in main execution:", exc_info=True)