v0.4.0 (#4)

- Summary (0ba2e4a30caca9217f27ac36283b3e777000a303)


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

app/components.py

@@ -67,6 +67,7 @@ def dataframe(
     height: int = 500,
     wrap: bool = True,
     visible: bool = True,
+    interactive: bool = False,
     elem_classes: Optional[str] = "dataframe",
 ) -> gr.Dataframe:
     if headers is None or values is None:
@@ -81,6 +82,7 @@ def dataframe(
         height=height,
         wrap=wrap,
         visible=visible,
+        interactive=interactive,
         elem_classes=elem_classes,
     )
 

app/event_handlers/calculate_practical_tasks.py

@@ -5,14 +5,83 @@ Description: Event handler for Gradio app to calculate practical tasks.
 License: MIT License
 """
 
+from app.oceanai_init import b5
 import gradio as gr
+import pandas as pd
 
 # Importing necessary components for the Gradio app
 from app.config import config_data
-from app.components import html_message
+from app.components import html_message, dataframe, files_create_ui
 
 
-def event_handler_calculate_practical_task_blocks():
-    gr.Info(config_data.InformationMessages_NOTI_IN_DEV)
+def event_handler_calculate_practical_task_blocks(
+    practical_tasks, practical_subtasks, pt_scores
+):
+    if practical_subtasks.lower() == "professional skills":
+        df_professional_skills = pd.read_csv(config_data.Links_PROFESSIONAL_SKILLS)
 
-    return html_message(config_data.InformationMessages_NOTI_IN_DEV, False, True)
+        df_professional_skills.index.name = "ID"
+        df_professional_skills.index += 1
+        df_professional_skills.index = df_professional_skills.index.map(str)
+
+        b5._priority_skill_calculation(
+            df_files=pt_scores.iloc[:, 1:],
+            correlation_coefficients=df_professional_skills,
+            threshold=0.5,
+            out=True,
+        )
+
+        # Optional
+        df = b5.df_files_priority_skill_.rename(
+            columns={
+                "Openness": "OPE",
+                "Conscientiousness": "CON",
+                "Extraversion": "EXT",
+                "Agreeableness": "AGR",
+                "Non-Neuroticism": "NNEU",
+            }
+        )
+        columns_to_round = df.columns[1:]
+        df[columns_to_round] = df[columns_to_round].apply(
+            lambda x: [round(i, 3) for i in x]
+        )
+
+        df.to_csv(config_data.Filenames_PT_SKILLS_SCORES)
+
+        df.reset_index(inplace=True)
+
+        return (
+            dataframe(
+                headers=df.columns.tolist(),
+                values=df.values.tolist(),
+                visible=True,
+            ),
+            files_create_ui(
+                config_data.Filenames_PT_SKILLS_SCORES,
+                "single",
+                [".csv"],
+                config_data.OtherMessages_EXPORT_PS,
+                True,
+                False,
+                True,
+                "csv-container",
+            ),
+            html_message(config_data.InformationMessages_NOTI_IN_DEV, False, False),
+        )
+    else:
+        gr.Info(config_data.InformationMessages_NOTI_IN_DEV)
+
+        return (
+            dataframe(visible=False),
+            files_create_ui(
+                None,
+                "single",
+                [".csv"],
+                config_data.OtherMessages_EXPORT_PS,
+                True,
+                False,
+                False,
+                "csv-container",
+            ),
+            html_message(config_data.InformationMessages_NOTI_IN_DEV, False, True),
+        )

app/event_handlers/calculate_pt_scores_blocks.py

@@ -10,7 +10,14 @@ import gradio as gr
 # Importing necessary components for the Gradio app
 from app.oceanai_init import b5
 from app.config import config_data
-from app.components import html_message, dataframe, files_create_ui
+from app.practical_tasks import supported_practical_tasks
+from app.components import (
+    html_message,
+    button,
+    dataframe,
+    files_create_ui,
+    radio_create_ui,
+)
 
 
 def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
@@ -23,11 +30,16 @@ def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
 
     b5.df_files_.to_csv(config_data.Filenames_PT_SCORES)
 
+    first_practical_task = next(iter(supported_practical_tasks))
+
+    df_files = b5.df_files_.copy()
+    df_files.reset_index(inplace=True)
+
     return (
         html_message(config_data.InformationMessages_NOTI_VIDEOS, False, False),
         dataframe(
-            headers=b5.df_files_.columns.tolist(),
-            values=b5.df_files_.values.tolist(),
+            headers=df_files.columns.tolist(),
+            values=df_files.values.tolist(),
             visible=True,
         ),
         files_create_ui(
@@ -41,4 +53,47 @@ def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
             "csv-container",
         ),
         gr.Column(visible=True),
+        radio_create_ui(
+            first_practical_task,
+            "Practical tasks",
+            list(map(str, supported_practical_tasks.keys())),
+            config_data.InformationMessages_PRACTICAL_TASKS_INFO,
+            True,
+            True,
+        ),
+        radio_create_ui(
+            supported_practical_tasks[first_practical_task][0],
+            "Practical subtasks",
+            supported_practical_tasks[first_practical_task],
+            config_data.InformationMessages_PRACTICAL_SUBTASKS_INFO,
+            True,
+            True,
+        ),
+        gr.JSON(
+            value={
+                str(task): supported_practical_tasks.get(task, [None])[0]
+                for task in supported_practical_tasks.keys()
+            },
+            visible=False,
+            render=True,
+        ),
+        button(
+            config_data.OtherMessages_CALCULATE_PRACTICAL_TASK,
+            True,
+            1,
+            True,
+            "calculate_practical_task",
+        ),
+        dataframe(visible=False),
+        files_create_ui(
+            None,
+            "single",
+            [".csv"],
+            config_data.OtherMessages_EXPORT_PS,
+            True,
+            False,
+            False,
+            "csv-container",
+        ),
+        html_message(config_data.InformationMessages_NOTI_IN_DEV, False, False),
     )

app/event_handlers/clear_blocks.py

@@ -71,5 +71,16 @@ def event_handler_clear_blocks():
             visible=False,
             render=True,
         ),
+        dataframe(visible=False),
+        files_create_ui(
+            None,
+            "single",
+            [".csv"],
+            config_data.OtherMessages_EXPORT_PS,
+            True,
+            False,
+            False,
+            "csv-container",
+        ),
         html_message(config_data.InformationMessages_NOTI_IN_DEV, False, False),
     )

app/event_handlers/event_handlers.py

@@ -38,6 +38,8 @@ def setup_app_event_handlers(
     calculate_practical_task,
     practical_subtasks_selected,
     practical_tasks_column,
+    practical_task_sorted,
+    csv_practical_task_sorted,
     in_development,
 ):
     # Events
@@ -56,8 +58,22 @@ def setup_app_event_handlers(
     gr.on(
         triggers=[calculate_pt_scores.click],
         fn=event_handler_calculate_pt_scores_blocks,
-        inputs=[files],
-        outputs=[notifications, pt_scores, csv_pt_scores, practical_tasks_column],
+        inputs=[
+            files,
+        ],
+        outputs=[
+            notifications,
+            pt_scores,
+            csv_pt_scores,
+            practical_tasks_column,
+            practical_tasks,
+            practical_subtasks,
+            practical_subtasks_selected,
+            calculate_practical_task,
+            practical_task_sorted,
+            csv_practical_task_sorted,
+            in_development,
+        ],
         queue=True,
     )
     examples.click(
@@ -83,6 +99,8 @@ def setup_app_event_handlers(
             practical_tasks,
             practical_subtasks,
             practical_subtasks_selected,
+            practical_task_sorted,
+            csv_practical_task_sorted,
             in_development,
         ],
         queue=True,
@@ -101,8 +119,10 @@ def setup_app_event_handlers(
     )
     calculate_practical_task.click(
         fn=event_handler_calculate_practical_task_blocks,
-        inputs=[],
+        inputs=[practical_tasks, practical_subtasks, pt_scores],
         outputs=[
+            practical_task_sorted,
+            csv_practical_task_sorted,
             in_development,
         ],
         queue=True,

app/tabs.py

@@ -89,6 +89,19 @@ def app_tab():
             "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",
+        )
+
     practical_subtasks_selected = gr.JSON(
         value={
             str(task): supported_practical_tasks.get(task, [None])[0]
@@ -116,6 +129,8 @@ def app_tab():
         calculate_practical_task,
         practical_subtasks_selected,
         practical_tasks_column,
+        practical_task_sorted,
+        csv_practical_task_sorted,
         in_development,
     )
 

config.toml

@@ -1,5 +1,5 @@
 [AppSettings]
-APP_VERSION = "0.3.0"
+APP_VERSION = "0.4.0"
 CSS_PATH = "app.css"
 
 [InformationMessages]
@@ -14,6 +14,7 @@ CALCULATE_PRACTICAL_TASK = "Calculation of information for a practical task"
 CLEAR_APP = "Clear"
 EXAMPLES_APP = "Examples"
 EXPORT_PT_SCORES = "Export Big Five personality traits to a CSV file"
+EXPORT_PS = "Export ranking professional skill results to a CSV file"
 NOTI_CALCULATE = "You can calculate Big Five personality traits scores"
 
 [Labels]
@@ -25,4 +26,8 @@ PRACTICAL_SUBTASKS_LABEL = "Practical subtasks"
 "About the Authors" = "about_authors_tab"
 
 [Filenames]
-PT_SCORES = "personality_traits_scores.csv"
+PT_SCORES = "personality_traits_scores.csv"
+PT_SKILLS_SCORES = "personality_skills_scores.csv"
+
+[Links]
+PROFESSIONAL_SKILLS = "https://download.sberdisk.ru/download/file/478678231?token=0qiZwliLtHWWYMv&filename=professional_skills.csv"

requirements.txt

@@ -1,6 +1,7 @@
-gradio==4.24.0
+gradio==4.23.0
 requests==2.31.0
 PyYAML==6.0.1
 toml==0.10.2
-oceanai==1.0.0a22
-tf-keras==2.16.0
+oceanai==1.0.0a24
+tf-keras==2.16.0
+pandas==2.2.1