From 0f139baf13920e96541761113c28df13a3d507c2 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Sat, 31 May 2025 01:11:14 -0700 Subject: [PATCH 1/2] use consistent version across all arch_config files (#497) --- README.md | 4 ++-- arch/arch_config_schema.yaml | 4 ++++ demos/samples_java/weather_forcecast_service/arch_config.yaml | 3 ++- demos/samples_python/currency_exchange/arch_config.yaml | 2 +- demos/samples_python/human_resources_agent/arch_config.yaml | 3 ++- demos/samples_python/multi_turn_rag_agent/arch_config.yaml | 2 +- .../network_switch_operator_agent/arch_config.yaml | 2 +- demos/samples_python/stock_quote/arch_config.yaml | 2 +- demos/samples_python/weather_forecast/arch_config.yaml | 2 +- demos/use_cases/llm_routing/arch_config.yaml | 2 +- demos/use_cases/ollama/arch_config.yaml | 2 +- demos/use_cases/orchestrating_agents/arch_config.yaml | 2 +- demos/use_cases/preference_based_routing/arch_config.yaml | 2 +- demos/use_cases/spotify_bearer_auth/arch_config.yaml | 3 ++- docs/source/concepts/includes/arch_config.yaml | 2 +- docs/source/get_started/quickstart.rst | 4 ++-- docs/source/guides/includes/arch_config.yaml | 2 +- tests/archgw/arch_config.yaml | 2 +- 18 files changed, 26 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 431eaace..ce2f503d 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ In following quickstart we will show you how easy it is to build AI agent with A Create `arch_config.yaml` file with following content, ```yaml -version: v0.1 +version: v0.1.0 listeners: ingress_traffic: @@ -195,7 +195,7 @@ Arch operates based on a configuration file where you can define LLM providers, Create `arch_config.yaml` file with following content: ```yaml -version: v0.1 +version: v0.1.0 listeners: egress_traffic: diff --git a/arch/arch_config_schema.yaml b/arch/arch_config_schema.yaml index 5e259942..867836a0 100644 --- a/arch/arch_config_schema.yaml +++ b/arch/arch_config_schema.yaml @@ -3,6 +3,10 @@ type: object properties: version: type: string + enum: + - v0.1 + - v0.1.0 + - 0.1-beta listeners: type: object additionalProperties: false diff --git a/demos/samples_java/weather_forcecast_service/arch_config.yaml b/demos/samples_java/weather_forcecast_service/arch_config.yaml index 8228d0f4..d11aaa96 100644 --- a/demos/samples_java/weather_forcecast_service/arch_config.yaml +++ b/demos/samples_java/weather_forcecast_service/arch_config.yaml @@ -1,4 +1,5 @@ -version: v0.1 +version: v0.1.0 + listeners: ingress_traffic: address: 0.0.0.0 diff --git a/demos/samples_python/currency_exchange/arch_config.yaml b/demos/samples_python/currency_exchange/arch_config.yaml index 03e5a01d..a9c0bce0 100644 --- a/demos/samples_python/currency_exchange/arch_config.yaml +++ b/demos/samples_python/currency_exchange/arch_config.yaml @@ -1,4 +1,4 @@ -version: v0.1 +version: v0.1.0 listeners: ingress_traffic: diff --git a/demos/samples_python/human_resources_agent/arch_config.yaml b/demos/samples_python/human_resources_agent/arch_config.yaml index 2ac97027..f46a6c7a 100644 --- a/demos/samples_python/human_resources_agent/arch_config.yaml +++ b/demos/samples_python/human_resources_agent/arch_config.yaml @@ -1,4 +1,5 @@ -version: v0.1 +version: v0.1.0 + listeners: ingress_traffic: address: 0.0.0.0 diff --git a/demos/samples_python/multi_turn_rag_agent/arch_config.yaml b/demos/samples_python/multi_turn_rag_agent/arch_config.yaml index 8e8feb4f..706a374b 100644 --- a/demos/samples_python/multi_turn_rag_agent/arch_config.yaml +++ b/demos/samples_python/multi_turn_rag_agent/arch_config.yaml @@ -1,4 +1,4 @@ -version: v0.1 +version: v0.1.0 listeners: ingress_traffic: diff --git a/demos/samples_python/network_switch_operator_agent/arch_config.yaml b/demos/samples_python/network_switch_operator_agent/arch_config.yaml index fa830d0b..0175e1c0 100644 --- a/demos/samples_python/network_switch_operator_agent/arch_config.yaml +++ b/demos/samples_python/network_switch_operator_agent/arch_config.yaml @@ -1,4 +1,4 @@ -version: v0.1 +version: v0.1.0 listeners: ingress_traffic: address: 0.0.0.0 diff --git a/demos/samples_python/stock_quote/arch_config.yaml b/demos/samples_python/stock_quote/arch_config.yaml index 96901620..6b4a427f 100644 --- a/demos/samples_python/stock_quote/arch_config.yaml +++ b/demos/samples_python/stock_quote/arch_config.yaml @@ -1,4 +1,4 @@ -version: v0.1 +version: v0.1.0 listeners: ingress_traffic: diff --git a/demos/samples_python/weather_forecast/arch_config.yaml b/demos/samples_python/weather_forecast/arch_config.yaml index 8585bc6f..a51bf6a1 100644 --- a/demos/samples_python/weather_forecast/arch_config.yaml +++ b/demos/samples_python/weather_forecast/arch_config.yaml @@ -1,4 +1,4 @@ -version: "0.1-beta" +version: v0.1.0 listeners: ingress_traffic: diff --git a/demos/use_cases/llm_routing/arch_config.yaml b/demos/use_cases/llm_routing/arch_config.yaml index 896fb795..0d38335e 100644 --- a/demos/use_cases/llm_routing/arch_config.yaml +++ b/demos/use_cases/llm_routing/arch_config.yaml @@ -1,4 +1,4 @@ -version: "0.1-beta" +version: v0.1.0 listeners: egress_traffic: diff --git a/demos/use_cases/ollama/arch_config.yaml b/demos/use_cases/ollama/arch_config.yaml index c933841d..24eb1bf1 100644 --- a/demos/use_cases/ollama/arch_config.yaml +++ b/demos/use_cases/ollama/arch_config.yaml @@ -1,4 +1,4 @@ -version: v0.1 +version: v0.1.0 listeners: egress_traffic: diff --git a/demos/use_cases/orchestrating_agents/arch_config.yaml b/demos/use_cases/orchestrating_agents/arch_config.yaml index 7cffa101..639c5242 100644 --- a/demos/use_cases/orchestrating_agents/arch_config.yaml +++ b/demos/use_cases/orchestrating_agents/arch_config.yaml @@ -1,4 +1,4 @@ -version: "0.1-beta" +version: v0.1.0 listeners: ingress_traffic: diff --git a/demos/use_cases/preference_based_routing/arch_config.yaml b/demos/use_cases/preference_based_routing/arch_config.yaml index f0d1cf95..1660e8d6 100644 --- a/demos/use_cases/preference_based_routing/arch_config.yaml +++ b/demos/use_cases/preference_based_routing/arch_config.yaml @@ -1,4 +1,4 @@ -version: "0.1-beta" +version: v0.1.0 routing: model: arch-router diff --git a/demos/use_cases/spotify_bearer_auth/arch_config.yaml b/demos/use_cases/spotify_bearer_auth/arch_config.yaml index 1d82a426..99a67401 100644 --- a/demos/use_cases/spotify_bearer_auth/arch_config.yaml +++ b/demos/use_cases/spotify_bearer_auth/arch_config.yaml @@ -1,4 +1,5 @@ -version: v0.1 +version: v0.1.0 + listeners: ingress_traffic: address: 0.0.0.0 diff --git a/docs/source/concepts/includes/arch_config.yaml b/docs/source/concepts/includes/arch_config.yaml index a7d0a289..4523ae32 100644 --- a/docs/source/concepts/includes/arch_config.yaml +++ b/docs/source/concepts/includes/arch_config.yaml @@ -1,4 +1,4 @@ -version: v0.1 +version: v0.1.0 listeners: ingress_traffic: diff --git a/docs/source/get_started/quickstart.rst b/docs/source/get_started/quickstart.rst index f5421acc..cdedbaca 100644 --- a/docs/source/get_started/quickstart.rst +++ b/docs/source/get_started/quickstart.rst @@ -40,7 +40,7 @@ Create ``arch_config.yaml`` file with the following content: .. code-block:: yaml - version: v0.1 + version: v0.1.0 listeners: ingress_traffic: @@ -143,7 +143,7 @@ Create ``arch_config.yaml`` file with the following content: .. code-block:: yaml - version: v0.1 + version: v0.1.0 listeners: egress_traffic: diff --git a/docs/source/guides/includes/arch_config.yaml b/docs/source/guides/includes/arch_config.yaml index e86c6072..4ee46cbb 100644 --- a/docs/source/guides/includes/arch_config.yaml +++ b/docs/source/guides/includes/arch_config.yaml @@ -1,4 +1,4 @@ -version: v0.1 +version: v0.1.0 listeners: ingress_traffic: diff --git a/tests/archgw/arch_config.yaml b/tests/archgw/arch_config.yaml index d1990330..c702887b 100644 --- a/tests/archgw/arch_config.yaml +++ b/tests/archgw/arch_config.yaml @@ -1,4 +1,4 @@ -version: "0.1-beta" +version: v0.1.0 listeners: ingress_traffic: From aff389d342bdb2a411d36cb8e40d043772e63485 Mon Sep 17 00:00:00 2001 From: Adil Hafeez Date: Sat, 31 May 2025 01:16:17 -0700 Subject: [PATCH 2/2] don't run docker compose up for preference based router e2e demo tests (#499) --- demos/shared/test_runner/run_demo_tests.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/demos/shared/test_runner/run_demo_tests.sh b/demos/shared/test_runner/run_demo_tests.sh index 01eb5967..2f44d3e0 100644 --- a/demos/shared/test_runner/run_demo_tests.sh +++ b/demos/shared/test_runner/run_demo_tests.sh @@ -23,7 +23,13 @@ do echo "starting archgw" archgw up arch_config.yaml echo "starting docker containers" - docker compose up -d 2>&1 > /dev/null + # only execute docker compose if demo is use_cases/preference_based_routing + if [ "$demo" == "use_cases/preference_based_routing" ]; then + echo "starting docker compose for $demo" + docker compose -f docker-compose.yaml up -d 2>&1 > /dev/null + else + echo "skipping docker compose for $demo" + fi echo "starting hurl tests" if ! hurl hurl_tests/*.hurl; then echo "Hurl tests failed for $demo"