Loren commited on
Commit
5715b2d
·
verified ·
1 Parent(s): f2cc8b2

Upload database.py

Browse files
Files changed (1) hide show
  1. database.py +3 -5
database.py CHANGED
@@ -215,8 +215,7 @@ def fetch_query_results(query: str, k_model: int = 10,
215
  df["distance"] = df["faiss_id"].map(distance_map)
216
 
217
  if use_rerank:
218
- print("use_rerank = True", flush=True)
219
- logging.debug("use_rerank = True")
220
  # Cross-encoder
221
  df["chunk_text"] = df["chunk_text"].str.replace(r'\s+', ' ', regex=True).str.strip()
222
  top_passages = df["chunk_text"].tolist()
@@ -230,8 +229,7 @@ def fetch_query_results(query: str, k_model: int = 10,
230
  # Garder top k_cross
231
  df_top = df.head(k_cross)
232
  else:
233
- print("use_rerank = False", flush=True)
234
- logging.debug("use_rerank = False")
235
  df = df.sort_values(by="distance", ascending=False)
236
  df["cross_score"] = df["distance"]
237
  # Garder top k_model
@@ -268,7 +266,7 @@ def fetch_query_results(query: str, k_model: int = 10,
268
  # Liste finale de dictionnaires
269
  list_result = duck_res.to_dict(orient="records")
270
 
271
- return {"status": "ok", "result": list_result}
272
  except Exception as e:
273
  return {"status": "error", "code": type(e).__name__, "message": str(e)}
274
 
 
215
  df["distance"] = df["faiss_id"].map(distance_map)
216
 
217
  if use_rerank:
218
+ status_dbg = "ok_rerank"
 
219
  # Cross-encoder
220
  df["chunk_text"] = df["chunk_text"].str.replace(r'\s+', ' ', regex=True).str.strip()
221
  top_passages = df["chunk_text"].tolist()
 
229
  # Garder top k_cross
230
  df_top = df.head(k_cross)
231
  else:
232
+ status_dbg = "ok_no_rerank"
 
233
  df = df.sort_values(by="distance", ascending=False)
234
  df["cross_score"] = df["distance"]
235
  # Garder top k_model
 
266
  # Liste finale de dictionnaires
267
  list_result = duck_res.to_dict(orient="records")
268
 
269
+ return {"status": status_dbg, "result": list_result}
270
  except Exception as e:
271
  return {"status": "error", "code": type(e).__name__, "message": str(e)}
272