mirror of
https://github.com/nomic-ai/gpt4all
synced 2024-11-18 03:25:46 +00:00
reduce nesting, better error reporting
This commit is contained in:
parent
a067f38544
commit
2b6fb7b95e
@ -87,24 +87,24 @@ class GPT4All():
|
||||
else:
|
||||
model_path = model_path.replace("\\", "\\\\")
|
||||
|
||||
if os.path.exists(model_path):
|
||||
model_dest = os.path.join(model_path, model_filename).replace("\\", "\\\\")
|
||||
if os.path.exists(model_dest):
|
||||
print("Found model file at ", model_dest)
|
||||
return model_dest
|
||||
if not os.path.exists(model_path):
|
||||
raise ValueError("Invalid model directory: {}".format(model_path))
|
||||
|
||||
# If model file does not exist, download
|
||||
elif allow_download:
|
||||
# Make sure valid model filename before attempting download
|
||||
available_models = GPT4All.list_models()
|
||||
if model_filename not in (m["filename"] for m in available_models):
|
||||
raise ValueError(f"Model filename not in model list: {model_filename}")
|
||||
return GPT4All.download_model(model_filename, model_path)
|
||||
else:
|
||||
raise ValueError("Failed to retrieve model")
|
||||
model_dest = os.path.join(model_path, model_filename).replace("\\", "\\\\")
|
||||
if os.path.exists(model_dest):
|
||||
print("Found model file at ", model_dest)
|
||||
return model_dest
|
||||
|
||||
# If model file does not exist, download
|
||||
elif allow_download:
|
||||
# Make sure valid model filename before attempting download
|
||||
available_models = GPT4All.list_models()
|
||||
if model_filename not in (m["filename"] for m in available_models):
|
||||
raise ValueError(f"Model filename not in model list: {model_filename}")
|
||||
return GPT4All.download_model(model_filename, model_path)
|
||||
else:
|
||||
raise ValueError("Invalid model directory")
|
||||
|
||||
raise ValueError("Failed to retrieve model")
|
||||
|
||||
@staticmethod
|
||||
def download_model(model_filename: str, model_path: str) -> str:
|
||||
"""
|
||||
|
Loading…
Reference in New Issue
Block a user