Add filtred

This commit is contained in:
Mario Gil 2023-10-23 01:14:32 -05:00
parent d7a0141a83
commit 5fbed52018
2 changed files with 11 additions and 3 deletions

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ NewData*
motor05102023.csv motor05102023.csv
run.sh run.sh
Finetuning/embeddings/all-mpnet-base-v2/*

13
main.py
View File

@ -21,6 +21,7 @@ from sentence_transformers import SentenceTransformer
from fastapi import FastAPI from fastapi import FastAPI
from unidecode import unidecode from unidecode import unidecode
from nltk.corpus import stopwords from nltk.corpus import stopwords
from typing import Optional
#from cleantext import clean #from cleantext import clean
import re import re
model="embeddings/all-mpnet-base-v2" model="embeddings/all-mpnet-base-v2"
@ -135,7 +136,6 @@ def FinderDbs(query,dbs,filtred=False,th=1.2):
AllData={} AllData={}
for dbt in dbs: for dbt in dbs:
Sal = dbt.similarity_search_with_score(query,4) Sal = dbt.similarity_search_with_score(query,4)
print(Sal)
for output in Sal: for output in Sal:
if output[0].metadata["id"] in AllData.keys(): if output[0].metadata["id"] in AllData.keys():
AllData[output[0].metadata["id"]]["d"]=min([AllData[output[0].metadata["id"]]["d"]-0.1,output[1]-0.1]) AllData[output[0].metadata["id"]]["d"]=min([AllData[output[0].metadata["id"]]["d"]-0.1,output[1]-0.1])
@ -165,17 +165,24 @@ def read_main():
class Response(BaseModel): class Response(BaseModel):
query: str query: str
filtred : Optional[int] = 0
filtred=False filtred=False
@app.post("/angela/") @app.post("/angela/")
def calculate_api(response: Response): def calculate_api(response: Response):
print(response.query)
query = response.query query = response.query
try:
filtred = response.filtred
except:
filtred = 0
if filtred==1:
filtred=True
else:
filtred=False
AllData=FinderDbs(query,[db2],filtred) AllData=FinderDbs(query,[db2],filtred)
versionL="_".join([model,entrenamiento]) versionL="_".join([model,entrenamiento])
if AllData: if AllData:
AllData = list(AllData) AllData = list(AllData)
dis=[] dis=[]
id=[] id=[]