fixes
This commit is contained in:
parent
d9e04453f9
commit
3b143e0f73
4
DM.py
4
DM.py
|
@ -1,7 +1,7 @@
|
||||||
import time
|
import time
|
||||||
|
|
||||||
class DM:
|
class DM:
|
||||||
def __init__(self, max_history_length=3):
|
def __init__(self, max_history_length=2):
|
||||||
self.working_history_sep = ""
|
self.working_history_sep = ""
|
||||||
self.working_history_consec = ""
|
self.working_history_consec = ""
|
||||||
self.chitchat_history_consec = ""
|
self.chitchat_history_consec = ""
|
||||||
|
@ -17,7 +17,7 @@ class DM:
|
||||||
chat = []
|
chat = []
|
||||||
for utt in self.chat_history:
|
for utt in self.chat_history:
|
||||||
if utt['intent'] == 'CHITCHAT':
|
if utt['intent'] == 'CHITCHAT':
|
||||||
if len(chat) == 8:
|
if len(chat) == 4:
|
||||||
chat = chat[1:]
|
chat = chat[1:]
|
||||||
chat.append(utt['modified_query'])
|
chat.append(utt['modified_query'])
|
||||||
self.chitchat_history_consec = '. '.join(chat)
|
self.chitchat_history_consec = '. '.join(chat)
|
||||||
|
|
|
@ -9,7 +9,7 @@ class Recommender:
|
||||||
self.retriever = retriever
|
self.retriever = retriever
|
||||||
self.rand_seed = 5
|
self.rand_seed = 5
|
||||||
|
|
||||||
def _new(self, material):
|
def _new(self, username, material):
|
||||||
if username not in curr_recommendations:
|
if username not in curr_recommendations:
|
||||||
return True
|
return True
|
||||||
for row in self.curr_recommendations[username]:
|
for row in self.curr_recommendations[username]:
|
||||||
|
@ -22,7 +22,7 @@ class Recommender:
|
||||||
for tag in material['tags']:
|
for tag in material['tags']:
|
||||||
if cosine_similarity(np.array(self.retriever.encode([tag])),
|
if cosine_similarity(np.array(self.retriever.encode([tag])),
|
||||||
np.array(self.retriever.encode([interest]))) > score:
|
np.array(self.retriever.encode([interest]))) > score:
|
||||||
if self._new(material):
|
if self._new(username, material):
|
||||||
print('hi')
|
print('hi')
|
||||||
self.curr_recommendations[username] = self.curr_recommendations[username].append(material) if username not in self.curr_recommendations else [material]
|
self.curr_recommendations[username] = self.curr_recommendations[username].append(material) if username not in self.curr_recommendations else [material]
|
||||||
self.recommended[username] = self.recommended[username].append(False) if username not in self.recommended else [False]
|
self.recommended[username] = self.recommended[username].append(False) if username not in self.recommended else [False]
|
||||||
|
|
|
@ -132,7 +132,7 @@ class ResponseGenerator:
|
||||||
elif action == "ConvGen":
|
elif action == "ConvGen":
|
||||||
gen_kwargs = {"length_penalty": 2.5, "num_beams":2, "max_length": 30, "repetition_penalty": 2.5, "temperature": 2}
|
gen_kwargs = {"length_penalty": 2.5, "num_beams":2, "max_length": 30, "repetition_penalty": 2.5, "temperature": 2}
|
||||||
#answer = self.generators['chat']('history: '+ consec_history + ' ' + utterance + ' persona: ' + 'I am Janet. My name is Janet. I am an AI developed by CNR to help VRE users.' , **gen_kwargs)[0]['generated_text']
|
#answer = self.generators['chat']('history: '+ consec_history + ' ' + utterance + ' persona: ' + 'I am Janet. My name is Janet. I am an AI developed by CNR to help VRE users.' , **gen_kwargs)[0]['generated_text']
|
||||||
answer = self.generators['chat']('question: ' + utterance + 'context: My name is Janet. I am an AI developed by CNR to help VRE users. ' + chitchat_history , **gen_kwargs)[0]['generated_text']
|
answer = self.generators['chat']('question: ' + utterance + ' context: My name is Janet. I am an AI developed by CNR to help VRE users. ' + chitchat_history , **gen_kwargs)[0]['generated_text']
|
||||||
return answer
|
return answer
|
||||||
|
|
||||||
elif action == "findPaper":
|
elif action == "findPaper":
|
||||||
|
|
12
main.py
12
main.py
|
@ -29,7 +29,7 @@ cors = CORS(app, resources={r"/api/predict": {"origins": url},
|
||||||
r"/api/dm": {"origins": url},
|
r"/api/dm": {"origins": url},
|
||||||
r"/health": {"origins": "*"}
|
r"/health": {"origins": "*"}
|
||||||
})
|
})
|
||||||
"""
|
|
||||||
conn = psycopg2.connect(
|
conn = psycopg2.connect(
|
||||||
host="janet-pg",
|
host="janet-pg",
|
||||||
database=os.getenv("POSTGRES_DB"),
|
database=os.getenv("POSTGRES_DB"),
|
||||||
|
@ -37,7 +37,7 @@ conn = psycopg2.connect(
|
||||||
password=os.getenv("POSTGRES_PASSWORD"))
|
password=os.getenv("POSTGRES_PASSWORD"))
|
||||||
|
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
"""
|
|
||||||
users = {}
|
users = {}
|
||||||
|
|
||||||
def vre_fetch():
|
def vre_fetch():
|
||||||
|
@ -133,7 +133,7 @@ def predict():
|
||||||
def feedback():
|
def feedback():
|
||||||
data = request.get_json().get("feedback")
|
data = request.get_json().get("feedback")
|
||||||
print(data)
|
print(data)
|
||||||
"""
|
|
||||||
cur.execute('INSERT INTO feedback_experimental (query, history, janet_modified_query, is_modified_query_correct, user_modified_query, evidence_useful, response, preferred_response, response_length_feedback, response_fluency_feedback, response_truth_feedback, response_useful_feedback, response_time_feedback, response_intent) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)',
|
cur.execute('INSERT INTO feedback_experimental (query, history, janet_modified_query, is_modified_query_correct, user_modified_query, evidence_useful, response, preferred_response, response_length_feedback, response_fluency_feedback, response_truth_feedback, response_useful_feedback, response_time_feedback, response_intent) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)',
|
||||||
(data['query'], data['history'], data['modQuery'],
|
(data['query'], data['history'], data['modQuery'],
|
||||||
data['queryModCorrect'], data['correctQuery'], data['evidence'], data['janetResponse'], data['preferredResponse'], data['length'],
|
data['queryModCorrect'], data['correctQuery'], data['evidence'], data['janetResponse'], data['preferredResponse'], data['length'],
|
||||||
|
@ -141,7 +141,7 @@ def feedback():
|
||||||
data['speed'], data['intent'])
|
data['speed'], data['intent'])
|
||||||
)
|
)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
"""
|
|
||||||
reply = jsonify({"status": "done"})
|
reply = jsonify({"status": "done"})
|
||||||
return reply
|
return reply
|
||||||
|
|
||||||
|
@ -185,7 +185,7 @@ if __name__ == "__main__":
|
||||||
|
|
||||||
rg = ResponseGenerator(index,db, rec, generators, retriever)
|
rg = ResponseGenerator(index,db, rec, generators, retriever)
|
||||||
|
|
||||||
"""
|
|
||||||
cur.execute('CREATE TABLE IF NOT EXISTS feedback_experimental (id serial PRIMARY KEY,'
|
cur.execute('CREATE TABLE IF NOT EXISTS feedback_experimental (id serial PRIMARY KEY,'
|
||||||
'query text NOT NULL,'
|
'query text NOT NULL,'
|
||||||
'history text NOT NULL,'
|
'history text NOT NULL,'
|
||||||
|
@ -202,5 +202,5 @@ if __name__ == "__main__":
|
||||||
'response_intent text NOT NULL);'
|
'response_intent text NOT NULL);'
|
||||||
)
|
)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
"""
|
|
||||||
app.run(host='0.0.0.0')
|
app.run(host='0.0.0.0')
|
||||||
|
|
Loading…
Reference in New Issue