From 984d51e2000420679564745142a925ac2325f876 Mon Sep 17 00:00:00 2001 From: ahmed531998 Date: Sun, 16 Apr 2023 19:52:40 +0200 Subject: [PATCH] fixes --- NLU.py | 8 +++++--- main.py | 16 +++------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/NLU.py b/NLU.py index e3a407b..292fcd8 100644 --- a/NLU.py +++ b/NLU.py @@ -17,15 +17,16 @@ class NLU: doc = self.coref_resolver(to_resolve) token_mention_mapper = {} output_string = "" - cand_clusters = [ + clusters = [ val for key, val in doc.spans.items() if key.startswith("coref_cluster") ] + """ clusters = [] for cluster in cand_clusters: if cluster[0].text == "I": continue clusters.append(cluster) - + """ # Iterate through every found cluster for cluster in clusters: first_mention = cluster[0] @@ -88,7 +89,8 @@ class NLU: self.to_process = self._resolve_coref(history_consec) intent, score = self._intentpredictor() - #print(score) + if intent == 'CHITCHAT': + self.to_process = utterance if score > 0.5: entities = self._entityextractor() offense = self._offensepredictor() diff --git a/main.py b/main.py index 010f961..fa11379 100644 --- a/main.py +++ b/main.py @@ -35,14 +35,6 @@ conn = psycopg2.connect( user=os.getenv("POSTGRES_USER"), password=os.getenv("POSTGRES_PASSWORD")) - -""" -conn = psycopg2.connect(host="https://janet-app-db.d4science.org", - database="janet", - user="janet_user", - password="2fb5e81fec5a2d906a04") -""" - cur = conn.cursor() @@ -114,10 +106,9 @@ def feedback(): data = request.get_json().get("feedback") 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)', + 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['queryModCorrect'], data['correctQuery'], data['evidence'], - data['janetResponse'], data['preferredResponse'], data['length'], + data['queryModCorrect'], data['correctQuery'], data['evidence'], data['janetResponse'], data['preferredResponse'], data['length'], data['fluency'], data['truthfulness'], data['usefulness'], data['speed'], data['intent']) ) @@ -175,8 +166,7 @@ if __name__ == "__main__": 'history text NOT NULL,' 'janet_modified_query text NOT NULL,' 'is_modified_query_correct text NOT NULL,' - 'user_modified_query text NOT NULL,' - 'evidence_useful text NOT NULL,' + 'user_modified_query text NOT NULL, evidence_useful text NOT NULL,' 'response text NOT NULL,' 'preferred_response text,' 'response_length_feedback text NOT NULL,'