Merge branch 'main' into rel-1.5.0

Author: malhotra5

e2e_tests/test_executable.py

@@ -5,13 +5,9 @@
 import subprocess
 import time
 from pathlib import Path
-from typing import Any
-
-from openhands.sdk import LLM
-from openhands_cli.locations import AGENT_SETTINGS_PATH, PERSISTENCE_DIR
-from openhands_cli.utils import get_default_cli_agent
 
 from .models import TestResult
+from .utils import seed_dummy_settings
 
 
 WELCOME_MARKERS = ["welcome", "openhands cli", "type /help", "available commands", ">"]
@@ -30,28 +26,7 @@ def test_executable() -> TestResult:
 
     try:
         # Create dummy agent settings
-        from openhands_cli.utils import (
-            get_llm_metadata,
-            should_set_litellm_extra_body,
-        )
-
-        model_name = "dummy-model"
-        extra_kwargs: dict[str, Any] = {}
-        if should_set_litellm_extra_body(model_name):
-            extra_kwargs["litellm_extra_body"] = {
-                "metadata": get_llm_metadata(
-                    model_name=model_name, llm_type="openhands"
-                )
-            }
-        llm = LLM(model=model_name, api_key="dummy-key", **extra_kwargs)
-        dummy_agent = get_default_cli_agent(llm=llm)
-
-        spec_path = os.path.join(PERSISTENCE_DIR, AGENT_SETTINGS_PATH)
-        specs_path = Path(os.path.expanduser(spec_path))
-
-        if not specs_path.exists():
-            specs_path.parent.mkdir(parents=True, exist_ok=True)
-            specs_path.write_text(dummy_agent.model_dump_json())
+        seed_dummy_settings()
 
         exe_path = Path("dist/openhands")
         if not exe_path.exists():

e2e_tests/test_experimental_ui.py

@@ -7,6 +7,7 @@
 from pathlib import Path
 
 from .models import TestResult
+from .utils import seed_dummy_settings
 
 
 def test_experimental_ui() -> TestResult:
@@ -15,6 +16,8 @@ def test_experimental_ui() -> TestResult:
     start_time = time.time()
 
     try:
+        seed_dummy_settings()
+
         exe_path = Path("dist/openhands")
         if not exe_path.exists():
             exe_path = Path("dist/openhands.exe")
@@ -49,9 +52,7 @@ def test_experimental_ui() -> TestResult:
 
             # Markers that indicate the textual UI has started
             ui_markers = [
-                "openhands",
-                "conversation",
-                "initialized",
+                "initialized conversation",
                 "what do you want to build",
             ]
 
@@ -64,11 +65,12 @@ def test_experimental_ui() -> TestResult:
                 if not rlist:
                     continue
                 line = proc.stdout.readline()
+
                 if not line:
                     continue
                 captured.append(line)
-                line_lower = line.strip().lower()
-                if any(marker in line_lower for marker in ui_markers):
+                if any(marker.lower() in line.lower() for marker in ui_markers):
+                    print("fouind marker in line", line)
                     saw_ui_start = True
                     break
 

e2e_tests/utils.py

@@ -0,0 +1,29 @@
+import os
+from pathlib import Path
+from typing import Any
+
+from openhands.sdk import LLM
+from openhands_cli.locations import AGENT_SETTINGS_PATH, PERSISTENCE_DIR
+from openhands_cli.utils import (
+    get_default_cli_agent,
+    get_llm_metadata,
+    should_set_litellm_extra_body,
+)
+
+
+def seed_dummy_settings():
+    model_name = "dummy-model"
+    extra_kwargs: dict[str, Any] = {}
+    if should_set_litellm_extra_body(model_name):
+        extra_kwargs["litellm_extra_body"] = {
+            "metadata": get_llm_metadata(model_name=model_name, llm_type="openhands")
+        }
+    llm = LLM(model=model_name, api_key="dummy-key", **extra_kwargs)
+    dummy_agent = get_default_cli_agent(llm=llm)
+
+    spec_path = os.path.join(PERSISTENCE_DIR, AGENT_SETTINGS_PATH)
+    specs_path = Path(os.path.expanduser(spec_path))
+
+    if not specs_path.exists():
+        specs_path.parent.mkdir(parents=True, exist_ok=True)
+        specs_path.write_text(dummy_agent.model_dump_json())

openhands-cli.spec

@@ -34,6 +34,8 @@ a = Analysis(
         *collect_data_files('mcp'),
         # Include all data files from openhands.sdk (templates, configs, etc.)
         *collect_data_files('openhands.sdk'),
+        # Include all data files from openhands_cli package
+        *collect_data_files('openhands_cli'),
         # Include package metadata for importlib.metadata
         *copy_metadata('fastmcp'),
         *copy_metadata('agent-client-protocol'),