diff --git a/api/api_functions.py b/api/api_functions.py index 92ab9894aee21c21c793196e293e3db81c90e432..7f65efb7e9b17bc186e07a11d65fbf407320aba9 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 a7bc640e79270c081751f42c98a5fe57ce00f9d5..562fe62ece50e5285c85ed2affa4d6d845afdd4d 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 3fec6eb2e765463f0d4aad69bd17fb2aba58cd37..e18df131f7a6164d7861cbbe22ae113f2b9b9482 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 b9f546dadef45aa02b389c5cfff8214b31afb41c..aacc8569f0407b0f8d91ecbd7d7e896d7615c52e 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