Update app.py

app.py

@@ -28,6 +28,16 @@ head_style = """
 
 DATA_URL_BASE = "http://opencompass.oss-cn-shanghai.aliyuncs.com/dev-assets/hf-research/"
 
+MAIN_LEADERBOARD_DESCRIPTION = """## Compass Academic Leaderboard
+--WIP--
+
+"""
+Initial_title = 'Compass Academic Leaderboard'
+
+MODEL_SIZE = ['<10B', '10B-70B', '>70B', 'Unknown']
+MODEL_TYPE = ['API', 'OpenSource']
+
+
 
 def findfile():
     model_meta_info = 'model-meta-info'
@@ -46,18 +56,13 @@ def findfile():
 model_info, results = findfile()
 
 
-MAIN_LEADERBOARD_DESCRIPTION = """## Compass Academic Leaderboard
---WIP--
-
-"""
-Initial_title = 'Compass Academic Leaderboard'
 
 
 
 def make_results_tab(model_info, results):
     models_list, datasets_list = [], []
     for i in model_info:
-        models_list.append([i['abbr'], i['display_name']])
+        models_list.append(i)
     for i in results.keys():
         datasets_list.append(i)
     
@@ -66,10 +71,12 @@ def make_results_tab(model_info, results):
     for model in models_list:
         this_result = {}
         this_result['Index'] = index
-        this_result['Model Name'] = model[1]
+        this_result['Model Name'] = model['display_name']
+        this_result['Parameters'] = model['num_param']
+        this_result['Opensource'] = model['release_type']
         index += 1        
         for dataset in datasets_list:
-            this_result[dataset] = results[dataset][model[0]]
+            this_result[dataset] = results[dataset][model['abbr']]
         result_list.append(this_result)
 
     df = pd.DataFrame(result_list)
@@ -93,7 +100,10 @@ def show_results_tab(df):
 
     
     def filter_df(model_name):
+        
         newdf = make_results_tab(model_info, results)
+
+        # search model name
         default_val = 'Input the Model Name'
         if model_name != default_val:
             method_names = [x.split('</a>')[0].split('>')[-1].lower() for x in newdf['Model Name']]
@@ -103,9 +113,46 @@ def show_results_tab(df):
             newdf.pop('TEMP')
             for i in range(len(newdf)):
                 df.loc[i, 'Index'] = i+1
+        
+        # filter size
+        if size_ranges:
+            def get_size_in_B(param):
+                if param == 'N/A':
+                    return None
+                try:
+                    return float(param.replace('B', ''))
+                except:
+                    return None
+            
+            newdf['size_in_B'] = newdf['Parameters'].apply(get_size_in_B)
+            mask = pd.Series(False, index=newdf.index)
+            
+            for size_range in size_ranges:
+                if size_range == '<10B':
+                    mask |= (newdf['size_in_B'] < 10) & (newdf['size_in_B'].notna())
+                elif size_range == '10B-70B':
+                    mask |= (newdf['size_in_B'] >= 10) & (newdf['size_in_B'] < 70)
+                elif size_range == '>70B':
+                    mask |= newdf['size_in_B'] >= 70
+                elif size_range == 'Unknown':
+                    mask |= newdf['size_in_B'].isna()
+                    
+            newdf = newdf[mask]
+            newdf.drop('size_in_B', axis=1, inplace=True)
+
+        # filter opensource
+        if model_types:
+            type_mask = pd.Series(False, index=newdf.index)
+            for model_type in model_types:
+                if model_type == 'API':
+                    type_mask |= newdf['Opensource'] == 'No'
+                elif model_type == 'Opensource':
+                    type_mask |= filtered_df['Opensource'] == 'Yes'
+            newdf = newdf[type_mask]
+
         return newdf
-    
 
+        
     with gr.Row():
         with gr.Column():
             model_name = gr.Textbox(
@@ -139,17 +186,17 @@ def show_results_tab(df):
     
     model_name.submit(
         fn=filter_df,
-        inputs=model_name,
+        inputs=[model_name, size_filter, type_filter],
         outputs=table
     )
     size_filter.change(
-        fn=update_table,
-        inputs=[size_filter, type_filter],
+        fn=filter_df,
+        inputs=[model_name, size_filter, type_filter],
         outputs=table,
     )
     type_filter.change(
-        fn=update_table,
-        inputs=[size_filter, type_filter],
+        fn=filter_df,
+        inputs=[model_name, size_filter, type_filter],
         outputs=table,
     )