Return 200 should be done without Response fix

swagger_server/controllers/extract_controller.py

@@ -60,7 +60,7 @@ def do_izlusci(conllus, prepovedane_besede):
             ]}
         except:
             return Response(data, 400)
-        return Response(ret, 200)
+        return ret, 200
     except Exception as e:
         return Response(str(e), 500)
 

swagger_server/controllers/jobs_controller.py

@@ -258,19 +258,22 @@ def execute_ateapi_job(job: Job):
         job.save()
         info = json.loads(job.job_input)
         _res = do_izlusci(info['conllus'], info['prepovedane_besede'])
-        try:
+        if type(_res) is tuple:
-            if type(_res.response) is dict:
+            ret_json = _res[0]
-                ret_json = str(_res.response)
+        else:
-            else:
+            try:
-                try:
+                if type(_res.response) is dict:
-                    ret_json = _res.response[0].decode('utf-8')
+                    ret_json = str(_res.response)
-                except:
+                else:
-                    ret_json = "Unknown exception."
+                    try:
+                        ret_json = _res.response[0].decode('utf-8')
+                    except:
+                        ret_json = "Unknown exception."
 
-            if _res.status_code != 200:
+                if _res.status_code != 200:
-                ret_json = f'ERROR - {ret_json}'
+                    ret_json = f'ERROR - {ret_json}'
-        except:
+            except:
-            ret_json = "ERROR - Unknown exception."
+                ret_json = "ERROR - Unknown exception."
         job.job_output = ret_json
         job.finished_on = datetime.datetime.utcnow()
         job.save()