installation routine works

Author: wsdt

Diff for: .idea/workspace.xml

@@ -1,10 +1,5 @@
+import os
+from global_constants import DB_NAME
 
-""" Converts a dictionary to a list by only adding
-the keys of the dict to the list. """
-def dict2listByKey(dict):
-    list = []
-    for key in dict:
-        list.append(key)
-    return list
-
-
+def doesDbExist():
+    return os.path.exists(DB_NAME)

Diff for: Helper.py

@@ -5,4 +5,4 @@
 class BaseModel(Model):
     class Meta:
         # Determine which db to use
-        database = db
+        database = db

Diff for: entities/ent_base_model.py

@@ -0,0 +1,4 @@
+# DO NOT PUT ANY LOGIC IN THIS FILE
+
+# (MUST NOT BE CHANGED!) -> bound due to chatterBot
+DB_NAME = "db.sqlite3"

Diff for: global_constants.py

@@ -1,10 +1,17 @@
+import sys
 from peewee import *
-from starterkit.conf import db
+from entities.ent_enabled_module import EnabledModule
 
-def db_loadEnabledModules():
-    # TODO: online (https://sqliteonline.com/) all sql tables are created, but here it seems that only the chatterbot ones are created
-    print(str(
-        db.get_tables()
-    ))
+# TODO: Import all modules dynamically
+from modules.get_welcome_msg import get_welcome_msg
+from modules.get_random_question import get_random_question
+from modules.get_random_fact import get_random_fact
 
-db_loadEnabledModules()
+def db_loadEnabledModules():
+    enabled_modules = []
+    for module in EnabledModule.select():
+        enabled_modules.append(
+            # str to class
+            getattr(sys.modules[__name__], module.class_name)
+        )
+    return enabled_modules

Diff for: mgr/mgr_db.py

@@ -1,20 +1,13 @@
 #!/usr/bin/python3
-from modules.get_welcome_msg import get_welcome_msg
-from modules.get_random_fact.get_random_fact import get_random_fact
-from modules.get_random_question.get_random_question import get_random_question
 from starterkit.get_smart_answer import get_smart_answer
+from mgr.mgr_db import db_loadEnabledModules
 
 # Speech to Text and reverse
 
 from pocketsphinx import LiveSpeech
 import pyttsx3
 
-# TODO REMOVE AND REPLACE WITH DB (no import)
-ENABLED_MODULES = [
-    get_welcome_msg,
-    get_random_question,
-    get_random_fact
-]
+ENABLED_MODULES = db_loadEnabledModules() # do only once for better performance
 
 # OUTPUT / Assistant Voice/Response +++++++++++++++
 assistantVoice = pyttsx3.init()
@@ -31,7 +24,7 @@ def configureAssistantVoice():
 def getAssistantResponse(phrase):
     for module in ENABLED_MODULES:
         # text should be always a str, bc. we validated this in main.py
-        if any(x in str(phrase) for x in module.chat_keywords):
+        if any(x in str(phrase) for x in module.chat_keywords): # TODO: get keywords from db
             answer = str(module.getAnswer(phrase))
             break
 

Diff for: mgr/mgr_voices.py

@@ -1,6 +1,6 @@
 import os
 
-# Automatically imports all modules
+# Automatically imports all modu
 for module in os.listdir(os.path.dirname(__file__)):
     if module == '__init__.py' or os.path.isdir(__file__): #module[-3:] != '.py'
         continue

Diff for: modules/__init__.py

@@ -1,10 +1,12 @@
+import os, sys
 from chatterbot import ChatBot
 from peewee import SqliteDatabase
+from global_constants import DB_NAME
 
 """ As get_smart_answer is no regular module, the .conf-file here looks completely different. """
 
-# Set database file (MUST NOT BE CHANGED!)
-db = SqliteDatabase('db.sqlite3')
+# Set database file
+db = SqliteDatabase(DB_NAME)
 
 # Set up chatbot
 chatbot = ChatBot(