From 49c4c85b7caccaaa82c75a2c511479de30ec5442 Mon Sep 17 00:00:00 2001
From: Tom Edwards <edwardstj1@cardiff.ac.uk>
Date: Wed, 12 Jun 2024 09:15:20 +0100
Subject: [PATCH] Work towards USAS
---
api/api_functions.py | 13 ++++++++++---
func/usas/usas.py | 12 ++++++++++--
main.py | 9 +++++++--
requirements.txt | 3 ++-
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/api/api_functions.py b/api/api_functions.py
index 92ab989..7f65efb 100644
--- a/api/api_functions.py
+++ b/api/api_functions.py
@@ -16,6 +16,13 @@ def get_ner_for_data(page):
return make_response(jsonify(result), 400)
-def get_usas_for_data():
- result = run_usas_on_text()
- return result
+# Perform USAS analysis on a file
+# TAKES XML text page
+# Returns NER results
+def get_usas_for_data(page):
+ result = run_usas_on_text(page)
+
+ if result["code"] == "SUCCESS":
+ return make_response(jsonify(result), 201)
+
+ return make_response(jsonify(result), 400)
diff --git a/func/usas/usas.py b/func/usas/usas.py
index a7bc640..562fe62 100644
--- a/func/usas/usas.py
+++ b/func/usas/usas.py
@@ -1,3 +1,11 @@
+import spacy
-def run_usas_on_text():
- return "hello usas"
\ No newline at end of file
+
+
+# Perform USAS on Text
+def run_usas_on_text(page):
+
+
+
+ result = {'output': "Hello USAS",'message': 'Done', 'code': 'SUCCESS'}
+ return result
diff --git a/main.py b/main.py
index 3fec6eb..e18df13 100644
--- a/main.py
+++ b/main.py
@@ -1,9 +1,12 @@
from flask import Flask
from flask import request
+from flask_cors import CORS, cross_origin
from api.api_functions import *
app = Flask(__name__)
+cors = CORS(app)
+app.config['CORS_HEADERS'] = 'Content-Type'
@app.route("/")
@@ -18,7 +21,7 @@ def test():
@app.route('/ner', methods=['POST'])
def ner():
- request_data = request.form.to_dict()
+ request_data = request.get_json()
page = request_data['page']
result = get_ner_for_data(page)
return result
@@ -26,5 +29,7 @@ def ner():
@app.route("/usas")
def usas():
- result = get_usas_for_data()
+ request_data = request.get_json()
+ page = request_data['page']
+ result = get_usas_for_data(page)
return result
diff --git a/requirements.txt b/requirements.txt
index b9f546d..aacc856 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,5 @@ flask~=3.0.3
torch~=2.3.1
transformers~=4.41.2
ckip-transformers~=0.3.4
-
+flask-cors~=4.0.1
+spacy~=3.7.4
--
GitLab