Merge remote-tracking branch 'origin/master'

packages/dbgpt-serve/src/dbgpt_serve/conversation/api/endpoints.py

@@ -8,7 +8,7 @@ from fastapi.security.http import HTTPAuthorizationCredentials, HTTPBearer
 from dbgpt.component import SystemApp
 from dbgpt.util import PaginationResult
 from dbgpt_serve.core import Result
-from utils.auth import UserRequest, get_user_from_headers
+from dbgpt_serve.utils.auth import UserRequest, get_user_from_headers
 
 from ..config import SERVE_SERVICE_COMPONENT_NAME, ServeConfig
 from ..service.service import Service

packages/dbgpt-serve/src/dbgpt_serve/datasource/service/service.py

@@ -238,7 +238,7 @@ class Service(
             self._dao.delete({"id": datasource_id})
         return db_config
 
-    def get_list(self, db_type: Optional[str] = None) -> List[DatasourceQueryResponse]:
+    def get_list(self, db_type: Optional[str] = None,user_id: Optional[int] = None) -> List[DatasourceQueryResponse]:
         """List the Flow entities.
 
         Returns:
@@ -247,6 +247,8 @@ class Service(
         query_request = {}
         if db_type:
             query_request["db_type"] = db_type
+        if user_id:
+            query_request["user_id"] = user_id
         query_list = self.dao.get_list(query_request)
         results = []
         for item in query_list: