bug fix

Author: nfriedri

app.py

@@ -30,9 +30,9 @@
 app.config['MAX_CONTENT_LENGTH'] = MAX_CONTENT_LENGTH
 
 
-logging.basicConfig(filename="logfile.log", level=logging.INFO)
-logging.info("APP: APP started at " + str(datetime.datetime.now()))
-print("logging configured")
+# logging.basicConfig(filename="logfile.log", level=logging.INFO)
+# logging.info("APP: APP started at " + str(datetime.datetime.now()))
+# print("logging configured")
 
 
 # API-Connection Test

debiasing/debiasing_controller.py

@@ -1,4 +1,7 @@
 import logging
+
+import numpy as np
+
 import augmentation_retrieval
 import calculation
 import json_controller
@@ -8,7 +11,6 @@
 
 def debiasing(methods, content, bar):
     logging.info("Debiasing-Engine: Started")
-
     # bar params: lower, uploaded, pca, space
     if content is None:
         return 'BAD REQUEST - NO BIAS SPEC JSON FOUND', 400
@@ -21,6 +23,7 @@ def debiasing(methods, content, bar):
     lex = 'false'
     if 'space' in bar:
         space = bar['space']
+        print(space)
     if 'uploaded' in bar:
         uploaded = bar['uploaded']
     if 'lower' in bar:
@@ -32,23 +35,19 @@ def debiasing(methods, content, bar):
     t1_list, t2_list, a1_list, a2_list, aug1_list, aug2_list = json_controller.json_to_debias_spec(content)
     if len(aug1_list) == 0:
         aug1_list, computed = augmentation_retrieval.retrieve_multiple_augmentations(t1_list)
-        print("here")
     if len(aug2_list) == 0:
         aug2_list, computed = augmentation_retrieval.retrieve_multiple_augmentations(t2_list)
-        print("here")
     if lower == 'true':
         t1_list = [x.lower() for x in t1_list]
         t2_list = [x.lower() for x in t2_list]
         a1_list = [x.lower() for x in a1_list]
         a2_list = [x.lower() for x in a2_list]
         aug1_list = [x.lower() for x in aug1_list]
         aug2_list = [x.lower() for x in aug2_list]
-    print(aug1_list)
-    print(aug2_list)
     equality_sets = []
-    for i in range(len(aug1_list)):
-        for j in range(len(aug2_list)):
-            equality_sets.append([aug1_list[i], aug2_list[j]])
+    for t1 in aug1_list:
+        for t2 in aug2_list:
+            equality_sets.append((t1, t2))
 
     t1, t2, a1, a2, aug1, aug2, not_found, deleted = specification_controller. \
         get_vectors_for_spec(space, lower, uploaded, t1_list, t2_list, a1_list, a2_list, aug1_list, aug2_list)
@@ -59,9 +58,8 @@ def debiasing(methods, content, bar):
     else:
         vocab, vecs = calculation.create_vocab_and_vecs(t1, t2, a1, a2, aug1, aug2)
 
-    t1_deb, t2_deb, a1_deb, a2_deb, new_vecs= [], [], [], [], []
+    t1_deb, t2_deb, a1_deb, a2_deb, new_vecs = [], [], [], [], []
     # print("Debiasing-Engine: Specs loaded, starting computing")
-
     if methods == 'bam':
         t1_deb, t2_deb, a1_deb, a2_deb, new_vecs = debiasing_bam(equality_sets, vocab, vecs, t1_list, t2_list, a1_list,
                                                                  a2_list)

debiasing/gbdd.py

@@ -7,12 +7,12 @@ def get_bias_direction(equality_sets, vecs, vocab):
     logging.info("Debi-Engine: GBDD Debiasing started")
     dir_vecs = []
     vecs_norm = vecs / np.transpose([np.linalg.norm(vecs, 2, 1)])
+    print(vocab)
     for eq in equality_sets:
         if eq[0] in vocab and eq[1] in vocab:
             dir_vecs.append(vecs_norm[vocab[eq[0]]] - vecs_norm[vocab[eq[1]]])
     q = np.array(dir_vecs)
     u, sigma, v = np.linalg.svd(q)
-
     v_b = v[0]
     return v_b
 

specification_controller.py

@@ -102,8 +102,10 @@ def get_vectors_for_spec(space, lower, uploaded, t1, t2, a1, a2, aug1=None, aug2
     a1, a2, a_del = format_set_sizes(a1_found, a2_found)
     deleted_keys = t_del + a_del
     if aug1 is not None and aug2 is not None:
-        aug1, aug2, aug_del = format_set_sizes(aug1_found, aug2_found)
-        deleted_keys += aug_del
+        # aug1, aug2, aug_del = format_set_sizes(aug1_found, aug2_found)
+        # deleted_keys += aug_del
+        aug1 = aug1_found
+        aug2 = aug2_found
         logging.info("SpecController: Returning found vectors")
         logging.info("SpecController: NotFound: " + str(not_found) + " ; DeletedKeys: " + str(deleted_keys))
         return t1, t2, a1, a2, aug1, aug2, not_found, deleted_keys