From 3215d3a4701bcb28ebf7b25f794cc83228b572a8 Mon Sep 17 00:00:00 2001
From: RINO-GAELICO <ducciorocca@gmail.com>
Date: Wed, 9 Oct 2024 13:21:53 -0700
Subject: [PATCH 1/8] Added a filtering mechanism within list_connectors in
 connector.py

---
 app/api/v1/connector.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/api/v1/connector.py b/app/api/v1/connector.py
index 78555cf5..286fbda3 100644
--- a/app/api/v1/connector.py
+++ b/app/api/v1/connector.py
@@ -1,3 +1,4 @@
+from typing import Optional
 from fastapi import APIRouter, Depends
 from sqlalchemy.orm import Session
 import app.schemas.connector as schemas
@@ -24,10 +25,10 @@
 actions = APIRouter()
 
 @router.get("/list", response_model=resp_schemas.CommonResponse)
-def list_connectors(db: Session = Depends(get_db)):
+def list_connectors(db: Session = Depends(get_db), provider_category_id: Optional[int] = None ):
 
     """
-    Retrieves a list of all connectors from the database.
+    Retrieves a list of all connectors from the database. If a provider category ID is provided, only connectors from that category are returned.
 
     Args:
         db (Session): Database session dependency.
@@ -38,6 +39,9 @@ def list_connectors(db: Session = Depends(get_db)):
 
     result, error = svc.list_connectors(db)
 
+    if provider_category_id:
+        result = list(filter(lambda x: x["provider_category_id"] == provider_category_id, result))
+
     if error:
         return commons.is_error_response("DB Error", result, {"connectors": []})
 

From 7c4c57336014b3736970e611113111a0e4c7d587 Mon Sep 17 00:00:00 2001
From: RINO-GAELICO <ducciorocca@gmail.com>
Date: Thu, 10 Oct 2024 16:37:20 -0700
Subject: [PATCH 2/8] Added the ability to pass the parameter
 provider_category_id from frontend

---
 ui/src/services/Connectors.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/src/services/Connectors.js b/ui/src/services/Connectors.js
index 3885d2a9..9eaa5df5 100644
--- a/ui/src/services/Connectors.js
+++ b/ui/src/services/Connectors.js
@@ -3,7 +3,10 @@ import DeleteService from "src/utils/http/DeleteService";
 import GetService from "src/utils/http/GetService";
 import PostService from "src/utils/http/PostService";
 
-export const getConnectors = ()=>{
+export const getConnectors = (provider_category_id = null)=>{
+    if (provider_category_id) {
+        return GetService(API_URL + `/connector/list?provider_category_id=${provider_category_id}`);
+    }
     return GetService(API_URL + "/connector/list")
 }
 

From 755a0f95b95d9cf6fc0f423b2b1212aec35348de Mon Sep 17 00:00:00 2001
From: RINO-GAELICO <ducciorocca@gmail.com>
Date: Fri, 11 Oct 2024 10:10:56 -0700
Subject: [PATCH 3/8] Added the parameter 2 to the getConnectors function in
 frontend

---
 ui/src/pages/Samples/SampleForm.jsx | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ui/src/pages/Samples/SampleForm.jsx b/ui/src/pages/Samples/SampleForm.jsx
index 93d7cc10..68e5a613 100644
--- a/ui/src/pages/Samples/SampleForm.jsx
+++ b/ui/src/pages/Samples/SampleForm.jsx
@@ -20,7 +20,7 @@ const SampleForm = ({ sample = {}, afterCreate = ()=>{}, onCancel = ()=>{}})=>{
 
 
     const getAllConnectors = ()=>{
-        getConnectors().then(response=>{
+        getConnectors(2).then(response=>{
 
             let tempOptions = [];
             response.data?.data?.connectors?.map(item=>{
@@ -29,7 +29,7 @@ const SampleForm = ({ sample = {}, afterCreate = ()=>{}, onCancel = ()=>{}})=>{
             setConnectors(tempOptions)
         })
     }
-    
+
 
     const saveSample = (data)=>{
         saveSamples(sample.id, {
@@ -66,23 +66,23 @@ const SampleForm = ({ sample = {}, afterCreate = ()=>{}, onCancel = ()=>{}})=>{
                     <Input label={<span className="span-important">Question</span>} hasError={errors["question"]?.message} errorMessage={errors["question"]?.message} {...register("question", {required: "This is required"})} />
                 </div>
                 <div>
-                    <Controller 
+                    <Controller
                         control={control}
                         name="connector"
                         rules={{
                             required: "This field is required"
                         }}
                         render={({ field: { onChange, value, ref } })=>(
-                            <Select 
-                                inputRef={ref} 
-                                label={ <span className="span-important">Connector</span> } 
+                            <Select
+                                inputRef={ref}
+                                label={ <span className="span-important">Connector</span> }
                                 value={connectors.find(c => c.value === value)}
-                                options={connectors} 
+                                options={connectors}
                                 onChange={val=>onChange(val.value)} />
                         )}
-                    
+
                     />
-                    
+
                 </div>
                 <div>
                     <Textarea label={<span className="span-important">Query</span>} rows={6} style={{resize: "vertical"}} hasError={errors["query"]?.message} errorMessage={errors["query"]?.message} {...register("query", {required: "This is required"})}  />
@@ -91,11 +91,11 @@ const SampleForm = ({ sample = {}, afterCreate = ()=>{}, onCancel = ()=>{}})=>{
                     <Textarea label="Metadata" rows={6} style={{resize: "vertical"}} hasError={errors["metadata"]?.message} errorMessage={errors["metadata"]?.message} {...register("metadata")} />
                 </div>
                 <div className="flex flex-gap-10 justify-content-end">
-                    <div> 
-                        <Button variant="secondary-danger" onClick={onCancel}>Cancel <FiXCircle/></Button> 
+                    <div>
+                        <Button variant="secondary-danger" onClick={onCancel}>Cancel <FiXCircle/></Button>
                     </div>
-                    <div> 
-                        <Button  buttonType="submit" disabled={isFormValid ? false: true} onClick={onCancel}>Save <FiCheckCircle/></Button> 
+                    <div>
+                        <Button  buttonType="submit" disabled={isFormValid ? false: true} onClick={onCancel}>Save <FiCheckCircle/></Button>
                     </div>
                 </div>
             </form>

From e902774e978143dd6c078ae4a3645adfe9ded8c9 Mon Sep 17 00:00:00 2001
From: RINO-GAELICO <ducciorocca@gmail.com>
Date: Mon, 14 Oct 2024 18:09:18 -0700
Subject: [PATCH 4/8] Fixed the filtering mechanism to allow for a correct
 access to the connector_key

---
 app/api/v1/connector.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/v1/connector.py b/app/api/v1/connector.py
index 286fbda3..5abf8e46 100644
--- a/app/api/v1/connector.py
+++ b/app/api/v1/connector.py
@@ -40,7 +40,7 @@ def list_connectors(db: Session = Depends(get_db), provider_category_id: Optiona
     result, error = svc.list_connectors(db)
 
     if provider_category_id:
-        result = list(filter(lambda x: x["provider_category_id"] == provider_category_id, result))
+        result = list(filter(lambda x: x.connector_key == provider_category_id, result))
 
     if error:
         return commons.is_error_response("DB Error", result, {"connectors": []})

From 55f3e8dcabce5d71e6858d75c83f55bc963fd5f4 Mon Sep 17 00:00:00 2001
From: RINO-GAELICO <ducciorocca@gmail.com>
Date: Fri, 18 Oct 2024 18:13:59 -0700
Subject: [PATCH 5/8] Added the correct field retrieval for provider_id

---
 app/api/v1/connector.py   | 2 +-
 app/services/connector.py | 3 ++-
 ui/.env.example           | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 ui/.env.example

diff --git a/app/api/v1/connector.py b/app/api/v1/connector.py
index 5abf8e46..537eecd5 100644
--- a/app/api/v1/connector.py
+++ b/app/api/v1/connector.py
@@ -40,7 +40,7 @@ def list_connectors(db: Session = Depends(get_db), provider_category_id: Optiona
     result, error = svc.list_connectors(db)
 
     if provider_category_id:
-        result = list(filter(lambda x: x.connector_key == provider_category_id, result))
+        result = list(filter(lambda x: x.provider_id == provider_category_id, result))
 
     if error:
         return commons.is_error_response("DB Error", result, {"connectors": []})
diff --git a/app/services/connector.py b/app/services/connector.py
index e73d48cb..eadb91ab 100644
--- a/app/services/connector.py
+++ b/app/services/connector.py
@@ -41,7 +41,8 @@ def list_connectors(db: Session):
         connector_docs=connector.connector_docs,
         connector_key=connector.provider.key,
         enable=connector.enable,
-        icon=connector.provider.icon
+        icon=connector.provider.icon,
+        provider_id=connector.provider.connector_id
     ) for connector in connectors]
 
     return connectors_response, None
diff --git a/ui/.env.example b/ui/.env.example
deleted file mode 100644
index 54f4d9c9..00000000
--- a/ui/.env.example
+++ /dev/null
@@ -1,2 +0,0 @@
-# Backend URL
-VITE_BACKEND_URL=http://your-backend-url
\ No newline at end of file

From be2ddedc25674d4c8c93621a532f17a60fb8cef5 Mon Sep 17 00:00:00 2001
From: RINO-GAELICO <ducciorocca@gmail.com>
Date: Mon, 21 Oct 2024 22:58:44 -0700
Subject: [PATCH 6/8] Moved the filtering logic to the service level

---
 app/api/v1/connector.py   |  6 +++---
 app/services/connector.py | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/api/v1/connector.py b/app/api/v1/connector.py
index 537eecd5..89e499c2 100644
--- a/app/api/v1/connector.py
+++ b/app/api/v1/connector.py
@@ -37,10 +37,10 @@ def list_connectors(db: Session = Depends(get_db), provider_category_id: Optiona
         CommonResponse: A response containing either the list of connectors or an error message.
     """
 
-    result, error = svc.list_connectors(db)
-
     if provider_category_id:
-        result = list(filter(lambda x: x.provider_id == provider_category_id, result))
+        result, error = svc.list_connectors_by_provider_category(provider_category_id, db)
+    else:
+        result, error = svc.list_connectors(db)
 
     if error:
         return commons.is_error_response("DB Error", result, {"connectors": []})
diff --git a/app/services/connector.py b/app/services/connector.py
index eadb91ab..233aabfd 100644
--- a/app/services/connector.py
+++ b/app/services/connector.py
@@ -47,6 +47,28 @@ def list_connectors(db: Session):
 
     return connectors_response, None
 
+def list_connectors_by_provider_category(category_id: int, db: Session):
+    """
+    Retrieves all connector records from the database filtered by provider category.
+
+    Args:
+        category_id (int): The ID of the provider category.
+        db (Session): Database session object.
+
+    Returns:
+        Tuple: List of connector responses and error message (if any).
+    """
+    connectors, error = list_connectors(db)
+
+    if error:
+        return [], error
+
+    filtered_connectors = [connector for connector in connectors if connector.provider_id == category_id]
+
+    return filtered_connectors, None
+
+
+
 def get_connector(connector_id: int, db: Session):
 
     """

From 907162e13ca177943e47a22e07e80297716db52f Mon Sep 17 00:00:00 2001
From: RINO-GAELICO <ducciorocca@gmail.com>
Date: Wed, 30 Oct 2024 10:01:54 -0700
Subject: [PATCH 7/8] Implemented changes; category_id instead of connector_id;
 added provider_id to the ConnectorBase class

---
 app/schemas/connector.py  | 1 +
 app/services/connector.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/schemas/connector.py b/app/schemas/connector.py
index b3fd41b0..75dc9865 100644
--- a/app/schemas/connector.py
+++ b/app/schemas/connector.py
@@ -9,6 +9,7 @@ class ConnectorBase(BaseModel):
     schema_config: Optional[Union[List[Dict], Dict]] = None
     connector_docs: Optional[str]= None
     enable: Optional[bool] = True
+    provider_id: Optional[int] = None
 
 class ConnectorResponse(ConnectorBase):
     connector_id:int
diff --git a/app/services/connector.py b/app/services/connector.py
index 233aabfd..06331824 100644
--- a/app/services/connector.py
+++ b/app/services/connector.py
@@ -42,7 +42,7 @@ def list_connectors(db: Session):
         connector_key=connector.provider.key,
         enable=connector.enable,
         icon=connector.provider.icon,
-        provider_id=connector.provider.connector_id
+        provider_id=connector.provider.category_id
     ) for connector in connectors]
 
     return connectors_response, None

From 2e99e8bab4c705c7d20d327f943aa97fe5c1851d Mon Sep 17 00:00:00 2001
From: RINO-GAELICO <ducciorocca@gmail.com>
Date: Wed, 30 Oct 2024 21:26:17 -0700
Subject: [PATCH 8/8] Changed the provider_id field from ConnectorBase to
 ConnectorResponse

---
 app/schemas/connector.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/schemas/connector.py b/app/schemas/connector.py
index 1f2526ca..01574f53 100644
--- a/app/schemas/connector.py
+++ b/app/schemas/connector.py
@@ -9,12 +9,12 @@ class ConnectorBase(BaseModel):
     schema_config: Optional[Union[List[Dict], Dict]] = None
     connector_docs: Optional[str]= None
     enable: Optional[bool] = True
-    provider_id: Optional[int] = None
 
 class ConnectorResponse(ConnectorBase):
     connector_id:int
     connector_key :Optional[str]=None
     icon:Optional[str]=None
+    provider_id: Optional[int] = None
 
 class ConnectorUpdate(BaseModel):
     connector_type: Optional[int] = None