Update PCAgent/api.py

PCAgent/api.py

@@ -35,32 +35,49 @@ def inference_chat(chat, model, api_url, token):
     for role, content in chat:
         messages.append({"role": role, "content": content})
 
-    client = OpenAI(
-        # 若没有配置环境变量，请用百炼API Key将下行替换为：api_key="sk-xxx",
-        api_key=token, 
-        base_url=api_url,
-    )
-
-
+    # client = OpenAI(
+    #     # 若没有配置环境变量，请用百炼API Key将下行替换为：api_key="sk-xxx",
+    #     api_key=token, 
+    #     base_url=api_url,
+    # )
+
+
+    # num_try = 5
+    # for _ in range(num_try):
+    #     try:
+    #         completion = client.chat.completions.create(
+    #             model=model, # 此处以qwen-plus为例，可按需更换模型名称。模型列表：https://help.aliyun.com/zh/model-studio/getting-started/models
+    #             messages=messages
+    #         )
+    #     except:
+    #         print("Network Error:")
+    #         try:
+    #             print(completion.model_dump_json())
+    #         except:
+    #             print("Request Failed")
+    #         time.sleep(2)
+    #     else:
+    #         break
+
+    dashscope.api_key = token
+    dashscope.base_http_api_url = api_url
     num_try = 5
     for _ in range(num_try):
         try:
-            completion = client.chat.completions.create(
-                model=model, # 此处以qwen-plus为例，可按需更换模型名称。模型列表：https://help.aliyun.com/zh/model-studio/getting-started/models
-                messages=messages
-            )
+            response = MultiModalConversation.call(model=model, messages=messages)
+            response = response['output']['choices'][0]['message']['content'][0]["text"]
         except:
             print("Network Error:")
             try:
-                print(completion.model_dump_json())
+                print(response.json())
             except:
                 print("Request Failed")
             time.sleep(2)
         else:
             break
-
     
-    return json.loads(completion.model_dump_json())['choices'][0]['message']['content']
+    return response
+    # return json.loads(completion.model_dump_json())['choices'][0]['message']['content']
 
     # headers = {
     #     "Content-Type": "application/json",