Update app.py

app.py

@@ -156,7 +156,13 @@ def safe_get(row, key, default="N/A"):
                 'Countries': ['Country', 'Location'],
                 'Companies': ['Company', 'Business'],
                 'Phone#': ['Phone', 'Telephone', 'Contact_Phone'],
-                'Linked To': ['Organization', 'Terror_Organization', 'Group']
+                'Linked To': ['Organization', 'Terror_Organization', 'Group'],
+                'IMO': ['IMO_Number', 'IMO_No', 'International_Maritime_Organization'],
+                'Flag': ['Flag_State', 'Flag_Country'],
+                'DWT': ['Deadweight', 'Dead_Weight_Tonnage'],
+                'Built_Year': ['Year_Built', 'Construction_Year', 'DOB'],
+                'Status': ['Vessel_Status', 'Ship_Status', 'AIS_Status'],
+                'Insurance': ['Insurer', 'Insurance_Company']
             }
             
             val = None
@@ -529,14 +535,46 @@ with tab3:
                 mime="text/csv"
             )
     
-    # Search
-    name_filter = st.text_input("Search vessels", placeholder="Enter vessel name...", key="search_vessels")
+    # Filters for vessels
+    col1, col2, col3 = st.columns([3, 2, 2])
+    
+    with col1:
+        name_filter = st.text_input("Search vessels", placeholder="Enter vessel name or IMO...", key="search_vessels")
+    
+    with col2:
+        flag_options = ["All Flags"]
+        if len(data['vessels']) > 0 and 'Flag' in data['vessels'].columns:
+            flags = data['vessels']['Flag'].dropna().astype(str).unique()
+            flag_options += sorted([f for f in flags if f and f.lower() != 'nan'])
+        flag_filter = st.selectbox("Flag State", flag_options, key="flag_vessels")
+    
+    with col3:
+        status_options = ["All Status"]
+        if len(data['vessels']) > 0 and 'Status' in data['vessels'].columns:
+            statuses = data['vessels']['Status'].dropna().astype(str).unique()
+            status_options += sorted([s for s in statuses if s and s.lower() != 'nan'])
+        status_filter = st.selectbox("Status", status_options, key="status_vessels")
     
     # Apply filters
     filtered_vessels = data['vessels'].copy()
+    
     if name_filter:
+        # Search in Name, IMO, and other relevant fields
+        mask = (
+            filtered_vessels['Name'].str.contains(name_filter, case=False, na=False) |
+            filtered_vessels.get('IMO', pd.Series()).astype(str).str.contains(name_filter, case=False, na=False) |
+            filtered_vessels.get('Owner', pd.Series()).astype(str).str.contains(name_filter, case=False, na=False)
+        )
+        filtered_vessels = filtered_vessels[mask]
+    
+    if flag_filter != "All Flags":
+        filtered_vessels = filtered_vessels[
+            filtered_vessels['Flag'].str.contains(flag_filter, case=False, na=False)
+        ]
+    
+    if status_filter != "All Status":
         filtered_vessels = filtered_vessels[
-            filtered_vessels['Name'].str.contains(name_filter, case=False, na=False)
+            filtered_vessels['Status'] == status_filter
         ]
 
     # Display vessels
@@ -544,15 +582,28 @@ with tab3:
         status_value = safe_get(vessel, 'Status')
         status_class = "status-inactive" if status_value == 'AIS Off' else "status-active"
         
+        # Get vessel-specific information
+        imo = safe_get(vessel, 'IMO')
+        flag = safe_get(vessel, 'Flag')
+        vessel_type = safe_get(vessel, 'Sub_Category')
+        owner = safe_get(vessel, 'Owner')
+        built_year = safe_get(vessel, 'Built_Year', safe_get(vessel, 'DOB'))  # Sometimes vessel age is in DOB
+        dwt = safe_get(vessel, 'DWT')
+        
         st.markdown(f"""
         <div class="entity-card">
             <h3>{safe_get(vessel, 'Name')}</h3>
-            <p><strong>ID:</strong> {safe_get(vessel, 'DC_ID')}</p>
-            <p><strong>IMO:</strong> {safe_get(vessel, 'IMO')}</p>
-            <p><strong>Flag:</strong> {safe_get(vessel, 'Flag')}</p>
-            <p><strong>Owner:</strong> {safe_get(vessel, 'Owner')}</p>
+            <p><strong>DC_ID:</strong> {safe_get(vessel, 'DC_ID')}</p>
+            <p><strong>IMO Number:</strong> <span style="color: #2B6CB0; font-weight: bold;">{imo}</span></p>
+            <p><strong>Vessel Type:</strong> {vessel_type}</p>
+            <p><strong>Flag State:</strong> {flag}</p>
+            <p><strong>Owner:</strong> {owner}</p>
+            <p><strong>Built Year:</strong> {built_year}</p>
+            <p><strong>DWT:</strong> {dwt}</p>
             <p><strong>Status:</strong> <span class="{status_class}">{status_value}</span></p>
             <p><strong>Insurance:</strong> {safe_get(vessel, 'Insurance')}</p>
+            <p><strong>Countries:</strong> {safe_get(vessel, 'Countries')}</p>
+            <p><strong>Information:</strong> {safe_get(vessel, 'Information')}</p>
         </div>
         """, unsafe_allow_html=True)