verifiers 0.2.2.dev45__tar.gz → 0.2.2.dev47__tar.gz

{verifiers-0.2.2.dev45 → verifiers-0.2.2.dev47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: verifiers
-Version: 0.2.2.dev45
+Version: 0.2.2.dev47
 Summary: Verifiers: Environments for LLM Reinforcement Learning
 Project-URL: Homepage, https://github.com/primeintellect-ai/verifiers
 Project-URL: Documentation, https://github.com/primeintellect-ai/verifiers

{verifiers-0.2.2.dev45 → verifiers-0.2.2.dev47}/tests/test_install_utils.py

@@ -1,5 +1,5 @@
-import sys
-from unittest.mock import MagicMock, patch
+from importlib.metadata import PackageNotFoundError
+from unittest.mock import patch
 
 import pytest
 
@@ -80,58 +80,32 @@ class TestIsHubEnv:
 
 
 class TestIsInstalled:
-    @patch("verifiers.utils.install_utils.subprocess.run")
-    def test_installed_no_version_check(self, mock_run):
-        mock_run.return_value = MagicMock(
-            returncode=0, stdout="Name: gsm8k\nVersion: 1.0.0\n"
-        )
+    @patch("verifiers.utils.install_utils.package_version", return_value="1.0.0")
+    def test_installed_no_version_check(self, mock_version):
         assert is_installed("gsm8k") is True
-        mock_run.assert_called_once_with(
-            ["uv", "pip", "show", "--python", sys.executable, "gsm8k"],
-            capture_output=True,
-            text=True,
-        )
-
-    @patch("verifiers.utils.install_utils.subprocess.run")
-    def test_not_installed(self, mock_run):
-        mock_run.return_value = MagicMock(returncode=1, stdout="")
+        mock_version.assert_called_once_with("gsm8k")
+
+    @patch("verifiers.utils.install_utils.package_version")
+    def test_not_installed(self, mock_version):
+        mock_version.side_effect = PackageNotFoundError("gsm8k")
         assert is_installed("gsm8k") is False
 
-    @patch("verifiers.utils.install_utils.subprocess.run")
-    def test_installed_version_matches(self, mock_run):
-        mock_run.return_value = MagicMock(
-            returncode=0, stdout="Name: gsm8k\nVersion: 1.0.0\n"
-        )
+    @patch("verifiers.utils.install_utils.package_version", return_value="1.0.0")
+    def test_installed_version_matches(self, mock_version):
         assert is_installed("gsm8k", version="1.0.0") is True
 
-    @patch("verifiers.utils.install_utils.subprocess.run")
-    def test_installed_version_mismatch(self, mock_run):
-        mock_run.return_value = MagicMock(
-            returncode=0, stdout="Name: gsm8k\nVersion: 1.0.0\n"
-        )
+    @patch("verifiers.utils.install_utils.package_version", return_value="1.0.0")
+    def test_installed_version_mismatch(self, mock_version):
         assert is_installed("gsm8k", version="2.0.0") is False
 
-    @patch("verifiers.utils.install_utils.subprocess.run")
-    def test_latest_version_skips_check(self, mock_run):
-        mock_run.return_value = MagicMock(
-            returncode=0, stdout="Name: gsm8k\nVersion: 1.0.0\n"
-        )
+    @patch("verifiers.utils.install_utils.package_version", return_value="1.0.0")
+    def test_latest_version_skips_check(self, mock_version):
         assert is_installed("gsm8k", version="latest") is True
 
-    @patch("verifiers.utils.install_utils.subprocess.run")
-    def test_normalizes_package_name(self, mock_run):
-        mock_run.return_value = MagicMock(returncode=0, stdout="")
+    @patch("verifiers.utils.install_utils.package_version", return_value="1.0.0")
+    def test_normalizes_package_name(self, mock_version):
         is_installed("my-package")
-        mock_run.assert_called_once_with(
-            ["uv", "pip", "show", "--python", sys.executable, "my_package"],
-            capture_output=True,
-            text=True,
-        )
-
-    @patch("verifiers.utils.install_utils.subprocess.run")
-    def test_exception_returns_false(self, mock_run):
-        mock_run.side_effect = Exception("subprocess error")
-        assert is_installed("gsm8k") is False
+        mock_version.assert_called_once_with("my_package")
 
 
 class TestCheckHubEnvInstalled:

{verifiers-0.2.2.dev45 → verifiers-0.2.2.dev47}/verifiers/utils/install_utils.py

@@ -4,6 +4,7 @@ import importlib
 import logging
 import subprocess
 import sys
+from importlib.metadata import PackageNotFoundError, version as package_version
 from pathlib import Path
 from typing import Optional
 from urllib.parse import urlparse
@@ -66,26 +67,10 @@ def is_installed(env_name: str, version: Optional[str] = None) -> bool:
         True if installed (and version matches if specified)
     """
     try:
-        pkg_name = normalize_package_name(env_name)
-        result = subprocess.run(
-            _uv_pip_cmd("show", pkg_name),
-            capture_output=True,
-            text=True,
-        )
-
-        if result.returncode != 0:
-            return False
-
-        if version and version != "latest":
-            for line in result.stdout.splitlines():
-                if line.startswith("Version:"):
-                    installed_version = line.split(":", 1)[1].strip()
-                    return installed_version == version
-            return False
-
-        return True
-    except Exception:
+        installed_version = package_version(normalize_package_name(env_name))
+    except PackageNotFoundError:
         return False
+    return not version or version == "latest" or installed_version == version
 
 
 def check_hub_env_installed(env_id: str) -> bool:

{verifiers-0.2.2.dev45 → verifiers-0.2.2.dev47}/verifiers/v1/serve/types.py

@@ -1,6 +1,6 @@
 from typing import ClassVar
 
-from pydantic import BaseModel, Field, field_serializer, model_validator
+from pydantic import BaseModel, Field, SerializeAsAny, model_validator
 
 from verifiers.v1.clients.config import ClientConfig
 from verifiers.v1.episode import WireEpisode
@@ -65,15 +65,11 @@ class RunRequest(BaseRequest):
 
 
 class RunResponse(BaseResponse):
-    episode: WireEpisode | None = None
+    episode: SerializeAsAny[WireEpisode] | None = None
     """The rollout's episode — its standing (`id`/`env`/`errors`, carrying
     episode-level errors even when no trace minted) inlined next to its flat,
     self-contained traces; task-specific data preserved in `model_extra`."""
 
-    @field_serializer("episode")
-    def _ser_episode(self, episode: "WireEpisode | None") -> dict | None:
-        return episode.model_dump() if episode is not None else None
-
 
 class RunGroupRequest(BaseRequest):
     """Legacy (v0) route: group-scored v0 envs run a task's n rollouts together."""
@@ -87,8 +83,4 @@ class RunGroupRequest(BaseRequest):
 
 
 class RunGroupResponse(BaseResponse):
-    traces: list[WireTrace] | None = None
-
-    @field_serializer("traces")
-    def _ser_traces(self, traces: "list[WireTrace] | None") -> list[dict] | None:
-        return [t.model_dump() for t in traces] if traces is not None else None
+    traces: list[SerializeAsAny[WireTrace]] | None = None