diff --git a/app_chatgpt/__manifest__.py b/app_chatgpt/__manifest__.py index be6e03ac..31f06bef 100644 --- a/app_chatgpt/__manifest__.py +++ b/app_chatgpt/__manifest__.py @@ -10,7 +10,7 @@ { 'name': 'ChatGPT4, China Ali,AiGC Center.Ai服务中心,聚合全网Ai', - 'version': '16.0.25.02.09', + 'version': '16.0.25.02.10', 'author': 'odooai.cn', 'company': 'odooai.cn', 'maintainer': 'odooai.cn', diff --git a/app_chatgpt/models/ai_robot.py b/app_chatgpt/models/ai_robot.py index c088614c..e4d0b417 100644 --- a/app_chatgpt/models/ai_robot.py +++ b/app_chatgpt/models/ai_robot.py @@ -250,16 +250,19 @@ GPT-3 A set of models that can understand and generate natural language def get_ai_list_model(self): self.ensure_one() - headers = {"Content-Type": "application/json", "Authorization": f"Bearer {self.openapi_api_key}"} - R_TIMEOUT = self.ai_timeout or 120 - o_url = "https://api.openai.com/v1/models" - if self.endpoint: - o_url = self.endpoint.replace("/chat/completions", "") + "/models" - response = requests.get(o_url, headers=headers, timeout=R_TIMEOUT) - response.close() - if response: - res = response.json() - r_text = json.dumps(res, indent=2) + if self.provider == 'openai': + headers = {"Content-Type": "application/json", "Authorization": f"Bearer {self.openapi_api_key}"} + R_TIMEOUT = self.ai_timeout or 120 + o_url = "https://api.openai.com/v1/models" + if self.endpoint: + o_url = self.endpoint.replace("/chat/completions", "") + "/models" + response = requests.get(o_url, headers=headers, timeout=R_TIMEOUT) + response.close() + if response: + res = response.json() + r_text = json.dumps(res, indent=2) + else: + r_text = 'No response.' else: r_text = 'No response.' raise UserError(r_text) diff --git a/app_deepseek/__manifest__.py b/app_deepseek/__manifest__.py index 4d6baf7d..c174497a 100644 --- a/app_deepseek/__manifest__.py +++ b/app_deepseek/__manifest__.py @@ -8,7 +8,7 @@ { 'name': 'Deepseek Ai for odoo ai center, 深度求索Ai支持-对话模型', - 'version': '16.0.25.02.07', + 'version': '16.0.25.02.10', 'author': 'odooai.cn', 'company': 'odooai.cn', 'maintainer': 'odooai.cn', diff --git a/app_deepseek/models/ai_robot.py b/app_deepseek/models/ai_robot.py index f2abdec5..966c3b6c 100644 --- a/app_deepseek/models/ai_robot.py +++ b/app_deepseek/models/ai_robot.py @@ -70,3 +70,27 @@ class AiRobot(models.Model): return content, usage, True else: return super().get_ai_post(res, author_id, answer_id, param) + + def get_ai_list_model(self): + self.ensure_one() + if self.provider == 'deepseek': + api_key = self.openapi_api_key + if not api_key: + raise UserError(_("Please provide Ai Robot [%s] API Key." % self.name)) + payload = {} + headers = { + 'Accept': 'application/json', + 'Authorization': f'Bearer {self.openapi_api_key}' + } + R_TIMEOUT = self.ai_timeout or 120 + o_url = "https://api.deepseek.com/models" + response = requests.get(o_url, headers=headers, data=payload, timeout=R_TIMEOUT) + response.close() + if response: + res = response.json() + r_text = json.dumps(res, indent=2) + else: + r_text = 'No response.' + raise UserError(r_text) + else: + return super().get_ai_list_model() diff --git a/app_deepseek/static/description/index.html b/app_deepseek/static/description/index.html index 97feb5ad..c3254ad7 100644 --- a/app_deepseek/static/description/index.html +++ b/app_deepseek/static/description/index.html @@ -17,7 +17,7 @@