MrSimple07 commited on
Commit
5048890
·
1 Parent(s): 5fc456f

complete new structure

Browse files
Files changed (3) hide show
  1. app.py +1 -0
  2. index_retriever.py +2 -2
  3. utils.py +2 -0
app.py CHANGED
@@ -196,6 +196,7 @@ def main():
196
  json_files_dir=JSON_FILES_DIR,
197
  table_data_dir=TABLE_DATA_DIR,
198
  image_data_dir=IMAGE_DATA_DIR,
 
199
  )
200
 
201
  if query_engine:
 
196
  json_files_dir=JSON_FILES_DIR,
197
  table_data_dir=TABLE_DATA_DIR,
198
  image_data_dir=IMAGE_DATA_DIR,
199
+ use_json_instead_csv=True,
200
  )
201
 
202
  if query_engine:
index_retriever.py CHANGED
@@ -6,7 +6,7 @@ from llama_index.core.prompts import PromptTemplate
6
  from llama_index.retrievers.bm25 import BM25Retriever
7
  from llama_index.core.retrievers import QueryFusionRetriever
8
  from my_logging import log_message
9
- from config import CUSTOM_PROMPT
10
 
11
  def create_vector_index(documents):
12
  log_message("Строю векторный индекс")
@@ -31,7 +31,7 @@ def create_query_engine(vector_index):
31
  num_queries=1
32
  )
33
 
34
- custom_prompt_template = PromptTemplate(CUSTOM_PROMPT)
35
  response_synthesizer = get_response_synthesizer(
36
  response_mode=ResponseMode.TREE_SUMMARIZE,
37
  text_qa_template=custom_prompt_template
 
6
  from llama_index.retrievers.bm25 import BM25Retriever
7
  from llama_index.core.retrievers import QueryFusionRetriever
8
  from my_logging import log_message
9
+ from config import CUSTOM_PROMPT, PROMPT_SIMPLE_POISK
10
 
11
  def create_vector_index(documents):
12
  log_message("Строю векторный индекс")
 
31
  num_queries=1
32
  )
33
 
34
+ custom_prompt_template = PromptTemplate(PROMPT_SIMPLE_POISK)
35
  response_synthesizer = get_response_synthesizer(
36
  response_mode=ResponseMode.TREE_SUMMARIZE,
37
  text_qa_template=custom_prompt_template
utils.py CHANGED
@@ -8,6 +8,7 @@ from config import AVAILABLE_MODELS, DEFAULT_MODEL, GOOGLE_API_KEY
8
  import time
9
  from index_retriever import rerank_nodes
10
  from my_logging import log_message
 
11
 
12
  def get_llm_model(model_name):
13
  try:
@@ -91,6 +92,7 @@ def answer_question(question, query_engine, reranker, current_model, chunks_df=N
91
  try:
92
  log_message(f"Получен вопрос: {question}")
93
  log_message(f"Используется модель: {current_model}")
 
94
  start_time = time.time()
95
 
96
  log_message("Извлекаю релевантные узлы")
 
8
  import time
9
  from index_retriever import rerank_nodes
10
  from my_logging import log_message
11
+ from utils import PROMPT_SIMPLE_POISK
12
 
13
  def get_llm_model(model_name):
14
  try:
 
92
  try:
93
  log_message(f"Получен вопрос: {question}")
94
  log_message(f"Используется модель: {current_model}")
95
+ log_message(f"Используется промпт: {PROMPT_SIMPLE_POISK[:200]}...")
96
  start_time = time.time()
97
 
98
  log_message("Извлекаю релевантные узлы")