change the default model to be a required field

Author: evanliu048

crates/chat-cli/src/api_client/error.rs

@@ -97,6 +97,9 @@ pub enum ApiClientError {
 
     #[error(transparent)]
     ListAvailableModelsError(#[from] SdkError<ListAvailableModelsError, HttpResponse>),
+
+    #[error("No default model found in the ListAvailableModels API response")]
+    DefaultModelNotFound,
 }
 
 impl ApiClientError {
@@ -121,6 +124,7 @@ impl ApiClientError {
             Self::MonthlyLimitReached { status_code } => *status_code,
             Self::Credentials(_e) => None,
             Self::ListAvailableModelsError(e) => sdk_status_code(e),
+            Self::DefaultModelNotFound => None,
         }
     }
 }
@@ -147,6 +151,7 @@ impl ReasonCode for ApiClientError {
             Self::MonthlyLimitReached { .. } => "MonthlyLimitReached".to_string(),
             Self::Credentials(_) => "CredentialsError".to_string(),
             Self::ListAvailableModelsError(e) => sdk_error_code(e),
+            Self::DefaultModelNotFound => "DefaultModelNotFound".to_string(),
         }
     }
 }

crates/chat-cli/src/api_client/mod.rs

@@ -69,7 +69,7 @@ pub const X_AMZN_CODEWHISPERER_OPT_OUT_HEADER: &str = "x-amzn-codewhisperer-opto
 // TODO(bskiser): confirm timeout is updated to an appropriate value?
 const DEFAULT_TIMEOUT_DURATION: Duration = Duration::from_secs(60 * 5);
 
-type ModelListResult = (Vec<Model>, Option<Model>);
+type ModelListResult = (Vec<Model>, Model);
 type ModelCache = Arc<RwLock<Option<ModelListResult>>>;
 
 #[derive(Clone, Debug)]
@@ -241,7 +241,7 @@ impl ApiClient {
         Ok(profiles)
     }
 
