Update app.py

app.py

@@ -166,46 +166,13 @@ def upload_to_firebase(user_id, content):
         return None
 
 
-def fetch_trustbuilders(user_id, keyword=None, brand=None, bucket=None):
+def fetch_trustbuilders(user_id):
     try:
-        st.write(f"Fetching TrustBuilders with keyword='{keyword}', brand='{brand}', bucket='{bucket}'")
-        trustbuilders = db.child("users").child(user_id).child("TrustBuilder").get().val()
-        st.write("TrustBuilders retrieved from Firebase:", trustbuilders)
-
-        if not trustbuilders:
-            st.write("No TrustBuilders found in Firebase.")
-            return {}
-
-        filtered_trustbuilders = {}
-        for key, value in trustbuilders.items():
-            message = value.get("message", "").lower()
-            brand_field = value.get("brand", "").lower()
-            bucket_field = value.get("bucket", "")
-
-            st.write(f"Checking TrustBuilder {key}:")
-            st.write(f"  Message: {message}")
-            st.write(f"  Brand: {brand_field}")
-            st.write(f"  Bucket: {bucket_field}")
-
-            if keyword and keyword.lower() not in message:
-                st.write("  Keyword does not match.")
-                continue
-            if brand and brand.lower() not in brand_field:
-                st.write("  Brand does not match.")
-                continue
-            if bucket and bucket != "All" and bucket != bucket_field:
-                st.write(f"  Bucket '{bucket_field}' does not match selected '{bucket}'.")
-                continue
-
-            st.write("  TrustBuilder matches filters.")
-            filtered_trustbuilders[key] = value
-
-        st.write("Filtered TrustBuilders:", filtered_trustbuilders)
-        return filtered_trustbuilders
+        path = f"users/{user_id}/TrustBuilder"
+        return db.child(path).get().val() or {}
     except Exception as e:
         st.error(f"Error fetching TrustBuilders: {e}")
         return {}
-
         
 def delete_trustbuilder(user_id, trustbuilder_id):
     try:
@@ -456,48 +423,6 @@ def update_message_counter():
 
 
 
-def fetch_trustbuilders(user_id, keyword=None, brand=None, bucket=None):
-    try:
-        st.write(f"Fetching TrustBuilders with keyword='{keyword}', brand='{brand}', bucket='{bucket}'")
-        trustbuilders = db.child("users").child(user_id).child("TrustBuilder").get().val()
-        st.write("TrustBuilders retrieved from Firebase:", trustbuilders)
-
-        if not trustbuilders:
-            st.write("No TrustBuilders found in Firebase.")
-            return {}
-
-        # Apply filters to the retrieved TrustBuilders
-        filtered_trustbuilders = {}
-        for key, value in trustbuilders.items():
-            message = value.get("message", "").lower()
-            brand_field = value.get("brand", "").lower()
-            bucket_field = value.get("bucket", "")
-
-            st.write(f"Checking TrustBuilder {key}:")
-            st.write(f"  Message: {message}")
-            st.write(f"  Brand: {brand_field}")
-            st.write(f"  Bucket: {bucket_field}")
-
-            # Apply filtering conditions
-            if keyword and keyword.lower() not in message:
-                st.write("  Keyword does not match.")
-                continue
-            if brand and brand.lower() not in brand_field:
-                st.write("  Brand does not match.")
-                continue
-            if bucket and bucket != "All" and bucket != bucket_field:
-                st.write(f"  Bucket '{bucket_field}' does not match selected '{bucket}'.")
-                continue
-
-            # If all filters match, add to results
-            st.write("  TrustBuilder matches filters.")
-            filtered_trustbuilders[key] = value
-
-        st.write("Filtered TrustBuilders:", filtered_trustbuilders)
-        return filtered_trustbuilders
-    except Exception as e:
-        st.error(f"Error fetching TrustBuilders: {e}")
-        return {}
 
 def delete_trustbuilder(user_id, trustbuilder_id):
     try:
