v0.5.0 (#5)

- Summary (4aa0743266f192e4551d911ad5dea17ebd1c6b25)


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

app.css

@@ -76,4 +76,20 @@ div.files-container label[data-testid="block-label"] {
 .examples_oceanai:active:not([disabled]),
 .clear_oceanai:active:not([disabled]) {
     transform: scale(0.98);
+}
+
+.settings-container {
+    max-width: fit-content;
+}
+
+.number-container {
+    max-width: fit-content;
+}
+
+.dropdown-container {
+    max-width: fit-content;
+}
+
+.dropdown-container > div > span[data-testid="block-info"] + div {
+    min-width: max-content;
 }

app/components.py

@@ -121,3 +121,57 @@ def radio_create_ui(
         interactive=interactive,
         visible=visible,
     )
+
+
+def threshold_create_ui(
+    value: float = 0.5,
+    minimum: float = 0.0,
+    maximum: float = 1.0,
+    step: float = 0.01,
+    label: Optional[str] = None,
+    info: Optional[str] = None,
+    show_label: bool = True,
+    interactive: bool = True,
+    visible: bool = False,
+    render: bool = True,
+    elem_classes: Optional[str] = "number-container",
+):
+    return gr.Number(
+        value=value,
+        minimum=minimum,
+        maximum=maximum,
+        step=step,
+        label=label,
+        info=info,
+        show_label=show_label,
+        interactive=interactive,
+        visible=visible,
+        render=render,
+        elem_classes=elem_classes,
+    )
+
+
+def dropdown_create_ui(
+    label: Optional[str] = None,
+    info: Optional[str] = None,
+    choices: List = [],
+    value: List = [],
+    multiselect: bool = False,
+    show_label: bool = True,
+    interactive: bool = True,
+    visible: bool = True,
+    render: bool = True,
+    elem_classes: Optional[str] = None,
+) -> gr.Dropdown:
+    return gr.Dropdown(
+        choices=choices,
+        value=value,
+        multiselect=multiselect,
+        label=label,
+        info=info,
+        show_label=show_label,
+        interactive=interactive,
+        visible=visible,
+        render=render,
+        elem_classes=elem_classes,
+    )

app/event_handlers/calculate_practical_tasks.py

@@ -8,14 +8,19 @@ License: MIT License
 from app.oceanai_init import b5
 import gradio as gr
 import pandas as pd
+from pathlib import Path
 
 # Importing necessary components for the Gradio app
 from app.config import config_data
-from app.components import html_message, dataframe, files_create_ui
+from app.components import html_message, dataframe, files_create_ui, video_create_ui
 
 
 def event_handler_calculate_practical_task_blocks(
-    practical_tasks, practical_subtasks, pt_scores
+    files,
+    practical_subtasks,
+    pt_scores,
+    threshold_professional_skills,
+    dropdown_professional_skills,
 ):
     if practical_subtasks.lower() == "professional skills":
         df_professional_skills = pd.read_csv(config_data.Links_PROFESSIONAL_SKILLS)
@@ -27,7 +32,7 @@ def event_handler_calculate_practical_task_blocks(
         b5._priority_skill_calculation(
             df_files=pt_scores.iloc[:, 1:],
             correlation_coefficients=df_professional_skills,
-            threshold=0.5,
+            threshold=threshold_professional_skills,
             out=True,
         )
 
@@ -46,14 +51,38 @@ def event_handler_calculate_practical_task_blocks(
             lambda x: [round(i, 3) for i in x]
         )
 
-        df.to_csv(config_data.Filenames_PT_SKILLS_SCORES)
+        professional_skills_list = (
+            config_data.Settings_DROPDOWN_PROFESSIONAL_SKILLS.copy()
+        )
+
+        professional_skills_list.remove(dropdown_professional_skills)
+
+        professional_skills_list = [
+            "OPE",
+            "CON",
+            "EXT",
+            "AGR",
+            "NNEU",
+        ] + professional_skills_list
+
+        df_hidden = df.drop(columns=professional_skills_list)
+
+        df_hidden.to_csv(config_data.Filenames_PT_SKILLS_SCORES)
 
-        df.reset_index(inplace=True)
+        df_hidden.reset_index(inplace=True)
+
+        df_hidden = df_hidden.sort_values(
+            by=[dropdown_professional_skills], ascending=False
+        )
+
+        person_id = int(df_hidden.iloc[0]["Person ID"]) - 1
 
         return (
+            gr.Row(visible=True),
+            gr.Column(visible=True),
             dataframe(
-                headers=df.columns.tolist(),
-                values=df.values.tolist(),
+                headers=df_hidden.columns.tolist(),
+                values=df_hidden.values.tolist(),
                 visible=True,
             ),
             files_create_ui(
@@ -66,12 +95,20 @@ def event_handler_calculate_practical_task_blocks(
                 True,
                 "csv-container",
             ),
+            video_create_ui(
+                value=files[person_id],
+                file_name=Path(files[person_id]).name,
+                label="Best Person ID - " + str(person_id + 1),
+                visible=True,
+            ),
             html_message(config_data.InformationMessages_NOTI_IN_DEV, False, False),
         )
     else:
         gr.Info(config_data.InformationMessages_NOTI_IN_DEV)
 
         return (
+            gr.Row(visible=False),
+            gr.Column(visible=False),
             dataframe(visible=False),
             files_create_ui(
                 None,
@@ -83,5 +120,6 @@ def event_handler_calculate_practical_task_blocks(
                 False,
                 "csv-container",
             ),
+            video_create_ui(visible=False),
             html_message(config_data.InformationMessages_NOTI_IN_DEV, False, True),
         )

app/event_handlers/calculate_pt_scores_blocks.py

@@ -17,6 +17,9 @@ from app.components import (
     dataframe,
     files_create_ui,
     radio_create_ui,
+    threshold_create_ui,
+    dropdown_create_ui,
+    video_create_ui,
 )
 
 
@@ -77,6 +80,9 @@ def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
             visible=False,
             render=True,
         ),
+        gr.Column(visible=False),
+        threshold_create_ui(visible=False),
+        dropdown_create_ui(visible=False),
         button(
             config_data.OtherMessages_CALCULATE_PRACTICAL_TASK,
             True,
@@ -84,6 +90,8 @@ def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
             True,
             "calculate_practical_task",
         ),
+        gr.Row(visible=False),
+        gr.Column(visible=False),
         dataframe(visible=False),
         files_create_ui(
             None,
@@ -95,5 +103,6 @@ def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
             False,
             "csv-container",
         ),
+        video_create_ui(visible=False),
         html_message(config_data.InformationMessages_NOTI_IN_DEV, False, False),
     )

app/event_handlers/clear_blocks.py

@@ -17,6 +17,8 @@ from app.components import (
     button,
     dataframe,
     radio_create_ui,
+    threshold_create_ui,
+    dropdown_create_ui,
 )
 
 
@@ -71,6 +73,11 @@ def event_handler_clear_blocks():
             visible=False,
             render=True,
         ),
+        gr.Column(visible=False),
+        threshold_create_ui(visible=False),
+        dropdown_create_ui(visible=False),
+        gr.Row(visible=False),
+        gr.Column(visible=False),
         dataframe(visible=False),
         files_create_ui(
             None,
@@ -82,5 +89,6 @@ def event_handler_clear_blocks():
             False,
             "csv-container",
         ),
+        video_create_ui(visible=False),
         html_message(config_data.InformationMessages_NOTI_IN_DEV, False, False),
     )

app/event_handlers/event_handlers.py

@@ -22,6 +22,7 @@ from app.event_handlers.practical_subtasks import event_handler_practical_subtas
 from app.event_handlers.calculate_practical_tasks import (
     event_handler_calculate_practical_task_blocks,
 )
+from app.event_handlers.practical_task_sorted import event_handler_practical_task_sorted
 
 
 def setup_app_event_handlers(
@@ -35,11 +36,17 @@ def setup_app_event_handlers(
     csv_pt_scores,
     practical_tasks,
     practical_subtasks,
+    settings_practical_tasks,
+    threshold_professional_skills,
+    dropdown_professional_skills,
     calculate_practical_task,
     practical_subtasks_selected,
     practical_tasks_column,
+    sorted_videos,
+    sorted_videos_column,
     practical_task_sorted,
     csv_practical_task_sorted,
+    video_sorted,
     in_development,
 ):
     # Events
@@ -69,9 +76,15 @@ def setup_app_event_handlers(
             practical_tasks,
             practical_subtasks,
             practical_subtasks_selected,
+            settings_practical_tasks,
+            threshold_professional_skills,
+            dropdown_professional_skills,
             calculate_practical_task,
+            sorted_videos,
+            sorted_videos_column,
             practical_task_sorted,
             csv_practical_task_sorted,
+            video_sorted,
             in_development,
         ],
         queue=True,
@@ -99,8 +112,14 @@ def setup_app_event_handlers(
             practical_tasks,
             practical_subtasks,
             practical_subtasks_selected,
+            settings_practical_tasks,
+            threshold_professional_skills,
+            dropdown_professional_skills,
+            sorted_videos,
+            sorted_videos_column,
             practical_task_sorted,
             csv_practical_task_sorted,
+            video_sorted,
             in_development,
         ],
         queue=True,
@@ -114,16 +133,36 @@ def setup_app_event_handlers(
     practical_subtasks.change(
         event_handler_practical_subtasks,
         [practical_tasks, practical_subtasks, practical_subtasks_selected],
-        [practical_subtasks_selected],
+        [
+            practical_subtasks_selected,
+            settings_practical_tasks,
+            threshold_professional_skills,
+            dropdown_professional_skills,
+        ],
         queue=True,
     )
     calculate_practical_task.click(
         fn=event_handler_calculate_practical_task_blocks,
-        inputs=[practical_tasks, practical_subtasks, pt_scores],
+        inputs=[
+            files,
+            practical_subtasks,
+            pt_scores,
+            threshold_professional_skills,
+            dropdown_professional_skills,
+        ],
         outputs=[
+            sorted_videos,
+            sorted_videos_column,
             practical_task_sorted,
             csv_practical_task_sorted,
+            video_sorted,
             in_development,
         ],
         queue=True,
     )
+    practical_task_sorted.select(
+        event_handler_practical_task_sorted,
+        [files, practical_task_sorted],
+        [video_sorted],
+        queue=True,
+    )

app/event_handlers/practical_subtasks.py

@@ -5,7 +5,11 @@ Description: Event handler for Gradio app to filter practical subtasks based on
 License: MIT License
 """
 
+import gradio as gr
+
 # Importing necessary components for the Gradio app
+from app.config import config_data
+from app.components import threshold_create_ui, dropdown_create_ui
 
 
 def event_handler_practical_subtasks(
@@ -13,4 +17,36 @@ def event_handler_practical_subtasks(
 ):
     practical_subtasks_selected[practical_tasks] = practical_subtasks
 
-    return practical_subtasks_selected
+    if practical_subtasks.lower() == "professional skills":
+        return (
+            practical_subtasks_selected,
+            gr.Column(visible=True),
+            threshold_create_ui(
+                value=0.5,
+                minimum=0.0,
+                maximum=1.0,
+                step=0.01,
+                label=config_data.Labels_THRESHOLD_PROFESSIONAL_SKILLS_LABEL,
+                info=config_data.InformationMessages_THRESHOLD_PROFESSIONAL_SKILLS_INFO,
+                show_label=True,
+                interactive=True,
+                visible=True,
+                render=True,
+                elem_classes="number-container",
+            ),
+            dropdown_create_ui(
+                label=f"Professional skills ({len(config_data.Settings_DROPDOWN_PROFESSIONAL_SKILLS)})",
+                info=config_data.InformationMessages_DROPDOWN_PROFESSIONAL_SKILLS_INFO,
+                choices=config_data.Settings_DROPDOWN_PROFESSIONAL_SKILLS,
+                value=config_data.Settings_DROPDOWN_PROFESSIONAL_SKILLS[0],
+                visible=True,
+                elem_classes="dropdown-container",
+            ),
+        )
+    else:
+        return (
+            practical_subtasks_selected,
+            gr.Column(visible=False),
+            threshold_create_ui(visible=False),
+            dropdown_create_ui(visible=False),
+        )

app/event_handlers/practical_task_sorted.py

@@ -0,0 +1,38 @@
+"""
+File: practical_task_sorted.py
+Author: Elena Ryumina and Dmitry Ryumin
+Description: Event handler for the practical task sorted to the Gradio app.
+License: MIT License
+"""
+
+import gradio as gr
+from pathlib import Path
+
+# Importing necessary components for the Gradio app
+from app.components import video_create_ui
+
+
+def event_handler_practical_task_sorted(
+    files, practical_task_sorted, evt_data: gr.SelectData
+):
+    # print(
+    #     f"{evt_data.value}, {evt_data.index}, {evt_data.target}, {evt_data.selected}, {evt_data._data}"
+    # )
+    # print(practical_task_sorted)
+
+    # print(evt_data, evt_data.index[0], practical_task_sorted.iloc[evt_data.index[0]])
+
+    person_id = int(practical_task_sorted.iloc[evt_data.index[0]]["Person ID"]) - 1
+
+    if evt_data.index[0] == 0:
+        label = "Best"
+    else:
+        label = ""
+    label += " Person ID"
+
+    return video_create_ui(
+        value=files[person_id],
+        file_name=Path(files[person_id]).name,
+        label=f"{label} - " + str(person_id + 1),
+        visible=True,
+    )

app/tabs.py

@@ -19,6 +19,8 @@ from app.components import (
     button,
     dataframe,
     radio_create_ui,
+    threshold_create_ui,
+    dropdown_create_ui,
 )
 
 
@@ -81,26 +83,63 @@ def app_tab():
             True,
         )
 
+        with gr.Row(
+            visible=False,
+            render=True,
+            variant="default",
+            elem_classes="settings-container",
+        ) as settings_practical_tasks:
+            threshold_professional_skills = threshold_create_ui(
+                value=0.5,
+                minimum=0.0,
+                maximum=1.0,
+                step=0.01,
+                label=config_data.Labels_THRESHOLD_PROFESSIONAL_SKILLS_LABEL,
+                info=config_data.InformationMessages_THRESHOLD_PROFESSIONAL_SKILLS_INFO,
+                show_label=True,
+                interactive=True,
+                visible=False,
+                render=True,
+                elem_classes="number-container",
+            )
+
+            dropdown_professional_skills = dropdown_create_ui(
+                label=f"Professional skills ({len(config_data.Settings_DROPDOWN_PROFESSIONAL_SKILLS)})",
+                info=config_data.InformationMessages_DROPDOWN_PROFESSIONAL_SKILLS_INFO,
+                choices=config_data.Settings_DROPDOWN_PROFESSIONAL_SKILLS,
+                value=config_data.Settings_DROPDOWN_PROFESSIONAL_SKILLS[0],
+                visible=False,
+                elem_classes="dropdown-container",
+            )
+
         calculate_practical_task = button(
             config_data.OtherMessages_CALCULATE_PRACTICAL_TASK,
             True,
             1,
-            True,
+            False,
             "calculate_practical_task",
         )
 
-        practical_task_sorted = dataframe(visible=False)
-
-        csv_practical_task_sorted = files_create_ui(
-            None,
-            "single",
-            [".csv"],
-            config_data.OtherMessages_EXPORT_PS,
-            True,
-            False,
-            False,
-            "csv-container",
-        )
+        with gr.Row(
+            visible=False,
+            render=True,
+            variant="default",
+        ) as sorted_videos:
+            with gr.Column(scale=1, visible=False, render=True) as sorted_videos_column:
+                practical_task_sorted = dataframe(visible=False)
+
+                csv_practical_task_sorted = files_create_ui(
+                    None,
+                    "single",
+                    [".csv"],
+                    config_data.OtherMessages_EXPORT_PS,
+                    True,
+                    False,
+                    False,
+                    "csv-container",
+                )
+
+            video_sorted = video_create_ui(visible=False)
 
     practical_subtasks_selected = gr.JSON(
         value={
@@ -126,11 +165,17 @@ def app_tab():
         csv_pt_scores,
         practical_tasks,
         practical_subtasks,
+        settings_practical_tasks,
+        threshold_professional_skills,
+        dropdown_professional_skills,
         calculate_practical_task,
         practical_subtasks_selected,
         practical_tasks_column,
+        sorted_videos,
+        sorted_videos_column,
         practical_task_sorted,
         csv_practical_task_sorted,
+        video_sorted,
         in_development,
     )
 

config.toml

@@ -1,5 +1,5 @@
 [AppSettings]
-APP_VERSION = "0.4.0"
+APP_VERSION = "0.5.0"
 CSS_PATH = "app.css"
 
 [InformationMessages]
@@ -7,6 +7,8 @@ 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"
+THRESHOLD_PROFESSIONAL_SKILLS_INFO = "Set threshold from 0 to 1.0"
+DROPDOWN_PROFESSIONAL_SKILLS_INFO = "What professional skill are you interested in?"
 
 [OtherMessages]
 CALCULATE_PT_SCORES = "Calculation of Big Five personality traits scores"
@@ -20,6 +22,7 @@ NOTI_CALCULATE = "You can calculate Big Five personality traits scores"
 [Labels]
 PRACTICAL_TASKS_LABEL = "Practical tasks"
 PRACTICAL_SUBTASKS_LABEL = "Practical subtasks"
+THRESHOLD_PROFESSIONAL_SKILLS_LABEL = "Threshold"
 
 [TabCreators]
 "App" = "app_tab"
@@ -29,5 +32,8 @@ PRACTICAL_SUBTASKS_LABEL = "Practical subtasks"
 PT_SCORES = "personality_traits_scores.csv"
 PT_SKILLS_SCORES = "personality_skills_scores.csv"
 
+[Settings]
+DROPDOWN_PROFESSIONAL_SKILLS = ["Analytical", "Interactive", "Routine", "Non-Routine"]
+
 [Links]
 PROFESSIONAL_SKILLS = "https://download.sberdisk.ru/download/file/478678231?token=0qiZwliLtHWWYMv&filename=professional_skills.csv"