From a708ae5b7aac7ccd86f63cdc7cb853d68ede3284 Mon Sep 17 00:00:00 2001 From: Hongsheng Liu Date: Wed, 26 Aug 2026 06:13:28 +0800 Subject: [PATCH] [Bugfix] Reconcile env-var inventory with post-#6217 main drift (#6631) Signed-off-by: hsliuustc0106 --- docs/configuration/environment_variables.md | 5 +++-- tests/config/test_environment_variables.py | 6 +++--- vllm_omni/config/environment_variable_inventory.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/configuration/environment_variables.md b/docs/configuration/environment_variables.md index 08d40beb0..368baaceb 100644 --- a/docs/configuration/environment_variables.md +++ b/docs/configuration/environment_variables.md @@ -82,6 +82,7 @@ depends on the installed kernels and model path. | --- | --- | --- | --- | --- | | `SPEAKER_SAMPLES_DIR` | Filesystem path; default `~/.cache/vllm-omni/speakers` | Speech server; read when speaker storage initializes | Environment-only setting. The directory is created; filesystem errors propagate. | Stable | | `SPEAKER_MAX_UPLOADED` | Integer; default `1000` | Speech server; read when speaker storage initializes | Environment-only setting. A non-integer logs a warning and uses `1000`; range is not otherwise validated. | Stable | +| `VLLM_OMNI_ASYNC_OUTPUT_TIMEOUT` | Float seconds; default `600` | Diffusion engine async-output wait in `step_streaming`; resolved per call on the request path, not at import | Environment-only setting. A non-float or `<=0` value warns once and uses the default. | Experimental | | `VLLM_OMNI_INPUT_WAIT_TIMEOUT_S` | Float seconds; default `600`; `<=0` disables | Full-payload input coordinator, not async-chunk transfer; read when the scheduler module imports in each worker | Environment-only setting. A non-float logs a warning and uses `600`. | Stable operational control | | `VLLM_OMNI_ORCH_MONITOR_PATH` | Filesystem path; default `/vllm_omni_orch_monitor_.json` | Orchestrator monitor enabled by `--enable-orch-monitor`; read when the monitor is created | Environment-only path override. Parent directories are created; write errors are logged. | Diagnostic | | `VLLM_OMNI_VIDEO_SYNC_TIMEOUT` | Float seconds; default `600` | Synchronous Videos API; read when the API server module imports | Environment-only setting. A non-float raises `ValueError` during import. | Experimental | @@ -177,7 +178,7 @@ collection, examples, bug reports, or logs. ## Model-specific variables -The audit found 57 variables read by a single model or pipeline family. They are +The audit found 56 variables read by a single model or pipeline family. They are not listed as public usage options here because doing so would turn implementation escape hatches into an accidental compatibility contract. @@ -190,7 +191,7 @@ Every audited model-specific name has a migration disposition in the | Request scope | 6 | Move request-varying behavior into a declared request-option schema. | | External | 0 | Retain only when a supported third-party library owns the contract. | | Internalize | 11 | Keep a debug or diagnostic switch out of public documentation and configuration. | -| Deprecate/remove | 7 | Remove a compatibility escape hatch that has no continuing contract. | +| Deprecate/remove | 6 | Remove a compatibility escape hatch that has no continuing contract. | The disposition is a migration target, not a statement that the existing environment switch is stable. Promote or request-scope work should land in diff --git a/tests/config/test_environment_variables.py b/tests/config/test_environment_variables.py index 7f3f9d4d9..3369fd429 100644 --- a/tests/config/test_environment_variables.py +++ b/tests/config/test_environment_variables.py @@ -164,10 +164,10 @@ def test_inventory_matches_reviewed_snapshot_counts(): """Make an inventory expansion an explicit review decision.""" category_counts = Counter(item.category for item in ENVIRONMENT_VARIABLE_INVENTORY.values()) assert category_counts == { - EnvironmentVariableCategory.PUBLIC_OMNI: 22, + EnvironmentVariableCategory.PUBLIC_OMNI: 23, EnvironmentVariableCategory.INHERITED_VLLM: 20, EnvironmentVariableCategory.PLATFORM_EXTERNAL: 27, - EnvironmentVariableCategory.MODEL_SPECIFIC: 57, + EnvironmentVariableCategory.MODEL_SPECIFIC: 56, EnvironmentVariableCategory.BENCHMARK_TRANSITIONAL: 20, EnvironmentVariableCategory.INTERNAL: 2, } @@ -182,7 +182,7 @@ def test_inventory_matches_reviewed_snapshot_counts(): ModelEnvironmentVariableDisposition.REQUEST_SCOPE: 6, ModelEnvironmentVariableDisposition.EXTERNAL: 0, ModelEnvironmentVariableDisposition.INTERNALIZE: 11, - ModelEnvironmentVariableDisposition.DEPRECATE_REMOVE: 7, + ModelEnvironmentVariableDisposition.DEPRECATE_REMOVE: 6, } diff --git a/vllm_omni/config/environment_variable_inventory.py b/vllm_omni/config/environment_variable_inventory.py index 583bfa56d..b5e3ca599 100644 --- a/vllm_omni/config/environment_variable_inventory.py +++ b/vllm_omni/config/environment_variable_inventory.py @@ -63,6 +63,7 @@ _PUBLIC_OMNI = ( "OMNI_DIFFUSION_SESSION_STATE_MANAGER_MAX_SESSIONS", "SPEAKER_MAX_UPLOADED", "SPEAKER_SAMPLES_DIR", + "VLLM_OMNI_ASYNC_OUTPUT_TIMEOUT", "VLLM_OMNI_INPUT_WAIT_TIMEOUT_S", "VLLM_OMNI_ORCH_MONITOR_PATH", "VLLM_OMNI_SERVER_STORAGE__FILE_CONCURRENCY", @@ -197,7 +198,6 @@ _MODEL_INTERNALIZE = ( _MODEL_DEPRECATE_REMOVE = ( "HIGGS_AUDIO_V2_TOKENIZER_PATH", - "ROSVOT_SOURCE_DIR", "VLLM_OMNI_LINGBOT_ACTION_ROOT", "VLLM_OMNI_VOXCPM_CODE_PATH", "VLLM_USE_FLASHINFER_MOE_FP16",