From 24d339702c1757dfb8b78a682ed0a2c5818f8b67 Mon Sep 17 00:00:00 2001
From: kirianguiller <kirianguiller@gmail.com>
Date: Fri, 13 Nov 2020 14:57:03 +0100
Subject: [PATCH] <restore> token list formatting

---
 app/klang/controller.py |  2 +-
 app/klang/service.py    | 17 ++++++++++-------
 app/utils/grew_utils.py |  7 +------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/klang/controller.py b/app/klang/controller.py
index 69bb1aa..3af3f9c 100644
--- a/app/klang/controller.py
+++ b/app/klang/controller.py
@@ -17,7 +17,7 @@ def get(self) :
         return ConllService.get_all()
 
 
-@api.route("/conll/<string:conll_name>")
+@api.route("/conlls/<string:conll_name>")
 class ConllNameServiceResource(Resource):
     "ConllService"
 
diff --git a/app/klang/service.py b/app/klang/service.py
index 9978a63..db26a92 100644
--- a/app/klang/service.py
+++ b/app/klang/service.py
@@ -46,17 +46,20 @@ def seperate_conll_sentences(conll_string: str) -> List[str]:
 
     @staticmethod
     def sentence_to_audio_tokens(sentence_string: str):
-        audio_tokens = {}
+        # audio_tokens = {}
+        audio_tokens = []
         for line in sentence_string.split("\n"):
             if line:
                 if not line.startswith("#"):
                     m = align_begin_and_end_regex.search(line)
-                    audio_token = {
-                        "token": m.group(1),
-                        "alignBegin": int(m.group(2)),
-                        "alignEnd": int(m.group(3)),
-                    }
-                    audio_tokens[int(line.split("\t")[0])] = audio_token
+                    # audio_token = {
+                    #     "token": m.group(1),
+                    #     "alignBegin": int(m.group(2)),
+                    #     "alignEnd": int(m.group(3)),
+                    # }
+                    audio_token = [m.group(1), m.group(2), m.group(3)]
+                    audio_tokens.append(audio_token)
+                    # audio_tokens[int(line.split("\t")[0])] = audio_token
 
         print(audio_tokens)
         return audio_tokens
diff --git a/app/utils/grew_utils.py b/app/utils/grew_utils.py
index a629043..99a82a8 100644
--- a/app/utils/grew_utils.py
+++ b/app/utils/grew_utils.py
@@ -107,7 +107,6 @@ def get_samples(project_id : str):
         return grew_samples
     
     @staticmethod
-<<<<<<< HEAD
     def create_sample(project_id: str, sample_id: str):
         reply = grew_request(
             "newSample",
@@ -133,10 +132,7 @@ def delete_sample(project_id: str, sample_id: str) -> None:
             data={"project_id": project_id, "sample_id": sample_id},
         )
 
-    
-    # @staticmethod
-    # def save_tree()
-=======
+    @staticmethod
     def search_pattern_in_graphs(project_id: str, pattern: str, user_ids = []):
         if current_app.config["ENV"] == "prod":
             data = {
@@ -151,4 +147,3 @@ def search_pattern_in_graphs(project_id: str, pattern: str, user_ids = []):
             }
         reply = grew_request("searchPatternInGraphs", data=data)
         return reply
->>>>>>> origin/main