@@ -566,20 +491,19 @@ def load_user_content(user_id):
 
 
 
-def save_content(user_id, brand, trust_builder_text, trust_bucket=None):
+def save_content(user_id, brand, trust_builder_text, trust_bucket):
     try:
-        trustbuilder_id = str(uuid.uuid4())
+        # Save directly under the bucket name
+        path = f"users/{user_id}/TrustBuilder/{trust_bucket}"
         data = {
             "brand": str(brand),
             "message": str(trust_builder_text),
-            "bucket": str(trust_bucket)
         }
-        st.write("Saving TrustBuilder with data:", data)
-        db.child("users").child(user_id).child("TrustBuilder").child(trustbuilder_id).set(data)
-        st.success(f"TrustBuilder saved to {trust_bucket} bucket.")
+        st.write(f"Saving TrustBuilder to path: {path}")
+        db.child(path).set(data)
+        st.success(f"TrustBuilder saved under the '{trust_bucket}' bucket.")
     except Exception as e:
         st.error(f"Error saving TrustBuilder: {e}")
-
         
 def ai_allocate_trust_bucket(trust_builder_text):
     # Implement your AI allocation logic here
@@ -596,8 +520,6 @@ def download_link(content, filename):
 
 
 
-
-
 def fetch_documents(user_id):
     try:
         docs = db.child("users").child(user_id).child("documents").get().val()
@@ -756,34 +678,13 @@ def side():
                         )
                         st.markdown("For detailed descriptions, visit [Academy](https://www.trustifier.ai/account/academy)")
                 
-              
-        trust_buckets = ["S", "D", "R", "B", "V", "C"]
-        bucket_labels = ["Stability", "Development", "Relationship", "Benefit", "Vision", "Competence"]
-        
-        # Image paths and labels (pre-resized images in your folder)
-        st.sidebar.header("TrustVault®")
-        
-        # CSS for scrollable container with gray border
-        st.markdown("""
-            <style>
-            .scrollable-container {
-                max-height: 300px;
-                overflow-y: auto;
-                border: 1px solid gray;
-                padding: 10px;
-                border-radius: 5px;
-                background-color: #f9f9f9;
-            }
-            </style>
-        """, unsafe_allow_html=True)
-        
-        # Container for Saved Documents
         with st.container():
             st.subheader("Saved Documents")
             st.write("Save documents like your brand tonality, key phrases, or segments here.")
             st.markdown('<div class="scrollable-container">', unsafe_allow_html=True)
         
-            docs = fetch_documents(st.session_state["wix_user_id"])
+            # Placeholder: Replace with your actual document fetching function
+            docs = {}  # Example: fetch_documents(st.session_state["wix_user_id"])
         
             if docs:
                 for doc_id, doc_data in docs.items():
@@ -814,12 +715,12 @@ def side():
             if uploaded_files:
                 md_contents = []
                 for file in uploaded_files:
-                    md_content = convert_file_to_md(file)
+                    md_content = convert_file_to_md(file)  # Replace with your file conversion logic
                     if md_content:
                         md_contents.append(md_content)
                 if md_contents:
                     merged_md_content = merge_markdown_contents(md_contents)
-                    public_url = upload_to_firebase(st.session_state["wix_user_id"], merged_md_content)
+                    public_url = upload_to_firebase(st.session_state["wix_user_id"], merged_md_content)  # Replace with your upload logic
                     if public_url:
                         # Save document reference and public URL to Firebase
                         doc_id = str(uuid.uuid4())
@@ -828,7 +729,6 @@ def side():
                             "public_url": public_url
                         })
                         st.success("Files uploaded and saved successfully!")
-                        st.markdown(f"[View your knowledge base here]({public_url})", unsafe_allow_html=True)
                         st.experimental_rerun()
                 else:
                     st.warning("No valid files uploaded.")
@@ -836,57 +736,59 @@ def side():
                 st.warning("Please select at least one file to upload.")
         
         # Show My TrustBuilders Section
