Update app.py

app.py

@@ -281,93 +281,92 @@ class Demo:
     def __init__(self):
         pass
 
-# Demo 클래스의 generation_code 메서드 수정
-     async def generation_code(self, query: Optional[str], _setting: Dict[str, str], _history: Optional[History]):
-          if not query or query.strip() == '':
-               query = random.choice(DEMO_LIST)['description']
-          
-          if _history is None:
-               _history = []
-          
-          messages = history_to_messages(_history, _setting['system'])
-          system_message = messages[0]['content']
-          
-          claude_messages = [
-               {"role": msg["role"] if msg["role"] != "system" else "user", "content": msg["content"]} 
-               for msg in messages[1:] + [{'role': Role.USER, 'content': query}]
-               if msg["content"].strip() != ''
-          ]
-          
-          openai_messages = [{"role": "system", "content": system_message}]
-          for msg in messages[1:]:
-               openai_messages.append({
-                    "role": msg["role"],
-                    "content": msg["content"]
-               })
-          openai_messages.append({"role": "user", "content": query})
-          
-          try:
-               yield [
-                    "Generating code...",
-                    _history,
-                    None,
-                    gr.update(active_key="loading"),
-                    gr.update(open=True)
-               ]
-               await asyncio.sleep(0)
-
-               collected_content = None
-               try:
-                    async for content in try_claude_api(system_message, claude_messages):
-                         code = content
-                         analysis = analyze_code(code)
-                         yield [
-                              code,
-                              _history,
-                              analysis,  # 분석 결과를 HTML로 전달
-                              gr.update(active_key="loading"),
-                              gr.update(open=True)
-                         ]
-                         await asyncio.sleep(0)
-                    collected_content = code
-                    
-               except Exception as claude_error:
-                    print(f"Falling back to OpenAI API due to Claude error: {str(claude_error)}")
-                    
-                    async for content in try_openai_api(openai_messages):
-                         code = content
-                         analysis = analyze_code(code)
-                         yield [
-                              code,
-                              _history,
-                              analysis,  # 분석 결과를 HTML로 전달
-                              gr.update(active_key="loading"),
-                              gr.update(open=True)
-                         ]
-                         await asyncio.sleep(0)
-                    collected_content = code
-
-               if collected_content:
-                    _history = messages_to_history([
-                         {'role': Role.SYSTEM, 'content': system_message}
-                    ] + claude_messages + [{
-                         'role': Role.ASSISTANT,
-                         'content': collected_content
-                    }])
-                    
+    async def generation_code(self, query: Optional[str], _setting: Dict[str, str], _history: Optional[History]):
+        if not query or query.strip() == '':
+            query = random.choice(DEMO_LIST)['description']
+        
+        if _history is None:
+            _history = []
+        
+        messages = history_to_messages(_history, _setting['system'])
+        system_message = messages[0]['content']
+        
+        claude_messages = [
+            {"role": msg["role"] if msg["role"] != "system" else "user", "content": msg["content"]} 
+            for msg in messages[1:] + [{'role': Role.USER, 'content': query}]
+            if msg["content"].strip() != ''
+        ]
+        
+        openai_messages = [{"role": "system", "content": system_message}]
+        for msg in messages[1:]:
+            openai_messages.append({
+                "role": msg["role"],
+                "content": msg["content"]
+            })
+        openai_messages.append({"role": "user", "content": query})
+        
+        try:
+            yield [
+                "Generating code...",
+                _history,
+                None,
+                gr.update(active_key="loading"),
+                gr.update(open=True)
+            ]
+            await asyncio.sleep(0)
+
+            collected_content = None
+            try:
+                async for content in try_claude_api(system_message, claude_messages):
+                    code = content
+                    analysis = analyze_code(code)
                     yield [
-                         collected_content,
-                         _history,
-                         analyze_code(collected_content),  # 최종 분석 결과를 HTML로 전달
-                         gr.update(active_key="render"),
-                         gr.update(open=True)
+                        code,
+                        _history,
+                        analysis,  # 분석 결과를 HTML로 전달
+                        gr.update(active_key="loading"),
+                        gr.update(open=True)
                     ]
-               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)}')
+                    await asyncio.sleep(0)
+                collected_content = code
+                
+            except Exception as claude_error:
+                print(f"Falling back to OpenAI API due to Claude error: {str(claude_error)}")
+                
+                async for content in try_openai_api(openai_messages):
+                    code = content
+                    analysis = analyze_code(code)
+                    yield [
+                        code,
+                        _history,
+                        analysis,  # 분석 결과를 HTML로 전달
+                        gr.update(active_key="loading"),
+                        gr.update(open=True)
+                    ]
+                    await asyncio.sleep(0)
+                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,
+                    analyze_code(collected_content),  # 최종 분석 결과를 HTML로 전달
+                    gr.update(active_key="render"),
+                    gr.update(open=True)
+                ]
+            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)}')
 
     def clear_history(self):
         return []