only filter_metadata in api and ui

app.py

@@ -14,22 +14,11 @@ except Exception as e:
 # ---------------------------------------------------------------------
 # MCP - returns raw dictionary format
 # ---------------------------------------------------------------------
-def create_metadata_dict(sources_input, sources_value):
-    """
-    This helper function creates the filter dictionary based on user input.
-    """
-    if sources_input and sources_value:
-        
-        return {sources_input: sources_value}
-    return None
-
 
 def retrieve(
     query:str, 
-    collection_name:str = None,
-    filter_metadata:dict = None,
-    sources_input:str = None,
-    sources_value:str = None,
+    collection_name:Optional[str] = None,
+    filter_metadata:Optional[dict] = None,
 ) -> list:
     """
     Retrieve semantically similar documents from the vector database for MCP clients.
@@ -44,9 +33,6 @@ def retrieve(
     Returns:
         list: List of dictionaries containing document content, metadata, and scores
     """
-    if not filter_metadata:
-        if sources_input and sources_value:
-            filter_metadata = {sources_input: sources_value}
     
     # Call retriever function and return raw results
     results = get_context(
@@ -78,18 +64,8 @@ with gr.Blocks() as ui:
                 placeholder="EUDR, Humboldt",
                 info="Name of the collection"
             )
-            sources_input = gr.Textbox(
-                label="Sources Filter key to be looked in metadata (optional)", 
-                lines=1, 
-                placeholder="country",
-                info="Filter by document source type (leave empty for all)"
-            )
-            sources_value = gr.Textbox(
-                label="Value in filter to be looked for(optional)", 
-                lines=1, 
-                placeholder="Ecuador, Guatemala",
-                info="Filter by document subtype (leave empty for all)"
-            )           
+
+            filter_metadata = gr.JSON(label="Filter Metadata (optional)")          
             submit_btn = gr.Button("Submit", variant="primary")
         
         # Output needs to be in json format to be added as tool in HuggingChat
@@ -101,18 +77,11 @@ with gr.Blocks() as ui:
             )
     
     # UI event handler
-    # submit_btn.click(
-    #     fn=retrieve,
-    #     inputs=[query_input,collection_name, filter_metadata],
-    #     outputs=output,
-    #     api_name="retrieve"
-    # )
     submit_btn.click(
-        # 3. Use the updated state as an input to the retrieve function.
         fn=retrieve,
-        inputs=[query_input, collection_name, None, sources_input, sources_value],
+        inputs=[query_input, collection_name, filter_metadata],
         outputs=output,
-        queue=False
+        api_name="retrieve"
     )