Update app.py

app.py

@@ -1,134 +1,133 @@
 import streamlit as st
 import pandas as pd
+import json
 import os
+from datetime import datetime
 
-# ---------- Constants ----------
 CONTACT_FILE = "contacts.xlsx"
 MATRIX_FILE = "channel_matrix.xlsx"
-SAVED_LISTS_FILE = "saved_lists.csv"
+SAVED_LISTS_FILE = "saved_lists.json"
 
-TAGS = ["+mini", "+hdy", "+smx", "+pmx", "+cape", "+med", "+atl", "+rsea", "+safr", "+pg", "+wci", "+eci", "+seas", "+feast", "+nopac", "+aus", "+indo"]
+st.set_page_config(page_title="Skype Contacts Manager", layout="wide")
 
-# ---------- Load Contacts ----------
+# Load contacts
 @st.cache_data
 def load_contacts():
     df = pd.read_excel(CONTACT_FILE)
+    df["display_name"] = df["display_name"].astype(str).str.strip().str.lower()
     if "country" not in df.columns:
         df["country"] = "N/A"
-    df["display_name"] = df["display_name"].astype(str)
-    df["checkbox"] = False
+    if "tags" not in df.columns:
+        df["tags"] = ""
     return df
 
-# ---------- Load Saved Lists ----------
+df = load_contacts()
+if "checkbox" not in df.columns:
+    df["checkbox"] = False
+
+# Load saved lists
 def load_saved_lists():
     if os.path.exists(SAVED_LISTS_FILE):
-        return pd.read_csv(SAVED_LISTS_FILE)
-    return pd.DataFrame(columns=["list_name", "contacts", "tags", "timestamp"])
-
-def save_list(list_name, selected_contacts, tags):
-    existing = load_saved_lists()
-    contacts_str = ";".join(selected_contacts)
-    tags_str = ";".join(tags)
-    timestamp = pd.Timestamp.now().strftime("%Y-%m-%d %H:%M:%S")
-    new_row = pd.DataFrame([{
-        "list_name": list_name,
-        "contacts": contacts_str,
-        "tags": tags_str,
-        "timestamp": timestamp
-    }])
-    updated = pd.concat([existing, new_row], ignore_index=True)
-    updated.to_csv(SAVED_LISTS_FILE, index=False)
-
-# ---------- UI: Filter + Tick ----------
+        with open(SAVED_LISTS_FILE, "r") as f:
+            return json.load(f)
+    return {}
+
+def save_list(name, contact_names, tags=[]):
+    lists = load_saved_lists()
+    lists[name] = {
+        "contacts": contact_names,
+        "tags": tags,
+        "timestamp": datetime.now().isoformat()
+    }
+    with open(SAVED_LISTS_FILE, "w") as f:
+        json.dump(lists, f)
+
+# UI: Filter & Editable Contact Table
 def contact_filter_ui():
-    st.markdown("### 🔍 Filter Contacts")
-    st.markdown("Use the checkboxes below to filter by tags. Use AND / OR logic to combine tags.")
-
-    logic = st.radio("Matching logic:", ["AND", "OR"], horizontal=True)
-    selected_tags = st.multiselect("Filter by Tags", options=TAGS)
+    st.header("📝 Skype Contact Manager")
 
-    df = load_contacts()
+    # Sidebar Tag Filter
+    all_tags = sorted(set(tag for row in df["tags"] for tag in str(row).split()))
+    selected_tags = st.sidebar.multiselect("📌 Filter by Tags", options=all_tags)
+    logic_mode = st.sidebar.radio("Tag Filter Logic", ["AND", "OR"])
 
-    # Tag filtering
+    # Filter Contacts
     if selected_tags:
-        if logic == "AND":
+        if logic_mode == "AND":
             mask = df["tags"].apply(lambda x: all(tag in str(x).split() for tag in selected_tags))
         else:
             mask = df["tags"].apply(lambda x: any(tag in str(x).split() for tag in selected_tags))
-        df = df[mask]
-
-    # Display
-    st.markdown("### ✅ Tick Contacts to Save in a List")
-    edited_df = st.data_editor(
-        df[["display_name", "country", "checkbox"]],
-        use_container_width=True,
-        key="editor"
-    )
-
-    ticked = edited_df[edited_df["checkbox"] == True]["display_name"].tolist()
-
-    st.markdown("---")
-    st.markdown("### 💾 Save Current Selection")
-    list_name = st.text_input("List Name")
-    if st.button("Save List"):
-        if not list_name:
-            st.error("Please enter a name for the list.")
-        elif not ticked:
-            st.warning("No contacts selected.")
-        else:
-            save_list(list_name, ticked, selected_tags)
-            st.success(f"List '{list_name}' saved!")
-
-    # Show saved lists
-    st.markdown("---")
-    st.markdown("### 📂 Manage Saved Lists")
-    saved_df = load_saved_lists()
-    if saved_df.empty:
-        st.info("No saved lists yet.")
+        filtered_df = df[mask].copy()
     else:
