remove umbrella

stacosys/interface/api.py

@@ -3,13 +3,13 @@
 
 import logging
 from flask import abort, jsonify, request
-
 from stacosys.interface import app
 from stacosys.model.comment import Comment
 
 logger = logging.getLogger(__name__)
 
 
+
 @app.route("/ping", methods=["GET"])
 def ping():
     return "OK"
@@ -17,13 +17,10 @@ def ping():
 
 @app.route("/comments", methods=["GET"])
 def query_comments():
-
     comments = []
-    try:
     token = request.args.get("token", "")
     if token != app.config.get("SITE_TOKEN"):
         abort(401)
-
     url = request.args.get("url", "")
 
     logger.info("retrieve comments for url %s" % (url))
@@ -42,22 +39,14 @@ def query_comments():
             d["site"] = comment.author_site
         logger.debug(d)
         comments.append(d)
-        r = jsonify({"data": comments})
+    return jsonify({"data": comments})
-        r.status_code = 200
-    except Exception:
-        logger.warn("bad request")
-        r = jsonify({"data": []})
-        r.status_code = 400
-    return r
 
 
 @app.route("/comments/count", methods=["GET"])
 def get_comments_count():
-    try:
     token = request.args.get("token", "")
     if token != app.config.get("SITE_TOKEN"):
         abort(401)
-
     url = request.args.get("url", "")
     if url:
         count = (
@@ -66,12 +55,5 @@ def get_comments_count():
             .count()
         )
     else:
-            count = (
+        count = Comment.select(Comment).where(Comment.publishd.is_null(False)).count()
-                Comment.select(Comment).where(Comment.published.is_null(False)).count()
+    return jsonify({"count": count})
-            )
-        r = jsonify({"count": count})
-        r.status_code = 200
-    except Exception:
-        r = jsonify({"count": 0})
-        r.status_code = 200
-    return r