知识库权限修改

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

@@ -475,7 +475,7 @@ class RoleDal(DalBase):
         :param v_schema:
         :return:
         """
-        obj = self.model(**data.model_dump(exclude={'menu_ids', 'dept_ids'}))
+        obj = self.model(**data.model_dump(exclude={'menu_ids', 'dept_ids', 'knowledge_ids'}))
         if data.menu_ids:
             menus = await MenuDal(db=self.db).get_datas(limit=0, id=("in", data.menu_ids), v_return_objs=True)
             for menu in menus:
@@ -484,10 +484,10 @@ class RoleDal(DalBase):
             depts = await DeptDal(db=self.db).get_datas(limit=0, id=("in", data.dept_ids), v_return_objs=True)
             for dept in depts:
                 obj.depts.add(dept)
-        if data.knowledges:
-            depts = await DeptDal(db=self.db).get_datas(limit=0, id=("in", data.dept_ids), v_return_objs=True)
-            for dept in depts:
-                obj.depts.add(dept)
+        if data.knowledge_ids:
+            knowledges = await DeptDal(db=self.db).get_datas(limit=0, id=("in", data.knowledge_ids), v_return_objs=True)
+            for knowledge in knowledges:
+                obj.knowledges.add(knowledge)
         await self.flush(obj)
         return await self.out_dict(obj, v_options, v_return_obj, v_schema)
 

dbgpt/app/openapi/api_v1/api_v1.py

@@ -44,13 +44,6 @@ from dbgpt.util.executor_utils import (
 )
 from dbgpt.util.tracer import SpanType, root_tracer
 
-from dbgpt.app.apps.utils.spach_keywords import my_spacy_nlp
-
-from dbgpt.app.apps.vadmin.media.params.media_list import MediaListParams
-from dbgpt.app.apps.vadmin.media import schemas, crud
-from dbgpt.app.apps.vadmin.auth.utils.current import AllUserAuth, FullAdminAuth, OpenAuth
-from dbgpt.app.apps.vadmin.auth.utils.validation.auth import Auth
-
 
 router = APIRouter()
 CFG = Config()
@@ -351,40 +344,7 @@ async def chat_prepare(dialogue: ConversationVo = Body()):
 async def chat_completions(
     dialogue: ConversationVo = Body(),
     flow_service: FlowService = Depends(get_chat_flow),
-    auth: Auth = Depends(OpenAuth())
 ):
-    print('----------------completions---------------->')
-    logger.info(f"-----用户输入为:---->:{dialogue.user_input}")
-    print('----------------begin---------------->')
-
-    #nlp = spacy.load("en_core_web_trf")
-    #nlp = spacy.load("zh_core_web_trf")
-    #nlp.add_pipe("textrank")
-    doc = my_spacy_nlp.nlp(dialogue.user_input)
-
-    words = []
-    # examine the top-ranked phrases in the document
-    for phrase in doc._.phrases:
-        #logger.info(f"----1--->:{phrase.rank}--->:{phrase.count}")
-        #logger.info(f"----2--->:{phrase.chunks[0]}")
-        words.append(phrase.chunks[0])
-
-    print(words)
-
-    if len(words) > 0 :
-        print(words[0])
-
-        # 取出词频率排名第一的词，进行数据库查询--->把关键词循环3次
-        mydic = {'page': 1, 'limit': 10, 'v_order': None, 'v_order_field': None, 'type': 1, 'group_id': None,
-                 'file_name': ('like', words[0])}
-
-        datas, count = await crud.MediaDal(auth.db).get_datas(**mydic, v_return_count=True)
-        logger.info(f"-----查询到的图片为:---->:{datas}")
-    else:
-        logger.info(f"-----没有找到需要查询的内容:---->")
-
-    print('----------------end---------------->')
-
     logger.info(
         f"chat_completions:{dialogue.chat_mode},{dialogue.select_param},{dialogue.model_name}"
     )