Merge pull request #1306 from microsoft/lramos15/immediate-locust

Move hydrate model to common place

Author: sandy081

src/platform/endpoint/node/modelMetadataFetcher.ts

@@ -121,8 +121,7 @@ export class ModelMetadataFetcher extends Disposable implements IModelMetadataFe
 		await this._taskSingler.getOrCreate(ModelMetadataFetcher.ALL_MODEL_KEY, this._fetchModels.bind(this));
 		const chatModels: IChatModelInformation[] = [];
 		for (const [, models] of this._familyMap) {
-			for (let model of models) {
-				model = await this._hydrateResolvedModel(model);
+			for (const model of models) {
 				if (isChatModelInformation(model)) {
 					chatModels.push(model);
 				}
@@ -169,8 +168,7 @@ export class ModelMetadataFetcher extends Disposable implements IModelMetadataFe
 		} else {
 			resolvedModel = this._familyMap.get(family)?.[0];
 		}
-		resolvedModel = await this._hydrateResolvedModel(resolvedModel);
-		if (!isChatModelInformation(resolvedModel)) {
+		if (!resolvedModel || !isChatModelInformation(resolvedModel)) {
 			throw new Error(`Unable to resolve chat model with family selection: ${family}`);
 		}
 		return resolvedModel;
@@ -191,7 +189,6 @@ export class ModelMetadataFetcher extends Disposable implements IModelMetadataFe
 		if (!resolvedModel) {
 			return;
 		}
-		resolvedModel = await this._hydrateResolvedModel(resolvedModel);
 		if (!isChatModelInformation(resolvedModel)) {
 			throw new Error(`Unable to resolve chat model: ${apiModel.id},${apiModel.name},${apiModel.version},${apiModel.family}`);
 		}
@@ -200,9 +197,8 @@ export class ModelMetadataFetcher extends Disposable implements IModelMetadataFe
 
 	public async getEmbeddingsModel(family: 'text-embedding-3-small'): Promise<IEmbeddingModelInformation> {
 		await this._taskSingler.getOrCreate(ModelMetadataFetcher.ALL_MODEL_KEY, this._fetchModels.bind(this));
-		let resolvedModel = this._familyMap.get(family)?.[0];
-		resolvedModel = await this._hydrateResolvedModel(resolvedModel);
-		if (!isEmbeddingModelInformation(resolvedModel)) {
+		const resolvedModel = this._familyMap.get(family)?.[0];
+		if (!resolvedModel || !isEmbeddingModelInformation(resolvedModel)) {
 			throw new Error(`Unable to resolve embeddings model with family selection: ${family}`);
 		}
 		return resolvedModel;
@@ -267,7 +263,8 @@ export class ModelMetadataFetcher extends Disposable implements IModelMetadataFe
 
 			const data: IModelAPIResponse[] = (await response.json()).data;
 			this._requestLogger.logModelListCall(requestId, requestMetadata, data);
-			for (const model of data) {
+			for (const rawModel of data) {
+				const model = await this._hydrateResolvedModel(rawModel);
 				const isCompletionModel = isCompletionModelInformation(model);
 				// The base model is whatever model is deemed "fallback" by the server
 				if (model.is_chat_fallback && !isCompletionModel) {