fix: Fix default RouterMode value (#1092)

The Python bindings use the default value for RouterMode. Previously that was Random (good), but now it became None (bad).

Remove the option and clean up the duplicate RouterMode. I was trying to avoid putting the `KV` enum in dynamo-runtime. Turns out adding those two characters gives us a healthy simplification, and restores the old default router value.

Also clean up two noisy log messages when waiting for KV routing metrics to start in worker.

components/http/src/main.rs

 // SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 use clap::Parser;
 use std::sync::Arc;
 
 use dynamo_llm::{
-    http::service::{
-        discovery::{LLMRouterMode, ModelWatcher},
-        service_v2::HttpService,
-    },
+    http::service::{discovery::ModelWatcher, service_v2::HttpService},
     model_type::ModelType,
 };
 use dynamo_runtime::{
-    logging, transports::etcd::PrefixWatcher, DistributedRuntime, Result, Runtime, Worker,
+    logging, pipeline::RouterMode, transports::etcd::PrefixWatcher, DistributedRuntime, Result,
+    Runtime, Worker,
 };
 
 #[derive(Parser)]
@@ -89,7 +75,7 @@ async fn app(runtime: Runtime) -> Result<()> {
                 component.clone(),
                 manager.clone(),
                 &etcd_path,
-                LLMRouterMode::Random,
+                RouterMode::Random,
             )
             .await?,
         );

launch/dynamo-run/src/flags.rs

@@ -17,7 +17,6 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 
 use clap::ValueEnum;
-use dynamo_llm::http::service::discovery::LLMRouterMode;
 use dynamo_runtime::pipeline::RouterMode as RuntimeRouterMode;
 
 /// Required options depend on the in and out choices
@@ -195,25 +194,12 @@ pub enum RouterMode {
     KV,
 }
 
