v0.10.7 (#29)

- 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)
- Update config.toml (91d9d7ef4e540930919833c79607c51fc294d60d)
- Merge branch 'main' of https://huggingface.co/spaces/ElenaRyumina/OCEANAI (e6358979bef7df974cdd6c63aca029c57ac62af8)
- Summary (6de61f5802c0e3640047369ad08ecab73b331d34)
- Update config.toml (b5ed9ffe1ad1d0f500f794adbdaf154836c4f98b)
- Summary (32a92bfceec53fd471bc976cbb849fd9d927ad83)
- Merge branch 'main' of https://huggingface.co/spaces/ElenaRyumina/OCEANAI (da47ac2a7b54d4ff7a69c19e9a2c785464ca5016)
- Merge branch 'main' of https://huggingface.co/spaces/ElenaRyumina/OCEANAI (a38174b5323e173d29898a3d3914e1fff4956b23)
- Summary (fe195552c3857fb5eb2edd95cb44bc2702b5d340)


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

README.md

@@ -4,7 +4,7 @@ emoji: 😀🤓😎😉😤
 colorFrom: gray
 colorTo: red
 sdk: gradio
-sdk_version: 5.7.1
+sdk_version: 5.8.0
 app_file: app.py
 pinned: false
 license: mit

app.css

@@ -265,6 +265,14 @@ div.surname-container > div.metadata_surname-logo div.image-container,
 div.email-container > div.metadata_email-logo div.image-container,
 div.phone-container > div.metadata_phone-logo div.image-container {
     width: fit-content;
+    min-width: auto;
+}
+
+div.name-container > div.metadata_name-logo div.image-container > div.icon-button-wrapper,
+div.surname-container > div.metadata_surname-logo div.image-container > div.icon-button-wrapper,
+div.email-container > div.metadata_email-logo div.image-container > div.icon-button-wrapper,
+div.phone-container > div.metadata_phone-logo div.image-container > div.icon-button-wrapper {
+    display: none;
 }
 
 div.name-container > div.metadata_name-logo div.image-container > button > div > img,

app.py

@@ -92,7 +92,7 @@ if __name__ == "__main__":
             free_ports(port)
 
     create_gradio_app().queue(api_open=False).launch(
-        share=False,
-        server_name=None,
-        server_port=None,
+        share=True,
+        server_name=config_data.AppSettings_SERVER_NAME,
+        server_port=config_data.AppSettings_PORT,
     )

app/event_handlers/calculate_pt_scores_blocks.py

@@ -52,7 +52,7 @@ def event_handler_calculate_pt_scores_blocks(
         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",
+            "Ranking potential candidates by professional responsibilities": "Estimating professional abilities",
             "Ранжирование потенциальных кандидатов по профессиональным обязанностям": "Определить профессиональные возможности",
         }
 

app/event_handlers/clear_blocks.py

