mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-24 14:25:00 +00:00
Show supported models when avail check fails
This commit is contained in:
parent
82d7f04865
commit
545f10551e
1 changed files with 9 additions and 4 deletions
|
@ -64,7 +64,7 @@ class Coder:
|
||||||
main_model = models.GPT35_16k
|
main_model = models.GPT35_16k
|
||||||
|
|
||||||
if not skip_model_availabily_check and not main_model.always_available:
|
if not skip_model_availabily_check and not main_model.always_available:
|
||||||
if not check_model_availability(main_model):
|
if not check_model_availability(io, main_model):
|
||||||
if main_model != models.GPT4:
|
if main_model != models.GPT4:
|
||||||
io.tool_error(
|
io.tool_error(
|
||||||
f"API key does not support {main_model.name}, falling back to"
|
f"API key does not support {main_model.name}, falling back to"
|
||||||
|
@ -608,7 +608,7 @@ class Coder:
|
||||||
raise Exception("No data found in openai response!")
|
raise Exception("No data found in openai response!")
|
||||||
|
|
||||||
tokens = None
|
tokens = None
|
||||||
if hasattr(completion, 'usage'):
|
if hasattr(completion, "usage"):
|
||||||
prompt_tokens = completion.usage.prompt_tokens
|
prompt_tokens = completion.usage.prompt_tokens
|
||||||
completion_tokens = completion.usage.completion_tokens
|
completion_tokens = completion.usage.completion_tokens
|
||||||
|
|
||||||
|
@ -911,7 +911,12 @@ class Coder:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
def check_model_availability(main_model):
|
def check_model_availability(io, main_model):
|
||||||
available_models = openai.Model.list()
|
available_models = openai.Model.list()
|
||||||
model_ids = [model.id for model in available_models["data"]]
|
model_ids = [model.id for model in available_models["data"]]
|
||||||
return main_model.name in model_ids
|
if main_model.name in model_ids:
|
||||||
|
return True
|
||||||
|
|
||||||
|
available_models = ", ".join(model_ids)
|
||||||
|
io.tool_error(f"API key supports: {available_models}")
|
||||||
|
return False
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue