eval-protocol 0.2.93.dev2__py3-none-any.whl → 0.2.93.dev3__py3-none-any.whl

eval_protocol/cli_commands/local_test.py

@@ -1,11 +1,11 @@
 import argparse
 import os
+import shlex
 import subprocess
 import sys
-import shlex
 from typing import List
 
-from .upload import _discover_tests, _prompt_select
+from .utils import _build_entry_point, _discover_and_select_tests
 
 
 def _find_dockerfiles(root: str) -> List[str]:
@@ -19,12 +19,6 @@ def _find_dockerfiles(root: str) -> List[str]:
     return dockerfiles
 
 
-def _run_pytest_host(pytest_target: str) -> int:
-    print(f"Running locally: pytest {pytest_target} -vs")
-    proc = subprocess.run([sys.executable, "-m", "pytest", pytest_target, "-vs"])
-    return proc.returncode
-
-
 def _build_docker_image(dockerfile_path: str, image_tag: str, build_extras: List[str] | None = None) -> bool:
     context_dir = os.path.dirname(dockerfile_path)
     print(f"Building Docker image '{image_tag}' from {dockerfile_path} ...")
@@ -41,6 +35,13 @@ def _build_docker_image(dockerfile_path: str, image_tag: str, build_extras: List
         return False
 
 
+def _run_pytest_host(pytest_target: str) -> int:
+    """Run pytest against a target on the host and return its exit code."""
+    print(f"Running locally: pytest {pytest_target} -vs")
+    proc = subprocess.run([sys.executable, "-m", "pytest", pytest_target, "-vs"])
+    return proc.returncode
+
+
 def _run_pytest_in_docker(
     project_root: str, image_tag: str, pytest_target: str, run_extras: List[str] | None = None
 ) -> int:
@@ -87,6 +88,53 @@ def _run_pytest_in_docker(
         return 1
 
 
+def run_evaluator_test(
+    project_root: str,
+    pytest_target: str,
+    ignore_docker: bool,
+    docker_build_extra: str = "",
+    docker_run_extra: str = "",
+) -> int:
+    """Run an evaluator test either on host or in Docker, reusing local-test logic."""
+    build_extras = shlex.split(docker_build_extra) if docker_build_extra else []
+    run_extras = shlex.split(docker_run_extra) if docker_run_extra else []
+
+    if ignore_docker:
+        if not pytest_target:
+            print("Error: Failed to resolve a pytest target to run.")
+            return 1
+        return _run_pytest_host(pytest_target)
+
+    dockerfiles = _find_dockerfiles(project_root)
+    if len(dockerfiles) > 1:
+        print("Error: Multiple Dockerfiles found. Only one Dockerfile is allowed for evaluator validation/local-test.")
+        for df in dockerfiles:
+            print(f" - {df}")
+        print("Hint: or use --ignore-docker to bypass Docker and use local pytest.")
+        return 1
+    if len(dockerfiles) == 1:
+        # Ensure host home logs directory exists so container writes are visible to host ep logs
+        try:
+            os.makedirs(os.path.join(os.path.expanduser("~"), ".eval_protocol"), exist_ok=True)
+        except Exception:
+            pass
+        image_tag = "ep-evaluator:local"
+        ok = _build_docker_image(dockerfiles[0], image_tag, build_extras=build_extras)
+        if not ok:
+            print("Docker build failed. See logs above.")
+            return 1
+        if not pytest_target:
+            print("Error: Failed to resolve a pytest target to run.")
+            return 1
+        return _run_pytest_in_docker(project_root, image_tag, pytest_target, run_extras=run_extras)
+
+    # No Dockerfile: run on host
+    if not pytest_target:
+        print("Error: Failed to resolve a pytest target to run.")
+        return 1
+    return _run_pytest_host(pytest_target)
+
+
 def local_test_command(args: argparse.Namespace) -> int:
     project_root = os.getcwd()
 
@@ -99,12 +147,7 @@ def local_test_command(args: argparse.Namespace) -> int:
             file_path = (
                 file_part if os.path.isabs(file_part) else os.path.abspath(os.path.join(project_root, file_part))
             )
-            # Convert to project-relative like the non-:: path
-            try:
-                rel = os.path.relpath(file_path, project_root)
-            except Exception:
-                rel = file_path
-            pytest_target = f"{rel}::{func_part}"
+            pytest_target = _build_entry_point(project_root, file_path, func_part)
         else:
             file_path = entry if os.path.isabs(entry) else os.path.abspath(os.path.join(project_root, entry))
             # Use path relative to project_root when possible
@@ -114,14 +157,9 @@ def local_test_command(args: argparse.Namespace) -> int:
                 rel = file_path
             pytest_target = rel
     else:
-        tests = _discover_tests(project_root)
-        if not tests:
-            print("No evaluation tests found.\nHint: Ensure @evaluation_test is applied.")
-            return 1
         non_interactive = bool(getattr(args, "yes", False))
-        selected = _prompt_select(tests, non_interactive=non_interactive)
+        selected = _discover_and_select_tests(project_root, non_interactive=non_interactive)
         if not selected:
-            print("No tests selected.")
             return 1
         if len(selected) != 1:
             print("Error: Please select exactly one evaluation test for 'local-test'.")
@@ -137,39 +175,10 @@ def local_test_command(args: argparse.Namespace) -> int:
     ignore_docker = bool(getattr(args, "ignore_docker", False))
     build_extras_str = getattr(args, "docker_build_extra", "") or ""
     run_extras_str = getattr(args, "docker_run_extra", "") or ""
-    build_extras = shlex.split(build_extras_str) if build_extras_str else []
-    run_extras = shlex.split(run_extras_str) if run_extras_str else []
-    if ignore_docker:
-        if not pytest_target:
-            print("Error: Failed to resolve a pytest target to run.")
-            return 1
-        return _run_pytest_host(pytest_target)
-
-    dockerfiles = _find_dockerfiles(project_root)
-    if len(dockerfiles) > 1:
-        print("Error: Multiple Dockerfiles found. Only one Dockerfile is allowed for local-test.")
-        for df in dockerfiles:
-            print(f" - {df}")
-        print("Hint: use --ignore-docker to bypass Docker.")
-        return 1
-    if len(dockerfiles) == 1:
-        # Ensure host home logs directory exists so container writes are visible to host ep logs
-        try:
-            os.makedirs(os.path.join(os.path.expanduser("~"), ".eval_protocol"), exist_ok=True)
-        except Exception:
-            pass
-        image_tag = "ep-evaluator:local"
-        ok = _build_docker_image(dockerfiles[0], image_tag, build_extras=build_extras)
-        if not ok:
-            print("Docker build failed. See logs above.")
-            return 1
-        if not pytest_target:
-            print("Error: Failed to resolve a pytest target to run.")
-            return 1
-        return _run_pytest_in_docker(project_root, image_tag, pytest_target, run_extras=run_extras)
-
-    # No Dockerfile: run on host
-    if not pytest_target:
-        print("Error: Failed to resolve a pytest target to run.")
-        return 1
-    return _run_pytest_host(pytest_target)
+    return run_evaluator_test(
+        project_root,
+        pytest_target,
+        ignore_docker=ignore_docker,
+        docker_build_extra=build_extras_str,
+        docker_run_extra=run_extras_str,
+    )