Update app.py

app.py

@@ -995,8 +995,53 @@ def refresh_data():
 
 
 
+def create_registration_bar_chart(data, type_name="Spaces"):
+    # DataFrame인 경우 처리
+    if isinstance(data, pd.DataFrame):
+        registrations = data['Space ID' if type_name == "Spaces" else 'Model ID'].apply(
+            lambda x: x.split('/')[0]
+        ).value_counts()
+    else:
+        # 리스트나 다른 형태의 데이터인 경우 처리
+        registrations = {}
+        for item in data:
+            if isinstance(item, dict):
+                creator = item.get('id', '').split('/')[0]
+            else:
+                creator = str(item).split('/')[0]
+            registrations[creator] = registrations.get(creator, 0) + 1
+        registrations = pd.Series(registrations)
+    
+    # 정렬된 데이터 준비
+    registrations = registrations.sort_values(ascending=False)
+    
+    fig = go.Figure(data=[go.Bar(
+        x=registrations.index,
+        y=registrations.values,
+        text=registrations.values,
+        textposition='auto',
+        marker_color='#FF6B6B'
+    )])
+    
+    fig.update_layout(
+        title=f"Korean {type_name} Registrations by Creator",
+        xaxis_title="Creator ID",
+        yaxis_title="Number of Registrations",
+        showlegend=False,
+        height=400,
+        width=700
+    )
+    
+    return fig
+
 def create_pie_chart(data, total_count, type_name="Spaces"):