-        for _, row in saved_df.iterrows():
-            with st.expander(f"📋 {row['list_name']} ({row['timestamp']})"):
-                st.write("Tags:", row["tags"])
-                st.write("Contacts:")
-                for c in row["contacts"].split(";"):
-                    st.markdown(f"- {c}")
-
-# ---------- UI: Channel Matrix ----------
-def channel_matrix_ui():
-    st.markdown("## 🧭 Channel Matrix")
-    try:
-        matrix_df = pd.read_excel(MATRIX_FILE)
-        matrix_df = matrix_df.rename(columns={matrix_df.columns[0]: "Operator"})
-        charterers = list(matrix_df.columns[1:])
-    except Exception as e:
-        st.error("Could not load Channel Matrix. Check file formatting.")
-        st.exception(e)
+        filtered_df = df.copy()
+
+    # Editable Table
+    with st.expander("✅ Tick off contacts as you check them", expanded=False):
+        edited_df = st.data_editor(
+            filtered_df[["display_name", "country", "checkbox"]],
+            num_rows="dynamic",
+            key="editor"
+        )
+        for idx in edited_df.index:
+            df.loc[df["display_name"] == edited_df.loc[idx, "display_name"], "checkbox"] = edited_df.loc[idx, "checkbox"]
+
+    st.divider()
+
+# Save List Section
+def save_list_ui():
+    st.subheader("💾 Save Selected List")
+    ticked_contacts = df[df["checkbox"]]["display_name"].tolist()
+
+    if not ticked_contacts:
+        st.info("✅ Tick contacts in the above section to create a list.")
         return
 
-    selected_charterer = st.selectbox("Select a Charterer", charterers)
+    list_name = st.text_input("List name")
+    if st.button("Save List") and list_name:
+        save_list(list_name, ticked_contacts)
+        st.success(f"List '{list_name}' saved!")
 
-    if selected_charterer:
-        yes_ops = matrix_df[matrix_df[selected_charterer].astype(str).str.upper() == "YES"]["Operator"]
-        no_ops = matrix_df[matrix_df[selected_charterer].astype(str).str.upper() == "NO"]["Operator"]
-
-        col1, col2 = st.columns(2)
-
-        with col1:
-            st.success(f"✅ Operators who work with us for {selected_charterer}'s cargoes:")
-            st.dataframe(yes_ops.reset_index(drop=True), use_container_width=True)
-
-        with col2:
-            st.error(f"❌ Operators who won't work with us for {selected_charterer}'s cargoes:")
-            st.dataframe(no_ops.reset_index(drop=True), use_container_width=True)
-
-# ---------- Main App ----------
-st.set_page_config(page_title="Skype Contacts", layout="wide")
-st.title("📞 Skype Contacts & Channel Matrix Tool")
+# Manage Saved Lists
+def load_list_ui():
+    st.subheader("📂 Load or Manage a Saved List")
+    saved_lists = load_saved_lists()
+    if not saved_lists:
+        st.info("No saved lists yet.")
+        return
 
-tabs = st.tabs(["📇 Contact Filter", "📊 Channel Matrix"])
+    list_name = st.selectbox("Select a List", list(saved_lists.keys()))
+    if list_name:
+        contacts = saved_lists[list_name]["contacts"]
+        st.write(f"List: **{list_name}** — {len(contacts)} contacts")
+        st.write(", ".join(contacts))
 
-with tabs[0]:
-    contact_filter_ui()
+        if st.button(f"❌ Delete '{list_name}'"):
+            saved_lists.pop(list_name)
+            with open(SAVED_LISTS_FILE, "w") as f:
+                json.dump(saved_lists, f)
+            st.success("List deleted!")
 
-with tabs[1]:
-    channel_matrix_ui()
+# Channel Matrix
+def channel_matrix_ui():
+    st.header("📊 Channel Matrix")
+    matrix_df = pd.read_excel(MATRIX_FILE)
+    matrix_df = matrix_df.rename(columns={matrix_df.columns[0]: "Operator"})
+    charterers = list(matrix_df.columns[1:])
+    selected = st.selectbox("Select a Charterer", charterers)
+
+    yes_ops = matrix_df[matrix_df[selected].astype(str).str.upper() == "YES"]["Operator"]
+    no_ops = matrix_df[matrix_df[selected].astype(str).str.upper() == "NO"]["Operator"]
+
+    col1, col2 = st.columns(2)
+    with col1:
+        st.success("✅ Operators who work with us")
+        st.dataframe(pd.DataFrame({"Operator": yes_ops}), use_container_width=True)
+    with col2:
+        st.error("❌ Operators who won't work with us")
+        st.dataframe(pd.DataFrame({"Operator": no_ops}), use_container_width=True)
+
+# Page Layout
+contact_filter_ui()
+save_list_ui()
+load_list_ui()
+channel_matrix_ui()