update

backend/app/main.py

@@ -79,6 +79,44 @@ def _pick_from_raw(raw_data: Dict, aliases: List[str]) -> str:
     return ""
 
 
+def _contact_value(contact: Contact, field: str):
+    if field == "first_name":
+        return contact.first_name or _pick_from_raw(contact.raw_data, ["first name", "firstname", "first_name"])
+    if field == "last_name":
+        return contact.last_name or _pick_from_raw(contact.raw_data, ["last name", "lastname", "last_name"])
+    if field == "email":
+        return contact.email or _pick_from_raw(contact.raw_data, ["email", "work email", "email address", "secondary email", "tertiary email"])
+    if field == "company":
+        return contact.company or _pick_from_raw(contact.raw_data, ["company", "company name", "company name for emails", "organization name", "account name"])
+    if field == "title":
+        return contact.title or _pick_from_raw(contact.raw_data, ["title", "job title"])
+    if field == "file_id":
+        return contact.file_id or ""
+    if field == "created_at":
+        return contact.created_at.isoformat() if contact.created_at else ""
+    return (contact.raw_data or {}).get(field)
+
+
+def _to_float(val):
+    s = _safe_str(val).replace(",", "")
+    if not s:
+        return None
+    try:
+        return float(s)
+    except Exception:
+        return None
+
+
+def _to_datetime(val):
+    s = _safe_str(val)
+    if not s:
+        return None
+    try:
+        return datetime.fromisoformat(s.replace("Z", "+00:00"))
+    except Exception:
+        return None
+
+
 @app.get("/api/health")
 def health():
     return {"status": "ok"}
@@ -160,6 +198,9 @@ async def list_contacts(
     search: str = Query("", description="Search by name/email/company/title"),
     field: str = Query("", description="Optional field name to filter"),
     value: str = Query("", description="Optional field value to filter"),
+    op: str = Query("contains", description="Filter op: contains|equals|from|to|between"),
+    from_value: str = Query("", description="From value for range filters"),
+    to_value: str = Query("", description="To value for range filters"),
     limit: int = Query(200, ge=1, le=1000),
     offset: int = Query(0, ge=0),
     db: Session = Depends(get_db)
@@ -177,26 +218,46 @@ async def list_contacts(
     contacts_all = query.order_by(Contact.created_at.desc(), Contact.id.desc()).all()
 
     # Dynamic field filtering for all imported Apollo attributes.
-    if field and value:
-        v = value.lower()
+    if field:
+        cmp_value = value or from_value
+        v = _safe_str(cmp_value).lower()
+        v_from = _safe_str(from_value)
+        v_to = _safe_str(to_value)
 
         def match_dynamic(c: Contact):
-            if field == "first_name":
-                return v in (c.first_name or "").lower()
-            if field == "last_name":
-                return v in (c.last_name or "").lower()
-            if field == "email":
-                return v in (c.email or "").lower()
-            if field == "company":
-                return v in (c.company or "").lower()
-            if field == "title":
-                return v in (c.title or "").lower()
-            if field == "file_id":
-                return v in (c.file_id or "").lower()
-            if field == "created_at":
-                return v in ((c.created_at.isoformat() if c.created_at else "").lower())
-            raw_val = (c.raw_data or {}).get(field)
-            return v in _safe_str(raw_val).lower()
+            field_val = _contact_value(c, field)
+            field_str = _safe_str(field_val).lower()
+            op_local = (op or "contains").lower()
+            if op_local == "equals":
+                return field_str == v
+            if op_local == "from":
+                # Numeric/date first, then lexical fallback
+                f_num, v_num = _to_float(field_val), _to_float(v_from or value)
+                if f_num is not None and v_num is not None:
+                    return f_num >= v_num
+                f_dt, v_dt = _to_datetime(field_val), _to_datetime(v_from or value)
+                if f_dt and v_dt:
+                    return f_dt >= v_dt
+                return field_str >= _safe_str(v_from or value).lower()
+            if op_local == "to":
+                f_num, v_num = _to_float(field_val), _to_float(v_to or value)
+                if f_num is not None and v_num is not None:
+                    return f_num <= v_num
+                f_dt, v_dt = _to_datetime(field_val), _to_datetime(v_to or value)
+                if f_dt and v_dt:
+                    return f_dt <= v_dt
+                return field_str <= _safe_str(v_to or value).lower()
+            if op_local == "between":
+                f_num, from_num, to_num = _to_float(field_val), _to_float(v_from), _to_float(v_to)
+                if f_num is not None and from_num is not None and to_num is not None:
+                    return from_num <= f_num <= to_num
+                f_dt, from_dt, to_dt = _to_datetime(field_val), _to_datetime(v_from), _to_datetime(v_to)
+                if f_dt and from_dt and to_dt:
+                    return from_dt <= f_dt <= to_dt
+                low, high = v_from.lower(), v_to.lower()
+                return low <= field_str <= high
+            # default contains
+            return v in field_str
 
         contacts_all = [c for c in contacts_all if match_dynamic(c)]
 

frontend/src/pages/Contacts.jsx

@@ -9,12 +9,16 @@ export default function Contacts() {
     const [contacts, setContacts] = useState([]);
     const [fields, setFields] = useState([]);
     const [selectedContact, setSelectedContact] = useState(null);
+    const [selectedContactDetails, setSelectedContactDetails] = useState(null);
     const [sequences, setSequences] = useState([]);
     const [loading, setLoading] = useState(true);
     const [seqLoading, setSeqLoading] = useState(false);
     const [searchQuery, setSearchQuery] = useState('');
     const [filterField, setFilterField] = useState('none');
+    const [filterOp, setFilterOp] = useState('contains');
     const [filterValue, setFilterValue] = useState('');
+    const [filterFrom, setFilterFrom] = useState('');
+    const [filterTo, setFilterTo] = useState('');
 
     useEffect(() => {
         fetchFields();
@@ -24,7 +28,7 @@ export default function Contacts() {
     useEffect(() => {
         const timer = setTimeout(() => fetchContacts(), 250);
         return () => clearTimeout(timer);
-    }, [searchQuery, filterField, filterValue]);
+    }, [searchQuery, filterField, filterOp, filterValue, filterFrom, filterTo]);
 
     const fetchFields = async () => {
         try {
@@ -44,9 +48,19 @@ export default function Contacts() {
             const params = new URLSearchParams();
             params.set('limit', '1000');
             if (searchQuery.trim()) params.set('search', searchQuery.trim());
-            if (filterField !== 'none' && filterValue.trim()) {
+            if (filterField !== 'none') {
                 params.set('field', filterField);
-                params.set('value', filterValue.trim());
+                params.set('op', filterOp);
+                if (filterOp === 'between') {
+                    if (filterFrom.trim()) params.set('from_value', filterFrom.trim());
+                    if (filterTo.trim()) params.set('to_value', filterTo.trim());
+                } else if (filterOp === 'from') {
+                    if (filterFrom.trim()) params.set('from_value', filterFrom.trim());
+                } else if (filterOp === 'to') {
+                    if (filterTo.trim()) params.set('to_value', filterTo.trim());
+                } else if (filterValue.trim()) {
+                    params.set('value', filterValue.trim());
+                }
             }
             const res = await fetch(`/api/contacts?${params.toString()}`);
             if (res.ok) {
@@ -62,15 +76,21 @@ export default function Contacts() {
 
     const openContact = async (contact) => {
         setSelectedContact(contact);
+        setSelectedContactDetails(null);
         setSeqLoading(true);
         try {
-            const res = await fetch(`/api/contacts/${contact.id}/sequences`);
-            if (res.ok) {
-                const data = await res.json();
-                setSequences(data.sequences || []);
-            } else {
-                setSequences([]);
+            const [detailRes, seqRes] = await Promise.all([
+                fetch(`/api/contacts/${contact.id}`),
+                fetch(`/api/contacts/${contact.id}/sequences`)
+            ]);
+            if (detailRes.ok) {
+                const detailData = await detailRes.json();
+                setSelectedContactDetails(detailData);
             }
+            if (seqRes.ok) {
+                const seqData = await seqRes.json();
+                setSequences(seqData.sequences || []);
+            } else setSequences([]);
         } catch (e) {
             console.error('Failed to fetch contact sequences:', e);
             setSequences([]);
@@ -112,11 +132,55 @@ export default function Contacts() {
                             </SelectContent>
                         </Select>
                         {filterField !== 'none' && (
-                            <Input
-                                placeholder={`Contains value for "${filterField}"`}
-                                value={filterValue}
-                                onChange={(e) => setFilterValue(e.target.value)}
-                            />
+                            <>
+                                <Select value={filterOp} onValueChange={setFilterOp}>
+                                    <SelectTrigger>
+                                        <SelectValue />
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        <SelectItem value="contains">contains</SelectItem>
+                                        <SelectItem value="equals">equals</SelectItem>
+                                        <SelectItem value="from">from</SelectItem>
+                                        <SelectItem value="to">to</SelectItem>
+                                        <SelectItem value="between">between</SelectItem>
+                                    </SelectContent>
+                                </Select>
+                                {(filterOp === 'contains' || filterOp === 'equals') && (
+                                    <Input
+                                        placeholder={`Value for "${filterField}"`}
+                                        value={filterValue}
+                                        onChange={(e) => setFilterValue(e.target.value)}
+                                    />
+                                )}
+                                {filterOp === 'from' && (
+                                    <Input
+                                        placeholder="From value"
+                                        value={filterFrom}
+                                        onChange={(e) => setFilterFrom(e.target.value)}
+                                    />
+                                )}
+                                {filterOp === 'to' && (
+                                    <Input
+                                        placeholder="To value"
+                                        value={filterTo}
+                                        onChange={(e) => setFilterTo(e.target.value)}
+                                    />
+                                )}
+                                {filterOp === 'between' && (
+                                    <div className="grid grid-cols-2 gap-2">
+                                        <Input
+                                            placeholder="From"
+                                            value={filterFrom}
+                                            onChange={(e) => setFilterFrom(e.target.value)}
+                                        />
+                                        <Input
+                                            placeholder="To"
+                                            value={filterTo}
+                                            onChange={(e) => setFilterTo(e.target.value)}
+                                        />
+                                    </div>
+                                )}
+                            </>
                         )}
                     </div>
                     <div className="max-h-[70vh] overflow-y-auto space-y-2 pr-1">
@@ -164,15 +228,31 @@ export default function Contacts() {
                         <div>
                             <div className="mb-6">
                                 <h3 className="text-xl font-semibold text-slate-800">
-                                    {selectedContact.first_name} {selectedContact.last_name}
+                                    {(selectedContactDetails?.first_name || selectedContact.first_name)} {(selectedContactDetails?.last_name || selectedContact.last_name)}
                                 </h3>
                                 <div className="mt-2 flex flex-wrap gap-2 text-xs text-slate-600">
-                                    <Badge variant="outline" className="gap-1"><Mail className="h-3 w-3" /> {selectedContact.email || 'N/A'}</Badge>
-                                    <Badge variant="outline" className="gap-1"><Building2 className="h-3 w-3" /> {selectedContact.company || 'N/A'}</Badge>
-                                    <Badge variant="outline" className="gap-1"><Briefcase className="h-3 w-3" /> {selectedContact.title || 'N/A'}</Badge>
+                                    <Badge variant="outline" className="gap-1"><Mail className="h-3 w-3" /> {(selectedContactDetails?.email || selectedContact.email) || 'N/A'}</Badge>
+                                    <Badge variant="outline" className="gap-1"><Building2 className="h-3 w-3" /> {(selectedContactDetails?.company || selectedContact.company) || 'N/A'}</Badge>
+                                    <Badge variant="outline" className="gap-1"><Briefcase className="h-3 w-3" /> {(selectedContactDetails?.title || selectedContact.title) || 'N/A'}</Badge>
                                 </div>
                             </div>
 
+                            {selectedContactDetails?.raw_data && (
+                                <div className="mb-6 rounded-xl border border-slate-200 bg-slate-50/50 p-4">
+                                    <h4 className="text-sm font-semibold text-slate-700 mb-3">Company Details</h4>
+                                    <div className="grid grid-cols-1 sm:grid-cols-2 gap-2 text-sm">
+                                        <div><span className="text-slate-500">Company Name:</span> <span className="text-slate-800">{selectedContactDetails.raw_data['Company Name'] || selectedContactDetails.company || 'N/A'}</span></div>
+                                        <div><span className="text-slate-500">Company Name for Emails:</span> <span className="text-slate-800">{selectedContactDetails.raw_data['Company Name for Emails'] || 'N/A'}</span></div>
+                                        <div><span className="text-slate-500">Industry:</span> <span className="text-slate-800">{selectedContactDetails.raw_data['Industry'] || 'N/A'}</span></div>
+                                        <div><span className="text-slate-500">Employees:</span> <span className="text-slate-800">{selectedContactDetails.raw_data['# Employees'] || 'N/A'}</span></div>
+                                        <div><span className="text-slate-500">Annual Revenue:</span> <span className="text-slate-800">{selectedContactDetails.raw_data['Annual Revenue'] || 'N/A'}</span></div>
+                                        <div><span className="text-slate-500">Last Raised At:</span> <span className="text-slate-800">{selectedContactDetails.raw_data['Last Raised At'] || 'N/A'}</span></div>
+                                        <div><span className="text-slate-500">Website:</span> <span className="text-slate-800">{selectedContactDetails.raw_data['Website'] || 'N/A'}</span></div>
+                                        <div><span className="text-slate-500">Location:</span> <span className="text-slate-800">{[selectedContactDetails.raw_data['City'], selectedContactDetails.raw_data['State'], selectedContactDetails.raw_data['Country']].filter(Boolean).join(', ') || 'N/A'}</span></div>
+                                    </div>
+                                </div>
+                            )}
+
                             {seqLoading ? (
                                 <p className="text-sm text-slate-500">Loading sequences...</p>
                             ) : sequences.length === 0 ? (