问答对编辑

dbgpt/app/apps/vadmin/keywordsviews.py

@@ -7,11 +7,6 @@ from dbgpt.app.apps.utils.response import SuccessResponse, ErrorResponse
 from dbgpt.app.apps.vadmin.auth.utils.validation.auth import Auth
 from dbgpt.app.apps.vadmin.media import schemas
 from dbgpt.app.apps.vadmin.media.crud import MediaDal,QuestionDal,CorrelationDal
-from dbgpt.app.apps.vadmin.media.models import VadminCorrelation
-from dbgpt.app.apps.vadmin.media.params.media_list import MediaListParams, GroupListParams, MediaEditParams, \
-    QuestionListParams, \
-    QuestionEditParams, CorrelationListParams
-from dbgpt.app.apps.core.dependencies import IdList
 
 from dbgpt.app.apps.vadmin.chathistory.crud import ChatHistoryDal
 from dbgpt.app.apps.vadmin.chathistory.schemas.chathistory import ChatHistorySchemas

dbgpt/app/apps/vadmin/media/crud.py

@@ -18,8 +18,8 @@ from sqlalchemy import select, update
 from . import models, schemas
 
 from dbgpt.app.apps.utils import status
-from .params.media_list import MediaEditParams, QuestionEditParams
-
+from .params.media_list import MediaEditParams
+from .schemas import QuestionEditParams
 
 class MediaDal(DalBase):
 

dbgpt/app/apps/vadmin/media/params/media_list.py

@@ -41,16 +41,6 @@ class QuestionListParams(QueryParams):
         self.title = ("like", title)
 
 
-class QuestionEditParams:
-    def __init__(self, ids: list[int] = None, title: str = None, group_id: int = None, key_word: str = None, answer: str = None):
-        super().__init__()
-        self.ids = ids
-        self.title = title
-        self.key_word = key_word
-        self.answer = answer
-        self.group_id = group_id
-
-
 class CorrelationListParams(QueryParams):
     def __init__(self, name: str = None, params: Paging = Depends()):
         super().__init__(params)

dbgpt/app/apps/vadmin/media/schemas/__init__.py

@@ -7,6 +7,7 @@ from .media import GroupOut
 
 from .media import Question
 from .media import QuestionOut
+from .media import QuestionEditParams
 
 from .media import Correlation
 from .media import CorrelationOut

dbgpt/app/apps/vadmin/media/schemas/media.py

@@ -41,6 +41,13 @@ class Question(BaseModel):
     answer: str | None = None
     group_id: int | None = 0
 
+class QuestionEditParams(BaseModel):
+    ids : list | None = []
+    title : str | None = None
+    key_word : str | None = None
+    answer : str | None = None
+    group_id : int | None = 0
+
 
 class QuestionOut(Question):
     model_config = ConfigDict(from_attributes=True)

dbgpt/app/apps/vadmin/media/views.py

@@ -7,8 +7,7 @@ from dbgpt.app.apps.vadmin.auth.utils.current import FullAdminAuth
 from dbgpt.app.apps.vadmin.auth.utils.validation.auth import Auth
 from . import schemas, crud
 from .models import VadminQuestion, VadminMedia
-from .params.media_list import MediaListParams, GroupListParams, MediaEditParams, QuestionListParams, \
-    QuestionEditParams, CorrelationListParams
+from .params.media_list import MediaListParams, GroupListParams, MediaEditParams, QuestionListParams, CorrelationListParams
 from ...core.dependencies import IdList
 from dbgpt.app.apps.utils.filter import mydfafiter, mydfafiter_picture, mydfafiter_question, mydfafiter_video
 from sqlalchemy import BinaryExpression
@@ -125,16 +124,16 @@ async def question_add(ids: IdList = Depends(), auth: Auth = Depends(FullAdminAu
 
 
 @router.post("/question/edit", summary="编辑问答对")
-async def question_edit(params: QuestionEditParams = Depends(), auth: Auth = Depends(FullAdminAuth())):
-    if len(params.key_word) > 0:
-        question_dic = {'page': 1, 'limit': 0, 'v_order': None, 'v_order_field': None, 'id': params.ids[0]}
+async def question_edit(data: schemas.QuestionEditParams , auth: Auth = Depends(FullAdminAuth())):
+    if len(data.key_word) > 0:
+        question_dic = {'page': 1, 'limit': 0, 'v_order': None, 'v_order_field': None, 'id': data.ids[0]}
         question_datas, count = await crud.QuestionDal(auth.db).get_datas(**question_dic, v_return_count=True)
         if len(question_datas) > 0:
             print(f"------编辑时要删除旧的问答对------>:{question_datas[0]}")
             mydfafiter_question.remove(question_datas[0].get('key_word'))
-            print(f"------编辑时要添加新的问答对------>:{params.key_word}")
-            mydfafiter_question.add(params.key_word)
-    ret = await crud.QuestionDal(auth.db).update_question_datas(params)
+            print(f"------编辑时要添加新的问答对------>:{data.key_word}")
+            mydfafiter_question.add(data.key_word)
+    ret = await crud.QuestionDal(auth.db).update_question_datas(data)
     return SuccessResponse(ret)