@@ -212,6 +212,21 @@ def create(
212
212
213
213
env_var .update ({"BASE_MODEL" : f"{ model_path_prefix } " })
214
214
215
+ model_format = aqua_model .freeform_tags .get (
216
+ Tags .MODEL_FORMAT , ModelFormat .SAFETENSORS .value
217
+ ).upper ()
218
+ if model_format == ModelFormat .GGUF .value :
219
+ try :
220
+ model_file = aqua_model .custom_metadata_list .get (
221
+ AQUA_MODEL_ARTIFACT_FILE
222
+ ).value
223
+ except ValueError as err :
224
+ raise AquaValueError (
225
+ f"{ AQUA_MODEL_ARTIFACT_FILE } key is not available in the custom metadata field "
226
+ f"for model { aqua_model .id } ."
227
+ ) from err
228
+ env_var .update ({"BASE_MODEL_FILE" : f"{ model_file } " })
229
+
215
230
if is_fine_tuned_model :
216
231
_ , fine_tune_output_path = get_model_by_reference_paths (
217
232
aqua_model .model_file_description
@@ -304,24 +319,15 @@ def create(
304
319
305
320
deployment_params = get_combined_params (config_params , user_params )
306
321
307
- if deployment_params :
308
- params = f"{ params } { deployment_params } "
322
+ params = f"{ params } { deployment_params } " .strip ()
323
+ if params :
324
+ env_var .update ({"PARAMS" : params })
309
325
310
- env_var .update ({"PARAMS" : params })
311
326
for env in container_spec .get (ContainerSpec .ENV_VARS , []):
312
327
if isinstance (env , dict ):
313
- env_var .update (env )
314
-
315
- if (
316
- AquaModelApp .to_aqua_model (
317
- model = aqua_model , region = self .region
318
- ).model_format
319
- == ModelFormat .GGUF
320
- ):
321
- model_file = aqua_model .custom_metadata_list .get (
322
- AQUA_MODEL_ARTIFACT_FILE
323
- ).value
324
- env_var .update ({"MODEL" : f"/opt/ds/model/deployed_model/{ model_file } " })
328
+ for key , _items in env .items ():
329
+ if key not in env_var :
330
+ env_var .update (env )
325
331
326
332
logging .info (f"Env vars used for deploying { aqua_model .id } :{ env_var } " )
327
333
0 commit comments