-        st.subheader("Show my TrustBuilders®")
+        st.subheader("Show My TrustBuilders®")
         search_query = st.text_input("Search by keyword", key="search_query")
-        brand_input = st.text_input("Brand/Product/Person", key="brand_input")
-        
-        # Trust Bucket Selection for Filtering
-        st.write("Choose the Trust Bucket®")
-        bucket_options = ["All"] + bucket_labels
-        selected_bucket = st.selectbox("Select Trust Bucket", options=bucket_options, key="selected_bucket")
+        selected_bucket = st.selectbox(
+            "Select Trust Bucket",
+            options=["All"] + bucket_labels,
+            key="selected_bucket"
+        )
         
         if st.button("Show TrustBuilders"):
-            search_results = fetch_trustbuilders(
-                st.session_state["wix_user_id"],
-                keyword=search_query,
-                brand=brand_input,
-                bucket=selected_bucket
-            )
-            if search_results:
-                for result_id, result_data in search_results.items():
-                    with st.expander(f"TrustBuilder ID: {result_id[:8]}"):
-                        st.write(f"Brand: {result_data.get('brand', 'N/A')}")
-                        st.write(f"Bucket: {result_data.get('bucket', 'N/A')}")
-                        st.write(f"Message: {result_data.get('message', '')}")
+            trustbuilders = fetch_trustbuilders(st.session_state["wix_user_id"])
+            filtered_trustbuilders = {
+                bucket: data for bucket, data in trustbuilders.items()
+                if (selected_bucket == "All" or selected_bucket == bucket)
+                   and (not search_query or search_query.lower() in data["message"].lower())
+            }
+        
+            if filtered_trustbuilders:
+                for bucket, data in filtered_trustbuilders.items():
+                    with st.expander(f"Bucket: {bucket}"):
+                        st.write(f"Brand: {data['brand']}")
+                        st.write(f"Message: {data['message']}")
             else:
                 st.write("No TrustBuilders found.")
         
-        # Trust Bucket Selection for Saving
-        st.write("Choose the Trust Bucket®")
-        cols = st.columns(len(trust_buckets))
-        for idx, (bucket, label) in enumerate(zip(trust_buckets, bucket_labels)):
-            with cols[idx]:
-                if st.button(f"{bucket}", key=f"bucket_{label}"):
-                    st.write(f"Selected Trust Bucket: {label}")
-                    st.session_state["selected_bucket_to_save"] = label
-        
         # Save TrustBuilders Section
         st.subheader("Save TrustBuilders®")
-        brand = st.text_input("Brand/Product/Person", key="brand_product")
+        bucket_to_save = st.selectbox(
+            "Choose Trust Bucket to Save",
+            options=bucket_labels,
+            key="bucket_to_save"
+        )
+        brand_input = st.text_input("Brand/Product/Person", key="brand_input")
         trust_builder_text = st.text_area("Type/paste Trust Builder®", height=100)
         
-        # Allocate TrustBuilders to Buckets
-        st.write("Allocate to")
-        cols_allocate = st.columns(len(trust_buckets))
-        for idx, (bucket, label) in enumerate(zip(trust_buckets, bucket_labels)):
-            with cols_allocate[idx]:
-                if st.button(f"{bucket}", key=f"allocate_{label}"):
-                    save_content(st.session_state["wix_user_id"], brand, trust_builder_text, trust_bucket=label)
+        if st.button("Save TrustBuilder"):
+            if bucket_to_save and trust_builder_text.strip():
+                save_content(
+                    st.session_state["wix_user_id"],
+                    brand_input,
+                    trust_builder_text.strip(),
+                    bucket_to_save
+                )
+            else:
+                st.warning("Please select a bucket and provide TrustBuilder text.")
+        
+        
+        
+
 
 
-# Initialize embeddings and FAISS index only when wix_user_id is set
 
 
+                        
 side()
 if st.session_state.get("wix_user_id") and "faiss_db" not in st.session_state:
     refresh_faiss_index()