small changes

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

@@ -144,7 +144,7 @@ if st.session_state.get('-LOGGED_IN_BOOL-'):
             key='-SAVE_IN_CLOUD-')
         DOWNLOAD_VERSION = col2.checkbox(
             label='**Скачать**',
-            value=False,
+            value=True,
             key='-DOWNLOAD_VERSION-')
         ONLINE_TEST_VERSION = col3.checkbox(
             label='**Онлайн тест**',

utilities_language_bert/esp_main_workflow_bert.py

@@ -236,7 +236,7 @@ def main_workflow(
     for i, sentence in enumerate(current_text_sentences):
         for task in RESULT_TASKS:
             if task.sentence_text == sentence:
-                sentence = sentence.replace(task.original_text, f'__________({tasks_counter})')
+                sentence = sentence.replace(task.original_text, f'__________({tasks_counter})', 1)
                 VARIANTS.append(task.variants)
                 tasks_counter += 1
         TEXT_WITH_GAPS.append(sentence)
@@ -251,7 +251,7 @@ def main_workflow(
                 f'\n\n{"$" * 70}\n\n{PREPARED_TASKS["KEYS_ONLY"]}'
     logs.update(label='Сейчас все будет готово!', state='running')
     progress.progress(95)
-    save_name = save_name if save_name != '' else f'{str(datetime.datetime.now())[:-7]}_{original_text[:20]}'
+    save_name = save_name if save_name != '' else f'{str(datetime.datetime.now())[:-7]}_{original_text[:20]}_{level}_M3'
     out = {
         'name': save_name,
         'STUDENT_OUT': STUDENT_OUT,

utilities_language_bert/esp_sentence_bert.py

@@ -175,6 +175,7 @@ class TASK:
         self.tags = task_data['tags']
         self.lemma = task_data['lemma']
         self.gender = task_data['gender']
+        self.in_summary = task_data['in_summary']
         self.max_num_distractors = max_num_distractors
         self.original_text = task_data['original_text']
         self.sentence_text = task_data['sentence_text']

utilities_language_general/esp_constants.py

@@ -5,6 +5,8 @@ import streamlit as st
 from pickle import load
 from transformers import pipeline
 from summarizer import Summarizer
+from torch import cuda, device
+device = device('cuda' if cuda.is_available else 'cpu')
 
 
 @st.cache_resource
@@ -27,7 +29,7 @@ def load_spacy():
 @st.cache_resource
 def load_bert():
     with st.spinner('Загружаю языковую модель'):
-        _pipeline = pipeline(task="fill-mask", model="a-v-white/bert-base-spanish-wwm-cased-finetuned-literature-pro")
+        _pipeline = pipeline(task="fill-mask", model="a-v-white/bert-base-spanish-wwm-cased-finetuned-literature-pro", device=device)
     return _pipeline
 
 

utilities_language_general/esp_utils.py

@@ -139,7 +139,7 @@ def get_distractors_from_model(doc, model, scaler, classifier, pos_dict:dict, ta
                          and distractor_lemma != lemma
                          and distractor_lemma not in lemma
                          and lemma not in  distractor_lemma
-                         and (candidate_gender == gender and level_name in ('B1', 'B2', 'C1', 'C2'))
+                         and (candidate_gender == gender and level_name in ('B1', 'B2', 'C1', 'C2') or level_name in ('A1', 'A2'))
                          and length_ratio <= max_length_ratio
                          and distractor_lemma not in global_distractors
                          and edit_distance(lemma, distractor_lemma) / ((len(lemma) + len(distractor_lemma)) / 2) > min_edit_distance_ratio)
@@ -224,7 +224,7 @@ def get_distractors_from_model_bert(model, scaler, classifier, pos_dict:dict, le
                 and decision
                 and distractor_lemma != lemma
                 and (len(_distractors) < max_num_distractors+100)
-                and (candidate_gender == gender and level_name in ('B1', 'B2', 'C1', 'C2'))
+                and (candidate_gender == gender and level_name in ('B1', 'B2', 'C1', 'C2') or level_name in ('A1', 'A2'))
                 and (length_ratio <= max_length_ratio)  # May be changed if case of phrases
                 and (distractor_lemma not in global_distractors)
                 and (edit_distance(lemma, distractor_lemma)  # May be changed if case of phrases

utilities_language_w2v/esp_main_workflow_w2v.py

@@ -227,7 +227,7 @@ def main_workflow(
     tasks_counter = 1
     for i, sentence in enumerate(current_text_sentences):
         for task in filter(lambda t: t.sentence_number == i, RESULT_TASKS):
-            sentence = sentence.replace(task.original_text, f'__________({tasks_counter})')
+            sentence = sentence.replace(task.original_text, f'__________({tasks_counter})', 1)
             VARIANTS.append(task.variants)
             tasks_counter += 1
         TEXT_WITH_GAPS.append(sentence)
@@ -242,7 +242,8 @@ def main_workflow(
                 f'\n\n{"$" * 70}\n\n{PREPARED_TASKS["KEYS_ONLY"]}'
     logs.update(label='Сейчас все будет готово!', state='running')
     progress.progress(90)
-    save_name = save_name if save_name != '' else f'{str(datetime.datetime.now())[:-7]}_{original_text[:20]}'
+    md = {'Модель-1': 'M1', 'Модель-2': 'M2'}
+    save_name = save_name if save_name != '' else f'{str(datetime.datetime.now())[:-7]}_{original_text[:20]}_{level}_{md[model_name]}'
     out = {
         'name': save_name,
         'STUDENT_OUT': STUDENT_OUT,