Skip to content

Commit

Permalink
Merge branch 'lm-sys:main' into feature/jab-api-0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
rmontoya12 authored Nov 4, 2024
2 parents a6b5c5c + 185e1a9 commit 135ac8a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions fastchat/serve/api_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ def get_api_provider_stream_iter(
max_new_tokens,
api_base=model_api_dict["api_base"],
api_key=model_api_dict["api_key"],
conversation_id=state.conv_id,
)
elif model_api_dict["api_type"] == "jab":
messages = conv.to_jab_api_messages()
Expand Down Expand Up @@ -1203,6 +1204,7 @@ def metagen_api_stream_iter(
max_new_tokens,
api_key,
api_base,
conversation_id,
):
try:
text_messages = []
Expand Down Expand Up @@ -1235,6 +1237,7 @@ def metagen_api_stream_iter(
"model": model_name,
"chunks_delimited": True,
"messages": messages,
"conversation_id": conversation_id,
"options": {
"max_tokens": max_new_tokens,
"generation_algorithm": "top_p",
Expand Down

0 comments on commit 135ac8a

Please sign in to comment.