Merge pull request #162 from genenetwork/feature/llm2-refactoring

Feature/llm2 refactoring

2 files changed, 48 insertions, 51 deletions

diff --git a/gn3/api/llm.py b/gn3/api/llm.py
index 7d860d8..442252f 100644
--- a/gn3/api/llm.py
+++ b/gn3/api/llm.py
@@ -1,36 +1,27 @@
-"""API for data used to generate menus"""
-
-# pylint: skip-file
+"""Api endpoints for gnqa"""
+from datetime import timedelta
+import json
+import sqlite3
+from redis import Redis
 
-from flask import jsonify, request, Blueprint, current_app
+from flask import Blueprint
+from flask import current_app
+from flask import jsonify
+from flask import request
 
-from functools import wraps
 from gn3.llms.process import get_gnqa
 from gn3.llms.process import get_user_queries
 from gn3.llms.process import fetch_query_results
+from gn3.llms.errors import LLMError
 from gn3.auth.authorisation.oauth2.resource_server import require_oauth
 from gn3.auth import db
-from redis import Redis
-import json
-import sqlite3
-from datetime import timedelta
-
-GnQNA = Blueprint("GnQNA", __name__)
-
 
-def handle_errors(func):
-    @wraps(func)
-    def decorated_function(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except Exception as error:
-            return jsonify({"error": str(error)}), 500
-    return decorated_function
+gnqa = Blueprint("gnqa", __name__)
 
 
-@GnQNA.route("/gnqna", methods=["POST"])
-def gnqa():
-    # todo  add auth
+@gnqa.route("/gnqna", methods=["POST"])
+def gnqna():
+    """Main gnqa endpoint"""
     query = request.json.get("querygnqa", "")
     if not query:
         return jsonify({"error": "querygnqa is missing in the request"}), 400
@@ -38,7 +29,8 @@ def gnqa():
     try:
         fahamu_token = current_app.config.get("FAHAMU_AUTH_TOKEN")
         if fahamu_token is None:
-            return jsonify({"query": query, "error": "Use of invalid fahamu auth token"}), 500
+            return jsonify({"query": query,
+                            "error": "Use of invalid fahamu auth token"}), 500
         task_id, answer, refs = get_gnqa(
             query, fahamu_token, current_app.config.get("DATA_DIR"))
         response = {
@@ -49,19 +41,22 @@ def gnqa():
         }
         with (Redis.from_url(current_app.config["REDIS_URI"],
                              decode_responses=True) as redis_conn):
-            # The key will be deleted after 60 seconds
-            redis_conn.setex(f"LLM:random_user-{query}", timedelta(days=10), json.dumps(response))
+            redis_conn.setex(
+                f"LLM:random_user-{query}",
+                timedelta(days=10), json.dumps(response))
         return jsonify({
             **response,
             "prev_queries": get_user_queries("random_user", redis_conn)
         })
-    except Exception as error:
-        return jsonify({"query": query, "error": f"Request failed-{str(error)}"}), 500
+    except LLMError as error:
+        return jsonify({"query": query,
+                        "error": f"Request failed-{str(error)}"}), 500
 
 
-@GnQNA.route("/rating/<task_id>", methods=["POST"])
+@gnqa.route("/rating/<task_id>", methods=["POST"])
 @require_oauth("profile")
 def rating(task_id):
+    """Endpoint for rating qnqa query and answer"""
     try:
         llm_db_path = current_app.config["LLM_DB_PATH"]
         with (require_oauth.acquire("profile") as token,
@@ -81,48 +76,50 @@ def rating(task_id):
                   task_id TEXT NOT NULL UNIQUE
                   )"""
             cursor.execute(create_table)
-            cursor.execute("""INSERT INTO Rating(user_id,query,answer,weight,task_id)
+            cursor.execute("""INSERT INTO Rating(user_id,query,
+            answer,weight,task_id)
             VALUES(?,?,?,?,?)
             ON CONFLICT(task_id) DO UPDATE SET
             weight=excluded.weight
             """, (str(user_id), query, answer, weight, task_id))
         return {
-                "message": "You have successfully rated this query:Thank you!!"
-            }, 200
+            "message":
+            "You have successfully rated this query:Thank you!!"
+        }, 200
     except sqlite3.Error as error:
         return jsonify({"error": str(error)}), 500
-    except Exception as error:
-        raise error
 
 
-@GnQNA.route("/history/<query>", methods=["GET"])
+@gnqa.route("/history/<query>", methods=["GET"])
 @require_oauth("profile user")
-@handle_errors
 def fetch_user_hist(query):
-
-    with (require_oauth.acquire("profile user") as the_token, Redis.from_url(current_app.config["REDIS_URI"],
-                                                                             decode_responses=True) as redis_conn):
+    """"Endpoint to fetch previos searches for User"""
+    with (require_oauth.acquire("profile user") as the_token,
+          Redis.from_url(current_app.config["REDIS_URI"],
+          decode_responses=True) as redis_conn):
         return jsonify({
             **fetch_query_results(query, the_token.user.id, redis_conn),
             "prev_queries": get_user_queries("random_user", redis_conn)
         })
 
 
-@GnQNA.route("/historys/<query>", methods=["GET"])
-@handle_errors
+@gnqa.route("/historys/<query>", methods=["GET"])
 def fetch_users_hist_records(query):
-    """method to fetch all users hist:note this is a test functionality to be replaced by fetch_user_hist"""
-
-    with Redis.from_url(current_app.config["REDIS_URI"], decode_responses=True) as redis_conn:
+    """method to fetch all users hist:note this is a test functionality
+    to be replaced by fetch_user_hist
+    """
+    with Redis.from_url(current_app.config["REDIS_URI"],
+                        decode_responses=True) as redis_conn:
         return jsonify({
             **fetch_query_results(query, "random_user", redis_conn),
             "prev_queries": get_user_queries("random_user", redis_conn)
         })
 
 
-@GnQNA.route("/get_hist_names", methods=["GET"])
-@handle_errors
+@gnqa.route("/get_hist_names", methods=["GET"])
 def fetch_prev_hist_ids():
-
-    with (Redis.from_url(current_app.config["REDIS_URI"], decode_responses=True)) as redis_conn:
-        return jsonify({"prev_queries": get_user_queries("random_user", redis_conn)})
+    """Test method for fetching history for Anony Users"""
+    with (Redis.from_url(current_app.config["REDIS_URI"],
+                         decode_responses=True)) as redis_conn:
+        return jsonify({"prev_queries": get_user_queries("random_user",
+                                                         redis_conn)})
diff --git a/gn3/app.py b/gn3/app.py
index 3f1e6ee..c8f0c5a 100644
--- a/gn3/app.py
+++ b/gn3/app.py
@@ -25,7 +25,7 @@ from gn3.api.menu import menu
 from gn3.api.search import search
 from gn3.api.metadata import metadata
 from gn3.api.sampledata import sampledata
-from gn3.api.llm import GnQNA
+from gn3.api.llm import gnqa
 from gn3.auth import oauth2
 from gn3.case_attributes import caseattr
 
@@ -78,7 +78,7 @@ def create_app(config: Union[Dict, str, None] = None) -> Flask:
     app.register_blueprint(sampledata, url_prefix="/api/sampledata")
     app.register_blueprint(oauth2, url_prefix="/api/oauth2")
     app.register_blueprint(caseattr, url_prefix="/api/case-attribute")
-    app.register_blueprint(GnQNA, url_prefix="/api/llm")
+    app.register_blueprint(gnqa, url_prefix="/api/llm")
 
     register_error_handlers(app)
     return app