Update app.py

app.py

@@ -11,9 +11,6 @@ import time
 from functools import partial
 import json
 import gradio as gr
-import modelscope_studio.components.base as ms
-import modelscope_studio.components.legacy as legacy
-import modelscope_studio.components.antd as antd
 
 import html
 import urllib.parse
@@ -92,22 +89,6 @@ class Role:
 History = List[Tuple[str, str]]
 Messages = List[Dict[str, str]]
 
-# 이미지 캐시
-IMAGE_CACHE = {}
-
-def get_image_base64(image_path):
-    # Improvement: Consider adding logging and handling specific exceptions
-    if image_path in IMAGE_CACHE:
-        return IMAGE_CACHE[image_path]
-    try:
-        with open(image_path, "rb") as image_file:
-            encoded_string = base64.b64encode(image_file.read()).decode()
-            IMAGE_CACHE[image_path] = encoded_string
-            return encoded_string
-    except Exception as e:
-        # TODO: Log exception details
-        return IMAGE_CACHE.get('default.png', '')
-
 def history_to_messages(history: History, system: str) -> Messages:
     messages = [{'role': Role.SYSTEM, 'content': system}]
     for h in history:
@@ -139,12 +120,7 @@ BUILTIN_MODULES = {
     'getopt', 'logging', 'platform', 'ctypes', 'typing', 'array', 'asyncio', 'concurrent',
     'contextlib', 'dataclasses', 'enum', 'graphlib', 'hashlib', 'hmac', 'io', 'pathlib',
     'pickle', 'shelve', 'shutil', 'signal', 'stat', 'struct', 'tempfile', 'warnings',
-    'weakref', 'zipfile', 'zlib', 'mmap', 'msvcrt', 'winreg', 'winsound', 'crypt',
-    'dbm', 'gzip', 'bz2', 'lzma', 'pwd', 'grp', 'termios', 'tty', 'pty', 'fcntl',
-    'pipes', 'resource', 'nis', 'syslog', 'optparse', 'imp', 'posix', '_thread',
-    'builtins', 'traceback', 'gc', 'inspect', 'site', 'user', 'distutils', 'test',
-    'unittest', 'venv', 'code', 'codeop', 'pdb', 'profile', 'pstats', 'timeit',
-    'trace', 'tracemalloc', 'sched', 'secrets', 'mimetypes'
+    'weakref', 'zipfile', 'zlib'
 }
 
 # Import to Package Name Mapping Dictionary
@@ -156,10 +132,6 @@ IMPORT_TO_PACKAGE = {
     'yaml': 'pyyaml',
     'tensorflow': 'tensorflow-cpu',
     'tf': 'tensorflow-cpu',
-    'wx': 'wxPython',
-    'cairo': 'pycairo',
-    'MySQLdb': 'mysqlclient',
-    'psycopg2': 'psycopg2-binary',
     'magic': 'python-magic',
     'Image': 'pillow'
 }
@@ -316,9 +288,6 @@ async def try_openai_api(openai_messages):
         print(f"OpenAI API error: {str(e)}")
         raise e
 
-def history_render(history: History):
-    return history
-
 def remove_code_block(text):
     text = re.sub(r'```[python|html]?\n', '', text)
     text = re.sub(r'\n```', '', text)
@@ -400,14 +369,6 @@ def boost_prompt(prompt: str) -> str:
         print(f"프롬프트 증강 중 오류 발생: {str(e)}")
         return prompt
 
-def handle_boost(prompt: str):
-    try:
-        boosted_prompt = boost_prompt(prompt)
-        return boosted_prompt
-    except Exception as e:
-        print(f"Boost 처리 중 오류: {str(e)}")
-        return prompt
-
 # 배포 관련 함수 추가
 def generate_space_name():
     """6자리 랜덤 영문 이름 생성"""
@@ -517,21 +478,11 @@ class Demo:
         openai_messages.append({"role": "user", "content": query})
         
         try:
-            yield [
-                "Generating code...",
-                _history
-            ]
-            await asyncio.sleep(0)
-
             collected_content = None
             try:
                 async for content in try_claude_api(system_message, claude_messages):
                     code = content
-                    yield [
-                        code,
-                        _history
-                    ]
-                    await asyncio.sleep(0)
+                    yield code
                 collected_content = code
                 
             except Exception as claude_error:
@@ -539,36 +490,23 @@ class Demo:
                 
                 async for content in try_openai_api(openai_messages):
                     code = content
-                    yield [
-                        code,
-                        _history
-                    ]
-                    await asyncio.sleep(0)
+                    yield code
                 collected_content = code
 
             if collected_content:
-                _history = messages_to_history([
-                    {'role': Role.SYSTEM, 'content': system_message}
-                ] + claude_messages + [{
-                    'role': Role.ASSISTANT,
-                    'content': collected_content
-                }])
-                
-                yield [
-                    collected_content,
-                    _history
-                ]
+                _history.append([query, collected_content])
             else:
                 raise ValueError("No content was generated from either API")
                 
         except Exception as e:
             print(f"Error details: {str(e)}")
             raise ValueError(f'Error calling APIs: {str(e)}')
+            
+        return collected_content
 
     def clear_history(self):
         return []
 
