Skip to content
Merged
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
6 changes: 5 additions & 1 deletion backend/apps/datasource/api/recommended_problem.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from apps.datasource.crud.datasource import update_ds_recommended_config
from apps.datasource.crud.recommended_problem import get_datasource_recommended, \
save_recommended_problem
save_recommended_problem, get_datasource_recommended_base
from apps.datasource.models.datasource import RecommendedProblemBase
from common.core.deps import SessionDep, CurrentUser

Expand All @@ -13,6 +13,10 @@
async def datasource_recommended(session: SessionDep, ds_id: int):
return get_datasource_recommended(session, ds_id)

@router.get("/get_datasource_recommended_base/{ds_id}")
async def datasource_recommended(session: SessionDep, ds_id: int):
return get_datasource_recommended_base(session, ds_id)


@router.post("/save_recommended_problem")
async def datasource_recommended(session: SessionDep, user: CurrentUser, data_info: RecommendedProblemBase):
Expand Down
15 changes: 14 additions & 1 deletion backend/apps/datasource/crud/recommended_problem.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
from sqlmodel import select

from common.core.deps import SessionDep, CurrentUser, Trans
from ..models.datasource import DsRecommendedProblem, RecommendedProblemBase, RecommendedProblemBaseChat
from ..models.datasource import DsRecommendedProblem, RecommendedProblemBase, CoreDatasource, RecommendedProblemResponse
import orjson


def get_datasource_recommended(session: SessionDep, ds_id: int):
Expand All @@ -16,6 +17,18 @@ def get_datasource_recommended_chart(session: SessionDep, ds_id: int):
dsRecommendedProblems = session.exec(statement).all()
return dsRecommendedProblems


def get_datasource_recommended_base(session: SessionDep, ds_id: int):
statement = select(CoreDatasource.id,CoreDatasource.recommended_config).where(CoreDatasource.id == ds_id)
datasourceBase = session.exec(statement).first()
if datasourceBase is None:
return RecommendedProblemResponse(ds_id,0,None)
elif datasourceBase.recommended_config == 1:
return RecommendedProblemResponse(ds_id,1,None)
else:
dsRecommendedProblems = session.exec(select(DsRecommendedProblem.question).where(DsRecommendedProblem.datasource_id == ds_id)).all()
return RecommendedProblemResponse(ds_id,datasourceBase.recommended_config, orjson.dumps(dsRecommendedProblems).decode())

def save_recommended_problem(session: SessionDep,user: CurrentUser, data_info: RecommendedProblemBase):
session.query(DsRecommendedProblem).filter(DsRecommendedProblem.datasource_id == data_info.datasource_id).delete(synchronize_session=False)
problemInfo = data_info.problemInfo
Expand Down
10 changes: 10 additions & 0 deletions backend/apps/datasource/models/datasource.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ class CreateDatasource(BaseModel):
tables: List[CoreTable] = []
recommended_config: int = 1

class RecommendedProblemResponse:
def __init__(self, datasource_id,recommended_config,questions):
self.datasource_id = datasource_id
self.recommended_config = recommended_config
self.questions = questions
datasource_id: int = None
recommended_config: int = None
questions: str = None


class RecommendedProblemBase(BaseModel):
datasource_id: int = None
recommended_config: int = None
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/api/recommendedApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ export const recommendedApi = {
request.get(`/recommended_problem/get_datasource_recommended/${dsId}`),
save_recommended_problem: (data: any) =>
request.post(`/recommended_problem/save_recommended_problem`, data),
get_datasource_recommended_base: (datasource_id?: number): Promise<any> => {
return request.get(`/recommended_problem/get_datasource_recommended_base/${datasource_id}`)
},
}
1 change: 1 addition & 0 deletions frontend/src/views/chat/QuickQuestion.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ const props = withDefaults(
:current-chat="currentChat"
:record-id="recordId"
:questions="questions"
:datasource="datasourceId"
:disabled="disabled"
:first-chat="firstChat"
position="input"
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/views/chat/RecommendQuestionQuick.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@
import { computed, nextTick, onBeforeUnmount, ref } from 'vue'
import { endsWith, startsWith } from 'lodash-es'
import { chatApi } from '@/api/chat.ts'
import { recommendedApi } from '@/api/recommendedApi.ts'

const props = withDefaults(
defineProps<{
recordId?: number
disabled?: boolean
datasource?: number
}>(),
{
recordId: undefined,
disabled: false,
datasource: undefined,
}
)

Expand Down Expand Up @@ -41,6 +44,16 @@ function clickQuestion(question: string): void {
const stopFlag = ref(false)

async function getRecommendQuestions(articles_number: number) {
recommendedApi.get_datasource_recommended_base(props.datasource).then((res) => {
if (res.recommended_config === 2) {
questions.value = res.questions
} else {
getRecommendQuestionsLLM(articles_number)
}
})
}

async function getRecommendQuestionsLLM(articles_number: number) {
stopFlag.value = false
loading.value = true
try {
Expand Down