Merge branch 'master' into feat/streaming

pkg/api/http/controller/group.py

@@ -123,4 +123,4 @@ class RouterGroup(abc.ABC):
 
     def http_status(self, status: int, code: int, msg: str) -> typing.Tuple[quart.Response, int]:
         """返回一个指定状态码的响应"""
-        return (self.fail(code, msg), status)
+        return (self.fail(code, msg), status)

pkg/api/http/controller/groups/pipelines/pipelines.py

@@ -13,7 +13,9 @@ class PipelinesRouterGroup(group.RouterGroup):
             if quart.request.method == 'GET':
                 sort_by = quart.request.args.get('sort_by', 'created_at')
                 sort_order = quart.request.args.get('sort_order', 'DESC')
-                return self.success(data={'pipelines': await self.ap.pipeline_service.get_pipelines(sort_by, sort_order)})
+                return self.success(
+                    data={'pipelines': await self.ap.pipeline_service.get_pipelines(sort_by, sort_order)}
+                )
             elif quart.request.method == 'POST':
                 json_data = await quart.request.json
 

pkg/api/http/controller/groups/user.py

@@ -67,3 +67,19 @@ class UserRouterGroup(group.RouterGroup):
             await self.ap.user_service.reset_password(user_email, new_password)
 
             return self.success(data={'user': user_email})
+
+        @self.route('/change-password', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
+        async def _(user_email: str) -> str:
+            json_data = await quart.request.json
+            
+            current_password = json_data['current_password']
+            new_password = json_data['new_password']
+            
+            try:
+                await self.ap.user_service.change_password(user_email, current_password, new_password)
+            except argon2.exceptions.VerifyMismatchError:
+                return self.http_status(400, -1, 'Current password is incorrect')
+            except ValueError as e:
+                return self.http_status(400, -1, str(e))
+            
+            return self.success(data={'user': user_email})

pkg/api/http/service/knowledge.py

@@ -78,7 +78,9 @@ class KnowledgeService:
         runtime_kb = await self.ap.rag_mgr.get_knowledge_base_by_uuid(kb_uuid)
         if runtime_kb is None:
             raise Exception('Knowledge base not found')
-        return [result.model_dump() for result in await runtime_kb.retrieve(query)]
+        return [
+            result.model_dump() for result in await runtime_kb.retrieve(query, runtime_kb.knowledge_base_entity.top_k)
+        ]
 
     async def get_files_by_knowledge_base(self, kb_uuid: str) -> list[dict]:
         """获取知识库文件"""

pkg/api/http/service/pipeline.py

@@ -40,7 +40,7 @@ class PipelineService:
 
     async def get_pipelines(self, sort_by: str = 'created_at', sort_order: str = 'DESC') -> list[dict]:
         query = sqlalchemy.select(persistence_pipeline.LegacyPipeline)
-        
+
         if sort_by == 'created_at':
             if sort_order == 'DESC':
                 query = query.order_by(persistence_pipeline.LegacyPipeline.created_at.desc())
@@ -51,7 +51,7 @@ class PipelineService:
                 query = query.order_by(persistence_pipeline.LegacyPipeline.updated_at.desc())
             else:
                 query = query.order_by(persistence_pipeline.LegacyPipeline.updated_at.asc())
-        
+
         result = await self.ap.persistence_mgr.execute_async(query)
         pipelines = result.all()
         return [

pkg/api/http/service/user.py

@@ -82,3 +82,18 @@ class UserService:
         await self.ap.persistence_mgr.execute_async(
             sqlalchemy.update(user.User).where(user.User.user == user_email).values(password=hashed_password)
         )
+
+    async def change_password(self, user_email: str, current_password: str, new_password: str) -> None:
+        ph = argon2.PasswordHasher()
+        
+        user_obj = await self.get_user_by_email(user_email)
+        if user_obj is None:
+            raise ValueError('User not found')
+        
+        ph.verify(user_obj.password, current_password)
+        
+        hashed_password = ph.hash(new_password)
+        
+        await self.ap.persistence_mgr.execute_async(
+            sqlalchemy.update(user.User).where(user.User.user == user_email).values(password=hashed_password)
+        )