update the model cache structure

Author: evanliu048

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

@@ -69,14 +69,17 @@ 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 ModelCache = Arc<RwLock<Option<ModelListResult>>>;
+
 #[derive(Clone, Debug)]
 pub struct ApiClient {
     client: CodewhispererClient,
     streaming_client: Option<CodewhispererStreamingClient>,
     sigv4_streaming_client: Option<QDeveloperStreamingClient>,
     mock_client: Option<Arc<Mutex<std::vec::IntoIter<Vec<ChatResponseStream>>>>>,
     profile: Option<AuthProfile>,
-    model_cache: Arc<RwLock<Option<(Vec<Model>, Option<Model>)>>>,
+    model_cache: ModelCache,
 }
 
 impl ApiClient {

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

@@ -88,7 +88,7 @@ pub async fn select_model(os: &mut Os, session: &mut ChatSession) -> Result<Opti
 
     if let Some(index) = selection {
         let selected = &models[index];
-        let model_id_str = selected.model_id.to_string();
+        let model_id_str = selected.model_id.clone();
         session.conversation.model = Some(model_id_str);
         let display_name = get_display_name(selected.model_id());