Skip to content

feat: use variables OPENAI_MODEL_LIST #2907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merrymercy merged 3 commits into from
Jan 17, 2024
Merged

feat: use variables OPENAI_MODEL_LIST #2907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15015a0
feat: use variables OPENAI_MODEL_LIST
congchan Jan 9, 2024
92282c2
fix format
congchan Jan 9, 2024
38ddb46
fix left condition
congchan Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions fastchat/llm_judge/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
import openai
import anthropic

from fastchat.model.model_adapter import get_conversation_template, ANTHROPIC_MODEL_LIST
from fastchat.model.model_adapter import (
get_conversation_template,
ANTHROPIC_MODEL_LIST,
OPENAI_MODEL_LIST,
)

# API setting constants
API_MAX_RETRY = 16
Expand Down Expand Up @@ -159,7 +163,7 @@ def run_judge_single(question, answer, judge, ref_answer, multi_turn=False):
conv.append_message(conv.roles[0], user_prompt)
conv.append_message(conv.roles[1], None)

if model in ["gpt-3.5-turbo", "gpt-4"]:
if model in OPENAI_MODEL_LIST:
judgment = chat_completion_openai(model, conv, temperature=0, max_tokens=2048)
elif model in ANTHROPIC_MODEL_LIST:
judgment = chat_completion_anthropic(
Expand Down Expand Up @@ -262,7 +266,7 @@ def run_judge_pair(question, answer_a, answer_b, judge, ref_answer, multi_turn=F
conv.append_message(conv.roles[0], user_prompt)
conv.append_message(conv.roles[1], None)

if model in ["gpt-3.5-turbo", "gpt-4"]:
if model in OPENAI_MODEL_LIST:
conv.set_system_message(system_prompt)
judgment = chat_completion_openai(model, conv, temperature=0, max_tokens=2048)
elif model in ANTHROPIC_MODEL_LIST:
Expand Down
22 changes: 12 additions & 10 deletions fastchat/model/model_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,17 @@
"claude-instant-1.2",
)

OPENAI_MODEL_LIST = (
"gpt-3.5-turbo",
"gpt-3.5-turbo-0301",
"gpt-3.5-turbo-0613",
"gpt-3.5-turbo-1106",
"gpt-4",
"gpt-4-0314",
"gpt-4-0613",
"gpt-4-turbo",
)


class BaseModelAdapter:
"""The base and the default model adapter."""
Expand Down Expand Up @@ -1053,16 +1064,7 @@ class ChatGPTAdapter(BaseModelAdapter):
"""The model adapter for ChatGPT"""

def match(self, model_path: str):
return model_path in (
"gpt-3.5-turbo",
"gpt-3.5-turbo-0301",
"gpt-3.5-turbo-0613",
"gpt-3.5-turbo-1106",
"gpt-4",
"gpt-4-0314",
"gpt-4-0613",
"gpt-4-turbo",
)
return model_path in OPENAI_MODEL_LIST

def load_model(self, model_path: str, from_pretrained_kwargs: dict):
raise NotImplementedError()
Expand Down