Merge pull request #121 from x-atlas-consortia/yuanzhou/assayclass-de…

…v-server-deploy Tweaks for deployment
x-atlas-consortia · Aug 30, 2024 · 438ae30 · 438ae30
2 parents 44aa495 + 58a444c
commit 438ae30
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 2 deletions.
diff --git a/dev/.gitignore → ...gy_api/routes/assayclasses_dev/.gitignore b/dev/.gitignore → ...gy_api/routes/assayclasses_dev/.gitignore
diff --git a/dev/README.md → ...ogy_api/routes/assayclasses_dev/README.md b/dev/README.md → ...ogy_api/routes/assayclasses_dev/README.md
diff --git a/dev/app.py → ...tology_api/routes/assayclasses_dev/app.py b/dev/app.py → ...tology_api/routes/assayclasses_dev/app.py
@@ -1,9 +1,24 @@
 import os
 import json
-from flask import Flask, request, Response, abort
 from urllib.request import urlopen
 from urllib.error import HTTPError
 import logging
+from flask import Flask, request, Response, abort, Blueprint
+
+
+####################################################################################################
+# For assayclasses development needs - Zhou 8/28/2024
+assayclasses_dev_blueprint = Blueprint('assayclasses-dev', __name__, url_prefix='/assayclasses-dev')
+
+@assayclasses_dev_blueprint.route('', methods=['GET'])
+def assayclasses_dev_get_all():
+    return assayclass()
+
+@assayclasses_dev_blueprint.route('/<code>', methods=['GET'])
+def assayclasses_dev_get_by_code(code):
+    return assayclasses_by_code(code)
+####################################################################################################
+
 
 #
 # This is a RESTful service that exposes two endpoints:
@@ -30,7 +45,7 @@
 
 
 app = Flask(__name__,
-            instance_path=os.path.join(os.path.abspath(os.path.dirname(__file__)), 'instance'),
+            instance_path=os.path.join(os.path.abspath(os.path.dirname(__file__)), '../../instance'),
             instance_relative_config=True)
 app.config.from_pyfile('app.cfg')
 

diff --git a/dev/assayclasses.json → ...routes/assayclasses_dev/assayclasses.json b/dev/assayclasses.json → ...routes/assayclasses_dev/assayclasses.json
diff --git a/dev/instance/app.cfg.example → ...assayclasses_dev/instance/app.cfg.example b/dev/instance/app.cfg.example → ...assayclasses_dev/instance/app.cfg.example
diff --git a/dev/requirements.txt → .../routes/assayclasses_dev/requirements.txt b/dev/requirements.txt → .../routes/assayclasses_dev/requirements.txt
diff --git a/dev/test_api.sh → ...y_api/routes/assayclasses_dev/test_api.sh b/dev/test_api.sh → ...y_api/routes/assayclasses_dev/test_api.sh
diff --git a/src/main.py b/src/main.py
@@ -73,6 +73,13 @@ def make_flask_config():
 app.register_blueprint(assayclasses_blueprint)
 
 
+####################################################################################################
+# For assayclasses development needs - Zhou 8/28/2024
+from hs_ontology_api.routes.assayclasses_dev.app import assayclasses_dev_blueprint
+app.register_blueprint(assayclasses_dev_blueprint)
+####################################################################################################
+
+
 # Instantiate a Cells API client.
 # May 2024 Deprecated
 # cellsurl = make_flask_config().get('CELLSURL')