From 4c6dc748a04a09654a999dd47896a20a52f49e45 Mon Sep 17 00:00:00 2001
From: Gabriel Luiz Freitas Almeida <gabriel@logspace.ai>
Date: Thu, 19 Oct 2023 22:52:38 -0300
Subject: [PATCH] updates to colliding endpoints and search

---
 src/backend/langflow/api/v1/store.py          | 22 +++++++++++--------
 .../langflow/services/store/service.py        |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/backend/langflow/api/v1/store.py b/src/backend/langflow/api/v1/store.py
index 478088492..74ea1a914 100644
--- a/src/backend/langflow/api/v1/store.py
+++ b/src/backend/langflow/api/v1/store.py
@@ -25,7 +25,13 @@ def get_user_store_api_key(user: User = Depends(auth_utils.get_current_active_us
     return user.store_api_key
 
 
-@router.post("/", response_model=ComponentResponse)
+def get_optional_user_store_api_key(
+    user: User = Depends(auth_utils.get_current_active_user),
+):
+    return user.store_api_key
+
+
+@router.post("/components/", response_model=ComponentResponse)
 def create_component(
     component: StoreComponentCreate,
     store_service: StoreService = Depends(get_store_service),
@@ -39,7 +45,7 @@ def create_component(
         raise HTTPException(status_code=400, detail=str(exc))
 
 
-@router.get("/{component_id}", response_model=ComponentResponse)
+@router.get("/components/{component_id}", response_model=ComponentResponse)
 def read_component(
     component_id: UUID,
     store_service: StoreService = Depends(get_store_service),
@@ -58,7 +64,7 @@ def read_component(
     return component
 
 
-@router.get("/", response_model=List[ComponentResponse])
+@router.get("/components/", response_model=List[ComponentResponse])
 def list_components(
     page: int = 1,
     limit: int = 10,
@@ -76,7 +82,6 @@ def list_components(
 
 @router.get("/search", response_model=List[ComponentResponse])
 async def search_endpoint(
-    api_key: Optional[str] = Query(None),
     query: str = Query(...),
     page: int = Query(1),
     limit: int = Query(10),
@@ -88,10 +93,11 @@ async def search_endpoint(
     sort: Optional[List[str]] = Query(None),
     fields: Optional[List[str]] = Query(None),
     store_service: "StoreService" = Depends(get_store_service),
+    store_api_Key: str = Depends(get_optional_user_store_api_key),
 ):
     try:
-        return await store_service.search(
-            api_key=api_key,
+        return store_service.search(
+            api_key=store_api_Key,
             query=query,
             page=page,
             limit=limit,
@@ -104,6 +110,4 @@ async def search_endpoint(
             fields=fields,
         )
     except Exception as exc:
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(exc)
-        )
+        raise HTTPException(status_code=500, detail=str(exc))
diff --git a/src/backend/langflow/services/store/service.py b/src/backend/langflow/services/store/service.py
index 542a0670c..42d1845d4 100644
--- a/src/backend/langflow/services/store/service.py
+++ b/src/backend/langflow/services/store/service.py
@@ -51,7 +51,7 @@ class StoreService(Service):
         fields: Optional[List[str]] = None,
     ) -> List[ComponentResponse]:
         params = {
-            "filter[name][_like]": query,
+            "search": query,
             "page": page,
             "limit": limit,
             "sort": sort_by,