verifiers 0.3.2.dev157__py3-none-any.whl → 0.3.2.dev159__py3-none-any.whl

verifiers/v1/__init__.py

@@ -15,7 +15,6 @@ from verifiers.v1.clients import (
 )
 from verifiers.v1.configs.agent import AgentConfig
 from verifiers.v1.configs.cli.env import (
-    merge_env_defaults,
     narrowed_env_annotation,
     resolve_env_field,
 )
@@ -153,6 +152,7 @@ from verifiers.v1.utils.decorators import (
     stop,
     tool,
 )
+from verifiers.v1.utils.generic import merge_defaults
 from verifiers.v1.utils.git import (
     PATCH_CAP_BYTES as PATCH_CAP_BYTES,
 )
@@ -321,7 +321,7 @@ __all__ = [  # noqa: RUF022 - grouped by public API area
     "SharedEnvConfig",
     "ServeConfig",
     "resolve_env_field",
-    "merge_env_defaults",
+    "merge_defaults",
     "narrowed_env_annotation",
     "SingleAgentEnvConfig",
     "AgentConfig",

verifiers/v1/configs/cli/env.py

@@ -1,5 +1,6 @@
 """Run-config plumbing around the `[env]` block: narrowing the `env` field of
-every config that owns one, and layering shared env defaults under it.
+every config that owns one. `merge_defaults` (`utils/generic.py`) layers shared env
+defaults under it.
 
 A run composes the blocks it needs — `[env]` (what runs, `configs/env.py`),
 `[serve]` (how it's hosted, `configs/serve.py`) — plus its own fields. Nothing here is a base class: the eval
@@ -10,11 +11,11 @@ single_agent_env_config)`. The `SerializeAsAny` is load-bearing: pydantic serial
 by declared type, so a plain `EnvConfig` silently drops a narrowed subclass's agents
 and knobs from `model_dump()` — the env-server wire's payload."""
 
-from pydantic import BaseModel, ValidationError
+from pydantic import ValidationError
 from pydantic_config import BaseConfig
 
-from verifiers.v1.configs.env import EnvConfig, SharedEnvConfig
-from verifiers.v1.utils.generic import deep_merge, prefix_validation_error
+from verifiers.v1.configs.env import EnvConfig
+from verifiers.v1.utils.generic import prefix_validation_error
 
 
 def resolve_env_field(data: dict, narrowed: "type[EnvConfig] | None" = None) -> dict:
@@ -45,32 +46,6 @@ def resolve_env_field(data: dict, narrowed: "type[EnvConfig] | None" = None) ->
     return data
 
 
-def merge_env_defaults(defaults: SharedEnvConfig, env: dict | None) -> dict:
-    """A raw `env` block over `defaults`, the knobs that several envs of one run share
-    (e.g. the retries of every eval source). Only the fields set in `defaults` apply,
-    and the env's own values win. A subtree whose `id`/`type` differs from the
-    default's is the env's alone, so one plugin's knobs never leak into another's."""
-    return deep_merge(_dump_set(defaults), env or {})
-
-
-def _dump_set(config: BaseModel) -> dict:
-    """`config`'s set fields, including those set on a sub-config after construction
-    (which leaves the parent's field unmarked). Each dumped sub-config keeps its
-    `id`/`type` even at the default: `deep_merge` detects a plugin switch only when
-    both sides name it."""
-    dump = {}
-    for name in type(config).model_fields:
-        value = getattr(config, name)
-        if isinstance(value, BaseModel):
-            nested = _dump_set(value)
-            if nested or name in config.model_fields_set:
-                keys = [k for k in ("id", "type") if k in type(value).model_fields]
-                dump[name] = {**{k: getattr(value, k) for k in keys}, **nested}
-        elif name in config.model_fields_set:
-            dump[name] = config.model_dump(include={name})[name]
-    return dump
-
-
 def narrowed_env_annotation(cls) -> "type[EnvConfig] | None":
     """The env field's annotation when the CLI pre-narrowed it (`narrow_config`
     swaps in a concrete subclass). The base declaration reads as `EnvConfig` itself

verifiers/v1/harnesses/rlm/harness.py

@@ -69,7 +69,7 @@ class CompactionConfig(BaseConfig):
 
 class RLMHarnessConfig(HarnessConfig):
     version: str = Field(
-        default="7b5c89b2a0055e6c1a993cdd0ba0384053835f14", min_length=1
+        default="f18f10800f86f13913e19ef930abe5fcde4aa90f", min_length=1
     )
     """Git ref (branch, tag, or commit) of nano-rlm to install. Must know every
     field this harness puts on the wire, i.e. be at least the default ref."""

verifiers/v1/utils/generic.py

@@ -2,7 +2,7 @@
 
 from typing import TypeVar, get_args, get_origin
 
-from pydantic import ValidationError
+from pydantic import BaseModel, ValidationError
 
 T = TypeVar("T")
 
@@ -39,6 +39,58 @@ def deep_merge(base: dict, override: dict) -> dict:
     return merged
 
 
+def merge_defaults(defaults: BaseModel, raw: dict | None) -> dict:
+    """Fill in a raw config block with the values that `defaults` sets, e.g. a
+    group's shared knobs under each member's own block.
+
+    - Only fields that were set on `defaults` are filled in; its plain defaults are not.
+    - Nested blocks are filled in key by key; a value already in `raw` is kept.
+    - If `raw` names a different `id`/`type` for a block (at any depth), that block is
+      taken from `raw` alone, so one plugin's fields never leak into another's.
+
+    For example, with `defaults` set to `algo = {type = "grpo", kl = 0.1}`:
+    `{}` becomes `{type = "grpo", kl = 0.1}`, `{kl = 0.5}` becomes
+    `{type = "grpo", kl = 0.5}`, and `{type = "max_rl"}` stays `{type = "max_rl"}`.
+    """
+    # `deep_merge` detects an `id`/`type` switch only on nested blocks, so wrap the
+    # block once to detect a switch of the block itself too.
+    identity = {
+        k: getattr(defaults, k)
+        for k in ("id", "type")
+        if k in type(defaults).model_fields
+    }
+    block = {**identity, **_dump_set(defaults)}
+    return deep_merge({"block": block}, {"block": raw or {}})["block"]
+
+
+def _dump_set(config: BaseModel) -> dict:
+    """The fields set on `config`, including extra fields, as a nested dict. A
+    sub-config the parent did not set still counts when its own fields changed after
+    construction (pydantic then leaves the parent's field unmarked), but not when it
+    only matches the field's default, which may itself be built with arguments. A
+    dumped sub-config always includes its `id`/`type`, because `deep_merge` detects a
+    switch only when both sides name it."""
+    dump = {}
+    for name, field in type(config).model_fields.items():
+        value = getattr(config, name)
+        if isinstance(value, BaseModel):
+            nested = _dump_set(value)
+            if name not in config.model_fields_set:
+                default = field.get_default(
+                    call_default_factory=True, validated_data=config.__dict__
+                )
+                if isinstance(default, BaseModel) and nested == _dump_set(default):
+                    continue
+            if nested or name in config.model_fields_set:
+                keys = [k for k in ("id", "type") if k in type(value).model_fields]
+                dump[name] = {**{k: getattr(value, k) for k in keys}, **nested}
+        elif name in config.model_fields_set:
+            dump[name] = config.model_dump(include={name})[name]
+    # Extra fields of an `extra="allow"` model exist only because they were set.
+    dump.update(config.model_dump(include=set(config.model_extra or {})))
+    return dump
+
+
 def concrete_type(
     cls: type, bound: type[T], *, origin: type | None = None
 ) -> type[T] | None:

{verifiers-0.3.2.dev157.dist-info → verifiers-0.3.2.dev159.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: verifiers
-Version: 0.3.2.dev157
+Version: 0.3.2.dev159
 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.3.2.dev157.dist-info → verifiers-0.3.2.dev159.dist-info}/RECORD

@@ -1,5 +1,5 @@
 verifiers/__init__.py,sha256=F5IVMw6mhGaPBMCw7QKk0la_r5mMwydP2hdTTdQucik,352
-verifiers/v1/__init__.py,sha256=6t2FsosAjmyfJz6qS8tDQ2gWCvQfyRzqk1mYwv5_-EQ,8738
+verifiers/v1/__init__.py,sha256=_8pSA4XU7zR4V-8sRpnZjh-YkfAYx1a0pikJtoFKzIk,8764
 verifiers/v1/agent.py,sha256=yBCCBe5tVTeQ8OZDlVSZLw_IDvCmEQSnF3wQ1BZcT14,32342
 verifiers/v1/env.py,sha256=GqrVxxrvv-9WitXhD8Rre0tKQgnQWeD8mTM2gDHMVBs,18040
 verifiers/v1/episode.py,sha256=UPtA02aGWA-fY8cJKEuYCMtQVnPN1C0BSN13LggNT8U,5986
@@ -55,7 +55,7 @@ verifiers/v1/configs/task.py,sha256=57OnEGAa6jTiG12Lx_elREU02koYh8UkM0t0Vvxahys,
 verifiers/v1/configs/taskset.py,sha256=LLbKdV2LW0ZjB9-fsKErIVKjchOAPcDLWGLVjgXKG_0,935
 verifiers/v1/configs/cli/__init__.py,sha256=YMDUPdbRlDJ77dhj3QqzmyRhqNgUvuQdpj_bdBqzZPM,78
 verifiers/v1/configs/cli/debug.py,sha256=CcUZ9MEcv0iAL9w2BkTfnZg20yWJ-Vn8P30-e5tuCic,2741
-verifiers/v1/configs/cli/env.py,sha256=FcapEAtgeHzRuVaqk8BU36ZxmMOfdJ1XlioPbdwwspo,3990
+verifiers/v1/configs/cli/env.py,sha256=qg2LNOasAU0yg3b0xqXpx3cIj4nHbHSlK3Ldc3NhiT4,2667
 verifiers/v1/configs/cli/eval.py,sha256=9Zw7mAUipMhoIcwRa_lgo5gII4rMmMEBAgzcPxPWPjw,6895
 verifiers/v1/configs/cli/init.py,sha256=JvIUOdhfZfNOXg2wm2i06jLLHpb97tNMzZqmcK_9wVw,916
 verifiers/v1/configs/cli/replay.py,sha256=vUCNs-9j1CXcAZhGozN1EaztcXK_dYVK3iN_fRmbSXw,2929
@@ -113,7 +113,7 @@ verifiers/v1/harnesses/pi/harness.py,sha256=ysKOLSRQnbPkMtwvuUoJU7Hd4uM4bDF1duD0
 verifiers/v1/harnesses/prime_agent/__init__.py,sha256=xfPC4RrlnyYWaf38tPAOZq4YL6M55lMpj5BoRLmaK8I,171
 verifiers/v1/harnesses/prime_agent/harness.py,sha256=Zs_f5H2hQgDzUS4zwArM5UxCYJI5Zo0ELmayn1oBkK0,10663
 verifiers/v1/harnesses/rlm/__init__.py,sha256=hwx51xTdEWzzYgMj-p4ETNcptoub3IPMDbEdJ4uB8Ns,122
-verifiers/v1/harnesses/rlm/harness.py,sha256=zA4VB23ibYnw5WZfhvZipxxm5Ift01pG-FaYzMtY3PI,13538
+verifiers/v1/harnesses/rlm/harness.py,sha256=NFJ3u1xC06d9NwjnxFD8cCqIXoGjAIwhmJly-hXSvMA,13538
 verifiers/v1/harnesses/terminus_2/__init__.py,sha256=l1pwfg1HyVDEqT9efdnFWcXqaZwtKwe7TrplkyxZSA0,166
 verifiers/v1/harnesses/terminus_2/harness.py,sha256=cKQJluW01mkxEccTLFwSWsVMavyiwq_w-NA4Hb_JkGU,3052
 verifiers/v1/harnesses/terminus_2/program.py,sha256=X8MZdyItU3gbXGXnGOlJ9LWcUTnqIDaxlhkZvoRiqKY,2703
@@ -178,7 +178,7 @@ verifiers/v1/utils/artifacts.py,sha256=3QL2ELwqXuek9OLwF4hJdzZb_hwfVjjenw8VjepdL
 verifiers/v1/utils/compile.py,sha256=5pxy31wx2Q-3pQjOO5B9SH6OT-wwb8r4F1LAl6HMeQA,5835
 verifiers/v1/utils/decorators.py,sha256=vhoN6YoKb15-Fkqmc9RaNlUIbt9WRvNK4zAn2bAxfS4,5367
 verifiers/v1/utils/format.py,sha256=yX160sGewMMZn9iJqTHRbYYt4Z9pHasjMlFT1dXrKD8,2446
-verifiers/v1/utils/generic.py,sha256=2VIN9RapMO9pVkFHB1UKUHck1vlTJ1pjfad2NzxuuXA,2055
+verifiers/v1/utils/generic.py,sha256=Iy_mgApIEBqm0DPpjBDLLkDFN0_NJ-UQmY9bZpdv5cM,4742
 verifiers/v1/utils/git.py,sha256=MTRinOvG4EddfjdahHkFZUihHmhJ37n5ROtgjzjE1NA,8366
 verifiers/v1/utils/image.py,sha256=OFw_wdwVtbdwa8uJ3X3vYfhpUAi0CTH5HMBupjVsRRQ,282
 verifiers/v1/utils/interrupt.py,sha256=F-KKhc5ndPJJfhd3SuMqyqhXhA32FhCRy5KWFJpEoM4,1179
@@ -193,8 +193,8 @@ verifiers/v1/utils/scope.py,sha256=bzUEiWDOVdbj7dXOwGOlzsQ_-Xu0j9NR5TalQB-8TS8,8
 verifiers/v1/utils/score.py,sha256=493yJVMw8teCu9JxapxMFPFzI0hNUqdo0Y2nGW4kckk,6200
 verifiers/v1/utils/trace_store.py,sha256=RsCDonGR-bs-tvEstcppiJm3jFmAdIiG83fA5KtCbAw,2801
 verifiers/v1/utils/version.py,sha256=-obEo_-l9-D8FLef4hYxncOe-uJpxrM1g2Hig_37Sgs,1607
-verifiers-0.3.2.dev157.dist-info/METADATA,sha256=S_JgAQryBAsnmV4JAI_Y7imKTAH7U_p-D6L1RIO25ig,4161
-verifiers-0.3.2.dev157.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-verifiers-0.3.2.dev157.dist-info/entry_points.txt,sha256=iugElcdWPKbQM7uFF0lZ8iUpHsNr17-BwEAAjJWxV3U,259
-verifiers-0.3.2.dev157.dist-info/licenses/LICENSE,sha256=v0RrUsdV3IDoZhrRce297IXS3xMHNJ-_LdLpFAUWb9k,1072
-verifiers-0.3.2.dev157.dist-info/RECORD,,
+verifiers-0.3.2.dev159.dist-info/METADATA,sha256=T0FmSudGXNolQ9I6tpm8jvLx8NuiuUHcBk60c1MOKFI,4161
+verifiers-0.3.2.dev159.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+verifiers-0.3.2.dev159.dist-info/entry_points.txt,sha256=iugElcdWPKbQM7uFF0lZ8iUpHsNr17-BwEAAjJWxV3U,259
+verifiers-0.3.2.dev159.dist-info/licenses/LICENSE,sha256=v0RrUsdV3IDoZhrRce297IXS3xMHNJ-_LdLpFAUWb9k,1072
+verifiers-0.3.2.dev159.dist-info/RECORD,,