-    korean_count = len(data)
+    # DataFrame인 경우 처리
+    if isinstance(data, pd.DataFrame):
+        korean_count = len(data)
+    else:
+        # 리스트나 다른 형태의 데이터인 경우 처리
+        korean_count = len(data)
+    
     other_count = total_count - korean_count
     
     fig = go.Figure(data=[go.Pie(
@@ -1019,36 +1064,25 @@ def create_pie_chart(data, total_count, type_name="Spaces"):
     
     return fig
 
-def create_registration_bar_chart(data, type_name="Spaces"):
-    # 등록자별 건수 집계
-    registrations = {}
-    for item in data:
-        creator = item.get('id', '').split('/')[0]  # ID의 첫 부분을 등록자로 간주
-        registrations[creator] = registrations.get(creator, 0) + 1
+def refresh_all_data():
+    spaces_results = get_spaces_data("trending")
+    models_results = get_models_data()
     
-    # 정렬된 데이터 준비
-    sorted_data = sorted(registrations.items(), key=lambda x: x[1], reverse=True)
-    creators = [x[0] for x in sorted_data]
-    counts = [x[1] for x in sorted_data]
-    
-    fig = go.Figure(data=[go.Bar(
-        x=creators,
-        y=counts,
-        text=counts,
-        textposition='auto',
-        marker_color='#FF6B6B'
-    )])
+    # Spaces 차트 생성
+    spaces_pie = create_pie_chart(spaces_results[2], 500, "Spaces")
+    spaces_bar = create_registration_bar_chart(spaces_results[2], "Spaces")
     
-    fig.update_layout(
-        title=f"Korean {type_name} Registrations by Creator",
-        xaxis_title="Creator ID",
-        yaxis_title="Number of Registrations",
-        showlegend=False,
-        height=400,
-        width=700
-    )
+    # Models 차트 생성
+    models_pie = create_pie_chart(models_results[2], 3000, "Models")
+    models_bar = create_registration_bar_chart(models_results[2], "Models")
     
-    return fig
+    return [
+        spaces_results[0], spaces_results[1], spaces_results[2],
+        spaces_pie, spaces_bar,
+        models_results[0], models_results[1], models_results[2],
+        models_pie, models_bar
+    ]
+
 
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("""
@@ -1063,45 +1097,71 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         trending_plot = gr.Plot()
         with gr.Row():
             # 원형 그래프와 막대 그래프를 위한 컨테이너 추가
-            with gr.Column():
-                spaces_pie_chart = gr.Plot(label="Korean Spaces Distribution")
-            with gr.Column():
-                spaces_bar_chart = gr.Plot(label="Registrations by Creator")
+            with gr.Column(scale=1):
+                spaces_pie_chart = gr.Plot(
+                    label="Korean Spaces Distribution",
+                    elem_id="spaces_pie"
+                )
+            with gr.Column(scale=2):
+                spaces_bar_chart = gr.Plot(
+                    label="Registrations by Creator",
+                    elem_id="spaces_bar"
+                )
         trending_info = gr.HTML()
-        trending_df = gr.DataFrame()
+        trending_df = gr.DataFrame(
+            headers=["Rank", "Space ID", "Title", "Likes", "URL"],
+            datatype=["number", "str", "str", "number", "str"],
+            row_count=(10, "dynamic")
+        )
     
     with gr.Tab("Models Trending"):
         models_plot = gr.Plot()
         with gr.Row():
             # 원형 그래프와 막대 그래프를 위한 컨테이너 추가
-            with gr.Column():
-                models_pie_chart = gr.Plot(label="Korean Models Distribution")
-            with gr.Column():
-                models_bar_chart = gr.Plot(label="Registrations by Creator")
+            with gr.Column(scale=1):
+                models_pie_chart = gr.Plot(
+                    label="Korean Models Distribution",
+                    elem_id="models_pie"
+                )
+            with gr.Column(scale=2):
+                models_bar_chart = gr.Plot(
+                    label="Registrations by Creator",
+                    elem_id="models_bar"
+                )
         models_info = gr.HTML()
-        models_df = gr.DataFrame()
-    
+        models_df = gr.DataFrame(
+            headers=["Global Rank", "Model ID", "Title", "Downloads", "Likes", "Korea Search", "URL"],
+            datatype=["str", "str", "str", "str", "str", "str", "str"],
+            row_count=(10, "dynamic")
+        )
+
     def refresh_all_data():
-        spaces_results = get_spaces_data("trending")
-        models_results = get_models_data()
-        
-        # Spaces 차트 생성
-        spaces_pie = create_pie_chart(spaces_results[2], 500, "Spaces")  # DataFrame에서 데이터 추출
-        spaces_bar = create_registration_bar_chart(spaces_results[2], "Spaces")
-        
-        # Models 차트 생성
-        models_pie = create_pie_chart(models_results[2], 3000, "Models")  # DataFrame에서 데이터 추출
-        models_bar = create_registration_bar_chart(models_results[2], "Models")
-        
-        return [
-            spaces_results[0], spaces_results[1], spaces_results[2],
-            spaces_pie, spaces_bar,
-            models_results[0], models_results[1], models_results[2],
-            models_pie, models_bar
-        ]
-    
+        try:
+            spaces_results = get_spaces_data("trending")
+            models_results = get_models_data()
+            
+            # Spaces 차트 생성
+            spaces_pie = create_pie_chart(spaces_results[2], 500, "Spaces")
+            spaces_bar = create_registration_bar_chart(spaces_results[2], "Spaces")
+            
+            # Models 차트 생성
+            models_pie = create_pie_chart(models_results[2], 3000, "Models")
+            models_bar = create_registration_bar_chart(models_results[2], "Models")
+            
+            return [
+                spaces_results[0], spaces_results[1], spaces_results[2],
+                spaces_pie, spaces_bar,
+                models_results[0], models_results[1], models_results[2],
+                models_pie, models_bar
+            ]
+        except Exception as e:
+            print(f"Error in refresh_all_data: {str(e)}")
+            # 에러 발생 시 기본값 반환
+            return [None] * 10
+
+    # 새로고침 버튼 클릭 이벤트 핸들러
     refresh_btn.click(
-        refresh_all_data,
+        fn=refresh_all_data,
         outputs=[
             trending_plot, trending_info, trending_df,
             spaces_pie_chart, spaces_bar_chart,
@@ -1111,23 +1171,44 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     )
     
     # 초기 데이터 로드
-    initial_data = refresh_all_data()
-    
-    # 초기값 설정
-    trending_plot.value = initial_data[0]
-    trending_info.value = initial_data[1]
-    trending_df.value = initial_data[2]
-    spaces_pie_chart.value = initial_data[3]
-    spaces_bar_chart.value = initial_data[4]
-    models_plot.value = initial_data[5]
-    models_info.value = initial_data[6]
-    models_df.value = initial_data[7]
-    models_pie_chart.value = initial_data[8]
-    models_bar_chart.value = initial_data[9]
+    try:
+        initial_data = refresh_all_data()
+        
+        # 초기값 설정
+        trending_plot.value = initial_data[0]
+        trending_info.value = initial_data[1]
+        trending_df.value = initial_data[2]
+        spaces_pie_chart.value = initial_data[3]
+        spaces_bar_chart.value = initial_data[4]
+        models_plot.value = initial_data[5]
+        models_info.value = initial_data[6]
+        models_df.value = initial_data[7]
+        models_pie_chart.value = initial_data[8]
+        models_bar_chart.value = initial_data[9]
+    except Exception as e:
+        print(f"Error loading initial data: {str(e)}")
+        gr.Warning("초기 데이터 로드 중 오류가 발생했습니다.")
+
+# CSS 스타일 추가
+demo.load("""
+<style>
+#spaces_pie, #models_pie {
+    min-height: 400px;
+    border-radius: 10px;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+#spaces_bar, #models_bar {
+    min-height: 400px;
+    border-radius: 10px;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+</style>
+""")
 
 # Gradio 앱 실행
 demo.launch(
     server_name="0.0.0.0",
     server_port=7860,
-    share=False
+    share=False,
+    show_error=True
 )