Update app.py

app.py

@@ -22,10 +22,9 @@ def make_msg_chunk_ai(history,team_dropdown,all_teams_df,batting_team,batting_sc
     req_params = {'flag':os.environ.get("FLAG")}
     url = os.environ["FLASK_AI_PROMPT"]
     response = requests.post(url, json=req_params)
-    print(response)
-    print(response.json())
     full_data = response.json()
     system_message=full_data['ai_data']
+    print("Got Ai Data : ",system_message,"\n====SYSTEM MESSAGE")
     temp_df = all_teams_df[all_teams_df["team_id"]==team_dropdown]
     temp_df = temp_df.drop(["team_id","player_code"],axis=1)
     cur_tem_selection = temp_df[["player_name","role_type","team"]]
@@ -45,8 +44,9 @@ def user(user_message, history):
         return "", history + [[user_message, None]]
 
 def bot(history,team_dropdown,all_teams_df,batting_team,batting_score,chase):
-    print(history,"====This is history")
+    print(len(history),"====This is history")
     bot_templete = make_msg_chunk_ai(history,team_dropdown,all_teams_df,batting_team,batting_score,chase)
+    print("Made bot templete")
     stream = client.chat.completions.create(
     model="gpt-4-1106-preview",
     messages=bot_templete,
@@ -55,6 +55,8 @@ def bot(history,team_dropdown,all_teams_df,batting_team,batting_score,chase):
     for chunk in stream:
         if chunk.choices[0].delta.content is not None:
             history[-1][1]+=chunk.choices[0].delta.content
+            time.sleep(0.09)
+            print(history)
             yield history
     
 
@@ -80,9 +82,46 @@ def activate_full_builder_and_load_data(email):
 
 
 team_name_and_team_comp_dict={}
+
+def display_generated_teams_df(df):
+    # Create a pivot table counting the number of players by team and team_id
+    pivot_df = pd.pivot_table(df, index='team_id', columns='team', aggfunc='size', fill_value=0)
+    
+    # Reset index to make 'team_id' a column again and ensure a consistent DataFrame structure
+    pivot_df = pivot_df.reset_index()
+    
+    # Renaming the columns if needed, for instance, to map internal team names to display names
+    # This can be skipped or adjusted based on your specific naming requirements
+    # Example: pivot_df.columns = ['Team No', 'PKBS', 'RCB']
+    
+    # Adjust 'team_id' column name to 'Team No'
+    pivot_df.rename(columns={'team_id': 'Team No'}, inplace=True)
+    pivot_df["sorter"]=pivot_df['Team No'].apply(lambda x: eval(x.lower().replace("team","").strip()))
+    pivot_df = pivot_df.sort_values(["sorter"])
+    pivot_df.drop(["sorter"],inplace=True,axis=1)
+
+    return pivot_df
+
+def sort_dataframe_by_role(df):
+    """
+    Sorts the DataFrame by the 'Role' column according to a custom order.
+
+    Parameters:
+    - df: The DataFrame to be sorted.
+    - role_order: A list specifying the order in which roles should be sorted.
+
+    Returns:
+    - A DataFrame sorted by the 'Role' column according to the specified order.
+    """
+    role_order=["Wicket-keeper", "Batsman", "All-rounder", "Bowler"]
+    df['Role'] = pd.Categorical(df['Role'], categories=role_order, ordered=True)
+    sorted_df = df.sort_values('Role')
+    return sorted_df
+
 def get_teams_data(batting_team,batting_score,chase):
     # print(batting_team,"bat team",batting_score,"nan score",chase)
     if batting_team and batting_score and chase and len(batting_team)>0 and len(batting_score)>0 and len(chase)>0:
+        batting_score=batting_score.split("(")[0].strip()
         req_params = {'batting_team':batting_team,
                     'batting_score':batting_score,
                     'chase':chase,
@@ -90,7 +129,6 @@ def get_teams_data(batting_team,batting_score,chase):
         url = os.environ["FLASK_TEAM_BUILDER"] 
         gr.Warning("Making Teams")
         response = requests.post(url, json=req_params)
-        
         full_data = response.json()
         
         full_data=full_data['teams_generated']
@@ -99,14 +137,20 @@ def get_teams_data(batting_team,batting_score,chase):
         for idx,team in enumerate(full_data):
             team_name_and_team_comp_dict[f"Team {idx+1}"]=team
             team = pd.DataFrame(team)
+            team = team.drop_duplicates(["player_code"],ignore_index=True)
             team["team_id"]=f"Team {idx+1}"
+            team["hit"]=team["hit"].apply(lambda x: round(float(x),1))
             all_teams_df.append(team)
         all_teams_df = pd.concat(all_teams_df)
+        display_teams_df = display_generated_teams_df(all_teams_df)
         all_team_name = list(team_name_and_team_comp_dict.keys())
         first_df = pd.DataFrame(team_name_and_team_comp_dict[all_team_name[0]])
-        first_html = first_df.sample(len(first_df)).to_html(classes='ui celled table', index=False)
+        first_df=first_df[["player_name","role_type","team","hit"]]
+        first_df.columns = ["Player Name","Role","Team","HIT%"]
+        first_df = sort_dataframe_by_role(first_df)
+        first_html = first_df.to_html(classes='ui celled table', index=False)
         
-        return gr.update(choices=all_team_name,value=all_team_name[0],visible=True,interactive=True),gr.update(value=first_html,visible=True),gr.update(visible=True),gr.update(visible=True),all_teams_df
+        return gr.update(choices=all_team_name,value=all_team_name[0],visible=True,interactive=True),gr.update(value=first_html,visible=True),gr.update(visible=True),gr.update(visible=True),all_teams_df,gr.update(value=display_teams_df,visible=True)
     else:
         gr.Warning("Please Verify Inputs")
         # return gr.update(visible=False,interactive=True),gr.update(visible=False),gr.update(visible=False),gr.update(visible=False),pd.DataFrame()
@@ -153,10 +197,13 @@ def display_selected_df(team_index,all_teams_df):
     temp_df2["hit"]=temp_df2["hit"].apply(fix_hit)
     temp_df2.columns=["Player Name","Role","Team","HIT%"]
     # html_header = f"<h2>{team_index}</h2>"
-    req_html= temp_df2.sample(len(temp_df2)).to_html(classes='ui celled table', index=False)
+    temp_df2 = sort_dataframe_by_role(temp_df2)
+    req_html= temp_df2.to_html(classes='ui celled table', index=False)
     print("changing data")
     
     return req_html,disp_df
+
+
     
     
 intro_html='''<h3> Welcome to AI-Saathi </h3>
@@ -173,12 +220,14 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="amber", secondary_hue="pink"
         activation_btn=gr.Button("Load Team Data")    
     
     with gr.Row():
-        batting_team = gr.Dropdown(choices=[], label="Batting Team",visible=False,interactive=True)
-        batting_score = gr.Dropdown(choices=["Low", "Average", "High"], label="Batting Score",visible=False,interactive=True)
-        chase = gr.Dropdown(choices=["Yes", "No"], label="Chased",visible=False,interactive=True)
+        batting_team = gr.Radio(choices=[], label="Which team will bat 1st?",visible=False,interactive=True)
+        batting_score = gr.Radio(choices=["Low (1st innings < 145)", "Average (1st innings 145-180)", "High (1st innings >180)"],label="What will be 1st innings score?",visible=False,interactive=True)
+        chase = gr.Radio(choices=["Yes", "No"], label="Will it be chased?",visible=False,interactive=True)
         all_teams_df = gr.DataFrame(visible=False)
     with gr.Row():
         submit = gr.Button("Submit",visible=False)
+    with gr.Row():
+        teams_info_disp=gr.DataFrame(visible=False,height=300)
     with gr.Row():
         team_dropdown = gr.Dropdown(label="Select Team",allow_custom_value=False,multiselect=False,visible=False)
     with gr.Row():
@@ -197,11 +246,11 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="amber", secondary_hue="pink"
         clear_btn = gr.ClearButton(chat_bot,visible=False)
         
     activation_btn.click(fn=activate_full_builder_and_load_data,inputs=[email_input,],outputs=[batting_team,batting_score,chase,submit,email_input,activation_btn])
-    submit.click(fn=get_teams_data,inputs=[batting_team,batting_score,chase],outputs=[team_dropdown,html_data,basic_status,btn,all_teams_df])
+    submit.click(fn=get_teams_data,inputs=[batting_team,batting_score,chase],outputs=[team_dropdown,html_data,basic_status,btn,all_teams_df,teams_info_disp])
     team_dropdown.change(fn=display_selected_df, inputs=[team_dropdown,all_teams_df], outputs=[html_data,basic_status])
     
     
-    html_data.change(fn=put_df2use,inputs=html_data,outputs=curr_team_data)
+    # html_data.change(fn=put_df2use,inputs=html_data,outputs=curr_team_data)
     
     btn.click(fn=activate_chat,inputs=[chat_bot,user_msg,clear_btn],outputs=[chat_bot,user_msg,clear_btn])
     
@@ -213,8 +262,8 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="amber", secondary_hue="pink"
     team_dropdown.change(lambda: None, None,thread_id)
     chat_bot.like(fn=save_like_data)
     
-
-demo.launch(share=False)
+demo.queue(default_concurrency_limit=3)
+demo.launch(share=True)