new UI changes

app.py

@@ -8,15 +8,16 @@ import json
 CARBON_API_KEY = "a38ee1fe5fef56fc8e1ae2afc881378804bb902882442e1554adae4f82ee23ea"
 customer_id = "Candid"
 
-# Define your main function here
 def main():
     st.title('Google Drive Data Connector using Carbon SDK')
     
+    # Authenticate with Carbon API
     st.write('### Authenticate with Carbon API')
     carbon = Carbon(api_key=CARBON_API_KEY, customer_id=customer_id)
     token = carbon.auth.get_access_token()
     carbon = Carbon(access_token=token.access_token)  # authenticated object
 
+    # Connect to Google Drive
     st.write('### Connect to Google Drive')
     get_oauth_url_response = carbon.integrations.get_oauth_url(
         service="GOOGLE_DRIVE",
@@ -32,7 +33,7 @@ def main():
         salesforce_domain="string_example",
         sync_files_on_connection=True,
         set_page_as_boundary=False,
-        data_source_id=Decimal(1),
+        data_source_id=Decimal(1),  # Using static data_source_id initially
         connecting_new_account=False,
         request_id="b7620173-662c-4ae7-bb61-2e6ffd8619f5",
         use_ocr=False,
@@ -48,43 +49,97 @@ def main():
     )
     
     st.write(f"OAuth URL: {get_oauth_url_response.oauth_url}")
+    st.write("Please use the above URL to connect your Google Drive account.")
     
-    st.write('### Fetch Files and Folders')
-    list_files_response = carbon.data.list()
-    
-    st.write('Files and Folders:')
-    for item in list_files_response['data']:
-        st.write(f"Name: {item['name']} - Type: {item['type']}")
+    # Fetch the data source ID for the connected Google Drive
+    st.write('### List Files in Connected Google Drive')
+    if st.button('List Files'):
+        with st.spinner('Fetching files...'):
+            try:
+                # Fetch data sources
+                query_user_data_sources_response = carbon.data_sources.query_user_data_sources(
+                    pagination={"limit": 100, "offset": 0},
+                    order_by="created_at",
+                    order_dir="desc",
+                    filters={"source": "GOOGLE_DRIVE"},
+                )
+                
+                # Filter and display relevant information from data sources response
+                st.write("Data sources:")
+                for ds in query_user_data_sources_response.results:
+                    st.write(f"- ID: {ds.id}, External ID: {ds.data_source_external_id}, Sync Status: {ds.sync_status}")
 
+                data_sources = query_user_data_sources_response.results
+                if data_sources:
+                    data_source_id = int(data_sources[0].id)  # Convert to int
+                    st.write(f"Using data_source_id: {data_source_id}")
+                    sync_response = carbon.integrations.sync_data_source_items(data_source_id=data_source_id)
+                    
+                    # Filter and display relevant information from sync response
+                    st.write("Files in Google Drive:")
+                    if hasattr(sync_response, 'items'):
+                        for item in sync_response.items:
+                            st.write(f"File ID: {item.id}, File Name: {item.name}, File Size: {item.size if hasattr(item, 'size') else 'N/A'}, Last Modified: {item.last_modified if hasattr(item, 'last_modified') else 'N/A'}")
+                    else:
+                        st.write("No files found.")
+                else:
+                    st.write("No Google Drive data sources found for the user.")
+            except Exception as e:
+                st.error(f"An error occurred: {e}")
+    
+    # Search in the connected data source
     st.write('### Search in the Connected Data Source')
-    query = st.text_input("Enter your query:", value=" ")
-    if query:
-        url = "https://api.carbon.ai/embeddings"
-        payload = {
-            "query": query,
-            "k": 2,
-            "file_ids": [item['id'] for item in list_files_response['data'] if item['type'] == 'file'],  # Get all file ids
-            "include_all_children": True,
-            "tags": {},
-            "include_tags": True,
-            "include_vectors": True,
-            "include_raw_file": True,
-            "hybrid_search": False,
-            "media_type": "TEXT",
-            "embedding_model": "OPENAI"
-        }
-        headers = {
-            "authorization": f"Bearer {CARBON_API_KEY}",
-            "customer-id": customer_id,
-            "Content-Type": "application/json"
-        }
-        response_search = requests.post(url, json=payload, headers=headers)
-        response_search_chunks = json.loads(response_search.text)
-        
-        for i, doc in enumerate(response_search_chunks['documents']):
-            st.write(f"Document {i+1}")
-            st.write(doc['content'])
-            st.write("-------------------------------------------------")
+    query = st.text_input("Enter your query:", value="Type here...")
+    if st.button('Search'):
+        if query:
+            with st.spinner('Searching...'):
+                try:
+                    url = "https://api.carbon.ai/embeddings"
+                    payload = {
+                        "query": query,
+                        "k": 2,
+                        "file_ids": [],  # Modify to include relevant file IDs if needed
+                        "include_all_children": True,
+                        "tags": {},
+                        "include_tags": True,
+                        "include_vectors": True,
+                        "include_raw_file": True,
+                        "hybrid_search": False,
+                        "media_type": "TEXT",
+                        "embedding_model": "OPENAI"
+                    }
+                    headers = {
+                        "authorization": f"Bearer {CARBON_API_KEY}",
+                        "customer-id": customer_id,
+                        "Content-Type": "application/json"
+                    }
+                    response_search = requests.post(url, json=payload, headers=headers)
+                    response_search_chunks = json.loads(response_search.text)
+                    
+                    st.write("Search results:")
+                    for i, doc in enumerate(response_search_chunks['documents']):
+                        st.write(f"Document {i+1}:")
+                        st.write(doc['content'])
+                        if 'file_url' in doc:
+                            st.markdown(f"[Download {doc['filename']}]({doc['file_url']})")
+                        st.write("-------------------------------------------------")
+                except Exception as e:
+                    st.error(f"An error occurred: {e}")
+        else:
+            st.write("Please enter a query to search.")
+    
+    # Display search history
+    st.write('### Search History')
+    if 'search_history' not in st.session_state:
+        st.session_state['search_history'] = []
+    
+    if query and st.button('Add to Search History'):
+        st.session_state['search_history'].append(query)
+    
+    if st.session_state['search_history']:
+        st.write("Past Searches:")
+        for past_query in st.session_state['search_history']:
+            st.write(past_query)
 
 # Call the main function
 if __name__ == '__main__':