v0.6.0 (#6)

- Summary (20b6a530cbb8ed5c0b35b7f56eba2e870ea4c29c)


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

app.css

@@ -84,6 +84,7 @@ div.files-container label[data-testid="block-label"] {
 
 .number-container {
     max-width: fit-content;
+    min-width: fit-content !important;
 }
 
 .dropdown-container {

app/components.py

@@ -123,7 +123,7 @@ def radio_create_ui(
     )
 
 
-def threshold_create_ui(
+def number_create_ui(
     value: float = 0.5,
     minimum: float = 0.0,
     maximum: float = 1.0,

app/event_handlers/calculate_practical_tasks.py

@@ -15,19 +15,55 @@ from app.config import config_data
 from app.components import html_message, dataframe, files_create_ui, video_create_ui
 
 
+def read_csv_file(file_path, drop_id=False):
+    df = pd.read_csv(file_path)
+
+    if drop_id:
+        df = pd.DataFrame(df.drop(["ID"], axis=1))
+
+    df.index.name = "ID"
+    df.index += 1
+    df.index = df.index.map(str)
+
+    return df
+
+
+def apply_rounding_and_rename_columns(df):
+    df_rounded = df.rename(
+        columns={
+            "Openness": "OPE",
+            "Conscientiousness": "CON",
+            "Extraversion": "EXT",
+            "Agreeableness": "AGR",
+            "Non-Neuroticism": "NNEU",
+        }
+    )
+    columns_to_round = df_rounded.columns[1:]
+    df_rounded[columns_to_round] = df_rounded[columns_to_round].apply(
+        lambda x: [round(i, 3) for i in x]
+    )
+    return df_rounded
+
+
+def colleague_type(subtask):
+    return "minor" if "junior" in subtask.lower() else "major"
+
+
 def event_handler_calculate_practical_task_blocks(
     files,
     practical_subtasks,
     pt_scores,
     threshold_professional_skills,
     dropdown_professional_skills,
+    target_score_ope,
+    target_score_con,
+    target_score_ext,
+    target_score_agr,
+    target_score_nneu,
+    equal_coefficient,
 ):
     if practical_subtasks.lower() == "professional skills":
-        df_professional_skills = pd.read_csv(config_data.Links_PROFESSIONAL_SKILLS)
-
-        df_professional_skills.index.name = "ID"
-        df_professional_skills.index += 1
-        df_professional_skills.index = df_professional_skills.index.map(str)
+        df_professional_skills = read_csv_file(config_data.Links_PROFESSIONAL_SKILLS)
 
         b5._priority_skill_calculation(
             df_files=pt_scores.iloc[:, 1:],
@@ -37,19 +73,7 @@ def event_handler_calculate_practical_task_blocks(
         )
 
         # 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 = apply_rounding_and_rename_columns(b5.df_files_priority_skill_)
 
         professional_skills_list = (
             config_data.Settings_DROPDOWN_PROFESSIONAL_SKILLS.copy()
@@ -103,6 +127,75 @@ def event_handler_calculate_practical_task_blocks(
             ),
             html_message(config_data.InformationMessages_NOTI_IN_DEV, False, False),
         )
+    elif (
+        practical_subtasks.lower() == "finding a suitable junior colleague"
+        or practical_subtasks.lower() == "finding a suitable senior colleague"
+    ):
+        df_correlation_coefficients = read_csv_file(config_data.Links_FINDING_COLLEAGUE)
+
+        b5._colleague_ranking(
+            df_files=pt_scores.iloc[:, 1:],
+            correlation_coefficients=df_correlation_coefficients,
+            target_scores=[
+                target_score_ope,
+                target_score_con,
+                target_score_ext,
+                target_score_agr,
+                target_score_nneu,
+            ],
+            colleague=colleague_type(practical_subtasks),
+            equal_coefficients=equal_coefficient,
+            out=False,
+        )
+
+        # Optional
+        df = df = apply_rounding_and_rename_columns(b5.df_files_colleague_)
+
+        professional_skills_list = [
+            "OPE",
+            "CON",
+            "EXT",
+            "AGR",
+            "NNEU",
+        ]
+
+        df_hidden = df.drop(columns=professional_skills_list)
+
+        df_hidden.to_csv(
+            colleague_type(practical_subtasks) + config_data.Filenames_COLLEAGUE_RANKING
+        )
+
+        df_hidden.reset_index(inplace=True)
+
+        person_id = int(df_hidden.iloc[0]["Person ID"]) - 1
+
+        return (
+            gr.Row(visible=True),
+            gr.Column(visible=True),
+            dataframe(
+                headers=df_hidden.columns.tolist(),
+                values=df_hidden.values.tolist(),
+                visible=True,
+            ),
+            files_create_ui(
+                colleague_type(practical_subtasks)
+                + config_data.Filenames_COLLEAGUE_RANKING,
+                "single",
+                [".csv"],
+                config_data.OtherMessages_EXPORT_WT,
+                True,
+                False,
+                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)
 

app/event_handlers/calculate_pt_scores_blocks.py

@@ -17,7 +17,7 @@ from app.components import (
     dataframe,
     files_create_ui,
     radio_create_ui,
-    threshold_create_ui,
+    number_create_ui,
     dropdown_create_ui,
     video_create_ui,
 )
@@ -81,8 +81,14 @@ def event_handler_calculate_pt_scores_blocks(files, evt_data: gr.EventData):
             render=True,
         ),
         gr.Column(visible=False),
-        threshold_create_ui(visible=False),
+        number_create_ui(visible=False),
         dropdown_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
         button(
             config_data.OtherMessages_CALCULATE_PRACTICAL_TASK,
             True,

app/event_handlers/clear_blocks.py

@@ -17,7 +17,7 @@ from app.components import (
     button,
     dataframe,
     radio_create_ui,
-    threshold_create_ui,
+    number_create_ui,
     dropdown_create_ui,
 )
 
@@ -74,8 +74,14 @@ def event_handler_clear_blocks():
             render=True,
         ),
         gr.Column(visible=False),
-        threshold_create_ui(visible=False),
+        number_create_ui(visible=False),
         dropdown_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
+        number_create_ui(visible=False),
         gr.Row(visible=False),
         gr.Column(visible=False),
         dataframe(visible=False),

app/event_handlers/event_handlers.py

@@ -39,6 +39,12 @@ def setup_app_event_handlers(
     settings_practical_tasks,
     threshold_professional_skills,
     dropdown_professional_skills,
+    target_score_ope,
+    target_score_con,
+    target_score_ext,
+    target_score_agr,
+    target_score_nneu,
+    equal_coefficient,
     calculate_practical_task,
     practical_subtasks_selected,
     practical_tasks_column,
@@ -79,6 +85,12 @@ def setup_app_event_handlers(
             settings_practical_tasks,
             threshold_professional_skills,
             dropdown_professional_skills,
+            target_score_ope,
+            target_score_con,
+            target_score_ext,
+            target_score_agr,
+            target_score_nneu,
+            equal_coefficient,
             calculate_practical_task,
             sorted_videos,
             sorted_videos_column,
@@ -115,6 +127,12 @@ def setup_app_event_handlers(
             settings_practical_tasks,
             threshold_professional_skills,
             dropdown_professional_skills,
+            target_score_ope,
+            target_score_con,
+            target_score_ext,
+            target_score_agr,
+            target_score_nneu,
+            equal_coefficient,
             sorted_videos,
             sorted_videos_column,
             practical_task_sorted,
@@ -138,6 +156,12 @@ def setup_app_event_handlers(
             settings_practical_tasks,
             threshold_professional_skills,
             dropdown_professional_skills,
+            target_score_ope,
+            target_score_con,
+            target_score_ext,
+            target_score_agr,
+            target_score_nneu,
+            equal_coefficient,
         ],
         queue=True,
     )
@@ -149,6 +173,12 @@ def setup_app_event_handlers(
             pt_scores,
             threshold_professional_skills,
             dropdown_professional_skills,
+            target_score_ope,
+            target_score_con,
+            target_score_ext,
+            target_score_agr,
+            target_score_nneu,
+            equal_coefficient,
         ],
         outputs=[
             sorted_videos,

app/event_handlers/practical_subtasks.py

@@ -9,7 +9,7 @@ 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
+from app.components import number_create_ui, dropdown_create_ui
 
 
 def event_handler_practical_subtasks(
@@ -21,7 +21,7 @@ def event_handler_practical_subtasks(
         return (
             practical_subtasks_selected,
             gr.Column(visible=True),
-            threshold_create_ui(
+            number_create_ui(
                 value=0.5,
                 minimum=0.0,
                 maximum=1.0,
@@ -42,11 +42,111 @@ def event_handler_practical_subtasks(
                 visible=True,
                 elem_classes="dropdown-container",
             ),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+        )
+    elif (
+        practical_subtasks.lower() == "finding a suitable junior colleague"
+        or practical_subtasks.lower() == "finding a suitable senior colleague"
+    ):
+        return (
+            practical_subtasks_selected,
+            gr.Column(visible=True),
+            number_create_ui(visible=False),
+            dropdown_create_ui(visible=False),
+            number_create_ui(
+                value=config_data.Values_TARGET_SCORES[0],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_OPE_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_OPE_INFO,
+                show_label=True,
+                interactive=True,
+                visible=True,
+                render=True,
+                elem_classes="number-container",
+            ),
+            number_create_ui(
+                value=config_data.Values_TARGET_SCORES[1],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_CON_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_CON_INFO,
+                show_label=True,
+                interactive=True,
+                visible=True,
+                render=True,
+                elem_classes="number-container",
+            ),
+            number_create_ui(
+                value=config_data.Values_TARGET_SCORES[2],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_EXT_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_EXT_INFO,
+                show_label=True,
+                interactive=True,
+                visible=True,
+                render=True,
+                elem_classes="number-container",
+            ),
+            number_create_ui(
+                value=config_data.Values_TARGET_SCORES[3],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_AGR_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_AGR_INFO,
+                show_label=True,
+                interactive=True,
+                visible=True,
+                render=True,
+                elem_classes="number-container",
+            ),
+            number_create_ui(
+                value=config_data.Values_TARGET_SCORES[4],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_NNEU_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_NNEU_INFO,
+                show_label=True,
+                interactive=True,
+                visible=True,
+                render=True,
+                elem_classes="number-container",
+            ),
+            number_create_ui(
+                value=0.5,
+                minimum=0.0,
+                maximum=1.0,
+                step=0.01,
+                label=config_data.Labels_EQUAL_COEFFICIENT_LABEL,
+                info=config_data.InformationMessages_EQUAL_COEFFICIENT_INFO,
+                show_label=True,
+                interactive=True,
+                visible=True,
+                render=True,
+                elem_classes="number-container",
+            ),
         )
     else:
         return (
             practical_subtasks_selected,
             gr.Column(visible=False),
-            threshold_create_ui(visible=False),
+            number_create_ui(visible=False),
             dropdown_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
+            number_create_ui(visible=False),
         )

app/tabs.py

@@ -19,7 +19,7 @@ from app.components import (
     button,
     dataframe,
     radio_create_ui,
-    threshold_create_ui,
+    number_create_ui,
     dropdown_create_ui,
 )
 
@@ -89,7 +89,7 @@ def app_tab():
             variant="default",
             elem_classes="settings-container",
         ) as settings_practical_tasks:
-            threshold_professional_skills = threshold_create_ui(
+            threshold_professional_skills = number_create_ui(
                 value=0.5,
                 minimum=0.0,
                 maximum=1.0,
@@ -112,6 +112,90 @@ def app_tab():
                 elem_classes="dropdown-container",
             )
 
+            target_score_ope = number_create_ui(
+                value=config_data.Values_TARGET_SCORES[0],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_OPE_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_OPE_INFO,
+                show_label=True,
+                interactive=True,
+                visible=False,
+                render=True,
+                elem_classes="number-container",
+            )
+
+            target_score_con = number_create_ui(
+                value=config_data.Values_TARGET_SCORES[1],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_CON_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_CON_INFO,
+                show_label=True,
+                interactive=True,
+                visible=False,
+                render=True,
+                elem_classes="number-container",
+            )
+
+            target_score_ext = number_create_ui(
+                value=config_data.Values_TARGET_SCORES[2],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_EXT_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_EXT_INFO,
+                show_label=True,
+                interactive=True,
+                visible=False,
+                render=True,
+                elem_classes="number-container",
+            )
+
+            target_score_agr = number_create_ui(
+                value=config_data.Values_TARGET_SCORES[3],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_AGR_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_AGR_INFO,
+                show_label=True,
+                interactive=True,
+                visible=False,
+                render=True,
+                elem_classes="number-container",
+            )
+
+            target_score_nneu = number_create_ui(
+                value=config_data.Values_TARGET_SCORES[4],
+                minimum=0.0,
+                maximum=1.0,
+                step=0.000001,
+                label=config_data.Labels_TARGET_SCORE_NNEU_LABEL,
+                info=config_data.InformationMessages_TARGET_SCORE_NNEU_INFO,
+                show_label=True,
+                interactive=True,
+                visible=False,
+                render=True,
+                elem_classes="number-container",
+            )
+
+            equal_coefficient = number_create_ui(
+                value=0.5,
+                minimum=0.0,
+                maximum=1.0,
+                step=0.01,
+                label=config_data.Labels_EQUAL_COEFFICIENT_LABEL,
+                info=config_data.InformationMessages_EQUAL_COEFFICIENT_INFO,
+                show_label=True,
+                interactive=True,
+                visible=False,
+                render=True,
+                elem_classes="number-container",
+            )
+
         calculate_practical_task = button(
             config_data.OtherMessages_CALCULATE_PRACTICAL_TASK,
             True,
@@ -168,6 +252,12 @@ def app_tab():
         settings_practical_tasks,
         threshold_professional_skills,
         dropdown_professional_skills,
+        target_score_ope,
+        target_score_con,
+        target_score_ext,
+        target_score_agr,
+        target_score_nneu,
+        equal_coefficient,
         calculate_practical_task,
         practical_subtasks_selected,
         practical_tasks_column,

config.toml

@@ -1,5 +1,5 @@
 [AppSettings]
-APP_VERSION = "0.5.0"
+APP_VERSION = "0.6.0"
 CSS_PATH = "app.css"
 
 [InformationMessages]
@@ -7,22 +7,36 @@ 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"
+THRESHOLD_PROFESSIONAL_SKILLS_INFO = "Set value from 0 to 1.0"
 DROPDOWN_PROFESSIONAL_SKILLS_INFO = "What professional skill are you interested in?"
+DROPDOWN_DROPDOWN_COLLEAGUES_INFO = "What colleague are you interested in?"
+TARGET_SCORE_OPE_INFO = "Set value from 0 to 1.0"
+TARGET_SCORE_CON_INFO = "Set value from 0 to 1.0"
+TARGET_SCORE_EXT_INFO = "Set value from 0 to 1.0"
+TARGET_SCORE_AGR_INFO = "Set value from 0 to 1.0"
+TARGET_SCORE_NNEU_INFO = "Set value from 0 to 1.0"
+EQUAL_COEFFICIENT_INFO = "Set value from 0 to 1.0"
 
 [OtherMessages]
 CALCULATE_PT_SCORES = "Calculation of Big Five personality traits scores"
-CALCULATE_PRACTICAL_TASK = "Calculation of information for a practical task"
+CALCULATE_PRACTICAL_TASK = "Solving 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"
+EXPORT_WT = "Export ranking effective work teams results to a CSV file"
 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"
+THRESHOLD_PROFESSIONAL_SKILLS_LABEL = "Polarity traits threshold"
+TARGET_SCORE_OPE_LABEL = "Openness target score"
+TARGET_SCORE_CON_LABEL = "Conscientiousness target score"
+TARGET_SCORE_EXT_LABEL = "Extraversion target score"
+TARGET_SCORE_AGR_LABEL = "Agreeableness target score"
+TARGET_SCORE_NNEU_LABEL = "Non-Neuroticism target score"
+EQUAL_COEFFICIENT_LABEL = "Equal coefficient"
 
 [TabCreators]
 "App" = "app_tab"
@@ -31,9 +45,15 @@ THRESHOLD_PROFESSIONAL_SKILLS_LABEL = "Threshold"
 [Filenames]
 PT_SCORES = "personality_traits_scores.csv"
 PT_SKILLS_SCORES = "personality_skills_scores.csv"
+COLLEAGUE_RANKING = "_colleague_ranking.csv"
 
 [Settings]
 DROPDOWN_PROFESSIONAL_SKILLS = ["Analytical", "Interactive", "Routine", "Non-Routine"]
+DROPDOWN_COLLEAGUES = ["major", "minor"]
+
+[Values]
+TARGET_SCORES = [0.527886, 0.522337, 0.458468, 0.51761, 0.444649]
 
 [Links]
-PROFESSIONAL_SKILLS = "https://download.sberdisk.ru/download/file/478678231?token=0qiZwliLtHWWYMv&filename=professional_skills.csv"
+PROFESSIONAL_SKILLS = "https://download.sberdisk.ru/download/file/478678231?token=0qiZwliLtHWWYMv&filename=professional_skills.csv"
+FINDING_COLLEAGUE = "https://download.sberdisk.ru/download/file/478675819?token=LuB7L1QsEY0UuSs&filename=colleague_ranking.csv"

requirements.txt

@@ -2,6 +2,6 @@ gradio==4.23.0
 requests==2.31.0
 PyYAML==6.0.1
 toml==0.10.2
-oceanai==1.0.0a24
+oceanai==1.0.0a26
 tf-keras==2.16.0
 pandas==2.2.1