Merge remote-tracking branch 'origin/master'

master
zc 5 months ago
commit 59049b34dc
  1. 1
      packages/dbgpt-core/src/dbgpt/rag/evaluation/answer.py
  2. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/conn_spark.py
  3. 3
      packages/dbgpt-ext/src/dbgpt_ext/datasource/conn_tugraph.py
  4. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_clickhouse.py
  5. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_doris.py
  6. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_duckdb.py
  7. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_hive.py
  8. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_mssql.py
  9. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_mysql.py
  10. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_oceanbase.py
  11. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_oracle.py
  12. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_postgresql.py
  13. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_sqlite.py
  14. 2
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_starrocks.py
  15. 3
      packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_vertica.py
  16. 27
      packages/dbgpt-serve/src/dbgpt_serve/agent/db/gpts_app.py
  17. 8
      packages/dbgpt-system/src/dbgpt_system/dept/dept_controller.py
  18. 7
      packages/dbgpt-system/src/dbgpt_system/sys_user/controller.py

@ -146,6 +146,7 @@ class AnswerRelevancyMetric(LLMEvaluationMetric):
"""Answer Relevancy metric."""
prompt_template = ANSWER_RELEVANCY_EVALUATE_PROMPT_TEMPLATE
name = "AnswerRelevancyMetric" # 添加类属性 name <--- 修改点
def __init__(
self,

@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
label=_("Apache Spark datasource"),
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_("Unified engine for large-scale data analytics."),
description=_("用于大规模数据分析的统一引擎。"),
)
@dataclass
class SparkParameters(BaseDatasourceParameters):

@ -19,8 +19,7 @@ from dbgpt.util.i18n_utils import _
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_(
"TuGraph is a high-performance graph database jointly developed by Ant Group "
"and Tsinghua University."
"TuGraph是蚂蚁集团和清华大学联合开发的高性能图形数据库。"
),
)
@dataclass

@ -26,7 +26,7 @@ logger = logging.getLogger(__name__)
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_(
"Columnar database for high-performance analytics and real-time queries."
"用于高性能分析和实时查询的列式数据库。"
),
)
@dataclass

@ -20,7 +20,7 @@ from dbgpt.util.i18n_utils import _
label=_("Apache Doris datasource"),
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_("A new-generation open-source real-time data warehouse."),
description=_("新一代开源实时数据仓库。"),
)
@dataclass
class DorisParameters(RDBMSDatasourceParameters):

@ -19,7 +19,7 @@ from dbgpt.util.i18n_utils import _
label=_("DuckDB datasource"),
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_("In-memory analytical database with efficient query processing."),
description=_("具有高效查询处理功能的内存分析数据库。"),
)
@dataclass
class DuckDbConnectorParameters(BaseDatasourceParameters):

@ -21,7 +21,7 @@ from dbgpt.util.i18n_utils import _
label=_("Apache Hive datasource"),
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_("A distributed fault-tolerant data warehouse system."),
description=_("分布式容错数据仓库系统。"),
)
@dataclass
class HiveParameters(BaseDatasourceParameters):

@ -19,7 +19,7 @@ from dbgpt.util.i18n_utils import _
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_(
"Powerful, scalable, secure relational database system by Microsoft."
"由微软提供的强大、可扩展且安全的关系型数据库系统。"
),
)
@dataclass

@ -17,7 +17,7 @@ from dbgpt.util.i18n_utils import _
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_(
"Fast, reliable, scalable open-source relational database management system."
"快速、可靠、可扩展的开源关系型数据库管理系统。"
),
)
@dataclass

@ -19,7 +19,7 @@ logger = logging.getLogger(__name__)
label=_("OceanBase datasource"),
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_("An Ultra-Fast & Cost-Effective Distributed SQL Database."),
description=_("极速、高性价比的分布式 SQL 数据库。"),
)
@dataclass
class OceanBaseParameters(RDBMSDatasourceParameters):

@ -20,7 +20,7 @@ from dbgpt.util.i18n_utils import _
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_(
"Enterprise-grade relational database with oracledb driver (python-oracledb)."
"企业级关系型数据库,支持 Oracle 数据库驱动(python-oracledb)."
),
)
@dataclass

@ -24,7 +24,7 @@ logger = logging.getLogger(__name__)
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_(
"Powerful open-source relational database with extensibility and SQL standards."
"功能强大的开源关系型数据库,具备高度可扩展性且符合SQL标准。"
),
)
@dataclass

