Merge pull request #125 from x-atlas-consortia/shirey/assayclass-dev-…

…server Shirey/assayclass dev server
x-atlas-consortia · Sep 3, 2024 · 4cf69f1 · 4cf69f1
2 parents 1cf711e + f7eebcf
commit 4cf69f1
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 24 deletions.
diff --git a/...gy_api/routes/assayclasses_dev/.gitignore → dev/.gitignore b/...gy_api/routes/assayclasses_dev/.gitignore → dev/.gitignore
diff --git a/...ogy_api/routes/assayclasses_dev/README.md → dev/README.md b/...ogy_api/routes/assayclasses_dev/README.md → dev/README.md
diff --git a/...tology_api/routes/assayclasses_dev/app.py → dev/app.py b/...tology_api/routes/assayclasses_dev/app.py → dev/app.py
@@ -1,24 +1,9 @@
 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:
@@ -45,7 +30,7 @@ def assayclasses_dev_get_by_code(code):
 
 
 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/...routes/assayclasses_dev/assayclasses.json → dev/assayclasses.json b/...routes/assayclasses_dev/assayclasses.json → dev/assayclasses.json
diff --git a/...assayclasses_dev/instance/app.cfg.example → dev/instance/app.cfg.example b/...assayclasses_dev/instance/app.cfg.example → dev/instance/app.cfg.example
diff --git a/.../routes/assayclasses_dev/requirements.txt → dev/requirements.txt b/.../routes/assayclasses_dev/requirements.txt → dev/requirements.txt
diff --git a/...y_api/routes/assayclasses_dev/test_api.sh → dev/test_api.sh b/...y_api/routes/assayclasses_dev/test_api.sh → dev/test_api.sh
diff --git a/src/main.py b/src/main.py
@@ -75,13 +75,6 @@ def make_flask_config():
 app.register_blueprint(datasettypes_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')