Merge commit '3599f39f4926dc8f86866f138da0d36138b5c511'
This commit is contained in:
@@ -46,6 +46,7 @@ baseline_args=(
|
||||
-e '{"dnd_pipeline_narratio_publish_outputs":[{"source":"narratio.transcript.final","required":true},{"source":"narratio.artifact.session_recap","required":true}]}'
|
||||
-e 'dnd_pipeline_narratio_testing_scriptorium_profile=endpoint-profile'
|
||||
-e 'dnd_pipeline_notarius_testing_llm_profile=gpt-terra-latest'
|
||||
-e '{"dnd_pipeline_audita_llm_transient_retries":null,"dnd_pipeline_audita_llm_repair_attempts":null,"dnd_pipeline_audita_llm_operation_timeout":null,"dnd_pipeline_notarius_promptkit_transient_retries":null,"dnd_pipeline_scriptorium_transient_retries":null}'
|
||||
)
|
||||
|
||||
cleanup() {
|
||||
@@ -90,19 +91,37 @@ printf '%s\n' \
|
||||
baseline_log="$test_tmp/baseline.log"
|
||||
run_converge "$baseline_log" "${baseline_args[@]}"
|
||||
/usr/local/bin/seriatim --version
|
||||
/usr/local/bin/audita config validate --config /usr/local/etc/audita/config.yml
|
||||
AUDITA_LLM_API_KEY="$synthetic_audita_api_key" \
|
||||
/usr/local/bin/audita config validate --config /usr/local/etc/audita/config.yml
|
||||
"$workspace_venv/bin/python" - <<'PY'
|
||||
import yaml
|
||||
|
||||
with open("/usr/local/etc/audita/config.yml", encoding="utf-8") as config_file:
|
||||
audita = yaml.safe_load(config_file)
|
||||
with open("/usr/local/etc/notarius/config.yml", encoding="utf-8") as config_file:
|
||||
notarius = yaml.safe_load(config_file)
|
||||
with open("/usr/local/etc/scriptorium/config.yml", encoding="utf-8") as config_file:
|
||||
scriptorium = yaml.safe_load(config_file)
|
||||
|
||||
assert "transient_retries" not in audita["llm"]
|
||||
assert "repair_attempts" not in audita["llm"]
|
||||
assert "operation_timeout" not in audita["llm"]
|
||||
assert "transient_retries" not in notarius.get("promptkit", {})
|
||||
assert "transient_retries" not in scriptorium
|
||||
PY
|
||||
/usr/local/bin/notarius config validate --config /usr/local/etc/notarius/config.yml \
|
||||
--pipeline dnd-session
|
||||
/usr/local/bin/notarius config validate --config /usr/local/etc/notarius/config.yml \
|
||||
--config-profile testing --pipeline dnd-session
|
||||
--config-overlay testing --pipeline dnd-session
|
||||
notarius_effective_config="$test_tmp/notarius-effective.yml"
|
||||
/usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
|
||||
> "$notarius_effective_config"
|
||||
notarius_testing_effective_config="$test_tmp/notarius-testing-effective.yml"
|
||||
/usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
|
||||
--config-profile testing > "$notarius_testing_effective_config"
|
||||
--config-overlay testing > "$notarius_testing_effective_config"
|
||||
grep -Fq 'mode: auto' "$notarius_effective_config"
|
||||
grep -Fq 'step: describe-session' "$notarius_effective_config"
|
||||
/usr/local/bin/scriptorium config validate --config /usr/local/etc/scriptorium/config.yml
|
||||
/usr/local/bin/scriptorium inspect profile --config /usr/local/etc/scriptorium/config.yml \
|
||||
--profile-dir "$profile_dir" --profile endpoint-profile
|
||||
/usr/bin/sudo -u narratio /usr/local/bin/narratio config validate \
|
||||
@@ -110,19 +129,17 @@ grep -Fq 'step: describe-session' "$notarius_effective_config"
|
||||
/usr/bin/sudo -u narratio /usr/local/bin/narratio config validate \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign dilfs
|
||||
/usr/bin/sudo -u narratio /usr/local/bin/narratio config validate \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --profile testing
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --overlay testing
|
||||
narratio_effective_config="$test_tmp/narratio-effective.yml"
|
||||
/usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs \
|
||||
> "$narratio_effective_config"
|
||||
narratio_testing_effective_config="$test_tmp/narratio-testing-effective.yml"
|
||||
/usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --profile testing \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --overlay testing \
|
||||
> "$narratio_testing_effective_config"
|
||||
grep -Fq 'enabled: true' "$narratio_effective_config"
|
||||
grep -Fq 'llm_api_key: AUDITA_LLM_API_KEY' "$narratio_effective_config"
|
||||
grep -Fq 'pipeline_id: dnd-session' "$narratio_effective_config"
|
||||
grep -Fq 'llm_api_key: OPENROUTER_API_KEY' "$narratio_effective_config"
|
||||
grep -Fq 'resume: true' "$narratio_effective_config"
|
||||
! grep -Fq 'chunk_cache:' "$narratio_effective_config"
|
||||
grep -Fq 'party: narratio.input.party' "$narratio_effective_config"
|
||||
@@ -152,6 +169,8 @@ assert config["storage"] == {
|
||||
},
|
||||
}
|
||||
assert config["cache"]["s3_audio"] is False
|
||||
assert config["audita"]["credentials"] == ["AUDITA_LLM_API_KEY"]
|
||||
assert config["notarius"]["credentials"] == ["OPENROUTER_API_KEY"]
|
||||
assert config["publish"] == {
|
||||
"enabled": True,
|
||||
"upload_run": True,
|
||||
@@ -168,8 +187,8 @@ assert config["publish"] == {
|
||||
},
|
||||
],
|
||||
}
|
||||
assert "config_profile" not in config["notarius"]
|
||||
assert testing_config["notarius"]["config_profile"] == "testing"
|
||||
assert "config_overlay" not in config["notarius"]
|
||||
assert testing_config["notarius"]["config_overlay"] == "testing"
|
||||
assert all(
|
||||
artifact["profile_id"] == "endpoint-profile"
|
||||
for artifact in testing_config["scriptorium"]["artifacts"].values()
|
||||
@@ -256,7 +275,7 @@ run_converge "$alternate_log" "${baseline_args[@]}" -e "$alternate_config"
|
||||
/usr/local/bin/notarius config validate --config /usr/local/etc/notarius/config.yml \
|
||||
--pipeline archive-session
|
||||
/usr/local/bin/notarius config validate --config /usr/local/etc/notarius/config.yml \
|
||||
--config-profile testing --pipeline archive-session
|
||||
--config-overlay testing --pipeline archive-session
|
||||
alternate_narratio_config="$test_tmp/alternate-narratio.yml"
|
||||
/usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs \
|
||||
@@ -264,14 +283,14 @@ alternate_narratio_config="$test_tmp/alternate-narratio.yml"
|
||||
grep -Fq 'pipeline_id: archive-session' "$alternate_narratio_config"
|
||||
alternate_testing_narratio_config="$test_tmp/alternate-testing-narratio.yml"
|
||||
/usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --profile testing \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --overlay testing \
|
||||
> "$alternate_testing_narratio_config"
|
||||
alternate_effective_config="$test_tmp/alternate-effective.yml"
|
||||
/usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
|
||||
> "$alternate_effective_config"
|
||||
alternate_testing_effective_config="$test_tmp/alternate-testing-effective.yml"
|
||||
/usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
|
||||
--config-profile testing > "$alternate_testing_effective_config"
|
||||
--config-overlay testing > "$alternate_testing_effective_config"
|
||||
"$workspace_venv/bin/python" - \
|
||||
"$alternate_narratio_config" "$alternate_testing_narratio_config" \
|
||||
"$alternate_effective_config" "$alternate_testing_effective_config" <<'PY'
|
||||
@@ -289,9 +308,9 @@ with open(sys.argv[4], encoding="utf-8") as config_file:
|
||||
notarius_testing = yaml.safe_load(config_file)
|
||||
|
||||
assert narratio_base["notarius"]["pipeline_id"] == "archive-session"
|
||||
assert "config_profile" not in narratio_base["notarius"]
|
||||
assert "config_overlay" not in narratio_base["notarius"]
|
||||
assert narratio_testing["notarius"]["pipeline_id"] == "archive-session"
|
||||
assert narratio_testing["notarius"]["config_profile"] == "testing"
|
||||
assert narratio_testing["notarius"]["config_overlay"] == "testing"
|
||||
assert notarius_base["pipelines"]["archive-session"]["llm_profile"] == "gpt-luna-latest"
|
||||
assert notarius_testing["pipelines"]["archive-session"]["llm_profile"] == "gpt-terra-latest"
|
||||
assert notarius_testing["pipelines"]["research-session"]["llm_profile"] == "gpt-luna-latest"
|
||||
@@ -300,3 +319,68 @@ PY
|
||||
alternate_repeat_log="$test_tmp/alternate-repeat.log"
|
||||
run_converge "$alternate_repeat_log" "${baseline_args[@]}" -e "$alternate_config"
|
||||
require_clean_recap "$alternate_repeat_log"
|
||||
|
||||
synthetic_fixture_audita_key='audita-override-synthetic-value'
|
||||
synthetic_fixture_notarius_key='notarius-override-synthetic-value'
|
||||
override_config="{\"dnd_pipeline_audita_backends\":{\"fixture\":{\"endpoint\":\"https://inference.fixture.invalid/v1\",\"credential\":\"FIXTURE_AUDITA_KEY\",\"concurrency\":2}},"\
|
||||
"\"dnd_pipeline_audita_profiles\":{\"fixture-proposal\":{\"id\":\"fixture-proposal\",\"backend\":\"fixture\",\"model\":\"fixture/proposal\",\"timeout_seconds\":900},"\
|
||||
"\"fixture-validation\":{\"id\":\"fixture-validation\",\"backend\":\"fixture\",\"model\":\"fixture/validation\",\"timeout_seconds\":900}},"\
|
||||
"\"dnd_pipeline_audita_llm_proposal_profile\":\"fixture-proposal\",\"dnd_pipeline_audita_llm_validation_profile\":\"fixture-validation\","\
|
||||
"\"dnd_pipeline_narratio_audita_credentials\":[\"FIXTURE_AUDITA_KEY\"],\"dnd_pipeline_narratio_notarius_credentials\":[\"FIXTURE_NOTARIUS_KEY\"],"\
|
||||
"\"dnd_pipeline_audita_llm_transient_retries\":0,\"dnd_pipeline_audita_llm_repair_attempts\":0,\"dnd_pipeline_audita_llm_operation_timeout\":\"20m\","\
|
||||
"\"dnd_pipeline_notarius_promptkit_transient_retries\":0,\"dnd_pipeline_scriptorium_transient_retries\":0,"\
|
||||
"\"dnd_pipeline_secrets\":{\"AUDITA_LLM_API_KEY\":\"$synthetic_audita_api_key\",\"OPENROUTER_API_KEY\":\"$synthetic_notarius_api_key\","\
|
||||
"\"FIXTURE_AUDITA_KEY\":\"$synthetic_fixture_audita_key\",\"FIXTURE_NOTARIUS_KEY\":\"$synthetic_fixture_notarius_key\","\
|
||||
"\"OBJECT_STORAGE_KEY_ID\":\"$synthetic_object_storage_key_id\",\"OBJECT_STORAGE_KEY\":\"$synthetic_object_storage_key\"}}"
|
||||
override_log="$test_tmp/override.log"
|
||||
run_converge "$override_log" "${baseline_args[@]}" -e "$override_config"
|
||||
FIXTURE_AUDITA_KEY="$synthetic_fixture_audita_key" \
|
||||
/usr/local/bin/audita config validate --config /usr/local/etc/audita/config.yml
|
||||
audita_override_settings="$test_tmp/audita-override-settings.yml"
|
||||
audita_override_profiles="$test_tmp/audita-override-profiles.yml"
|
||||
FIXTURE_AUDITA_KEY="$synthetic_fixture_audita_key" \
|
||||
/usr/local/bin/audita config print-effective --config /usr/local/etc/audita/config.yml \
|
||||
--view settings > "$audita_override_settings"
|
||||
FIXTURE_AUDITA_KEY="$synthetic_fixture_audita_key" \
|
||||
/usr/local/bin/audita config print-effective --config /usr/local/etc/audita/config.yml \
|
||||
--view profiles > "$audita_override_profiles"
|
||||
notarius_override_config="$test_tmp/notarius-override.yml"
|
||||
scriptorium_override_config="$test_tmp/scriptorium-override.yml"
|
||||
narratio_override_config="$test_tmp/narratio-override.yml"
|
||||
/usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
|
||||
> "$notarius_override_config"
|
||||
/usr/local/bin/scriptorium config show --config /usr/local/etc/scriptorium/config.yml \
|
||||
> "$scriptorium_override_config"
|
||||
/usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
|
||||
--config /usr/local/etc/narratio/pipeline.yml --campaign centaurs \
|
||||
> "$narratio_override_config"
|
||||
"$workspace_venv/bin/python" - \
|
||||
"$audita_override_settings" "$audita_override_profiles" \
|
||||
"$notarius_override_config" "$scriptorium_override_config" \
|
||||
"$narratio_override_config" <<'PY'
|
||||
import sys
|
||||
|
||||
import yaml
|
||||
|
||||
settings, profiles, notarius, scriptorium, narratio = (
|
||||
yaml.safe_load(open(path, encoding="utf-8")) for path in sys.argv[1:]
|
||||
)
|
||||
assert settings["backends"]["fixture"]["endpoint"] == "https://inference.fixture.invalid/v1"
|
||||
assert settings["backends"]["fixture"]["concurrency"] == 2
|
||||
assert settings["llm"]["proposal_profile"] == "fixture-proposal"
|
||||
assert settings["llm"]["validation_profile"] == "fixture-validation"
|
||||
assert settings["llm"]["transient_retries"] == 0
|
||||
assert settings["llm"]["repair_attempts"] == 0
|
||||
assert settings["llm"]["operation_timeout"] == "20m0s"
|
||||
assert profiles["proposal"]["model"] == "fixture/proposal"
|
||||
assert profiles["validation"]["model"] == "fixture/validation"
|
||||
assert notarius["promptkit"]["transient_retries"] == 0
|
||||
assert scriptorium["transient_retries"] == 0
|
||||
assert narratio["audita"]["credentials"] == ["FIXTURE_AUDITA_KEY"]
|
||||
assert narratio["notarius"]["credentials"] == ["FIXTURE_NOTARIUS_KEY"]
|
||||
PY
|
||||
! grep -Fq "$synthetic_fixture_audita_key" "$override_log" "$narratio_override_config"
|
||||
! grep -Fq "$synthetic_fixture_notarius_key" "$override_log" "$narratio_override_config"
|
||||
override_repeat_log="$test_tmp/override-repeat.log"
|
||||
run_converge "$override_repeat_log" "${baseline_args[@]}" -e "$override_config"
|
||||
require_clean_recap "$override_repeat_log"
|
||||
|
||||
Reference in New Issue
Block a user