From 51ba69a9cdfe7b665dfd5cc87a4fcb75f0afdda3 Mon Sep 17 00:00:00 2001 From: calpt Date: Wed, 17 Apr 2024 09:46:05 +0200 Subject: [PATCH] Switch resolving order if source not specified in `load_adapter()` (#681) If `source` is not specified in `load_adapter()`, will switch priorities to first search on HF Hub and only on AH if not found there. Related to AH deprecation (#668). This also fixes an bug with auto-resolving adapters for which no model index file is given in AH (e.g. currently for Llama-2). --- src/adapters/utils.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/adapters/utils.py b/src/adapters/utils.py index 511366e111..1dac7d88cf 100644 --- a/src/adapters/utils.py +++ b/src/adapters/utils.py @@ -719,15 +719,15 @@ def resolve_adapter_path( return pull_from_hf_model_hub(adapter_name_or_path, version=version, **kwargs) elif source is None: try: - logger.info("Attempting to load adapter from source 'ah'...") - return pull_from_hub( - adapter_name_or_path, model_name, adapter_config=adapter_config, version=version, **kwargs - ) - except EnvironmentError as ex: - logger.info(ex) logger.info("Attempting to load adapter from source 'hf'...") + return pull_from_hf_model_hub(adapter_name_or_path, version=version, **kwargs) + except (EnvironmentError, ValueError) as ex: + logger.info(ex) + logger.info("Attempting to load adapter from source 'ah'...") try: - return pull_from_hf_model_hub(adapter_name_or_path, version=version, **kwargs) + return pull_from_hub( + adapter_name_or_path, model_name, adapter_config=adapter_config, version=version, **kwargs + ) except Exception as ex: logger.info(ex) raise EnvironmentError(