diff --git a/api/db/services/connector_service.py b/api/db/services/connector_service.py index 23e9faffe..db8c713e2 100644 --- a/api/db/services/connector_service.py +++ b/api/db/services/connector_service.py @@ -15,6 +15,7 @@ # import logging from datetime import datetime +import os from typing import Tuple, List from anthropic import BaseModel @@ -103,7 +104,8 @@ class SyncLogsService(CommonService): Knowledgebase.avatar.alias("kb_avatar"), Connector2Kb.auto_parse, cls.model.from_beginning.alias("reindex"), - cls.model.status + cls.model.status, + cls.model.update_time ] if not connector_id: fields.append(Connector.config) @@ -116,7 +118,11 @@ class SyncLogsService(CommonService): if connector_id: query = query.where(cls.model.connector_id == connector_id) else: - interval_expr = SQL("INTERVAL `t2`.`refresh_freq` MINUTE") + database_type = os.getenv("DB_TYPE", "mysql") + if "postgres" in database_type.lower(): + interval_expr = SQL("make_interval(mins => t2.refresh_freq)") + else: + interval_expr = SQL("INTERVAL `t2`.`refresh_freq` MINUTE") query = query.where( Connector.input_type == InputType.POLL, Connector.status == TaskStatus.SCHEDULE, diff --git a/sdk/python/ragflow_sdk/modules/document.py b/sdk/python/ragflow_sdk/modules/document.py index 70c1ac842..c96698079 100644 --- a/sdk/python/ragflow_sdk/modules/document.py +++ b/sdk/python/ragflow_sdk/modules/document.py @@ -69,7 +69,7 @@ class Document(Base): response = res.json() actual_keys = set(response.keys()) if actual_keys == error_keys: - raise Exception(res.get("message")) + raise Exception(response.get("message")) else: return res.content except json.JSONDecodeError: diff --git a/sdk/python/ragflow_sdk/modules/session.py b/sdk/python/ragflow_sdk/modules/session.py index 12141afed..d2bbc76e8 100644 --- a/sdk/python/ragflow_sdk/modules/session.py +++ b/sdk/python/ragflow_sdk/modules/session.py @@ -80,6 +80,7 @@ class Session(Base): def _structure_answer(self, json_data): + answer = "" if self.__session_type == "agent": answer = json_data["data"]["content"] elif self.__session_type == "chat":