Unverified Commit 025b859c authored by takatost's avatar takatost Committed by GitHub

fix: tongyi generate error (#1904)

parent 0e239a4f
...@@ -52,9 +52,13 @@ class TongyiLargeLanguageModel(LargeLanguageModel): ...@@ -52,9 +52,13 @@ class TongyiLargeLanguageModel(LargeLanguageModel):
:param tools: tools for tool calling :param tools: tools for tool calling
:return: :return:
""" """
# transform credentials to kwargs for model instance
credentials_kwargs = self._to_credential_kwargs(credentials)
response = dashscope.Tokenization.call( response = dashscope.Tokenization.call(
model=model, model=model,
prompt=self._convert_messages_to_prompt(prompt_messages), prompt=self._convert_messages_to_prompt(prompt_messages),
**credentials_kwargs
) )
if response.status_code == HTTPStatus.OK: if response.status_code == HTTPStatus.OK:
...@@ -108,10 +112,6 @@ class TongyiLargeLanguageModel(LargeLanguageModel): ...@@ -108,10 +112,6 @@ class TongyiLargeLanguageModel(LargeLanguageModel):
# transform credentials to kwargs for model instance # transform credentials to kwargs for model instance
credentials_kwargs = self._to_credential_kwargs(credentials) credentials_kwargs = self._to_credential_kwargs(credentials)
dashscope.api_key = credentials_kwargs['api_key']
print(credentials_kwargs, 'credentials_kwargs')
client = EnhanceTongyi( client = EnhanceTongyi(
model_name=model, model_name=model,
streaming=stream, streaming=stream,
...@@ -121,7 +121,8 @@ class TongyiLargeLanguageModel(LargeLanguageModel): ...@@ -121,7 +121,8 @@ class TongyiLargeLanguageModel(LargeLanguageModel):
params = { params = {
'model': model, 'model': model,
'prompt': self._convert_messages_to_prompt(prompt_messages), 'prompt': self._convert_messages_to_prompt(prompt_messages),
**model_parameters **model_parameters,
**credentials_kwargs
} }
if stream: if stream:
responses = stream_generate_with_retry( responses = stream_generate_with_retry(
...@@ -222,7 +223,6 @@ class TongyiLargeLanguageModel(LargeLanguageModel): ...@@ -222,7 +223,6 @@ class TongyiLargeLanguageModel(LargeLanguageModel):
:param credentials: :param credentials:
:return: :return:
""" """
print(credentials, 'credentials')
credentials_kwargs = { credentials_kwargs = {
"api_key": credentials['dashscope_api_key'], "api_key": credentials['dashscope_api_key'],
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment