Spaces:
Sleeping
Sleeping
File size: 8,156 Bytes
433f3f1 dc3dc12 433f3f1 c7a3272 433f3f1 dc3dc12 433f3f1 ee157dc 433f3f1 c7a3272 433f3f1 c7a3272 433f3f1 c7a3272 0b170f9 433f3f1 c7a3272 433f3f1 c7a3272 433f3f1 ee157dc 433f3f1 ee157dc 433f3f1 ee157dc 433f3f1 ee157dc 433f3f1 ee157dc 433f3f1 d42c36e e634cf5 d42c36e e634cf5 dc3dc12 d42c36e dc3dc12 d42c36e dc3dc12 d42c36e dc3dc12 d42c36e | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | # Retrieve.py (fixed version)
import os
import json
import numpy as np
from typing import List, Dict, Optional, Any
import requests
from langchain_community.vectorstores import FAISS
import numpy as np
#from db_paths import (PERSONAL_INFO_CHUNKS_PATH,CHAT_HISTORY_CHUNKS_PATH)
import json
from supabase_ie import load_user_info, load_history_for_display, download_faiss_from_supabase
from config import SUPABASE_URL, SUPABASE_HEADERS
#used in embed_query
def normalize(v):
v = np.array(v)
norm = np.linalg.norm(v)
return v if norm == 0 else (v / norm)
#used in retrieve_all_chunks
def embed_query(query: str, model) -> np.ndarray:
formatted_query = f"query: {query.strip()}"
vector = model.embed_query(formatted_query)
return normalize(vector).astype("float32").reshape(1, -1)
#used in retrieve_all_chunks
def retrieve_chunks_from_vdb(
db_key: str,
query_vector: np.ndarray,
model,
query: str,
username: str,
k: int = 10,
use_metadata_boost: bool = False,
filter_keywords: List[str] = None,
topic: str = None,
db6_override_store: Optional[FAISS] = None, # NEW
) -> List[Dict]:
"""
Download FAISS index from Supabase, search it, return top-k results.
"""
try:
if db_key == "db6" and topic == "news" and db6_override_store is not None:
print("⚡ Using db6_override_store (fresh from db7)")
vdb = db6_override_store
else:
# 2) Normal logic for all other cases
if db_key in ["db1", "db2", "db3"]:
vdb_local = download_faiss_from_supabase(db_key=db_key, username=username)
else:
# db6 (when no override) and any other FAISS-based dbs
vdb_local = download_faiss_from_supabase(db_key=db_key, username=username)
vdb = FAISS.load_local(vdb_local, model, allow_dangerous_deserialization=True)
except Exception as e:
print(f"❌ Failed to load FAISS index {db_key} from Supabase or override: {e}")
return []
query_vector = np.array(query_vector, dtype="float32").reshape(1, -1)
if query_vector.shape[1] != vdb.index.d:
print(f"❌ Dimension mismatch: query {query_vector.shape[1]} vs index {vdb.index.d}")
return []
D, I = vdb.index.search(query_vector, k=k)
results = []
for idx, score in zip(I[0], D[0]):
doc_id = vdb.index_to_docstore_id.get(idx)
if doc_id is None:
continue
doc = vdb.docstore.search(doc_id)
meta_boost = compute_metadata_boost(doc.metadata, query, filter_keywords) if use_metadata_boost else 0.0
final_score = score + meta_boost
results.append({
"content": doc.page_content,
"metadata": {**doc.metadata, "source": db_key},
"source_db": db_key,
"score": final_score
})
return sorted(results, key=lambda x: x["score"], reverse=True)[:k]
#used in app_nn.py
def retrieve_all_chunks(
query: str,
model,
user_id: str, # UUID → for tables
username: str, # username → for FAISS buckets
k: int = 10,
filter_keywords: List[str] = None,
topic: str = None,
topic_to_dbs: Dict[str, List[str]] = None,
db6_override_store: Optional[FAISS] = None # NEW
) -> List[Dict]:
"""
Retrieve chunks across all Supabase sources (dbs + personal_info + chat_history).
"""
query_vector = embed_query(query, model)
all_chunks = []
# Decide which dbs to search
if topic_to_dbs and topic:
allowed_dbs = topic_to_dbs.get(topic, topic_to_dbs.get("default", []))
else:
allowed_dbs = ["db1", "db2", "db3", "db4", "db5", "db6", "personal_info", "chat_history"]
print(f"[DEBUG][RETRIEVE] Topic={topic}, allowed_dbs={allowed_dbs}")
for db_key in allowed_dbs:
if db_key == "personal_info":
profile = load_user_info(user_id=user_id)
all_chunks.append({
"content": json.dumps(profile, indent=2),
"metadata": {"source": "personal_info"},
"source_db": "personal_info",
"score": 0.0
})
elif db_key == "chat_history":
history = load_history_for_display(user_id=user_id)
all_chunks.append({
"content": json.dumps(history, indent=2),
"metadata": {"source": "chat_history"},
"source_db": "chat_history",
"score": 0.0
})
else:
use_metadata_boost = db_key in ["db1", "db2"]
all_chunks += retrieve_chunks_from_vdb(
db_key=db_key,
query_vector=query_vector,
model=model,
query=query,
username=username,
k=k,
use_metadata_boost=use_metadata_boost,
filter_keywords=filter_keywords,
topic=topic,
db6_override_store=db6_override_store, # NEW: passed through
)
return all_chunks
#used in db3and6_utils.py
def retrieve_from_db(
db_key: str,
query: str,
model,
username: str,
k: int = 5,
db6_override_store: Optional[FAISS] = None, # NEW (optional)
) -> List[Dict]:
"""
Retrieve top-k chunks from a single Supabase FAISS db (e.g. db6).
"""
query_vector = embed_query(query, model)
return retrieve_chunks_from_vdb(
db_key=db_key,
query_vector=query_vector,
model=model,
query=query,
username=username,
k=k,
db6_override_store=db6_override_store, # pass through
)
# used in retrieve_chunks_from_vdb
def compute_metadata_boost(metadata: Dict, query: str, filter_keywords: List[str] = None) -> float:
"""
Compute an additional score boost based on how well the query matches document metadata.
"""
boost = 0.0
query_lower = query.lower()
priority_keys = [
"topic", "theme", "tone", "style",
"dialogue_name", "source_title", "characters"
]
secondary_keys = ["period", "period_covered", "location"]
for key_group, weight_direct, weight_filter in [
(priority_keys, 0.2, 0.15),
(secondary_keys, 0.1, 0.05),
]:
for key in key_group:
if key in metadata:
values = metadata[key] if isinstance(metadata[key], list) else [metadata[key]]
for val in values:
val_lower = str(val).lower()
if val_lower in query_lower:
boost += weight_direct
if filter_keywords and val_lower in filter_keywords:
boost += weight_filter
return boost
# PERSONAL_BUCKET = {"personal", "advice","philosophical"}
# def get_story_from_supabase(
# user_id: str,
# username: str,
# conversation_type: str,
# topic_for_story: str | None,
# ) -> dict | None:
# """
# If conversation_type is personal/advice and topic_for_story is set,
# call a Supabase RPC that:
# - selects a story with your rules (unseen first; else seen<=1 and >90d ago),
# - logs usage,
# - returns a compact JSON payload for the prompt builder.
# Returns None if no suitable story.
# """
# print(f"[DEBUG] SOCRATIC_STORY = in the function")
# if conversation_type not in PERSONAL_BUCKET:
# print(f"[DEBUG] SOCRATIC_STORY = NOT IN PERSONAL_BUCKET")
# return None
# if not topic_for_story or topic_for_story == "none":
# print(f"[DEBUG] SOCRATIC_STORY = topic_for_story = none")
# return None
# fn = "pick_and_log_story_with_history_rpc"
# payload = {
# "p_user_id": user_id,
# "p_topic": topic_for_story,
# }
# url = f"{SUPABASE_URL}/rest/v1/rpc/{fn}"
# r = requests.post(url, headers=SUPABASE_HEADERS, json=payload, timeout=20)
# if r.status_code == 404 or not r.text or r.text == "null":
# return None
# r.raise_for_status()
# story = r.json()
# return story
# #return r.json() |