judgetap 0.2.1.dev41001__tar.gz → 0.2.1.dev42001__tar.gz

{judgetap-0.2.1.dev41001 → judgetap-0.2.1.dev42001}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: judgetap
-Version: 0.2.1.dev41001
+Version: 0.2.1.dev42001
 Summary: Fast typed decisions (choice, score, yes/no) across Jev-style engines, plus a guard for coding agents. Early development.
 Project-URL: Homepage, https://github.com/mergesafe-ai/judgetap
 Author-email: Omer Bar-Ness <omer@zsquared.io>

{judgetap-0.2.1.dev41001 → judgetap-0.2.1.dev42001}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "judgetap"
-version = "0.2.1.dev41001"
+version = "0.2.1.dev42001"
 description = "Fast typed decisions (choice, score, yes/no) across Jev-style engines, plus a guard for coding agents. Early development."
 readme = "README.md"
 license = "Apache-2.0"

{judgetap-0.2.1.dev41001 → judgetap-0.2.1.dev42001}/src/judgetap/__init__.py

@@ -23,7 +23,7 @@ from judgetap.errors import (
 )
 from judgetap.types import Decision, Question
 
-__version__ = "0.2.1.dev41001"  # x-release-please-version
+__version__ = "0.2.1.dev42001"  # x-release-please-version
 
 __all__ = [
     "Cascade",

{judgetap-0.2.1.dev41001 → judgetap-0.2.1.dev42001}/src/judgetap/engines/julia.py

@@ -6,16 +6,18 @@ the request is built with the Jev adapter's helpers. Its runtime ships in the
 model repo rather than on PyPI:
 
     python -c "from huggingface_hub import snapshot_download; \\
-        snapshot_download('SupersonicLabs/Julia-1', local_dir='Julia-1')"
-    pip install -e ./Julia-1
+        import os; snapshot_download('SupersonicLabs/Julia-1', \\
+        local_dir=os.path.expanduser('~/.judgetap/models/Julia-1'))"
+    pip install -e ~/.judgetap/models/Julia-1
 
 Spec `julia` loads the checkpoint at $JUDGETAP_JULIA_PATH (default
 `~/.judgetap/models/Julia-1`); `julia:<path>` names it. A relative path is
-taken from ~/.judgetap/models, never the working directory: the guard runs
-inside untrusted repos, which must not be able to supply the model that
-judges them. $JUDGETAP_JULIA_DEVICE picks the device (default `cpu`).
+taken from ~/.judgetap/models, never the working directory, and may not
+escape it (`../x` is rejected): the guard runs inside untrusted repos, which
+must not be able to supply the model that judges them. $JUDGETAP_JULIA_DEVICE picks the device (default `cpu`).
 
-Loaded models are cached per process (path, device), so a long-running
+Loaded models are cached per process (path, device), at most
+MAX_CACHED_MODELS of them (least recently used evicted), so a long-running
 program loads each once. The guard hook is a new process per action, so an
 in-process model still loads on every guarded action there: for the guard,
 prefer a server engine (AgentJev, or a TypeSafe-compatible URL).
@@ -36,7 +38,8 @@ from judgetap.errors import JudgetapError
 from judgetap.types import NO, YES, Question
 
 DEFAULT_PATH = "Julia-1"
-_models: dict[tuple[str, str], Any] = {}
+MAX_CACHED_MODELS = 2
+_models: dict[tuple[str, str], Any] = {}  # insertion order = LRU order
 _models_lock = threading.Lock()
 
 
@@ -47,9 +50,21 @@ def _models_dir() -> Path:
 
 
 def resolve_path(path: str) -> str:
-    """Absolute paths as given; anything else under ~/.judgetap/models."""
+    """Absolute paths as given; anything else under ~/.judgetap/models.
+
+    A relative path that resolves outside the models directory (``../x``,
+    or a symlink out of it) is rejected.
+    """
     p = Path(path).expanduser()
-    return str(p if p.is_absolute() else _models_dir() / p)
+    if p.is_absolute():
+        return str(p)
+    base = _models_dir()
+    if not (base / p).resolve().is_relative_to(base.resolve()):
+        raise ValueError(
+            f"julia model path {path!r} escapes {base}; "
+            "use an absolute path for a model outside it"
+        )
+    return str(base / p)
 
 
 # Julia's native limits: 2-20 options per question.
@@ -90,7 +105,9 @@ class JuliaEngine:
         key = (self.path, self.device)
         # One load per process and model, even with concurrent first calls.
         with _models_lock:
-            if key not in _models:
+            if key in _models:
+                _models[key] = _models.pop(key)  # mark most recently used
+            else:
                 try:
                     from julia import load_model
                 except ImportError as err:
@@ -106,6 +123,8 @@ class JuliaEngine:
                     max_length=8192,
                     head_length=512,
                 )
+                while len(_models) > MAX_CACHED_MODELS:
+                    del _models[next(iter(_models))]
             self._runtime = _models[key]
         return self._runtime
 

{judgetap-0.2.1.dev41001 → judgetap-0.2.1.dev42001}/tests/test_engine_julia.py

@@ -167,3 +167,33 @@ def test_model_loads_once_per_process_even_concurrently(tmp_path, monkeypatch):
         t.join()
     assert len(loads) == 1
     assert len({id(e._runtime) for e in engines}) == 1
+
+
+@pytest.mark.parametrize("spec", ["../Julia-1", "a/../../x", "../../etc"])
+def test_relative_paths_escaping_models_dir_are_rejected(spec, tmp_path, monkeypatch):
+    monkeypatch.setenv("JUDGETAP_HOME", str(tmp_path / "home"))
+    with pytest.raises(ValueError, match="escapes"):
+        JuliaEngine(spec)
+
+
+def test_relative_path_inside_models_dir_with_dotdot_is_allowed(tmp_path, monkeypatch):
+    monkeypatch.setenv("JUDGETAP_HOME", str(tmp_path / "home"))
+    path = JuliaEngine("a/../Julia-1").path
+    assert path == str(tmp_path / "home" / "models" / "a" / ".." / "Julia-1")
+
+
+def test_model_cache_keeps_two_most_recently_used(fake_julia, tmp_path, monkeypatch):
+    from judgetap.engines import julia as jmod
+
+    monkeypatch.setenv("JUDGETAP_HOME", str(tmp_path))
+    monkeypatch.setattr(jmod, "_models", {})
+    jmod.JuliaEngine("A")._get_runtime()
+    jmod.JuliaEngine("B")._get_runtime()
+    jmod.JuliaEngine("A")._get_runtime()  # A is now most recent
+    jmod.JuliaEngine("C")._get_runtime()  # evicts B
+    models = tmp_path / "models"
+    assert [k[0] for k in jmod._models] == [str(models / "A"), str(models / "C")]
+    assert len(fake_julia.loads) == 3
+    jmod.JuliaEngine("B")._get_runtime()  # reloads B, evicts A
+    assert len(fake_julia.loads) == 4
+    assert [k[0] for k in jmod._models] == [str(models / "C"), str(models / "B")]