Merge remote-tracking branch 'origin/main'

# Conflicts:
#	frontend/src/views/dashboard/utils/canvasUtils.ts

Author: ziyujiahao

backend/apps/ai_model/model_factory.py

@@ -41,6 +41,7 @@ def _init_llm(self) -> LangchainBaseLLM:
             model=self.config.model_name,
             api_key=self.config.api_key,
             base_url=self.config.api_base_url,
+            stream_usage=True,
             **self.config.additional_params
         )
 

backend/apps/chat/api/chat.py

@@ -118,6 +118,9 @@ async def stream_sql(session: SessionDep, current_user: CurrentUser, request_que
 
     def run_task():
         try:
+            # return id
+            yield json.dumps({'type': 'id', 'id': llm_service.get_record().id}) + '\n\n'
+
             # generate sql
             sql_res = llm_service.generate_sql(session=session)
             full_sql_text = ''

backend/apps/chat/task/llm.py

@@ -105,6 +105,9 @@ def init_record(self, session: SessionDep, current_user: CurrentUser) -> ChatRec
         self.record = save_question(session=session, current_user=current_user, question=self.chat_question)
         return self.record
 
+    def get_record(self):
+        return self.record
+
     def generate_sql(self, session: SessionDep):
         # append current question
         self.sql_message.append(HumanMessage(self.chat_question.sql_user_question()))

backend/template.yaml

@@ -34,7 +34,7 @@ template:
       {question}
       
       ### 其他规则:
-      请使用英语(English)回答
+      请使用英语(English)输出
       {rule}
   chart:
     system: |
@@ -51,7 +51,7 @@ template:
       {{"type":"line", "title": "标题", "axis": {{"x": {{"name":"x轴的中文名称","value": "x轴的SQL查询列(有别名用别名)"}}, "y": {{"name":"y轴的中文名称","value": "y轴的SQL查询列(有别名用别名)"}}}}
       其中“x”和“y”必须从SQL查询列中提取。
       - 如果需要饼图，则生成的 JSON 格式应为：
-      {{"type":"pie", "title": "标题", "column": [{{"name":"中文字段名1","value":"SQL查询列1(有别名用别名)"}},{{"name":"中文字段名2","value":"SQL查询列2(有别名用别名)"}}]}}
+      {{"type":"pie", "title": "标题", "columns": [{{"name":"中文字段名1","value":"SQL查询列1(有别名用别名)"}},{{"name":"中文字段名2","value":"SQL查询列2(有别名用别名)"}}]}}
       其中“column”必须从SQL查询列中提取。
       - 如果答案未知或者与生成JSON无关，则生成的 JSON 格式应为：
       {{"type":"error", "reason": "抱歉，我无法回答您的问题。"}}
@@ -80,5 +80,5 @@ template:
       {question}
       
       ### 其他规则:
-      请使用英语(English)回答
+      请使用英语(English)输出
       {rule}

frontend/package.json

@@ -9,14 +9,16 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@antv/g2": "^5.3.3",
     "@npkg/tinymce-plugins": "^0.0.7",
     "@tinymce/tinymce-vue": "^5.1.0",
     "dayjs": "^1.11.13",
-    "element-plus": "^2.9.11",
+    "element-plus-secondary": "^1.0.0",
     "lodash": "^4.17.21",
     "snowflake-id": "^1.1.0",
     "tinymce": "^5.8.2",
     "vue": "^3.5.13",
+    "vue-i18n": "^9.14.4",
     "vue-router": "^4.5.0",
     "web-storage-cache": "^1.1.1"
   },
@@ -28,7 +30,6 @@
     "@vue/tsconfig": "^0.7.0",
     "axios": "^1.8.4",
     "crypto-js": "^4.2.0",
-    "element-plus-secondary": "^1.0.0",
     "less": "^4.3.0",
     "pinia": "^3.0.2",
     "typescript": "~5.7.2",

frontend/src/App.vue

@@ -1,8 +1,16 @@
 <script setup lang="ts">
+import { computed } from 'vue'
+import { ElConfigProvider } from 'element-plus-secondary'
+import { getElementLocale } from '@/i18n'
+const elLanguage = computed(() => {
+  return getElementLocale()
+})
 </script>
 
 <template>
-  <router-view />
+  <el-config-provider :locale="elLanguage">
+    <router-view />
+  </el-config-provider>
 </template>
 
 <style scoped>

frontend/src/components/layout/index.vue

@@ -43,7 +43,8 @@
 
       <div v-else class="top-bar-title">
         <span class="split"/>
-        <span>System manage</span>
+        <!-- <span>System manage</span> -->
+         <span>{{ t('common.system_manage') }}</span>
       </div>
 
 
@@ -76,6 +77,21 @@
             <el-dropdown-menu>
               <el-dropdown-item @click="switchLayout">Switch Layout</el-dropdown-item>
               <el-dropdown-item @click="logout">Logout</el-dropdown-item>
+
+              <el-dropdown @command="changeLanguage">
+                <div class="lang-switch">
+                  Language
+                  <el-icon>
+                    <i class="el-icon-arrow-down"/>
+                  </el-icon>
+                </div>
+                <template #dropdown>
+                  <el-dropdown-menu>
+                    <el-dropdown-item command="en">English</el-dropdown-item>
+                    <el-dropdown-item command="zh-CN">中文</el-dropdown-item>
+                  </el-dropdown-menu>
+                </template>
+              </el-dropdown>
             </el-dropdown-menu>
           </template>
         </el-dropdown>
@@ -153,7 +169,9 @@ import icon_user from '@/assets/svg/icon_user.svg'
 import icon_ai from '@/assets/svg/icon_ai.svg'
 import {ArrowLeftBold} from '@element-plus/icons-vue'
 import {useCache} from '@/utils/useCache'
+import { useI18n } from 'vue-i18n'
 
+const { locale, t } = useI18n()
 const {wsCache} = useCache()
 const topLayout = ref(false)
 const router = useRouter()
@@ -215,6 +233,10 @@ const switchLayout = () => {
   topLayout.value = !topLayout.value
   wsCache.set('sqlbot-topbar-layout', topLayout.value)
 }
+
+const changeLanguage = (lang: string) => {
+  locale.value = lang
+}
 onMounted(() => {
   topLayout.value = wsCache.get('sqlbot-topbar-layout') || true
 })
@@ -536,4 +558,12 @@ onMounted(() => {
     }
   }
 }
+.lang-switch {
+  cursor: pointer;
+  padding: 0 12px;
+  
+  &:hover {
+    color: var(--el-color-primary);
+  }
+}
 </style>

frontend/src/i18n/en.json

@@ -0,0 +1,14 @@
+{
+  "menu": {
+    "dashboard": "Dashboard",
+    "chat": "Chat",
+    "datasource": "Data Source",
+    "system": "System"
+  },
+  "common": {
+    "back": "Back",
+    "confirm": "Confirm",
+    "cancel": "Cancel",
+    "system_manage": "System Management"
+  }
+}

frontend/src/i18n/index.ts

@@ -0,0 +1,34 @@
+import { createI18n } from 'vue-i18n'
+import en from './en.json'
+import zhCN from './zh-CN.json'
+import elementEnLocale from 'element-plus/es/locale/lang/en'
+import elementZhLocale from 'element-plus/es/locale/lang/zh-cn'
+
+const getDefaultLocale = () => {
+  /* const savedLang = localStorage.getItem('lang')
+  return savedLang || 'zh-CN' */
+  return 'zh-CN'
+}
+
+const messages = {
+  en: {
+    ...en,
+    el: elementEnLocale 
+  },
+  'zh-CN': {
+    ...zhCN,
+    el: elementZhLocale
+  }
+}
+
+export const i18n = createI18n({
+  legacy: false,
+  locale: getDefaultLocale(),
+  fallbackLocale: 'en',
+  globalInjection: true,
+  messages
+})
+
+export const getElementLocale = () => {
+  return i18n.global.locale.value === 'en' ? elementEnLocale : elementZhLocale
+}

frontend/src/i18n/zh-CN.json

@@ -0,0 +1,14 @@
+{
+  "menu": {
+    "dashboard": "仪表盘",
+    "chat": "聊天",
+    "datasource": "数据源",
+    "system": "系统"
+  },
+  "common": {
+    "back": "返回",
+    "confirm": "确认",
+    "cancel": "取消",
+    "system_manage": "系统管理"
+  }
+}