Merge branch 'develop'

Author: alesanmed

.gitignore

@@ -103,4 +103,8 @@ venv.bak/
 # mypy
 .mypy_cache/
 
-.vscode
+.vscode
+
+ask-resources.json
+.ask
+lambda/node_modules

initial_data/load_data.py

@@ -1,40 +1,40 @@
 # encoding: utf-8
-from sys import path
-import os
-from os.path import dirname as dir
-
-path.append(dir(path[0]))
+import json
+import urllib.parse
 
 from pymongo import MongoClient
-from configurations import skill_config
-import urllib
-import json
 
-def connect():
+from initial_data.configurations import skill_config
+
+
+def connect() -> MongoClient:
     username = urllib.parse.quote_plus(skill_config.DB_USER)
     password = urllib.parse.quote_plus(skill_config.DB_PASS)
-    db_ip = urllib.parse.quote_plus(skill_config.DB_IP)
-    db_port = urllib.parse.quote_plus(skill_config.DB_PORT)
+    db_url = urllib.parse.quote_plus(skill_config.DB_URL)
     db_name = urllib.parse.quote_plus(skill_config.DB_NAME)
 
-    client = MongoClient('mongodb://%s:%s@%s:%s/%s' % 
-                        (username, password, db_ip, db_port, db_name))
+    client = MongoClient(
+        f"mongodb+srv://{username}:{password}@{db_url}/{db_name}?retryWrites=true&w=majority"
+    )
 
     return client
 
-def close(client):
+
+def close(client: MongoClient):
     client.close()
 
+
 def load_data():
     client = connect()
 
-    db = client[skill_config.DB_NAME]
-    
-    questions = json.load(open('questions.json', 'r', encoding='utf-8'))
+    db = client.get_database(skill_config.DB_NAME)
+
+    questions = json.load(open("questions.json", "r", encoding="utf-8"))
 
     db.questions.insert_many(questions)
 
     close(client)
 
-if __name__ == '__main__':
-    load_data()
+
+if __name__ == "__main__":
+    load_data()

interaction_model.json

@@ -0,0 +1,126 @@
+# encoding: utf-8
+from typing import Any, Dict, List, Union
+
+from ask_sdk_core.handler_input import HandlerInput
+from bson import ObjectId
+from configurations import skill_config
+from connectors import db_utils
+
+
+def retrieve_random_question(handler_input: HandlerInput) -> Dict[str, Any]:
+    req_envelope = handler_input.request_envelope
+
+    user_id = (
+        req_envelope.context
+        and req_envelope.context.system
+        and req_envelope.context.system.user
+        and req_envelope.context.system.user.user_id
+    )
+
+    random_question = __get_question_for_user(user_id)
+
+    return random_question
+
+
+def get_question(question_id: str) -> Dict[str, Any]:
+    client = db_utils.connect()
+    db = client.get_database(skill_config.DB_NAME)
+
+    question = db.questions.find_one({"_id": ObjectId(question_id)})
+
+    if question is None:
+        raise LookupError()
+
+    return question
+
+
+def __get_question_for_user(user_id: Union[str, None]) -> Dict[str, Any]:
+    assert user_id is not None
+
+    question = None
+
+    if not __user_exists(user_id):
+        __insert_new_user(user_id)
+
+    if __get_number_of_questions() == __get_number_of_already_fetched_questions(
+        user_id
+    ):
+        __reset_user_fetched_questions(user_id)
+
+    fetched_questions = __get_already_fetched_questions(user_id)
+
+    question = __get_random_question_not_fetched(fetched_questions)
+
+    __add_user_fetched_question(user_id, question["_id"])
+
+    return question
+
+
+def __add_user_fetched_question(user_id, question_id):
+    client = db_utils.connect()
+    db = client.get_database(skill_config.DB_NAME)
+
+    db.users.find_one_and_update(
+        {"user_id": user_id}, {"$push": {"fetched_questions": question_id}}
+    )
+
+
+def __get_random_question_not_fetched(already_fetched: List[str]) -> Dict[str, Any]:
+    client = db_utils.connect()
+    db = client.get_database(skill_config.DB_NAME)
+
+    questions = db.questions.aggregate(
+        [{"$match": {"_id": {"$nin": already_fetched}}}, {"$sample": {"size": 1}}]
+    )
+
+    return list(questions)[0]
+
+
+def __reset_user_fetched_questions(user_id: str):
+    client = db_utils.connect()
+    db = client.get_database(skill_config.DB_NAME)
+
+    db.users.find_one_and_update(
+        {"user_id": user_id}, {"$set": {"fetched_questions": []}}
+    )
+
+
+def __get_number_of_questions() -> int:
+    client = db_utils.connect()
+    db = client.get_database(skill_config.DB_NAME)
+
+    res = db.questions.count_documents({})
+
+    return res
+
+
+def __get_number_of_already_fetched_questions(user_id: str):
+    return len(__get_already_fetched_questions(user_id))
+
+
+def __get_already_fetched_questions(user_id: str) -> List[str]:
+    client = db_utils.connect()
+    db = client.get_database(skill_config.DB_NAME)
+
+    res = db.users.find_one({"user_id": user_id})
+
+    if res is None:
+        raise LookupError()
+
+    return res["fetched_questions"]
+
+
+def __user_exists(user_id: str) -> bool:
+    client = db_utils.connect()
+    db = client.get_database(skill_config.DB_NAME)
+
+    res = db.users.count_documents({"user_id": user_id})
+
+    return res == 1
+
+
+def __insert_new_user(user_id: str) -> None:
+    client = db_utils.connect()
+    db = client.get_database(skill_config.DB_NAME)
+
+    db.users.insert_one({"user_id": user_id, "fetched_questions": []})

skill/connectors/__init__.py lambda/__init__.pyskill/connectors/__init__.py renamed to lambda/__init__.py

@@ -0,0 +1,39 @@
+# encoding: utf-8
+import urllib.parse
+from typing import Union
+
+from configurations import skill_config
+from pymongo import MongoClient
+from pymongo.errors import ServerSelectionTimeoutError
+
+client: Union[MongoClient, None] = None
+
+
+def connect() -> MongoClient:
+    global client
+
+    if client is not None:
+        try:
+            client.server_info()
+            return client
+        except ServerSelectionTimeoutError:
+            pass
+
+    username = urllib.parse.quote_plus(skill_config.DB_USER)
+    password = urllib.parse.quote_plus(skill_config.DB_PASS)
+    db_url = urllib.parse.quote_plus(skill_config.DB_URL)
+    db_name = urllib.parse.quote_plus(skill_config.DB_NAME)
+
+    client = MongoClient(
+        f"mongodb+srv://{username}:{password}@{db_url}/{db_name}?retryWrites=true&w=majority&serverSelectionTimeoutMS=3000"
+    )
+
+    return client
+
+
+def close():
+    global client
+
+    if client is not None:
+        client.close()
+        client = None