@ -25,7 +25,7 @@ logger = logging.getLogger(__name__)
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_(
"Lightweight embedded relational database with simplicity and portability."
"具有简单性和可移植性的轻量级嵌入式关系数据库。"
),
)
@dataclasses.dataclass

@ -22,7 +22,7 @@ from .dialect.starrocks.sqlalchemy import * # noqa
label=_("StarRocks datasource"),
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_("An Open-Source, High-Performance Analytical Database."),
description=_("一个开源、高性能的分析数据库。"),
)
@dataclass
class StarRocksParameters(RDBMSDatasourceParameters):

@ -30,8 +30,7 @@ registry.register(
category=ResourceCategory.DATABASE,
tags={"order": TAGS_ORDER_HIGH},
description=_(
"Vertica is a strongly consistent, ACID-compliant, SQL data warehouse, built "
"for the scale and complexity of today`s data-driven world."
"Vertica是一个高度一致、符合ACID标准的SQL数据仓库,专为当今数据驱动世界的规模和复杂性而构建。"
),
)
@dataclass

@ -1091,46 +1091,45 @@ class GptsAppDao(BaseDao):
"chat_dba", "chat_dashboard", "chat_excel"
"""
chat_normal_ctx = NativeTeamContext(
chat_scene="chat_normal",
chat_scene="大模型问答",
scene_name="Chat Normal",
scene_describe="Native LLM dialogue",
scene_describe="本地LLM对话",
param_title="",
show_disable=False,
)
chat_knowledge_ctx = NativeTeamContext(
chat_scene="chat_knowledge",
chat_scene="知识库问答",
scene_name="Chat Knowledge",
scene_describe="Private knowledge base Q&A",
scene_describe="私人知识库问答",
param_title="",
show_disable=False,
)
chat_with_db_qa_ctx = NativeTeamContext(
chat_scene="chat_with_db_qa",
chat_scene="数据库问答",
scene_name="Chat DB",
scene_describe="Database Metadata Q&A",
scene_describe="数据库元数据问答",
param_title="",
show_disable=False,
)
chat_with_db_execute_ctx = NativeTeamContext(
chat_scene="chat_with_db_execute",
scene_name="Chat Data",
scene_describe="Have a conversation with your private data through natural"
chat_scene="数据问答",
scene_name="chat_with_db_execute",
scene_describe="通过自然方式与您的私人数据进行对话"
" language",
param_title="",
show_disable=False,
)
chat_dashboard_ctx = NativeTeamContext(
chat_scene="chat_dashboard",
chat_scene="数据仪表盘问答",
scene_name="Chat Dashboard",
scene_describe="Provide you with professional data analysis reports through"
" natural language",
scene_describe="为您提供专业的数据分析报告",
param_title="",
show_disable=False,
)
chat_excel_ctx = NativeTeamContext(
chat_scene="chat_excel",
chat_scene="excel问答",
scene_name="Chat Excel",
scene_describe="Excel analysis through natural language",
scene_describe="Excel自然语言分析",
param_title="",
show_disable=False,
)

@ -39,9 +39,7 @@ async def update_dept(dept: Dept,
@router.get("/{dept_id}")
async def select_dept_details(dept_id: int):
user_info: UserRequest = Depends(get_user_from_headers)
if user_info:
raise Exception(f"登录已失效,请重新登录")
try:
return Result.succ(deptDao.select_dept_details(dept_id))
except Exception as ex:
@ -50,9 +48,7 @@ async def select_dept_details(dept_id: int):
@router.delete("/{dept_id}")
async def delete_dept(dept_id:int):
user_info: UserRequest = Depends(get_user_from_headers)
if user_info:
raise Exception(f"登录已失效,请重新登录")
try:
return Result.succ(deptDao.delete_dept(dept_id))
except Exception as ex:

@ -60,9 +60,7 @@ async def update_user(user:UserUpdate,
@router.put("/update/{user_id}/{status}")
async def update_user_status(user_id: int,status: str ):
user_info: UserRequest = Depends(get_user_from_headers)
if user_info:
raise Exception(f"登录已失效,请重新登录")
try:
return Result.succ(userDao.update_status(user_id, status))
except Exception as ex:
@ -85,9 +83,6 @@ async def update_user_password(user_password: UserPassword ):
@router.delete("/delete/{user_id}")
async def delete_user(user_id:int):
user_info: UserRequest = Depends(get_user_from_headers)
if user_info:
raise Exception(f"登录已失效,请重新登录")
try:
return Result.succ(userDao.delete_user(user_id))
except Exception as ex:

Loading…
Cancel
Save