Update app.py

app.py

@@ -529,7 +529,6 @@ class Demo:
             try:
                 async for content in try_claude_api(system_message, claude_messages):
                     code = content
-                    analysis = analyze_code(code)
                     yield [
                         code,
                         _history,
@@ -544,7 +543,6 @@ class Demo:
                 
                 async for content in try_openai_api(openai_messages):
                     code = content
-                    analysis = analyze_code(code)
                     yield [
                         code,
                         _history,
@@ -579,9 +577,6 @@ class Demo:
         return []
 
 
-# theme = gr.themes.Soft()
-theme='earneleh/paris' 
-
 # 예제 프롬프트
 example_prompts = [
     "만년달력을 만들어주세요. 년도와 월을 입력하면 해당 월의 달력이 표시되는 앱입니다.",
@@ -594,129 +589,125 @@ example_prompts = [
 # Demo 인스턴스 생성
 demo_instance = Demo()
 
-with gr.Blocks(css_paths="app.css",theme=theme) as demo:
+with gr.Blocks(css="body {background-color: #f7f7f7;}", theme=gr.themes.Soft()) as demo:
     history = gr.State([])
     setting = gr.State({
         "system": SystemPrompt,
     })
 
-    with ms.Application() as app:
-        with antd.ConfigProvider():
-            # Drawer 컴포넌트들      
-            with antd.Drawer(open=False, title="code", placement="left", width="750px") as code_drawer:
-                code_output = legacy.Markdown()
-    
-            with antd.Drawer(open=False, title="history", placement="left", width="900px") as history_drawer:
-                history_output = legacy.Chatbot(show_label=False, flushing=False, height=960, elem_classes="history_chatbot")
-
-            # 메인 컨텐츠를 위한 Row
-            with antd.Row(gutter=[32, 12]) as layout:    
-                # 좌측 패널
-                with antd.Col(span=24, md=12):
-                    with antd.Flex(vertical=True, gap="middle", wrap=True):
-                        header = gr.HTML(f"""
-                            <div class="left_header">
-                                <img src="data:image/gif;base64,{get_image_base64('mouse.gif')}" width="360px" />
-                                <h1 style="font-size: 18px;">고양이도 발로 코딩하는 'MOUSE-II'</h2>
-                                <h1 style="font-size: 10px;">프롬프트에 원하는 내용을 입력하고 Boost 버튼 클릭시 프롬프트 증강이 됨. -> 배포하기 클릭하면 허깅페이스를 통해 웹서비스가 배포됩니다. 문의: [email protected] </h2>                                 
-                            </div>
-                        """)
-
-                        input = antd.InputTextarea(
-                            size="large", 
-                            allow_clear=True, 
-                            placeholder=random.choice(DEMO_LIST)['description'],
-                            height=400
-                        )
-
-                        gr.Examples(
-                            examples=example_prompts,
-                            inputs=input
-                        )
-
-                        with antd.Flex(gap="small", justify="space-between"):
-                            btn = antd.Button("Send", type="primary", size="large")
-                            boost_btn = antd.Button("Boost", type="default", size="large")
-                            clear_btn = antd.Button("클리어", type="default", size="large")
-
-                # 우측 패널
-                with antd.Col(span=24, md=12):
-                    with ms.Div(elem_classes="right_panel"):
-                        with antd.Flex(gap="small", elem_classes="setting-buttons"):
-                            codeBtn = antd.Button("🧑‍💻 코드 보기", type="default")
-                            historyBtn = antd.Button("📜 히스토리", type="default")
-
-                        gr.HTML('<div class="render_header"><span class="header_btn"></span><span class="header_btn"></span><span class="header_btn"></span></div>')
-
-                        with antd.Tabs(active_key="empty", render_tab_bar="() => null") as state_tab:
-                            with antd.Tabs.Item(key="empty"):
-                                empty = antd.Empty(description="empty input", elem_classes="right_content")
-                            with antd.Tabs.Item(key="loading"):
-                                loading = antd.Spin(True, tip="coding...", size="large", elem_classes="right_content")
-
-                        code_display = gr.Code(language="python", height=400)
-                        
-                        gr.HTML("<h3>배포 설정</h3>")
-                        hf_token = gr.Textbox(label="Hugging Face 토큰", type="password", placeholder="hf_...")
-                        deploy_btn = antd.Button("배포하기", type="primary", size="large")
-                        deploy_result = gr.HTML(label="배포 결과")
-
-            # 이벤트 핸들러 연결
-            btn.click(
-                demo_instance.generation_code,
-                inputs=[input, setting, history],
-                outputs=[code_output, history, state_tab, code_drawer]
-            ).then(
-                lambda code: code,
-                inputs=[code_output],
-                outputs=[code_display]
-            )
-
-            boost_btn.click(
-                fn=handle_boost,
-                inputs=[input],
-                outputs=[input, state_tab]
+    # 메인 레이아웃
+    with gr.Row():
+        # 좌측 패널
+        with gr.Column(scale=1):
+            gr.HTML("""
+                <div style="text-align: center; margin-bottom: 10px;">
+                    <h1 style="margin-bottom: 0px;">MOUSE</h1>
+                    <p>고양이도 발로 코딩하는 'MOUSE-II'</p>
+                </div>
+            """)
+            
+            input_text = gr.Textbox(
+                label="원하는 앱 설명을 입력하세요",
+                placeholder=random.choice(DEMO_LIST)['description'],
+                lines=12,
+                max_lines=15
             )
-
-            clear_btn.click(
-                demo_instance.clear_history,
-                inputs=[],
-                outputs=[history]
+            
+            gr.Examples(
+                examples=example_prompts,
+                inputs=input_text
             )
-
-            deploy_btn.click(
-                fn=lambda code, token: deploy_to_huggingface(remove_code_block(code), token) if code else "코드가 없습니다.",
-                inputs=[code_output, hf_token],
-                outputs=[deploy_result]
+            
+            with gr.Row():
+                generate_btn = gr.Button("생성하기", variant="primary")
+                boost_btn = gr.Button("Boost", variant="secondary")
+                clear_btn = gr.Button("클리어", variant="secondary")
+            
+            with gr.Accordion("역대 프롬프트", open=False):
+                history_btn = gr.Button("이전 기록 보기")
+                history_output = gr.Chatbot(
+                    show_label=False, 
+                    height=400, 
+                    visible=False
+                )
+        
+        # 우측 패널
+        with gr.Column(scale=1):
+            with gr.Tabs():
+                with gr.TabItem("코드"):
+                    with gr.Row():
+                        loading_indicator = gr.HTML('<div id="loading" style="display:none; text-align:center;"><p>코드 생성 중...</p></div>')
+                    
+                    code_output = gr.Code(
+                        language="python", 
+                        label="생성된 코드", 
+                        value="", 
+                        lines=17, 
+                        height=400
+                    )
+                
+                with gr.TabItem("분석"):
+                    code_analysis = gr.HTML(label="코드 분석")
+            
+            gr.HTML("<h3>배포 설정</h3>")
+            hf_token = gr.Textbox(
+                label="Hugging Face 토큰", 
+                type="password", 
+                placeholder="hf_..."
             )
+            
+            deploy_btn = gr.Button("배포하기", variant="primary")
+            deploy_result = gr.HTML(label="배포 결과")
 
-            codeBtn.click(
-                lambda: gr.update(open=True),
-                inputs=[], 
-                outputs=[code_drawer]
-            )
+    # 이벤트 핸들러
+    async def generate_code_wrapper(query, setting, history):
+        loading_indicator.update('<div id="loading" style="display:block; text-align:center;"><p>코드 생성 중...</p></div>')
+        
+        result = None
+        analysis = ""
+        
+        async for output in demo_instance.generation_code(query, setting, history):
+            result = output[0]  # 코드 출력
+            code_analysis_html = analyze_code(result)
+        
+        loading_indicator.update('<div id="loading" style="display:none;"></div>')
+        return result, code_analysis_html
     
-            code_drawer.close(
-                lambda: gr.update(open=False),
-                inputs=[], 
-                outputs=[code_drawer]
-            )
-
-            historyBtn.click(
-                history_render,
-                inputs=[history],
-                outputs=[history_drawer, history_output]
-            )
-
-            history_drawer.close(
-                lambda: gr.update(open=False),
-                inputs=[],
-                outputs=[history_drawer]
-            )
+    generate_btn.click(
+        fn=generate_code_wrapper,
+        inputs=[input_text, setting, history],
+        outputs=[code_output, code_analysis]
+    )
+    
+    boost_btn.click(
+        fn=handle_boost,
+        inputs=[input_text],
+        outputs=[input_text, loading_indicator]
+    )
+    
+    clear_btn.click(
+        fn=demo_instance.clear_history,
+        inputs=[],
+        outputs=[history]
+    )
+    
+    deploy_btn.click(
+        fn=lambda code, token: deploy_to_huggingface(remove_code_block(code), token) if code else "코드가 없습니다.",
+        inputs=[code_output, hf_token],
+        outputs=[deploy_result]
+    )
+    
+    def toggle_history(history):
+        return gr.update(visible=True), history
+    
+    history_btn.click(
+        fn=toggle_history,
+        inputs=[history],
+        outputs=[history_output, history_output]
+    )
 
 if __name__ == "__main__":
     try:
-        demo_instance = Demo()
         demo.queue(default_concurrency_limit=20).launch(ssr_mode=False)
     except Exception as e:
         print(f"Initialization error: {e}")