-impl RouterMode {
-    pub fn is_kv_routing(&self) -> bool {
-        *self == RouterMode::KV
-    }
-
-    pub fn as_runtime(&self) -> Option<RuntimeRouterMode> {
-        match self {
-            RouterMode::RoundRobin => Some(RuntimeRouterMode::RoundRobin),
-            RouterMode::Random => Some(RuntimeRouterMode::Random),
-            // Runtime router does not have KV, it's a dynamo-llm thing, not dynamo-runtime
-            RouterMode::KV => None,
-        }
-    }
-
-    pub fn as_llm(&self) -> LLMRouterMode {
-        match self {
-            RouterMode::RoundRobin => LLMRouterMode::RoundRobin,
-            RouterMode::Random => LLMRouterMode::Random,
-            RouterMode::KV => LLMRouterMode::KV,
+impl From<RouterMode> for RuntimeRouterMode {
+    fn from(r: RouterMode) -> RuntimeRouterMode {
+        match r {
+            RouterMode::RoundRobin => RuntimeRouterMode::RoundRobin,
+            RouterMode::Random => RuntimeRouterMode::Random,
+            RouterMode::KV => RuntimeRouterMode::KV,
         }
     }
 }

launch/dynamo-run/src/input/common.rs

@@ -102,7 +102,7 @@ pub async fn prepare_engine(
                     let router =
                         PushRouter::<BackendInput, Annotated<LLMEngineOutput>>::from_client(
                             client,
-                            flags.router_mode.as_runtime(),
+                            flags.router_mode.into(),
                         )
                         .await?;
                     let service_backend = match &flags.router_mode {
@@ -133,7 +133,7 @@ pub async fn prepare_engine(
                     PushRouter::<
                         NvCreateChatCompletionRequest,
                         Annotated<NvCreateChatCompletionStreamResponse>,
-                    >::from_client(client, flags.router_mode.as_runtime())
+                    >::from_client(client, flags.router_mode.into())
                     .await?,
                 ),
                 ModelType::Completion => {

launch/dynamo-run/src/input/http.rs

@@ -17,7 +17,6 @@ use std::sync::Arc;
 
 use crate::input::common;
 use crate::{EngineConfig, Flags};
-use dynamo_llm::http::service::discovery::LLMRouterMode;
 use dynamo_llm::http::service::ModelManager;
 use dynamo_llm::{
     engines::StreamingEngineAdapter,
@@ -31,6 +30,7 @@ use dynamo_llm::{
     },
 };
 use dynamo_runtime::component::Component;
+use dynamo_runtime::pipeline::RouterMode;
 use dynamo_runtime::transports::etcd;
 use dynamo_runtime::{DistributedRuntime, Runtime};
 
@@ -65,7 +65,7 @@ pub async fn run(
                         http_service.model_manager().clone(),
                         etcd_client.clone(),
                         &network_prefix,
-                        flags.router_mode.as_llm(),
+                        flags.router_mode.into(),
                     )
                     .await?;
                 }
@@ -121,7 +121,7 @@ async fn run_watcher(
     model_manager: ModelManager,
     etcd_client: etcd::Client,
     network_prefix: &str,
-    router_mode: LLMRouterMode,
+    router_mode: RouterMode,
 ) -> anyhow::Result<()> {
     let watch_obj = Arc::new(
         discovery::ModelWatcher::new(component, model_manager, network_prefix, router_mode).await?,

launch/dynamo-run/src/lib.rs

@@ -76,7 +76,10 @@ pub async fn run(
                 }
                 None => {
                     // echo_full engine doesn't need a path
-                    Default::default()
+                    match &flags.model_name {
+                        Some(name) => LocalModel::with_name_only(name),
+                        None => Default::default(),
+                    }
                 }
             }
         }

lib/llm/src/http/service/discovery.rs

 // SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 use std::sync::Arc;
 
@@ -22,8 +10,8 @@ use tokio::sync::mpsc::Receiver;
 use dynamo_runtime::{
     component::{self, Component, ComponentEndpointInfo},
     pipeline::{
-        network::egress::push_router::PushRouter, ManyOut, Operator,
-        RouterMode as RuntimeRouterMode, SegmentSource, ServiceBackend, SingleIn, Source,
+        network::egress::push_router::PushRouter, ManyOut, Operator, RouterMode, SegmentSource,
+        ServiceBackend, SingleIn, Source,
     },
     protocols::{self, annotated::Annotated},
     slug::Slug,
@@ -165,33 +153,11 @@ impl std::fmt::Display for ModelNetworkName {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum LLMRouterMode {
-    Random,
-    RoundRobin,
-    KV,
-}
-
-impl LLMRouterMode {
-    pub fn is_kv_routing(&self) -> bool {
-        *self == LLMRouterMode::KV
-    }
-
-    pub fn as_runtime(&self) -> Option<RuntimeRouterMode> {
-        match self {
-            LLMRouterMode::RoundRobin => Some(RuntimeRouterMode::RoundRobin),
-            LLMRouterMode::Random => Some(RuntimeRouterMode::Random),
-            // Runtime router does not have KV, it's a dynamo-llm thing, not dynamo-runtime
-            LLMRouterMode::KV => None,
-        }
-    }
-}
-
 pub struct ModelWatcher {
     prefix: String,
     manager: ModelManager,
     drt: DistributedRuntime,
-    router_mode: LLMRouterMode,
+    router_mode: RouterMode,
     kv_chooser: Option<Arc<KvRouter>>,
 }
 
@@ -200,7 +166,7 @@ impl ModelWatcher {
         component: Component,
         model_manager: ModelManager,
         network_prefix: &str,
-        router_mode: LLMRouterMode,
+        router_mode: RouterMode,
     ) -> anyhow::Result<ModelWatcher> {
         let kv_chooser = if router_mode.is_kv_routing() {
             let selector = Box::new(DefaultWorkerSelector {});
@@ -329,14 +295,14 @@ impl ModelWatcher {
                 let backend = Backend::from_mdc(card.clone()).await?.into_operator();
                 let router = PushRouter::<BackendInput, Annotated<LLMEngineOutput>>::from_client(
                     client.clone(),
-                    self.router_mode.as_runtime(),
+                    self.router_mode,
                 )
                 .await?;
                 let service_backend = match self.router_mode {
-                    LLMRouterMode::Random | LLMRouterMode::RoundRobin => {
+                    RouterMode::Random | RouterMode::RoundRobin | RouterMode::Direct(_) => {
                         ServiceBackend::from_engine(Arc::new(router))
                     }
-                    LLMRouterMode::KV => {
+                    RouterMode::KV => {
                         let Some(kv_chooser) = self.kv_chooser.clone() else {
                             anyhow::bail!("KV routing mode with no chooser, should be unreachable");
                         };
@@ -363,14 +329,14 @@ impl ModelWatcher {
                 let backend = Backend::from_mdc(card.clone()).await?.into_operator();
                 let router = PushRouter::<BackendInput, Annotated<LLMEngineOutput>>::from_client(
                     client,
-                    self.router_mode.as_runtime(),
+                    self.router_mode,
                 )
                 .await?;
                 let service_backend = match self.router_mode {
-                    LLMRouterMode::Random | LLMRouterMode::RoundRobin => {
+                    RouterMode::Random | RouterMode::RoundRobin | RouterMode::Direct(_) => {
                         ServiceBackend::from_engine(Arc::new(router))
                     }
-                    LLMRouterMode::KV => {
+                    RouterMode::KV => {
                         let Some(kv_chooser) = self.kv_chooser.clone() else {
                             anyhow::bail!("KV routing mode with no chooser, should be unreachable");
                         };

lib/llm/src/kv_router/metrics_aggregator.rs

@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::sync::Once;
+
 pub use crate::kv_router::protocols::ForwardPassMetrics;
 use crate::kv_router::KV_METRICS_ENDPOINT;
 
@@ -23,6 +25,9 @@ use dynamo_runtime::{service::EndpointInfo, utils::Duration, Result};
 use tokio::sync::watch;
 use tokio_util::sync::CancellationToken;
 
+static METRICS_WAITING_MESSAGE: Once = Once::new();
+static METRICS_FOUND_MESSAGE: Once = Once::new();
+
 pub struct KvMetricsAggregator {
     pub service_name: String,
     pub endpoints_rx: watch::Receiver<ProcessedEndpoints>,
@@ -71,7 +76,14 @@ pub async fn collect_endpoints(
         .filter(|e| e.subject.starts_with(subject))
         .collect::<Vec<_>>();
     if endpoints.is_empty() {
-        tracing::debug!("Metrics endpoint not visible yet");
+        // Only print it once, we poll while the worker starts
+        METRICS_WAITING_MESSAGE.call_once(|| {
+            tracing::debug!("Waiting for metrics endpoint..");
+        });
+    } else {
+        METRICS_FOUND_MESSAGE.call_once(|| {
+            tracing::debug!("Found metrics endpoint");
+        });
     }
 
     Ok(endpoints)

lib/llm/src/local_model.rs

@@ -36,6 +36,13 @@ impl Default for LocalModel {
 }
 
 impl LocalModel {
+    pub fn with_name_only(name: &str) -> Self {
+        LocalModel {
+            card: ModelDeploymentCard::with_name_only(name),
+            ..Default::default()
+        }
+    }
+
     pub fn card(&self) -> &ModelDeploymentCard {
         &self.card
     }

lib/runtime/src/pipeline/network/egress/push_router.rs

@@ -43,11 +43,11 @@ where
 
     /// How we choose which endpoint to send traffic to.
     ///
-    /// Setting this to None means we never intend to call `generate` on this PushRouter. We are
+    /// Setting this to KV means we never intend to call `generate` on this PushRouter. We are
     /// not using it as an AsyncEngine.
     /// Instead we will decide whether to call random/round_robin/direct ourselves and call them directly.
     /// dynamo-llm's KV Routing does this.
-    router_mode: Option<RouterMode>,
+    router_mode: RouterMode,
 
     /// Number of round robin requests handled. Used to decide which server is next.
     round_robin_counter: Arc<AtomicU64>,
@@ -62,14 +62,20 @@ where
     _phantom: PhantomData<(T, U)>,
 }
 
-// Note there's no KV router in here because we are in dynamo-runtime. The KvRouter is in
-// dynamo-llm.
-#[derive(Default, Debug, Clone)]
+#[derive(Default, Debug, Clone, Copy, PartialEq)]
 pub enum RouterMode {
     #[default]
     Random,
     RoundRobin,
     Direct(i64),
+    // Marker value, KV routing itself is in dynamo-llm
+    KV,
+}
+
+impl RouterMode {
+    pub fn is_kv_routing(&self) -> bool {
+        *self == RouterMode::KV
+    }
 }
 
 async fn addressed_router(endpoint: &Endpoint) -> anyhow::Result<Arc<AddressedPushRouter>> {
@@ -84,10 +90,7 @@ where
     T: Data + Serialize,
     U: Data + for<'de> Deserialize<'de>,
 {
-    pub async fn from_client(
-        client: Client,
-        router_mode: Option<RouterMode>,
-    ) -> anyhow::Result<Self> {
+    pub async fn from_client(client: Client, router_mode: RouterMode) -> anyhow::Result<Self> {
         let addressed = addressed_router(&client.endpoint).await?;
         Ok(PushRouter {
             client,
@@ -189,10 +192,10 @@ where
         match &self.client.endpoints {
             EndpointSource::Static => self.r#static(request).await,
             EndpointSource::Dynamic(_) => match self.router_mode {
-                Some(RouterMode::Random) => self.random(request).await,
-                Some(RouterMode::RoundRobin) => self.round_robin(request).await,
-                Some(RouterMode::Direct(endpoint_id)) => self.direct(request, endpoint_id).await,
-                None => {
+                RouterMode::Random => self.random(request).await,
+                RouterMode::RoundRobin => self.round_robin(request).await,
+                RouterMode::Direct(endpoint_id) => self.direct(request, endpoint_id).await,
+                RouterMode::KV => {
                     anyhow::bail!("KV routing should not call generate on PushRouter");
                 }
             },

lib/runtime/src/service.rs

@@ -126,19 +126,23 @@ impl ServiceClient {
         }
         let deadline = tokio::time::Instant::now() + timeout;
 
-        let services: Vec<ServiceInfo> = stream::until_deadline(sub, deadline)
-            .map(|message| serde_json::from_slice::<ServiceInfo>(&message.payload))
-            .filter_map(|info| async move {
-                match info {
-                    Ok(info) => Some(info),
-                    Err(e) => {
-                        log::debug!("error decoding service info: {:?}", e);
-                        None
-                    }
+        let mut services = vec![];
+        let mut s = stream::until_deadline(sub, deadline);
+        while let Some(message) = s.next().await {
+            if message.payload.is_empty() {
+                // Expected while we wait for KV metrics in worker to start
+                tracing::trace!(service_name, "collect_services: empty payload from nats");
+                continue;
+            }
+            let info = serde_json::from_slice::<ServiceInfo>(&message.payload);
+            match info {
+                Ok(info) => services.push(info),
+                Err(err) => {
+                    let payload = String::from_utf8_lossy(&message.payload);
+                    tracing::debug!(%err, service_name, %payload, "error decoding service info");
                 }
-            })
-            .collect()
-            .await;
+            }
+        }
 
         Ok(ServiceSet { services })
     }