Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion packages/dbgpt-app/src/dbgpt_app/openapi/api_v1/api_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@
Result,
)
from dbgpt_app.scene import BaseChat, ChatFactory, ChatParam, ChatScene
from dbgpt_serve.agent.db.gpts_app import UserRecentAppsDao, adapt_native_app_model
from dbgpt_serve.agent.db.gpts_app import (
GptsAppDao,
UserRecentAppsDao,
adapt_native_app_model,
)
from dbgpt_serve.core import blocking_func_to_async
from dbgpt_serve.datasource.manages.db_conn_info import DBConfig, DbTypeInfo
from dbgpt_serve.datasource.service.db_summary_client import DBSummaryClient
Expand Down Expand Up @@ -521,6 +525,39 @@ async def chat_completions(
}
try:
domain_type = _parse_domain_type(dialogue)

# AWEL fallback: If the app is an AWEL layout chat flow but client
# sent chat_agent, rewrite to chat_flow to avoid creating derived
# conversations.
if dialogue.chat_mode == ChatScene.ChatAgent.value():
try:
gpts_app = GptsAppDao().app_detail(dialogue.app_code)
except Exception:
gpts_app = None
if gpts_app:
team_mode = getattr(gpts_app, "team_mode", "") or ""
team_context = getattr(gpts_app, "team_context", {}) or {}
# support both object-like and dict-like access
flow_category = (
getattr(team_context, "flow_category", None)
if not isinstance(team_context, dict)
else team_context.get("flow_category")
)
flow_uid = (
getattr(team_context, "uid", None)
if not isinstance(team_context, dict)
else team_context.get("uid")
)
if (
str(team_mode).lower() == "awel_layout"
and str(flow_category).lower() == "chat_flow"
):
# rewrite to chat_flow branch
dialogue.chat_mode = ChatScene.ChatFlow.value()
if not dialogue.select_param:
dialogue.select_param = flow_uid or dialogue.select_param
# fallthrough to ChatFlow handler below

if dialogue.chat_mode == ChatScene.ChatAgent.value():
from dbgpt_serve.agent.agents.controller import multi_agents

Expand Down
2 changes: 1 addition & 1 deletion packages/dbgpt-app/src/dbgpt_app/static/web/404.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/c09ab2c056586552.css" as="style"/><link rel="stylesheet" href="/_next/static/css/c09ab2c056586552.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-8d3a6e27a44f1596.js" defer=""></script><script src="/_next/static/chunks/framework-8b06d32cbb857e0e.js" defer=""></script><script src="/_next/static/chunks/main-6c4c7f5b8c9b1320.js" defer=""></script><script src="/_next/static/chunks/pages/_app-33e8b024c30a307f.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/gw05xfMzcrUCquZY65r8M/_buildManifest.js" defer=""></script><script src="/_next/static/gw05xfMzcrUCquZY65r8M/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"gw05xfMzcrUCquZY65r8M","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/c09ab2c056586552.css" as="style"/><link rel="stylesheet" href="/_next/static/css/c09ab2c056586552.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-bf305e0a3963a9ac.js" defer=""></script><script src="/_next/static/chunks/framework-8b06d32cbb857e0e.js" defer=""></script><script src="/_next/static/chunks/main-6c4c7f5b8c9b1320.js" defer=""></script><script src="/_next/static/chunks/pages/_app-33e8b024c30a307f.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/zCye8Ps-KfYljzfB-fdIM/_buildManifest.js" defer=""></script><script src="/_next/static/zCye8Ps-KfYljzfB-fdIM/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"zCye8Ps-KfYljzfB-fdIM","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
2 changes: 1 addition & 1 deletion packages/dbgpt-app/src/dbgpt_app/static/web/404/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/c09ab2c056586552.css" as="style"/><link rel="stylesheet" href="/_next/static/css/c09ab2c056586552.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-8d3a6e27a44f1596.js" defer=""></script><script src="/_next/static/chunks/framework-8b06d32cbb857e0e.js" defer=""></script><script src="/_next/static/chunks/main-6c4c7f5b8c9b1320.js" defer=""></script><script src="/_next/static/chunks/pages/_app-33e8b024c30a307f.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/gw05xfMzcrUCquZY65r8M/_buildManifest.js" defer=""></script><script src="/_next/static/gw05xfMzcrUCquZY65r8M/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"gw05xfMzcrUCquZY65r8M","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/c09ab2c056586552.css" as="style"/><link rel="stylesheet" href="/_next/static/css/c09ab2c056586552.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-bf305e0a3963a9ac.js" defer=""></script><script src="/_next/static/chunks/framework-8b06d32cbb857e0e.js" defer=""></script><script src="/_next/static/chunks/main-6c4c7f5b8c9b1320.js" defer=""></script><script src="/_next/static/chunks/pages/_app-33e8b024c30a307f.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/zCye8Ps-KfYljzfB-fdIM/_buildManifest.js" defer=""></script><script src="/_next/static/zCye8Ps-KfYljzfB-fdIM/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"zCye8Ps-KfYljzfB-fdIM","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Loading