Merge pull request #603 from biocore/csymons_bypass_qiita

Bypass Qiita

Author: wasade

microsetta_private_api/api/_sample.py

@@ -1,7 +1,7 @@
 import flask
 from flask import jsonify
-from qiita_client import NotFoundError, BadRequestError, \
-    ForbiddenError
+# from qiita_client import NotFoundError, BadRequestError, \
+#     ForbiddenError
 from werkzeug.exceptions import BadRequest
 
 from microsetta_private_api.api._account import _validate_account_access
@@ -17,7 +17,7 @@
 from microsetta_private_api.admin.admin_impl import token_grants_admin_access
 from microsetta_private_api.qiita import qclient
 
-from flask import current_app as app
+# from flask import current_app as app
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
@@ -61,6 +61,7 @@ def read_sample_association(account_id, source_id, sample_id, token_info):
         if sample is None:
             return jsonify(code=404, message="Sample not found"), 404
 
+    """
     qiita_body = {
         'sample_ids': ["10317." + str(sample.barcode)]
     }
@@ -93,8 +94,8 @@ def read_sample_association(account_id, source_id, sample_id, token_info):
     except RuntimeError:
         # How do I log these to gunicorn??
         app.logger.warning("Couldn't communicate with qiita", exc_info=True)
-        raise
-
+        pass
+    """
     return jsonify(sample.to_api()),
 
 
@@ -244,3 +245,17 @@ def get_preparations(sample_barcode):
         preps = r.list_preparations(sample_barcode)
         preps_api = [p.to_api() for p in preps]
         return jsonify(preps_api), 200
+
+
+def use_qclient(sample_barcode):
+    # NB: Do not use this function. It's a temporary workaround to bypass
+    # qiita in production code, but keep the qclient import so that all of
+    # our tests won't break.
+    qiita_body = {
+        'sample_ids': ["10317." + str(sample_barcode)]
+    }
+
+    _ = qclient.post(
+        '/api/v1/study/10317/samples/status',
+        json=qiita_body
+    )

microsetta_private_api/celery_utils.py

@@ -37,10 +37,10 @@ def __call__(self, *args, **kwargs):
            "task": "microsetta_private_api.admin.daklapack_polling.poll_dak_orders",  # noqa
            "schedule":  60 * 60 * 4  # every 4 hours
         },
-        "update_qiita_metadata": {
-           "task": "microsetta_private_api.tasks.update_qiita_metadata",  # noqa
-           "schedule":  60 * 60 * 24  # every 24 hours
-        },
+        # "update_qiita_metadata": {
+        #    "task": "microsetta_private_api.tasks.update_qiita_metadata",  # noqa
+        #    "schedule":  60 * 60 * 24  # every 24 hours
+        # },
         "pull_fundrazr_transactions": {
            "task": "microsetta_private_api.util.fundrazr.get_fundrazr_transactions",  # noqa
            "schedule": 60 * 60  # every hour

microsetta_private_api/celery_worker.py

@@ -4,12 +4,12 @@
 from microsetta_private_api.admin.daklapack_polling import poll_dak_orders
 from microsetta_private_api.util.fundrazr import get_fundrazr_transactions
 from microsetta_private_api.util.perk_fulfillment import check_shipping_updates
-from microsetta_private_api.tasks import update_qiita_metadata
+# from microsetta_private_api.tasks import update_qiita_metadata
 init_celery(celery, app.app)
 
 # Run any celery tasks that require initialization on worker start
 refresh_headers.delay()  # Initialize the vioscreen task with a token
 poll_dak_orders.delay()  # check for orders
 get_fundrazr_transactions.delay()  # check for new transactions
 check_shipping_updates.delay()  # check for tracking updates
-update_qiita_metadata.delay()  # run Qiita metadata push
+# update_qiita_metadata.delay()  # run Qiita metadata push