Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dev = [
"textarena==0.7.4",
]
# V1 examples and support packages, resolved from their local sources below.
# Installed by default (tool.uv.default-groups) so the v1 CLIs (eval <id>, serve) run straight
# Installed by default (tool.uv.default-groups) so the v1 CLIs (eval <id>, validate) run straight
# from this repo. The built-in tasksets/harnesses ship inside verifiers (verifiers/v1/...).
examples = [
"compact",
Expand Down Expand Up @@ -152,7 +152,6 @@ eval = "verifiers.v1.cli.eval.main:main"
validate = "verifiers.v1.cli.validate:main"
debug = "verifiers.v1.cli.debug:main"
replay = "verifiers.v1.cli.replay:main"
serve = "verifiers.v1.cli.serve:main"
init = "verifiers.v1.cli.init:main"
gepa = "verifiers.v1.cli.gepa:main"
vf-gepa = "verifiers.scripts.gepa:main"
Expand Down
4 changes: 2 additions & 2 deletions verifiers/v1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from verifiers.v1.configs.retries import RetryConfig
from verifiers.v1.configs.serve import (
ElasticPoolConfig,
ServingConfig,
ServeConfig,
StaticPoolConfig,
pool_serve_kwargs,
)
Expand Down Expand Up @@ -254,7 +254,7 @@
"Env",
"SingleAgentEnv",
"EnvConfig",
"ServingConfig",
"ServeConfig",
"LegacyEnvConfig",
"resolve_env_field",
"narrowed_env_annotation",
Expand Down
79 changes: 0 additions & 79 deletions verifiers/v1/cli/serve.py

This file was deleted.

3 changes: 1 addition & 2 deletions verifiers/v1/configs/cli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from verifiers.v1.configs.cli.debug import DebugConfig
from verifiers.v1.configs.cli.eval import EvalConfig
from verifiers.v1.configs.cli.init import InitConfig
from verifiers.v1.configs.cli.serve import ServeConfig
from verifiers.v1.configs.cli.validate import ValidateConfig

__all__ = ["DebugConfig", "EvalConfig", "InitConfig", "ServeConfig", "ValidateConfig"]
__all__ = ["DebugConfig", "EvalConfig", "InitConfig", "ValidateConfig"]
4 changes: 2 additions & 2 deletions verifiers/v1/configs/cli/eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from verifiers.v1.configs.cli.env import narrowed_env_annotation, resolve_env_field
from verifiers.v1.configs.env import EnvConfig
from verifiers.v1.configs.legacy import LegacyEnvConfig
from verifiers.v1.configs.serve import ServingConfig
from verifiers.v1.configs.serve import ServeConfig
from verifiers.v1.envs.single_agent import SingleAgentEnvConfig
from verifiers.v1.types import SamplingConfig

Expand All @@ -19,7 +19,7 @@ class EvalConfig(BaseConfig):
env: SerializeAsAny[EnvConfig] = SingleAgentEnvConfig()
"""The environment — which env, its seed taskset, each agent, its knobs. Narrowed to
the selected env's config class by the env id, else the taskset id."""
serve: ServingConfig = ServingConfig()
serve: ServeConfig = ServeConfig()
"""How the env is hosted under `--server`: the worker pool, each worker's episode
bound. Ignored by an in-process run."""
legacy: LegacyEnvConfig = LegacyEnvConfig()
Expand Down
62 changes: 0 additions & 62 deletions verifiers/v1/configs/cli/serve.py

This file was deleted.

10 changes: 5 additions & 5 deletions verifiers/v1/configs/serve.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""How an env is served: the worker pool, where it binds, and each worker's bound.

Serving is its own axis. `[env]` says what runs; this says how it's hosted, so an
eval, a `serve` process, and a trainer configure it identically instead of each
flattening pool knobs onto its own config."""
eval and a trainer's env server configure it identically instead of each flattening
pool knobs onto its own config."""

from typing import Annotated, Literal

Expand Down Expand Up @@ -35,10 +35,10 @@ class ElasticPoolConfig(BaseConfig):
]


class ServingConfig(BaseConfig):
class ServeConfig(BaseConfig):
"""The `[serve]` block: the worker pool, the ZMQ address, and each worker's
episode bound. Read by whoever hosts the env — the `serve` CLI, a server-backed
eval, a trainer's orchestrator."""
episode bound. Read by whoever hosts the env — a server-backed eval, a
trainer's env-server process."""

pool: PoolConfig = Field(default_factory=ElasticPoolConfig)
"""Worker-pool sizing. `elastic` (default) starts at one worker and scales up on
Expand Down
Loading