Spaces:
Sleeping
Sleeping
Commit ·
38350ae
1
Parent(s): 05ffb47
new r + stee product expansion
Browse files
utils.py
CHANGED
|
@@ -254,7 +254,11 @@ def enhance_query_for_steel_grades(query):
|
|
| 254 |
def answer_question(question, query_engine, reranker, current_model, chunks_df=None, rerank_top_k=20):
|
| 255 |
|
| 256 |
normalized_question = normalize_text(question)
|
| 257 |
-
normalized_question_2, query_changes, change_list = normalize_steel_designations(question)
|
|
|
|
|
|
|
|
|
|
|
|
|
| 258 |
if change_list:
|
| 259 |
log_message(f"Query changes: {', '.join(change_list)}")
|
| 260 |
if query_engine is None:
|
|
@@ -262,12 +266,13 @@ def answer_question(question, query_engine, reranker, current_model, chunks_df=N
|
|
| 262 |
|
| 263 |
try:
|
| 264 |
start_time = time.time()
|
| 265 |
-
|
|
|
|
| 266 |
log_message(f"user query: {question}")
|
| 267 |
log_message(f"normalized query: {normalized_question}")
|
| 268 |
log_message(f"after steel normalization: {normalized_question_2}")
|
|
|
|
| 269 |
log_message(f"Steel grades normalized in query: {query_changes}")
|
| 270 |
-
|
| 271 |
|
| 272 |
log_message(f"RETRIEVED: {len(retrieved_nodes)} nodes")
|
| 273 |
|
|
@@ -295,11 +300,11 @@ def answer_question(question, query_engine, reranker, current_model, chunks_df=N
|
|
| 295 |
log_message(f"UNIQUE NODES: {len(unique_retrieved)} nodes")
|
| 296 |
|
| 297 |
# Simple reranking with NORMALIZED question and PARAMETERIZED top_k
|
| 298 |
-
reranked_nodes = rerank_nodes(
|
| 299 |
top_k=rerank_top_k) # NOW PARAMETERIZED
|
| 300 |
|
| 301 |
# Direct query without formatting - use normalized question
|
| 302 |
-
response = query_engine.query(
|
| 303 |
|
| 304 |
end_time = time.time()
|
| 305 |
processing_time = end_time - start_time
|
|
|
|
| 254 |
def answer_question(question, query_engine, reranker, current_model, chunks_df=None, rerank_top_k=20):
|
| 255 |
|
| 256 |
normalized_question = normalize_text(question)
|
| 257 |
+
normalized_question_2, query_changes, change_list = normalize_steel_designations(question)
|
| 258 |
+
|
| 259 |
+
# FIX: Add query enhancement for steel grades
|
| 260 |
+
enhanced_question = enhance_query_for_steel_grades(normalized_question_2)
|
| 261 |
+
|
| 262 |
if change_list:
|
| 263 |
log_message(f"Query changes: {', '.join(change_list)}")
|
| 264 |
if query_engine is None:
|
|
|
|
| 266 |
|
| 267 |
try:
|
| 268 |
start_time = time.time()
|
| 269 |
+
# FIX: Use enhanced_question instead of normalized_question_2
|
| 270 |
+
retrieved_nodes = query_engine.retriever.retrieve(enhanced_question)
|
| 271 |
log_message(f"user query: {question}")
|
| 272 |
log_message(f"normalized query: {normalized_question}")
|
| 273 |
log_message(f"after steel normalization: {normalized_question_2}")
|
| 274 |
+
log_message(f"enhanced query: {enhanced_question}") # ADD THIS LOG
|
| 275 |
log_message(f"Steel grades normalized in query: {query_changes}")
|
|
|
|
| 276 |
|
| 277 |
log_message(f"RETRIEVED: {len(retrieved_nodes)} nodes")
|
| 278 |
|
|
|
|
| 300 |
log_message(f"UNIQUE NODES: {len(unique_retrieved)} nodes")
|
| 301 |
|
| 302 |
# Simple reranking with NORMALIZED question and PARAMETERIZED top_k
|
| 303 |
+
reranked_nodes = rerank_nodes(enhanced_question, unique_retrieved, reranker,
|
| 304 |
top_k=rerank_top_k) # NOW PARAMETERIZED
|
| 305 |
|
| 306 |
# Direct query without formatting - use normalized question
|
| 307 |
+
response = query_engine.query(enhanced_question)
|
| 308 |
|
| 309 |
end_time = time.time()
|
| 310 |
processing_time = end_time - start_time
|