Update code and models

CHILD_phrases_s300_cw10_mc100_w4_negative5-075_mean_e20_shr.bin.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c63d29808c4c2b4aa72f2c5516d868d73d9e3cc439095538ef18286d5ee2851
-size 37771457

CHILD_phrases_s300_cw10_mc50_w4_negative5-075_mean_e20_shr.bin.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96392e4a3873244eba861271715d681df009f4e06d9ed9c57026ab11b5b2ba83
-size 61965218

ALL_TOGETGER_phrases_s300_cw10_mc100_w4_negative5-075_mean_e10_shr.bin.gz → model1.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1656b2a3d774d11e2505fd94d54a0dd6390814194e0d7d58b8242bd356f93a4
-size 55741042
+oid sha256:f00a30a9b37b4c8c611aca7b2fa12c08f08769974f165b75dd3a3863f9b54f0a
+size 547791266

ALL_TOGETGER_phrases_s300_cw10_mc50_w4_negative5-075_mean_e20_shr.bin.gz → model2.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:767e219c0b8813c12dfda874166b8c6ea8162abe6bbd1742efa71b479f0708af
-size 91699760
+oid sha256:04a5956a39aabfc0e550614b3351752c872df92d9eea019212ec4ed36286c0a8
+size 130040640

pages/2_👨‍🏫_Начало_работы.py

@@ -128,7 +128,7 @@ if st.session_state.get('-LOGGED_IN_BOOL-'):
             key='-TARGET_WORDS_MODE-', horizontal=True)
         DISTRACTOR_MODEL = DISTRACTOR_MODEL_COL.radio(
             label='**Модель для выбора неправильных вариантов**',
-            options=['Модель-1', 'Модель-2'],
+            options=['Модель-1', 'Модель-2', 'Модель-3'],
             key='-DISTRACTOR_MODEL_MODE-', horizontal=True)
         CEFR_NUM_DISTRACTORS_COL, UTW_COL = FORM.columns([2, 2])
         with CEFR_NUM_DISTRACTORS_COL:
@@ -182,7 +182,7 @@ if st.session_state.get('-LOGGED_IN_BOOL-'):
             PROGRESS_BAR_S = st.progress(0)
 
             # Start generation process. Everything happens inside main_workflow func
-            if DISTRACTOR_MODEL == 'Модель-2':
+            if DISTRACTOR_MODEL == 'Модель-3':
                 from utilities_language_bert.rus_main_workflow_bert import main_workflow_bert
                 __TASK_DATA__ = main_workflow_bert(
                     file=UPLOAD_FILE,
@@ -211,7 +211,8 @@ if st.session_state.get('-LOGGED_IN_BOOL-'):
                     tw_mode_automatic_mode=TARGET_WORDS_MODE,
                     target_words=TARGET_WORDS,
                     num_distractors=NUMBER_DISTRACTORS,
-                    save_name=USER__SAVE_IN_CLOUD_FILE_NAME)
+                    save_name=USER__SAVE_IN_CLOUD_FILE_NAME,
+                    model_name=DISTRACTOR_MODEL)
 
             # In order to bypass further
             USER__SAVE_IN_CLOUD_FILE_NAME = USER__SAVE_IN_CLOUD_FILE_NAME if USER__SAVE_IN_CLOUD_FILE_NAME != '' \

utilities_database/user_database_utils.py

@@ -129,7 +129,7 @@ def check_email_exists(user_log_in_database, email_forgot_passwd: str):
     """
     authorized_users_data = user_log_in_database.fetch({'e-mail': email_forgot_passwd}).items
     if len(authorized_users_data) == 1:
-        return True, authorized_users_data['user_name']
+        return True, authorized_users_data[0]['user_name']
     return False, None
 
 

utilities_database/user_database_widgets.py

@@ -199,15 +199,9 @@ class LogIn:
         """
         with st.form("Reset Password Form"):
             email_reset_passwd = st.text_input("Email", placeholder='Please enter your email')
-            email_exists_check, user_name_reset_passwd = db_utils.check_email_exists(
-                user_log_in_database=db,
-                email_forgot_passwd=email_reset_passwd)
 
             current_passwd = st.text_input("Временный пароль",
                                            placeholder='Введите пароль, который вы получили в письме')
-            current_passwd_check = db_utils.check_current_passwd(user_log_in_database=db,
-                                                                 email_reset_passwd=email_reset_passwd,
-                                                                 current_passwd=current_passwd)
 
             new_passwd = st.text_input("Новый пароль", placeholder='Введите новый пароль',
                                        type='password')
@@ -218,6 +212,12 @@ class LogIn:
             reset_passwd_submit_button = st.form_submit_button(label='Изменить пароль')
 
             if reset_passwd_submit_button:
+                email_exists_check, user_name_reset_passwd = db_utils.check_email_exists(
+                    user_log_in_database=db,
+                    email_forgot_passwd=email_reset_passwd)
+                current_passwd_check = db_utils.check_current_passwd(user_log_in_database=db,
+                                                                     email_reset_passwd=email_reset_passwd,
+                                                                     current_passwd=current_passwd)
                 if not email_exists_check:
                     st.error("Пользователя с таким e-mail не существует!")
 

utilities_language_general/rus_constants.py

@@ -31,7 +31,8 @@ def load_bert():
 
 nlp = load_spacy()
 morph = load_morph()
-w2v_model_path = r'ALL_TOGETGER_phrases_s300_cw10_mc100_w4_negative5-075_mean_e10_shr.bin.gz'
+w2v_model1_path = r'model1.gz'
+w2v_model2_path = r'model2.gz'
 
 # Upload stop list
 stop_list = set()

utilities_language_w2v/rus_main_workflow_w2v.py

@@ -11,7 +11,8 @@ from utilities_language_general.rus_utils import prepare_tasks
 from utilities_language_w2v.rus_sentence_w2v import SENTENCE
 import utilities_language_general.rus_constants as esp_constants
 from utilities_language_general.rus_utils import prepare_target_words
-from utilities_language_general.rus_constants import w2v_model_path
+from utilities_language_general.rus_constants import w2v_model1_path
+from utilities_language_general.rus_constants import w2v_model2_path
 from utilities_language_general.rus_utils import compute_frequency_dict
 from streamlit.runtime.uploaded_file_manager import UploadedFile
 from utilities_language_general.rus_constants import BAD_USER_TARGET_WORDS
@@ -30,6 +31,7 @@ def main_workflow_w2v(
         target_words: str,
         num_distractors: int,
         save_name: str,
+        model_name: str,
         global_bad_target_words=BAD_USER_TARGET_WORDS):
     """
     This is the main course of the program.
@@ -49,6 +51,7 @@ def main_workflow_w2v(
     :param num_distractors: how many distractors does the user want the task to contain
     :param save_name: user specifies name to save file in cloud
     :param global_bad_target_words:global_bad_target_words
+    :param model_name
     :return: Dictionary with output data: filename, amount_mode, text_with_gaps, tasks_as_list, correct_answers,
              student_out, teacher_out, total_out, original_text
     """
@@ -61,7 +64,10 @@ def main_workflow_w2v(
     MAX_FREQUENCY = 0
 
     # Define which model is used for distractor generation
-    mask_filler = load_w2v(w2v_model_path)
+    if model_name == 'Модель-1':
+        mask_filler = load_w2v(w2v_model1_path)
+    else:
+        mask_filler = load_w2v(w2v_model2_path)
 
     # Get input text
     if file is not None: