diff --git a/app_chatgpt/__manifest__.py b/app_chatgpt/__manifest__.py index 83e3090e..a458ef6f 100644 --- a/app_chatgpt/__manifest__.py +++ b/app_chatgpt/__manifest__.py @@ -10,7 +10,7 @@ { 'name': 'ChatGPT4, China Ali,AiGC Center.Ai服务中心,聚合全网Ai', - 'version': '24.03.28', + 'version': '24.03.29', '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 8228f20e..781268c2 100644 --- a/app_chatgpt/models/ai_robot.py +++ b/app_chatgpt/models/ai_robot.py @@ -171,12 +171,15 @@ GPT-3 A set of models that can understand and generate natural language res_post, usage, is_ai = self.get_ai_post(res, author_id, answer_id, param) return res - def get_ai_post(self, res, author_id=False, answer_id=False, param={}): + def get_ai_post(self, res, author_id=False, answer_id=False, param=None): # hook,高级版要替代 - if res and author_id or isinstance(res, list) or isinstance(res, dict): - # TODO: and type(res) == openai.Completion - # 返回是个对象,那么就是ai - # if isinstance(res, dict): + if param is None: + param = {} + if not res or not author_id or (not isinstance(res, list) and not isinstance(res, dict)): + return res, False, False + # 返回是个对象,那么就是ai + usage = content = data = None + try: if self.provider == 'openai': # openai 格式处理 usage = res['usage'] @@ -184,15 +187,15 @@ GPT-3 A set of models that can understand and generate natural language # _logger.warning('===========Ai响应:%s' % content) elif self.provider == 'azure': # azure 格式 - usage = json.loads(json.dumps(res['usage'])) - content = json.loads(json.dumps(res['choices'][0]['message']['content'])) + usage = res['usage'] + content = res['choices'][0]['message']['content'] else: usage = False content = res data = content.replace(' .', '.').strip() return data, usage, True - else: - # 直接返回错误语句,那么就是非ai + except Exception as e: + _logger.error('==========app_chatgpt get_ai_post Error: %s' % e) return res, False, False def get_ai_system(self, content=None): diff --git a/app_chatgpt/static/description/index.html b/app_chatgpt/static/description/index.html index 5f70cadc..12c46513 100644 --- a/app_chatgpt/static/description/index.html +++ b/app_chatgpt/static/description/index.html @@ -11,7 +11,7 @@ -

Lastest update: v17.24.03.28

+

Lastest update: v17.24.03.29