Added two more async endpoints (temporary implementation)

swagger_server/controllers/doc2text_controller.py

@@ -24,7 +24,7 @@ tika_server = "http://tika2:9999/tika_NAROBENURLZANALASC"
 # tika_server = "http://rsdo.lhrs.feri.um.si:9998/tika"
 
 
-def extract_text(file):
+def extract_text_prepResp(file):
     if tika_responding():
         response = requests.put(tika_server, data=file)
         return response.text, 200
@@ -47,7 +47,7 @@ def extract_text(file):
     return content, 200
 
 
-def ocr_text(file):
+def ocr_text_prepResp(file):
     if tika_responding():
         response = requests.put(tika_server, data=file,
                                 headers={"X-Tika-PDFOcrStrategy": "ocr_only", "X-Tika-OCRLanguage": "slv+eng"})
@@ -87,7 +87,7 @@ def datoteka_v_besedilo_post(file=None):  # noqa: E501
     if file is None:
         return "No file provided", 400
     try:
-        return extract_text(file)
+        return extract_text_prepResp(file)
     except Exception as e:
         return str(e), 500
 
@@ -105,7 +105,7 @@ def get_text_ocr(file=None):  # noqa: E501
     if file is None:
         return "No file provided", 400
     try:
-        return ocr_text(file)
+        return ocr_text_prepResp(file)
     except Exception as e:
         return str(e), 500
 
@@ -125,7 +125,7 @@ def datoteka_v_besedilo_in_classla(file=None):  # noqa: E501
     if file is None:
         return "No file provided", 400
     try:
-        txt, _ = extract_text(file)
+        txt, _ = extract_text_prepResp(file)
         return cl_utils.raw_text_to_conllu(txt)
     except Exception as e:
         return str(e), 500
@@ -151,7 +151,7 @@ def get_conllu_ocr(file=None):  # noqa: E501
                                     headers={"X-Tika-PDFOcrStrategy": "ocr_only", "X-Tika-OCRLanguage": "slv+eng"})
             return cl_utils.raw_text_to_conllu(response.text)
         else:
-            txt, _ = ocr_text(file)
+            txt, _ = ocr_text_prepResp(file)
             return cl_utils.raw_text_to_conllu(txt)
     except Exception as e:
         return str(e), 500

swagger_server/controllers/marktext_controller.py

@@ -5,6 +5,7 @@ from swagger_server.models.oznaci_besedilo_async_body import OznaciBesediloAsync
 from swagger_server import util
 from swagger_server.classla import cl_utils
 from swagger_server.requets_db.models.vrsta import (Job, JobManager)
+import swagger_server.controllers.doc2text_controller as d2t
 
 
 def get_text(body):  # noqa: E501
@@ -26,4 +27,56 @@ def get_text(body):  # noqa: E501
         return "Something went wrong", 500
     ret = {'check_job_url': f'{connexion.request.url_root}/job/{job.id}'}
 
-    return ret  # Todo: Update swagger to the newest response template later
+    return ret, 200  # Todo: Update swagger to the newest response template later
+
+
+def get_text_from_file(file=None):  # noqa: E501
+    """Pretvori datoteko v besedilo in označi s classlo/stanzo z uporabo slovenskih modelov ter vrne conll-u format
+
+     # noqa: E501
+
+    :param file:
+    :type file: strstr
+
+    :rtype: str
+    """
+    if file is None:
+        return "No file provided", 400
+    txt, status = d2t.extract_text_prepResp(file)
+    # Todo: instead of parsing text here, instead save the file into the tb or locally, and then parsing
+    # Todo: when the job actually executes (this version of the implementation is temporary)
+
+    if status == 200:
+        job, is_old_job = JobManager.create_job(1, txt)
+        if job is None:
+            return "Something went wrong", 500
+        ret = {'check_job_url': f'{connexion.request.url_root}/job/{job.id}'}
+        return ret, 200
+    else:
+        return "Something went wrong", 500
+
+
+def get_text_from_file_ocr(file=None):  # noqa: E501
+    """Pretvori datoteko v besedilo s pomočjo ocr razpoznavanja in označi s classlo/stanzo z uporabo slovenskih modelov ter vrne conll-u format
+
+     # noqa: E501
+
+    :param file:
+    :type file: strstr
+
+    :rtype: str
+    """
+    if file is None:
+        return "No file provided", 400
+    txt, status = d2t.ocr_text_prepResp(file)
+    # Todo: instead of ocr-ing text here, instead save the file into the tb or locally, and then ocr
+    # Todo: when the job actually executes (this version of the implementation is temporary)
+
+    if status == 200:
+        job, is_old_job = JobManager.create_job(1, txt)
+        if job is None:
+            return "Something went wrong", 500
+        ret = {'check_job_url': f'{connexion.request.url_root}/job/{job.id}'}
+        return ret, 200
+    else:
+        return "Something went wrong", 500