move functions to utils and update import

pages/quiz_new.py

@@ -3,10 +3,9 @@ import os.path
 import sqlite3
 import random
 import datetime
-import re
 
 # Custom imports
-from pages.utils import add_blanks, chunker, random_session_id, check_answer, db_connect, chk_conn
+from pages.utils import *
 
 def app():
 
@@ -55,17 +54,17 @@ def app():
         tag_string = st.session_state.tags
         num_q = st.session_state.num_q
         
-        def clean_string(string):
-            return re.sub('[^0-9a-zA-Z\s,]+', '', string)
+        # def clean_string(string):
+        #     return re.sub('[^0-9a-zA-Z\s,]+', '', string)
 
-        def split_string(string, split_on = ","):
-            return [x.strip().upper() for x in string.split(split_on)]
+        # def split_string(string, split_on = ","):
+        #     return [x.strip().upper() for x in string.split(split_on)]
         
-        def make_subquery(terms, column = 'tags', operator = 'AND'):
-            return f' {operator} '.join([f"{column} LIKE '%{x}%'" for x in terms if len(x) > 0])
+        # def make_subquery(terms, column = 'tags', operator = 'AND'):
+        #     return f' {operator} '.join([f"{column} LIKE '%{x}%'" for x in terms if len(x) > 0])
         
-        def make_query(subquery, limit = 10):
-            return f"""SELECT * FROM vocab WHERE {subquery} ORDER BY RANDOM() LIMIT {str(limit)}"""
+        # def make_query(subquery, limit = 10):
+        #     return f"""SELECT * FROM vocab WHERE {subquery} ORDER BY RANDOM() LIMIT {str(limit)}"""
 
         clean_tags = clean_string(tag_string)
         terms = split_string(clean_tags)
@@ -74,8 +73,6 @@ def app():
 
         if tag_string:
 
-            st.markdown(f"## QUIZ: {' '.join(terms)}")
-           
             questions = []
             word_bank = []
 
@@ -92,6 +89,7 @@ def app():
             elif len(questions) < num_q:
                 st.warning(f"There are only {len(questions)} with that tag.")
             else:
+                st.markdown(f"## QUIZ: {' '.join(terms)}")
                 st.markdown("### Word Bank")
                 random.shuffle(word_bank)
                 st.table(chunker(word_bank, 5))

pages/utils.py

@@ -3,6 +3,7 @@ import random
 import datetime
 import string
 import sqlite3
+import re
 
 def add_blanks(word, sentence, blank = "__"):
   return re.sub(word, blank, sentence, flags=re.IGNORECASE)
@@ -17,6 +18,18 @@ def random_session_id():
 def check_answer(item, answer):
   return item == answer
 
+def clean_string(string):
+            return re.sub('[^0-9a-zA-Z\s,]+', '', string)
+
+def split_string(string, split_on = ","):
+    return [x.strip().upper() for x in string.split(split_on)]
+
+def make_subquery(terms, column = 'tags', operator = 'AND'):
+    return f' {operator} '.join([f"{column} LIKE '%{x}%'" for x in terms if len(x) > 0])
+
+def make_query(subquery, limit = 10):
+    return f"""SELECT * FROM vocab WHERE {subquery} ORDER BY RANDOM() LIMIT {str(limit)}"""
+
 def db_connect(database):
     conn = sqlite3.connect(database)
     c = conn.cursor()