-    pub async fn list_available_models(&self) -> Result<(Vec<Model>, Option<Model>), ApiClientError> {
+    pub async fn list_available_models(&self) -> Result<(Vec<Model>, Model), ApiClientError> {
         if cfg!(test) {
             return Ok((
                 vec![
@@ -251,13 +251,11 @@ impl ApiClient {
                         .build()
                         .unwrap(),
                 ],
-                Some(
-                    Model::builder()
-                        .model_id("model-1")
-                        .description("Test Model 1")
-                        .build()
-                        .unwrap(),
-                ),
+                Model::builder()
+                    .model_id("model-1")
+                    .description("Test Model 1")
+                    .build()
+                    .unwrap(),
             ));
         }
 
@@ -278,11 +276,11 @@ impl ApiClient {
                 default_model = Some(models_output.default_model().clone());
             }
         }
-
+        let default_model = default_model.ok_or_else(|| ApiClientError::DefaultModelNotFound)?;
         Ok((models, default_model))
     }
 
-    pub async fn list_available_models_cached(&self) -> Result<(Vec<Model>, Option<Model>), ApiClientError> {
+    pub async fn list_available_models_cached(&self) -> Result<(Vec<Model>, Model), ApiClientError> {
         {
             let cache = self.model_cache.read().await;
             if let Some(cached) = cache.as_ref() {
@@ -306,7 +304,7 @@ impl ApiClient {
         tracing::info!("Model cache invalidated");
     }
 
-    pub async fn get_available_models(&self, region: &str) -> Result<(Vec<Model>, Option<Model>), ApiClientError> {
+    pub async fn get_available_models(&self, region: &str) -> Result<(Vec<Model>, Model), ApiClientError> {
         let (mut models, default_model) = self.list_available_models_cached().await?;
 
         if region == "us-east-1" {

crates/chat-cli/src/auth/builder_id.rs

@@ -477,12 +477,6 @@ impl BuilderIdToken {
             Some(_) => TokenType::IamIdentityCenter,
         }
     }
-
-    /// Check if the token is for the internal amzn start URL (`https://amzn.awsapps.com/start`),
-    /// this implies the user will use midway for private specs
-    pub fn is_amzn_user(&self) -> bool {
-        matches!(&self.start_url, Some(url) if url == AMZN_START_URL)
-    }
 }
 
 pub enum PollCreateToken {

crates/chat-cli/src/auth/consts.rs

@@ -21,8 +21,5 @@ pub(crate) const CLIENT_TYPE: &str = "public";
 // The start URL for public builder ID users
 pub const START_URL: &str = "https://view.awsapps.com/start";
 
-// The start URL for internal amzn users
-pub const AMZN_START_URL: &str = "https://amzn.awsapps.com/start";
-
 pub(crate) const DEVICE_GRANT_TYPE: &str = "urn:ietf:params:oauth:grant-type:device_code";
 pub(crate) const REFRESH_GRANT_TYPE: &str = "refresh_token";

crates/chat-cli/src/cli/chat/cli/model.rs

@@ -11,10 +11,6 @@ use crossterm::{
 use dialoguer::Select;
 
 use crate::api_client::Endpoint;
-use crate::auth::builder_id::{
-    BuilderIdToken,
-    TokenType,
-};
 use crate::cli::chat::{
     ChatError,
     ChatSession,
@@ -107,31 +103,8 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
     }))
 }
 
-/// Returns a default model id to use if none has been otherwise provided.
-///
-/// Returns Claude 3.7 for: Amazon IDC users, FRA region users
-/// Returns Claude 4.0 for: Builder ID users, other regions
-pub async fn default_model_id(os: &Os) -> String {
-    // Check FRA region first
-    if let Ok(Some(profile)) = os.database.get_auth_profile() {
-        if profile.arn.split(':').nth(3) == Some("eu-central-1") {
-            return "claude-3.7-sonnet".to_string();
-        }
-    }
-
-    // Check if Amazon IDC user
-    if let Ok(Some(token)) = BuilderIdToken::load(&os.database).await {
-        if matches!(token.token_type(), TokenType::IamIdentityCenter) && token.is_amzn_user() {
-            return "claude-3.7-sonnet".to_string();
-        }
-    }
-
-    // Default to 4.0
-    "claude-4-sonnet".to_string()
-}
-
 /// Get available models with caching support
-pub async fn get_available_models(os: &Os) -> Result<(Vec<Model>, Option<Model>), ChatError> {
+pub async fn get_available_models(os: &Os) -> Result<(Vec<Model>, Model), ChatError> {
     let endpoint = Endpoint::configured_value(&os.database);
     let region = endpoint.region().as_ref();
 

crates/chat-cli/src/cli/chat/mod.rs

@@ -132,7 +132,6 @@ use crate::auth::AuthError;
 use crate::auth::builder_id::is_idc_user;
 use crate::cli::agent::Agents;
 use crate::cli::chat::cli::SlashCommand;
-use crate::cli::chat::cli::model::default_model_id;
 use crate::cli::chat::cli::prompts::{
     GetPromptError,
     PromptsSubcommand,
@@ -313,7 +312,7 @@ impl ChatArgs {
 
         // If modelId is specified, verify it exists before starting the chat
         // Otherwise, CLI will use a default model when starting chat
-        let (models, default_model_opt) = os.client.list_available_models_cached().await?;
+        let (models, default_model_opt) = get_available_models(os).await?;
         let model_id: Option<String> = if let Some(requested) = self.model.as_ref() {
             let requested_lower = requested.to_lowercase();
             if let Some(m) = models
@@ -337,11 +336,8 @@ impl ChatArgs {
             })
         {
             Some(saved)
-        } else if let Some(default_model) = default_model_opt {
-            Some(default_model.model_id().to_owned())
         } else {
-            // should not use this fallback method when service return a required default model in response
-            Some(default_model_id(os).await)
+            Some(default_model_opt.model_id().to_owned())
         };
 
         let (prompt_request_sender, prompt_request_receiver) = std::sync::mpsc::channel::<Option<String>>();