v0.10.3 (#25)

- Summary (f6125144e9df803bac37023b6854f03c30d62a31)
- Merge branch 'main' of https://huggingface.co/spaces/ElenaRyumina/OCEANAI (2f050c06a94348ba17660fdf0dd257a7a30f2f9a)
- Summary (8f52d543a1de5a77b59164e6f4f721696fc64299)
- Merge branch 'main' of https://huggingface.co/spaces/ElenaRyumina/OCEANAI (fffa0062f0da04563ce8cd5b8c7e70e3ae783833)
- Summary (1717e06c53138f3eaf52e38f984035d5fbbceac5)
- Merge branch 'main' of https://huggingface.co/spaces/ElenaRyumina/OCEANAI (cd90a1620005039e6998ca3d0ab34fe3bfe1f2dc)
- Summary (98c66eeb6760ebd60d0a4ae4d9d0ac8f896a59df)


Co-authored-by: Dmitry Ryumin <DmitryRyumin@users.noreply.huggingface.co>

app.css

@@ -140,6 +140,10 @@ div.files-container label[data-testid="block-label"] {
     max-width: fit-content;
 }
 
+div.notifications {
+    height: 85px;
+}
+
 div.languages-container_wrapper {
     display: grid;
     justify-content: end;

app.py

@@ -93,6 +93,6 @@ if __name__ == "__main__":
 
     create_gradio_app().queue(api_open=False).launch(
         share=False,
-        server_name=None,
-        server_port=None,
+        server_name=config_data.AppSettings_SERVER_NAME,
+        server_port=config_data.AppSettings_PORT,
     )

app/components.py

@@ -13,11 +13,18 @@ from app.config import config_data
 
 
 def html_message(
-    message: str = "", error: bool = True, visible: bool = True
+    message: str = "",
+    error: bool = True,
+    visible: bool = True,
+    elem_classes: Optional[str] = "html-container",
 ) -> gr.HTML:
     css_class = "noti_err" if not error else "noti_true"
 
-    return gr.HTML(value=f"<h3 class='{css_class}'>{message}</h3>", visible=visible)
+    return gr.HTML(
+        value=f"<h3 class='{css_class}'>{message}</h3>",
+        visible=visible,
+        elem_classes=elem_classes,
+    )
 
 
 def files_create_ui(

app/event_handlers/calculate_practical_tasks.py

@@ -270,7 +270,7 @@ def event_handler_calculate_practical_task_blocks(
                     + config_data.Settings_DROPDOWN_MBTI_DEL_COLS_WEBCAM
                 )
 
-                df_hidden.insert(0, "Personality Type (Dropdown)", dropdown_mbti)
+                df_hidden.insert(0, "Popular Occupations", dropdown_mbti)
 
                 df_hidden.rename(
                     columns={

app/event_handlers/calculate_pt_scores_blocks.py

@@ -25,10 +25,14 @@ from app.components import (
     textbox_create_ui,
 )
 
+import time
+
 
 def event_handler_calculate_pt_scores_blocks(
     language, type_modes, files, video, evt_data: gr.EventData
 ):
+    time.sleep(2000)
+
     _ = evt_data.target.__class__.__name__
 
     lang_id, _ = get_language_settings(language)
@@ -48,14 +52,29 @@ def event_handler_calculate_pt_scores_blocks(
     except TypeError:
         out = True
 
-    first_practical_task = next(iter(supported_practical_tasks[lang_id]))
+    if type_modes == config_data.Settings_TYPE_MODES[0]:
+        supported_practical_tasks_ren = supported_practical_tasks
+    elif type_modes == config_data.Settings_TYPE_MODES[1]:
+        rename_map = {
+            "Ranking potential candidates by professional responsibilities": "Determine professional possibilities",
+            "Ранжирование потенциальных кандидатов по профессиональным обязанностям": "Определить профессиональные возможности",
+        }
+
+        supported_practical_tasks_ren = [
+            {rename_map.get(k, k): v for k, v in d.items()}
+            for d in supported_practical_tasks
+        ]
+
+    first_practical_task = next(iter(supported_practical_tasks_ren[lang_id]))
 
     if out or len(b5.df_files_) == 0:
         gr.Warning(config_data.OtherMessages_CALCULATE_PT_SCORES_ERR[lang_id])
 
         return (
             html_message(
-                config_data.OtherMessages_CALCULATE_PT_SCORES_ERR[lang_id], False
+                config_data.OtherMessages_CALCULATE_PT_SCORES_ERR[lang_id],
+                False,
+                "notifications",
             ),
             dataframe(visible=False),
             files_create_ui(
@@ -73,24 +92,24 @@ def event_handler_calculate_pt_scores_blocks(
             radio_create_ui(
                 first_practical_task,
                 config_data.Labels_PRACTICAL_TASKS_LABEL,
-                list(map(str, supported_practical_tasks[lang_id].keys())),
+                list(map(str, supported_practical_tasks_ren[lang_id].keys())),
                 config_data.InformationMessages_PRACTICAL_TASKS_INFO[lang_id],
                 True,
                 True,
             ),
             radio_create_ui(
-                supported_practical_tasks[lang_id][first_practical_task][0],
+                supported_practical_tasks_ren[lang_id][first_practical_task][0],
                 config_data.Labels_PRACTICAL_SUBTASKS_LABEL[lang_id],
-                supported_practical_tasks[lang_id][first_practical_task],
+                supported_practical_tasks_ren[lang_id][first_practical_task],
                 config_data.InformationMessages_PRACTICAL_SUBTASKS_INFO[lang_id],
                 True,
                 True,
             ),
             gr.JSON(
                 value={
-                    str(task): supported_practical_tasks[index].get(task, [None])[0]
-                    for index in range(len(supported_practical_tasks))
-                    for task in supported_practical_tasks[index].keys()
+                    str(task): supported_practical_tasks_ren[index].get(task, [None])[0]
+                    for index in range(len(supported_practical_tasks_ren))
+                    for task in supported_practical_tasks_ren[index].keys()
                 },
                 visible=False,
                 render=True,
@@ -166,20 +185,23 @@ def event_handler_calculate_pt_scores_blocks(
 
     if type_modes == config_data.Settings_TYPE_MODES[0]:
         practical_tasks_choices = list(
-            map(str, supported_practical_tasks[lang_id].keys())
+            map(str, supported_practical_tasks_ren[lang_id].keys())
         )
     elif type_modes == config_data.Settings_TYPE_MODES[1]:
         practical_tasks_choices = [
             value
             for i, value in enumerate(
-                map(str, supported_practical_tasks[lang_id].keys())
+                map(str, supported_practical_tasks_ren[lang_id].keys())
             )
             if i not in {1}
         ]
 
     return (
         html_message(
-            config_data.InformationMessages_NOTI_VIDEOS[lang_id], False, False
+            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+            False,
+            False,
+            "notifications",
         ),
         dataframe(
             headers=(config_data.Dataframes_PT_SCORES[lang_id]),
@@ -207,18 +229,18 @@ def event_handler_calculate_pt_scores_blocks(
             True,
         ),
         radio_create_ui(
-            supported_practical_tasks[lang_id][first_practical_task][0],
+            supported_practical_tasks_ren[lang_id][first_practical_task][0],
             config_data.Labels_PRACTICAL_SUBTASKS_LABEL[lang_id],
-            supported_practical_tasks[lang_id][first_practical_task],
+            supported_practical_tasks_ren[lang_id][first_practical_task],
             config_data.InformationMessages_PRACTICAL_SUBTASKS_INFO[lang_id],
             True,
             True,
         ),
         gr.JSON(
             value={
-                str(task): supported_practical_tasks[index].get(task, [None])[0]
-                for index in range(len(supported_practical_tasks))
-                for task in supported_practical_tasks[index].keys()
+                str(task): supported_practical_tasks_ren[index].get(task, [None])[0]
+                for index in range(len(supported_practical_tasks_ren))
+                for task in supported_practical_tasks_ren[index].keys()
             },
             visible=False,
             render=True,

app/event_handlers/clear_blocks.py

@@ -54,7 +54,12 @@ def event_handler_clear_blocks(language, type_modes):
         webcam = gr.Video(interactive=True, visible=True)
 
     return (
-        html_message(config_data.InformationMessages_NOTI_VIDEOS[lang_id], False),
+        html_message(
+            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+            False,
+            True,
+            "notifications",
+        ),
         files_ui,
         webcam,
         video_create_ui(),

app/event_handlers/event_handlers.py

@@ -430,7 +430,7 @@ def setup_app_event_handlers(
     )
     practical_tasks.change(
         event_handler_practical_tasks,
-        [languages, practical_tasks, practical_subtasks_selected],
+        [languages, type_modes, practical_tasks, practical_subtasks_selected],
         [practical_subtasks],
         queue=True,
     )

app/event_handlers/examples_blocks.py

@@ -61,7 +61,12 @@ def event_handler_examples_blocks(language):
     )
 
     return (
-        html_message(config_data.InformationMessages_NOTI_VIDEOS[lang_id], False),
+        html_message(
+            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+            False,
+            True,
+            "notifications",
+        ),
         files_ui,
         webcam,
         switching_modes,

app/event_handlers/files.py

@@ -19,7 +19,12 @@ def event_handler_files(language, files, video, pt_scores):
 
     if not files:
         return (
-            html_message(config_data.InformationMessages_NOTI_VIDEOS[lang_id], False),
+            html_message(
+                config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+                False,
+                True,
+                "notifications",
+            ),
             video_create_ui(label=config_data.OtherMessages_VIDEO_PLAYER[lang_id]),
             button(
                 config_data.OtherMessages_CALCULATE_PT_SCORES[lang_id],
@@ -47,6 +52,7 @@ def event_handler_files(language, files, video, pt_scores):
             config_data.OtherMessages_NOTI_CALCULATE[lang_id],
             True,
             False if pt_scores.shape[1] >= 7 else True,
+            "notifications",
         ),
         video_create_ui(
             value=video,

app/event_handlers/languages.py

@@ -80,7 +80,10 @@ def event_handler_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
+            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+            False,
+            True,
+            "notifications",
         )
     else:
         video = video_create_ui(
@@ -92,6 +95,7 @@ def event_handler_languages(
             config_data.OtherMessages_NOTI_CALCULATE[lang_id],
             True,
             False if pt_scores.shape[1] >= 7 else True,
+            "notifications",
         )
 
     csv_pt_scores = files_create_ui(

app/event_handlers/practical_tasks.py

@@ -13,14 +13,27 @@ from app.utils import get_language_settings
 
 
 def event_handler_practical_tasks(
-    language, practical_tasks, practical_subtasks_selected
+    language, type_modes, practical_tasks, practical_subtasks_selected
 ):
     lang_id, _ = get_language_settings(language)
 
+    if type_modes == config_data.Settings_TYPE_MODES[0]:
+        supported_practical_tasks_ren = supported_practical_tasks
+    elif type_modes == config_data.Settings_TYPE_MODES[1]:
+        rename_map = {
+            "Ranking potential candidates by professional responsibilities": "Determine professional possibilities",
+            "Ранжирование потенциальных кандидатов по профессиональным обязанностям": "Определить профессиональные возможности",
+        }
+
+        supported_practical_tasks_ren = [
+            {rename_map.get(k, k): v for k, v in d.items()}
+            for d in supported_practical_tasks
+        ]
+
     return radio_create_ui(
         practical_subtasks_selected[practical_tasks],
         config_data.Labels_PRACTICAL_SUBTASKS_LABEL[lang_id],
-        supported_practical_tasks[lang_id][practical_tasks],
+        supported_practical_tasks_ren[lang_id][practical_tasks],
         config_data.InformationMessages_PRACTICAL_SUBTASKS_INFO[lang_id],
         True,
         True,

app/event_handlers/switching_modes.py

@@ -76,7 +76,12 @@ def event_handler_switching_modes(language, type_modes):
         )
 
     return (
-        html_message(config_data.InformationMessages_NOTI_VIDEOS[lang_id], False),
+        html_message(
+            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+            False,
+            True,
+            "notifications",
+        ),
         files_ui,
         webcam,
         switching_modes,

app/event_handlers/webcam.py

@@ -19,7 +19,12 @@ def event_handler_webcam(language, webcam, pt_scores):
 
     if not webcam:
         return (
-            html_message(config_data.InformationMessages_NOTI_VIDEOS[lang_id], False),
+            html_message(
+                config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+                False,
+                True,
+                "notifications",
+            ),
             video_create_ui(label=config_data.OtherMessages_VIDEO_PLAYER[lang_id]),
             gr.Video(value=None),
             button(
@@ -48,6 +53,7 @@ def event_handler_webcam(language, webcam, pt_scores):
             config_data.OtherMessages_NOTI_CALCULATE[lang_id],
             True,
             False if pt_scores.shape[1] >= 7 else True,
+            "notifications",
         ),
         video_create_ui(
             value=webcam,

app/tabs.py

@@ -130,6 +130,7 @@ def app_tab():
             config_data.AppSettings_DEFAULT_LANG_ID
         ],
         False,
+        "notifications",
     )
 
     pt_scores = dataframe(visible=False)