-
 # 예제 프롬프트
 example_prompts = [
     "만년달력을 만들어주세요. 년도와 월을 입력하면 해당 월의 달력이 표시되는 앱입니다.",
@@ -578,26 +516,81 @@ example_prompts = [
     "포모도로 타이머를 만들어주세요. 25분 집중, 5분 휴식을 반복하는 타이머로, 사이클 횟수도 표시됩니다."
 ]
 
+# CSS 스타일
+css = """
+.container {
+    max-width: 1200px;
+    margin: auto;
+}
+.header {
+    text-align: center;
+    margin: 20px 0;
+}
+.header h1 {
+    margin-bottom: 5px;
+    color: #2c3e50;
+}
+.header p {
+    margin-top: 0;
+    color: #7f8c8d;
+}
+.content {
+    display: flex;
+    flex-direction: row;
+    gap: 20px;
+}
+.left-panel, .right-panel {
+    flex: 1;
+    padding: 15px;
+    border-radius: 10px;
+    background-color: #f9f9f9;
+    box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+}
+.status {
+    text-align: center;
+    padding: 10px;
+    margin: 10px 0;
+    border-radius: 5px;
+}
+.generating {
+    background-color: #f39c12;
+    color: white;
+}
+.deploy-section {
+    margin-top: 20px;
+    padding: 15px;
+    border-radius: 10px;
+    background-color: #f0f0f0;
+}
+.footer {
+    text-align: center;
+    margin-top: 30px;
+    padding: 10px;
+    color: #7f8c8d;
+    font-size: 0.8em;
+}
+"""
+
 # Demo 인스턴스 생성
 demo_instance = Demo()
 
-with gr.Blocks(css="body {background-color: #f7f7f7;}") as demo:
+with gr.Blocks(css=css) as demo:
     history = gr.State([])
     setting = gr.State({
         "system": SystemPrompt,
     })
-
-    # 메인 레이아웃
-    with gr.Row():
+    is_generating = gr.State(False)
+
+    gr.HTML("""
+    <div class="header">
+        <h1>MOUSE</h1>
+        <p>고양이도 발로 코딩하는 'MOUSE-II'</p>
+    </div>
+    """)
+    
+    with gr.Row(elem_classes="content"):
         # 좌측 패널
-        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>
-            """)
-            
+        with gr.Column(elem_classes="left-panel"):
             input_text = gr.Textbox(
                 label="원하는 앱 설명을 입력하세요",
                 placeholder=random.choice(DEMO_LIST)['description'],
@@ -614,57 +607,67 @@ with gr.Blocks(css="body {background-color: #f7f7f7;}") as demo:
                 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, 
-                    type="messages"
-                )
+            status_html = gr.HTML("", elem_classes="status")
         
         # 우측 패널
-        with gr.Column(scale=1):
+        with gr.Column(elem_classes="right-panel"):
             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="생성된 코드", 
-                        lines=17
+                        lines=12
                     )
                 
                 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="배포 결과")
+            with gr.Box(elem_classes="deploy-section"):
+                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="배포 결과")
+
+    gr.HTML("""
+    <div class="footer">
+        MOUSE-II - 문의: [email protected]
+    </div>
+    """)
 
     # 이벤트 핸들러
-    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
-        
-        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
+    def start_generating():
+        return "🔄 코드 생성 중...", gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False), True
+    
+    def end_generating():
+        return "", gr.update(interactive=True), gr.update(interactive=True), gr.update(interactive=True), False
+    
+    def update_code_analysis(code):
+        analysis = analyze_code(code)
+        return analysis
+    
+    def handle_boost(prompt):
+        boosted = boost_prompt(prompt)
+        return boosted
     
     generate_btn.click(
-        fn=generate_code_wrapper,
+        fn=start_generating,
+        outputs=[status_html, generate_btn, boost_btn, clear_btn, is_generating]
+    ).then(
+        fn=demo_instance.generation_code,
         inputs=[input_text, setting, history],
-        outputs=[code_output, code_analysis]
+        outputs=code_output
+    ).then(
+        fn=update_code_analysis,
+        inputs=[code_output],
+        outputs=[code_analysis]
+    ).then(
+        fn=end_generating,
+        outputs=[status_html, generate_btn, boost_btn, clear_btn, is_generating]
     )
     
     boost_btn.click(
@@ -680,20 +683,14 @@ with gr.Blocks(css="body {background-color: #f7f7f7;}") as demo:
     )
     
     deploy_btn.click(
-        fn=lambda code, token: deploy_to_huggingface(remove_code_block(code), token) if code else "코드가 없습니다.",
+        fn=lambda code, token: deploy_to_huggingface(code, token) if code else "코드가 없습니다.",
         inputs=[code_output, hf_token],
         outputs=[deploy_result]
     )
-    
-    history_btn.click(
-        fn=history_render,
-        inputs=[history],
-        outputs=[history_output]
-    )
 
 if __name__ == "__main__":
     try:
-        demo.queue(default_concurrency_limit=20).launch(ssr_mode=False)
+        demo.queue().launch(ssr_mode=False)
     except Exception as e:
         print(f"Initialization error: {e}")
         raise