v0.9.0 (#19)

- Summary (32eee316b58bb048e7b36614e485205a467336be)


Co-authored-by: Dmitry Ryumin <[email protected]>

app.css

@@ -161,6 +161,7 @@ div.languages-container > div.country_flags button {
 }
 
 div.languages-container > div.country_flags div.image-container {
+    display: contents;
     width: fit-content;
 }
 

app/components.py

@@ -24,7 +24,9 @@ def files_create_ui(
     value: Union[str, List[str], Callable, None] = None,
     file_count: str = "multiple",
     file_types: List = ["video"],
-    label: str = config_data.OtherMessages_VIDEO_FILES,
+    label: str = config_data.OtherMessages_VIDEO_FILES[
+        config_data.AppSettings_DEFAULT_LANG_ID
+    ],
     show_label: bool = True,
     interactive: bool = True,
     visible: bool = True,
@@ -44,7 +46,9 @@ def files_create_ui(
 
 def video_create_ui(
     value: Optional[str] = None,
-    label: str = "Video Player",
+    label: str = config_data.OtherMessages_VIDEO_PLAYER[
+        config_data.AppSettings_DEFAULT_LANG_ID
+    ],
     file_name: Optional[str] = None,
     show_label: bool = True,
     interactive: bool = False,

app/description.py

@@ -21,11 +21,11 @@ DESCRIPTIONS = [
     TEMPLATE.format(
         description=config_data.InformationMessages_DESCRIPTIONS[0],
         version=config_data.AppSettings_APP_VERSION,
-        version_label="Version",
+        version_label=config_data.Labels_APP_VERSION[0],
     ),
     TEMPLATE.format(
         description=config_data.InformationMessages_DESCRIPTIONS[1],
         version=config_data.AppSettings_APP_VERSION,
-        version_label="Версия",
+        version_label=config_data.Labels_APP_VERSION[1],
     ),
 ]

app/event_handlers/calculate_pt_scores_blocks.py

@@ -11,7 +11,7 @@ import gradio as gr
 from app.oceanai_init import b5
 from app.config import config_data
 from app.description_steps import STEP_2
-from app.utils import read_csv_file, extract_profession_weights
+from app.utils import read_csv_file, extract_profession_weights, get_language_settings
 from app.practical_tasks import supported_practical_tasks
 from app.components import (
     html_message,
@@ -26,9 +26,11 @@ from app.components import (
 )
 
 
-def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
+def event_handler_calculate_pt_scores_blocks(language, files, evt_data: gr.EventData):
     _ = evt_data.target.__class__.__name__
 
+    lang_id, _ = get_language_settings(language)
+
     out = False
     b5.get_avt_predictions_gradio(
         paths=files, url_accuracy="", accuracy=False, lang="en", out=out
@@ -154,7 +156,9 @@ def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
     )
 
     return (
-        html_message(config_data.InformationMessages_NOTI_VIDEOS, False, False),
+        html_message(
+            config_data.InformationMessages_NOTI_VIDEOS[lang_id], False, False
+        ),
         dataframe(
             headers=df_files.columns.tolist(),
             values=df_files.values.tolist(),

app/event_handlers/clear_blocks.py

@@ -22,23 +22,26 @@ from app.components import (
     dropdown_create_ui,
     textbox_create_ui,
 )
+from app.utils import get_language_settings
 
 
-def event_handler_clear_blocks():
+def event_handler_clear_blocks(language):
+    lang_id, _ = get_language_settings(language)
+
     first_practical_task = next(iter(supported_practical_tasks))
 
     return (
-        html_message(config_data.InformationMessages_NOTI_VIDEOS, False),
+        html_message(config_data.InformationMessages_NOTI_VIDEOS[lang_id], False),
         files_create_ui(
             label="{} ({})".format(
-                config_data.OtherMessages_VIDEO_FILES,
+                config_data.OtherMessages_VIDEO_FILES[lang_id],
                 ", ".join(config_data.Settings_SUPPORTED_VIDEO_EXT),
             ),
             file_types=[f".{ext}" for ext in config_data.Settings_SUPPORTED_VIDEO_EXT],
         ),
         video_create_ui(),
         button(
-            config_data.OtherMessages_CALCULATE_PT_SCORES,
+            config_data.OtherMessages_CALCULATE_PT_SCORES[lang_id],
             False,
             3,
             "./images/calculate_pt_scores.ico",
@@ -46,7 +49,7 @@ def event_handler_clear_blocks():
             "calculate_oceanai",
         ),
         button(
-            config_data.OtherMessages_CLEAR_APP,
+            config_data.OtherMessages_CLEAR_APP[lang_id],
             False,
             1,
             "./images/clear.ico",

app/event_handlers/event_handlers.py

@@ -12,6 +12,7 @@ from app.event_handlers.languages import event_handler_languages
 from app.event_handlers.files import (
     event_handler_files,
     event_handler_files_select,
+    event_handler_files_delete,
 )
 from app.event_handlers.examples_blocks import event_handler_examples_blocks
 from app.event_handlers.clear_blocks import event_handler_clear_blocks
@@ -100,7 +101,7 @@ def setup_app_event_handlers(
     # Events
     languages.select(
         fn=event_handler_languages,
-        inputs=[languages, files],
+        inputs=[languages, files, video],
         outputs=[
             description,
             step_1,
@@ -111,18 +112,33 @@ def setup_app_event_handlers(
             tab3,
             tab4,
             files,
+            video,
+            examples,
+            calculate_pt_scores,
+            clear_app,
+            notifications,
         ],
         queue=True,
     )
     files.change(
         event_handler_files,
-        [files],
+        [
+            languages,
+            files,
+            video,
+        ],
         [notifications, video, calculate_pt_scores, clear_app],
         queue=True,
     )
     files.select(
         event_handler_files_select,
-        [files],
+        [languages, files],
+        [video],
+        queue=True,
+    )
+    files.delete(
+        event_handler_files_delete,
+        [languages, files, video],
         [video],
         queue=True,
     )
@@ -130,6 +146,7 @@ def setup_app_event_handlers(
         triggers=[calculate_pt_scores.click],
         fn=event_handler_calculate_pt_scores_blocks,
         inputs=[
+            languages,
             files,
         ],
         outputs=[
@@ -200,7 +217,7 @@ def setup_app_event_handlers(
     )
     clear_app.click(
         fn=event_handler_clear_blocks,
-        inputs=[],
+        inputs=[languages],
         outputs=[
             notifications,
             files,

app/event_handlers/files.py

@@ -11,15 +11,18 @@ from pathlib import Path
 # Importing necessary components for the Gradio app
 from app.config import config_data
 from app.components import html_message, video_create_ui, button
+from app.utils import get_language_settings
 
 
-def event_handler_files(files):
+def event_handler_files(language, files, video):
+    lang_id, _ = get_language_settings(language)
+
     if not files:
         return (
-            html_message(config_data.InformationMessages_NOTI_VIDEOS, False),
-            video_create_ui(),
+            html_message(config_data.InformationMessages_NOTI_VIDEOS[lang_id], False),
+            video_create_ui(label=config_data.OtherMessages_VIDEO_PLAYER[lang_id]),
             button(
-                config_data.OtherMessages_CALCULATE_PT_SCORES,
+                config_data.OtherMessages_CALCULATE_PT_SCORES[lang_id],
                 False,
                 3,
                 "./images/calculate_pt_scores.ico",
@@ -27,7 +30,7 @@ def event_handler_files(files):
                 "calculate_oceanai",
             ),
             button(
-                config_data.OtherMessages_CLEAR_APP,
+                config_data.OtherMessages_CLEAR_APP[lang_id],
                 False,
                 1,
                 "./images/clear.ico",
@@ -36,11 +39,18 @@ def event_handler_files(files):
             ),
         )
 
+    if video not in files:
+        video = files[0]
+
     return (
-        html_message(config_data.OtherMessages_NOTI_CALCULATE, True),
-        video_create_ui(value=files[0], file_name=Path(files[0]).name),
+        html_message(config_data.OtherMessages_NOTI_CALCULATE[lang_id], True),
+        video_create_ui(
+            value=video,
+            label=config_data.OtherMessages_VIDEO_PLAYER[lang_id],
+            file_name=Path(Path(video).name).name,
+        ),
         button(
-            config_data.OtherMessages_CALCULATE_PT_SCORES,
+            config_data.OtherMessages_CALCULATE_PT_SCORES[lang_id],
             True,
             3,
             "./images/calculate_pt_scores.ico",
@@ -48,7 +58,7 @@ def event_handler_files(files):
             "calculate_oceanai",
         ),
         button(
-            config_data.OtherMessages_CLEAR_APP,
+            config_data.OtherMessages_CLEAR_APP[lang_id],
             True,
             1,
             "./images/clear.ico",
@@ -58,5 +68,26 @@ def event_handler_files(files):
     )
 
 
-def event_handler_files_select(files, evt: gr.SelectData):
-    return video_create_ui(value=files[evt.index], file_name=evt.value)
+def event_handler_files_select(language, files, evt: gr.SelectData):
+    lang_id, _ = get_language_settings(language)
+
+    return video_create_ui(
+        value=files[evt.index],
+        label=config_data.OtherMessages_VIDEO_PLAYER[lang_id],
+        file_name=evt.value,
+    )
+
+
+def event_handler_files_delete(language, files, video, evt: gr.DeletedFileData):
+    global block_event_handler_files
+
+    lang_id, _ = get_language_settings(language)
+
+    if video == evt.file.path:
+        video = files[0]
+
+    return video_create_ui(
+        value=video,
+        label=config_data.OtherMessages_VIDEO_PLAYER[lang_id],
+        file_name=Path(Path(video).name).name,
+    )

app/event_handlers/languages.py

@@ -6,6 +6,7 @@ License: MIT License
 """
 
 import gradio as gr
+from pathlib import Path
 
 # Importing necessary components for the Gradio app
 from app.description import DESCRIPTIONS
@@ -13,20 +14,31 @@ from app.description_steps import STEP_1
 from app.config import config_data
 from app.components import (
     files_create_ui,
+    video_create_ui,
     dropdown_create_ui,
+    button,
+    html_message,
 )
+from app.utils import get_language_settings
 
 
-def event_handler_languages(languages, files):
-    if languages.lower() == "english":
-        lang_id = 0
-        choices = config_data.Settings_LANGUAGES_EN
-    elif languages.lower() == "russian":
-        lang_id = 1
-        choices = config_data.Settings_LANGUAGES_RU
+def event_handler_languages(languages, files, video):
+    lang_id, choices = get_language_settings(languages)
+
+    if not video:
+        video = video_create_ui(label=config_data.OtherMessages_VIDEO_PLAYER[lang_id])
+        noti_videos = html_message(
+            config_data.InformationMessages_NOTI_VIDEOS[lang_id], False
+        )
     else:
-        lang_id = 0
-        choices = config_data.Settings_LANGUAGES_EN
+        video = video_create_ui(
+            value=video,
+            label=config_data.OtherMessages_VIDEO_PLAYER[lang_id],
+            file_name=Path(video).name,
+        )
+        noti_videos = html_message(
+            config_data.OtherMessages_NOTI_CALCULATE[lang_id], True
+        )
 
     return (
         gr.Markdown(value=DESCRIPTIONS[lang_id]),
@@ -55,4 +67,30 @@ def event_handler_languages(languages, files):
             ),
             file_types=[f".{ext}" for ext in config_data.Settings_SUPPORTED_VIDEO_EXT],
         ),
+        video,
+        button(
+            config_data.OtherMessages_EXAMPLES_APP[lang_id],
+            True,
+            1,
+            "./images/examples.ico",
+            True,
+            "examples_oceanai",
+        ),
+        button(
+            config_data.OtherMessages_CALCULATE_PT_SCORES[lang_id],
+            True if files else False,
+            3,
+            "./images/calculate_pt_scores.ico",
+            True,
+            "calculate_oceanai",
+        ),
+        button(
+            config_data.OtherMessages_CLEAR_APP[lang_id],
+            True if files else False,
+            1,
+            "./images/clear.ico",
+            True,
+            "clear_oceanai",
+        ),
+        noti_videos,
     )

app/tabs.py

@@ -52,7 +52,9 @@ def app_tab():
 
     with gr.Row():
         examples = button(
-            config_data.OtherMessages_EXAMPLES_APP,
+            config_data.OtherMessages_EXAMPLES_APP[
+                config_data.AppSettings_DEFAULT_LANG_ID
+            ],
             True,
             1,
             "./images/examples.ico",
@@ -60,7 +62,9 @@ def app_tab():
             "examples_oceanai",
         )
         calculate_pt_scores = button(
-            config_data.OtherMessages_CALCULATE_PT_SCORES,
+            config_data.OtherMessages_CALCULATE_PT_SCORES[
+                config_data.AppSettings_DEFAULT_LANG_ID
+            ],
             False,
             3,
             "./images/calculate_pt_scores.ico",
@@ -68,7 +72,9 @@ def app_tab():
             "calculate_oceanai",
         )
         clear_app = button(
-            config_data.OtherMessages_CLEAR_APP,
+            config_data.OtherMessages_CLEAR_APP[
+                config_data.AppSettings_DEFAULT_LANG_ID
+            ],
             False,
             1,
             "./images/clear.ico",
@@ -76,7 +82,12 @@ def app_tab():
             "clear_oceanai",
         )
 
-    notifications = html_message(config_data.InformationMessages_NOTI_VIDEOS, False)
+    notifications = html_message(
+        config_data.InformationMessages_NOTI_VIDEOS[
+            config_data.AppSettings_DEFAULT_LANG_ID
+        ],
+        False,
+    )
 
     pt_scores = dataframe(visible=False)
 

app/utils.py

@@ -7,6 +7,26 @@ License: MIT License
 
 import pandas as pd
 
+# Importing necessary components for the Gradio app
+from app.config import config_data
+
+
+def get_language_settings(language):
+    language_mappings = {
+        "english": (0, config_data.Settings_LANGUAGES_EN),
+        "английский": (0, config_data.Settings_LANGUAGES_EN),
+        "russian": (1, config_data.Settings_LANGUAGES_RU),
+        "русский": (1, config_data.Settings_LANGUAGES_RU),
+    }
+
+    normalized_language = language.lower()
+
+    lang_id, choices = language_mappings.get(
+        normalized_language, (0, config_data.Settings_LANGUAGES_EN)
+    )
+
+    return lang_id, choices
+
 
 def preprocess_scores_df(df, name):
     df.index.name = name

config.toml

@@ -1,5 +1,5 @@
 [AppSettings]
-APP_VERSION = "0.8.8"
+APP_VERSION = "0.9.0"
 CSS_PATH = "app.css"
 DEFAULT_LANG_ID = 0
 
@@ -8,7 +8,7 @@ DESCRIPTIONS = [
     "is an open-source framework for Big Five personality traits assessment and HR-processes automatization",
     "- библиотека с открытым исходным кодом для оценивания большой пятерки качеств личности человека и автоматизации HR-процессов",
 ]
-NOTI_VIDEOS = "Select the video(s)"
+NOTI_VIDEOS = ["Select the video(s)", "Выберите видео"]
 PRACTICAL_TASKS_INFO = "Choose a practical task"
 PRACTICAL_SUBTASKS_INFO = "Choose a practical subtask"
 NOTI_IN_DEV = "In development"
@@ -30,18 +30,19 @@ STEP_2 = [
 
 [OtherMessages]
 VIDEO_FILES = ["Video Files", "Видеофайлы"]
-CALCULATE_PT_SCORES = "Calculation of Big Five personality traits scores"
+VIDEO_PLAYER = ["Video Player", "Видео проигрыватель"]
+CALCULATE_PT_SCORES = ["Calculation of Big Five personality traits scores", "Вычисление показателей Большой пятерки персональных качеств личности человека"]
 CALCULATE_PT_SCORES_ERR = "Personality traits scores have not been calculated. Try uploading a different file(s)"
 CALCULATE_PRACTICAL_TASK = "Solving practical task"
-CLEAR_APP = "Clear"
-EXAMPLES_APP = "Examples"
+CLEAR_APP = ["Clear", "Сброс"]
+EXAMPLES_APP = ["Examples", "Примеры"]
 EXPORT_PT_SCORES = "Export Big Five personality traits to a CSV file"
 EXPORT_PG = "Export ranking professional groups results to a CSV file"
 EXPORT_PS = "Export ranking professional skill results to a CSV file"
 EXPORT_WT = "Export ranking effective work teams results to a CSV file"
 EXPORT_CP = "Export consumer preferences for industrial goods results to a CSV file"
 EXPORT_MBTI = "Export ranking personality type results to a CSV file"
-NOTI_CALCULATE = "You can calculate Big Five personality traits scores"
+NOTI_CALCULATE = ["You can calculate Big Five personality traits scores", "Вы можете рассчитать показатели Большой пятерки персональных качеств личности человека"]
 
 [Labels]
 APP_LABEL = ["⭐ App", "⭐ Приложение"]
@@ -68,6 +69,7 @@ NUMBER_IMPORTANCE_NNEU_LABEL = "Non-Neuroticism weight"
 THRESHOLD_CONSUMER_PREFERENCES_LABEL = "Polarity traits threshold"
 LANGUAGES_LABEL = "Languages"
 NOTE_MBTI_LABEL = "Note: What are Personality Types of MBTI?"
+APP_VERSION = ["Version", "Версия"]
 
 [TabCreators]
 "⭐ App" = "app_tab"