Merge branch 'master' into case_insensitive_search_414

Author: HadronCollider

.github/workflows/label_merge_conflicts.yml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   find_conflicts:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: mschilde/auto-label-merge-conflicts@master

.github/workflows/main.yml

@@ -22,14 +22,14 @@ jobs:
 
     - name: Build docker-compose
       run: |
-        docker-compose build
+        docker compose build
 
     - name: Run docker-compose
       run:
-        APP_CONF=../app_conf/testing.ini docker-compose up -d
+        APP_CONF=../app_conf/testing.ini docker compose up -d
 
     - name: Run tests
       run: |
         docker ps -a
-        docker-compose logs
-        docker exec web_speech_trainer_web_1 bash -c 'cd /project/tests && pytest .'
+        docker compose logs
+        docker exec web_speech_trainer-web-1 bash -c 'cd /project/tests && pytest .'

app/feedback_evaluator.py

@@ -165,6 +165,7 @@ def __init__(self, weights=None):
     def find_strict_speech_duration_criterion(self, criteria_keys, suffix='StrictSpeechDurationCriterion'):
         for criteria in criteria_keys:
             if suffix in criteria:
+                self.weights[criteria] = self.weights.pop('StrictSpeechDurationCriterion')
                 return criteria
 
     def evaluate_feedback(self, criteria_results):
@@ -178,6 +179,8 @@ def evaluate_feedback(self, criteria_results):
         return super().evaluate_feedback(criteria_results)
 
     def get_result_as_sum_str(self, criteria_results):
+        if not self.ssd_criterion:
+            self.ssd_criterion = self.find_strict_speech_duration_criterion(criteria_results.keys())
         if criteria_results is None or self.weights is None or \
                 criteria_results.get(self.ssd_criterion, {}).get('result', 0) == 0 or \
                 criteria_results.get("DEFAULT_SPEECH_PACE_CRITERION", {}).get('result', 0) == 0:

app/templates/footer.html

@@ -1,5 +1,5 @@
 {% block footer %}
-<div align="center">&copy; Сopyright OSLL 2020<script language="javascript" type="text/javascript">
+<div align="center">&copy; Сopyright MOEVM 2020<script language="javascript" type="text/javascript">
 var d = new Date();
 if(d.getFullYear()>2020)
     document.write("-"+d.getFullYear());

app_conf/testing.ini

@@ -42,4 +42,8 @@ chrome=89
 firefox=87
 
 [locale]
-language=ru
+language=ru
+
+[bugreport]
+form_link=https://docs.google.com
+report_mail[email protected]

tests/test_app.py

@@ -3,17 +3,12 @@
 from app.web_speech_trainer import app
 
 
-def test_home_page():
-    """
-    GIVEN a Flask application configured for testing
-    WHEN the '/' page is requested (GET)
-    THEN check that the response is valid
-    """
+def test_init_page():
     flask_app = app
 
     with flask_app.test_client() as test_client:
-        response = test_client.get('/')
-        assert response.status_code == 404
+        response = test_client.get('/init/')
+        assert response.status_code == 200
 
 
 def test_fillers_ratio_criteria():

tests/test_feedback_evaluator.py

@@ -20,7 +20,7 @@ class TestPredefenceEightToTenMinutesNoSlideCheckFeedbackEvaluator:
                 "PredefenceStrictSpeechDurationCriterion": {'result': 0.5},
                 "DEFAULT_SPEECH_PACE_CRITERION": {'result': 0.7},
                 "DEFAULT_FILLERS_NUMBER_CRITERION": {'result': 0.9},
-            }, '0.600 * 0.50 + 0.200 * 0.70 + 0.200 * 0.90'),
+            }, '0.200 * 0.70 + 0.200 * 0.90 + 0.600 * 0.50'),
         ],
     )
     def test_get_result_as_sum_str(self, criteria_results, expected_string):