@@ -55,7 +55,11 @@ def event_handler_clear_blocks(language, type_modes):
 
     return (
         html_message(
-            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+            (
+                config_data.InformationMessages_NOTI_VIDEOS[lang_id].split("(")[0]
+                if lang_id == 0
+                else config_data.InformationMessages_NOTI_VIDEOS[lang_id]
+            ),
             False,
             True,
             "notifications",

app/event_handlers/event_handlers.py

@@ -152,6 +152,7 @@ def setup_app_event_handlers(
             switching_modes,
             type_modes,
             video,
+            examples,
             calculate_pt_scores,
             clear_app,
             pt_scores,
@@ -298,13 +299,10 @@ def setup_app_event_handlers(
     )
     examples.click(
         fn=event_handler_examples_blocks,
-        inputs=[languages],
+        inputs=[languages, type_modes],
         outputs=[
             notifications,
             files,
-            webcam,
-            switching_modes,
-            type_modes,
             video,
             calculate_pt_scores,
             clear_app,

app/event_handlers/examples_blocks.py

@@ -27,7 +27,7 @@ from app.components import (
 from app.utils import get_language_settings
 
 
-def event_handler_examples_blocks(language):
+def event_handler_examples_blocks(language, type_modes):
     lang_id, _ = get_language_settings(language)
 
     first_practical_task = next(iter(supported_practical_tasks[lang_id]))
@@ -38,39 +38,34 @@ def event_handler_examples_blocks(language):
         key=lambda x: int(re.search(r"\d+", Path(x).stem).group()),
     )
 
-    files_ui = files_create_ui(
-        value=video_files,
-        label="{} ({})".format(
-            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],
-    )
-    webcam = gr.Video(interactive=False, visible=False)
-    switching_modes = button(
-        config_data.OtherMessages_SWITCHEHG_MODES_ONLINE[lang_id],
-        True,
-        1,
-        "./images/webcam.ico",
-        True,
-        "switching_modes",
-    )
-    type_modes_ui = gr.Radio(
-        choices=config_data.Settings_TYPE_MODES,
-        value=config_data.Settings_TYPE_MODES[0],
-    )
+    if type_modes == config_data.Settings_TYPE_MODES[0]:
+        files_ui = files_create_ui(
+            value=video_files,
+            label="{} ({})".format(
+                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],
+        )
+    elif type_modes == config_data.Settings_TYPE_MODES[1]:
+        files_ui = files_create_ui(
+            label="{} ({})".format(
+                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],
+            interactive=False,
+            visible=False,
+        )
 
     return (
         html_message(
-            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
-            False,
+            config_data.OtherMessages_NOTI_CALCULATE[lang_id],
+            True,
             True,
             "notifications",
         ),
         files_ui,
-        webcam,
-        switching_modes,
-        type_modes_ui,
         video_create_ui(
             value=video_files[0],
             label=config_data.OtherMessages_VIDEO_PLAYER[lang_id],
@@ -78,7 +73,7 @@ def event_handler_examples_blocks(language):
         ),
         button(
             config_data.OtherMessages_CALCULATE_PT_SCORES[lang_id],
-            False,
+            True,
             3,
             "./images/calculate_pt_scores.ico",
             True,
@@ -86,7 +81,7 @@ def event_handler_examples_blocks(language):
         ),
         button(
             config_data.OtherMessages_CLEAR_APP[lang_id],
-            False,
+            True,
             1,
             "./images/clear.ico",
             True,

app/event_handlers/files.py

@@ -20,7 +20,11 @@ def event_handler_files(language, files, video, pt_scores):
     if not files:
         return (
             html_message(
-                config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+                (
+                    config_data.InformationMessages_NOTI_VIDEOS[lang_id].split("(")[0]
+                    if lang_id == 0
+                    else config_data.InformationMessages_NOTI_VIDEOS[lang_id]
+                ),
                 False,
                 True,
                 "notifications",

app/event_handlers/languages.py

@@ -57,6 +57,14 @@ def event_handler_languages(
             True,
             "switching_modes",
         )
+        examples = button(
+            config_data.OtherMessages_EXAMPLES_APP[lang_id],
+            True,
+            1,
+            "./images/examples.ico",
+            True,
+            "examples_oceanai",
+        )
     elif type_modes == config_data.Settings_TYPE_MODES[1]:
         files_ui = files_create_ui(
             label="{} ({})".format(
@@ -76,11 +84,23 @@ def event_handler_languages(
             True,
             "switching_modes",
         )
+        examples = button(
+            config_data.OtherMessages_EXAMPLE_APP[lang_id],
+            True,
+            1,
+            "./images/examples.ico",
+            True,
+            "examples_oceanai",
+        )
 
     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],
+            (
+                config_data.InformationMessages_NOTI_VIDEOS[lang_id].split("(")[0]
+                if lang_id == 0
+                else config_data.InformationMessages_NOTI_VIDEOS[lang_id]
+            ),
             False,
             True,
             "notifications",
@@ -135,11 +155,11 @@ def event_handler_languages(
     else:
         practical_task = next(iter(supported_practical_tasks[lang_id]))
 
-    print(current_lang_tasks, "\n")
-    print(inverse_lang_tasks, "\n")
-    print(practical_tasks, "\n")
-    print(supported_practical_tasks, "\n")
-    print(practical_subtasks, "\n")
+    # print(current_lang_tasks, "\n")
+    # print(inverse_lang_tasks, "\n")
+    # print(practical_tasks, "\n")
+    # print(supported_practical_tasks, "\n")
+    # print(practical_subtasks, "\n")
 
     return (
         gr.Markdown(value=DESCRIPTIONS[lang_id]),
@@ -164,14 +184,7 @@ def event_handler_languages(
         webcam,
         switching_modes,
         video,
-        button(
-            config_data.OtherMessages_EXAMPLES_APP[lang_id],
-            True,
-            1,
-            "./images/examples.ico",
-            True,
-            "examples_oceanai",
-        ),
+        examples,
         button(
             config_data.OtherMessages_CALCULATE_PT_SCORES[lang_id],
             True if files else False,

app/event_handlers/practical_subtasks.py

@@ -352,11 +352,20 @@ def event_handler_practical_subtasks(
             number_create_ui(
                 value=1,
                 minimum=1,
-                maximum=df_correlation_coefficients.columns.size,
+                maximum=(
+                    df_correlation_coefficients.columns.size
+                    if practical_subtasks.lower() == "car characteristics"
+                    else df_correlation_coefficients.columns.size - 1
+                ),
                 step=1,
                 label=config_data.Labels_NUMBER_PRIORITY_LABEL,
                 info=config_data.InformationMessages_VALUE_FROM_TO_INFO.format(
-                    1, df_correlation_coefficients.columns.size
+                    1,
+                    (
+                        df_correlation_coefficients.columns.size
+                        if practical_subtasks.lower() == "car characteristics"
+                        else df_correlation_coefficients.columns.size - 1
+                    ),
                 ),
                 show_label=True,
                 interactive=True,

app/event_handlers/practical_tasks.py

@@ -21,7 +21,7 @@ def event_handler_practical_tasks(
         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",
+            "Ranking potential candidates by professional responsibilities": "Estimating professional abilities",
             "Ранжирование потенциальных кандидатов по профессиональным обязанностям": "Определить профессиональные возможности",
         }
 

app/event_handlers/switching_modes.py

@@ -31,6 +31,16 @@ def event_handler_switching_modes(language, type_modes):
     first_practical_task = next(iter(supported_practical_tasks[lang_id]))
 
     if type_modes == config_data.Settings_TYPE_MODES[0]:
+        notifications = html_message(
+            (
+                config_data.InformationMessages_NOTI_VIDEOS[lang_id].split("(")[0]
+                if lang_id == 0
+                else config_data.InformationMessages_NOTI_VIDEOS[lang_id]
+            ),
+            False,
+            True,
+            "notifications",
+        )
         files_ui = files_create_ui(
             label="{} ({})".format(
                 config_data.OtherMessages_VIDEO_FILES[lang_id],
@@ -53,7 +63,21 @@ def event_handler_switching_modes(language, type_modes):
             choices=config_data.Settings_TYPE_MODES,
             value=config_data.Settings_TYPE_MODES[1],
         )
+        examples = button(
+            config_data.OtherMessages_EXAMPLE_APP[lang_id],
+            True,
+            1,
+            "./images/examples.ico",
+            True,
+            "examples_oceanai",
+        )
     elif type_modes == config_data.Settings_TYPE_MODES[1]:
+        notifications = html_message(
+            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+            False,
+            True,
+            "notifications",
+        )
         files_ui = files_create_ui(
             label="{} ({})".format(
                 config_data.OtherMessages_VIDEO_FILES[lang_id],
@@ -74,19 +98,23 @@ def event_handler_switching_modes(language, type_modes):
             choices=config_data.Settings_TYPE_MODES,
             value=config_data.Settings_TYPE_MODES[0],
         )
+        examples = button(
+            config_data.OtherMessages_EXAMPLES_APP[lang_id],
+            True,
+            1,
+            "./images/examples.ico",
+            True,
+            "examples_oceanai",
+        )
 
     return (
-        html_message(
-            config_data.InformationMessages_NOTI_VIDEOS[lang_id],
-            False,
-            True,
-            "notifications",
-        ),
+        notifications,
         files_ui,
         webcam,
         switching_modes,
         type_modes_ui,
         video_create_ui(),
+        examples,
         button(
             config_data.OtherMessages_CALCULATE_PT_SCORES[lang_id],
             False,

app/event_handlers/webcam.py

@@ -20,7 +20,11 @@ def event_handler_webcam(language, webcam, pt_scores):
     if not webcam:
         return (
             html_message(
-                config_data.InformationMessages_NOTI_VIDEOS[lang_id],
+                (
+                    config_data.InformationMessages_NOTI_VIDEOS[lang_id].split("(")[0]
+                    if lang_id == 0
+                    else config_data.InformationMessages_NOTI_VIDEOS[lang_id]
+                ),
                 False,
                 True,
                 "notifications",

config.toml

@@ -1,5 +1,5 @@
 [AppSettings]
-APP_VERSION = "0.10.6"
+APP_VERSION = "0.10.7"
 SERVER_NAME = "127.0.0.1"
 PORT = 7860
 CSS_PATH = "app.css"
@@ -44,6 +44,7 @@ CALCULATE_PT_SCORES_ERR = [
 CALCULATE_PRACTICAL_TASK = "Solving practical task"
 CLEAR_APP = ["Clear", "Сброс"]
 EXAMPLES_APP = ["Examples", "Примеры"]
+EXAMPLE_APP = ["Example", "Пример"]
 EXPORT_PT_SCORES = [
     "Export Big Five personality traits to a CSV file",
     "Экспорт показателей Большой пятерки персональных качеств личности человека в CSV файл"]
@@ -53,7 +54,7 @@ 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", "Вы можете рассчитать показатели Большой пятерки персональных качеств личности человека"]
-SWITCHEHG_MODES_ONLINE = ["Webcam", "Веб камера"]
+SWITCHEHG_MODES_ONLINE = ["Webcam", "Веб-камера"]
 SWITCHEHG_MODES_OFFLINE = ["Video Files", "Видеофайлы"]
 
 [Labels]

requirements.txt

@@ -1,4 +1,4 @@
-gradio==5.7.1
+gradio==5.8.0
 PyYAML==6.0.2
 toml==0.10.2
 oceanai==1.0.0a46