From 09d4ee43cf067966167a2e52c4e7bd9af573627e Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 20 Oct 2023 11:26:08 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20fix(store.py):=20remove=20duplic?= =?UTF-8?q?ate=20list=5Fcomponents=20endpoint=20to=20avoid=20conflicts=20a?= =?UTF-8?q?nd=20improve=20code=20organization=20=E2=9C=A8=20feat(store.py)?= =?UTF-8?q?:=20add=20new=20list=5Fcomponents=20endpoint=20to=20retrieve=20?= =?UTF-8?q?a=20paginated=20list=20of=20components=20from=20the=20store?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/store.py | 35 +++++++++++++++------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/backend/langflow/api/v1/store.py b/src/backend/langflow/api/v1/store.py index 74ea1a914..35938f1fc 100644 --- a/src/backend/langflow/api/v1/store.py +++ b/src/backend/langflow/api/v1/store.py @@ -45,6 +45,25 @@ def create_component( raise HTTPException(status_code=400, detail=str(exc)) +@router.get("/components/", response_model=List[ComponentResponse]) +def list_components( + page: int = 1, + limit: int = 10, + store_service: StoreService = Depends(get_store_service), + store_api_Key: str = Depends(get_optional_user_store_api_key), + settings_service=Depends(get_settings_service), +): + try: + if store_api_Key: + decrypted = auth_utils.decrypt_api_key(store_api_Key, settings_service) + else: + decrypted = None + result = store_service.list_components(decrypted, page, limit) + return result + except Exception as exc: + raise HTTPException(status_code=400, detail=str(exc)) + + @router.get("/components/{component_id}", response_model=ComponentResponse) def read_component( component_id: UUID, @@ -64,22 +83,6 @@ def read_component( return component -@router.get("/components/", response_model=List[ComponentResponse]) -def list_components( - page: int = 1, - limit: int = 10, - store_service: StoreService = Depends(get_store_service), - store_api_Key: str = Depends(get_user_store_api_key), - settings_service=Depends(get_settings_service), -): - try: - decrypted = auth_utils.decrypt_api_key(store_api_Key, settings_service) - result = store_service.list_components(decrypted, page, limit) - return result - except Exception as exc: - raise HTTPException(status_code=400, detail=str(exc)) - - @router.get("/search", response_model=List[ComponentResponse]) async def search_endpoint( query: str = Query(...),