Update app.py

app.py

@@ -45,13 +45,19 @@ logging.basicConfig(level=logging.INFO,
                     format="%(asctime)s - %(levelname)s - %(message)s")
 
 # ──────────────────────────────── OpenAI Client ──────────────────────────
+
+# OpenAI 클라이언트에 타임아웃과 재시도 로직 추가
 @st.cache_resource
 def get_openai_client():
-    """Create an OpenAI client."""
+    """Create an OpenAI client with timeout and retry settings."""
     if not OPENAI_API_KEY:
         raise RuntimeError("⚠️ OPENAI_API_KEY 환경 변수가 설정되지 않았습니다.")
-    return OpenAI(api_key=OPENAI_API_KEY)
-
+    return OpenAI(
+        api_key=OPENAI_API_KEY,
+        timeout=60.0,  # 타임아웃 60초로 설정
+        max_retries=3  # 재시도 횟수 3회로 설정
+    )
+    
 # ──────────────────────────────── Blog Creation System Prompt ─────────────
 def get_system_prompt(template="ginigen", tone="professional", word_count=1750, include_search_results=False, include_uploaded_files=False) -> str:
     """
@@ -788,64 +794,126 @@ def process_input(prompt: str, uploaded_files):
             # 사용자 메시지 추가
             api_messages.append({"role": "user", "content": user_content})
             
-            # OpenAI API 호출
-            try:
-                response = client.chat.completions.create(
-                    model=st.session_state.ai_model,
-                    messages=api_messages,
-                    temperature=1,
-                    max_tokens=MAX_TOKENS,
-                    top_p=1
-                )
-                
-                # 응답 추출
-                answer = response.choices[0].message.content
-                status.update(label="Blog generated successfully!", state="complete")
-                
-            except Exception as api_error:
-                error_message = str(api_error)
-                logging.error(f"OpenAI API error: {error_message}")
-                status.update(label=f"API Error: {error_message}", state="error")
-                raise Exception(f"OpenAI API error: {error_message}")
+            # OpenAI API 호출 - 재시도 로직 추가
+            max_retries = 3
+            retry_delay = 2  # 초 단위
+            answer = None
+            used_model = st.session_state.ai_model
+            
+            for retry in range(max_retries):
+                try:
+                    status.update(label=f"Generating blog with {used_model} (attempt {retry+1}/{max_retries})...")
+                    response = client.chat.completions.create(
+                        model=used_model,
+                        messages=api_messages,
+                        temperature=1,
+                        max_tokens=MAX_TOKENS,
+                        top_p=1,
+                        request_timeout=90  # 타임아웃 90초로 설정
+                    )
+                    
+                    # 응답 추출
+                    answer = response.choices[0].message.content
+                    status.update(label=f"Blog generated successfully with {used_model}!", state="complete")
+                    break  # 성공하면 반복문 종료
+                    
+                except Exception as api_error:
+                    error_message = str(api_error)
+                    logging.error(f"OpenAI API error (attempt {retry+1}/{max_retries}): {error_message}")
+                    
+                    if retry < max_retries - 1:
+                        wait_time = retry_delay * (retry + 1)  # 점점 길어지는 대기 시간
+                        status.update(label=f"API Error: {error_message}. Retrying in {wait_time}s... ({retry+1}/{max_retries})")
+                        time.sleep(wait_time)
+                    else:
+                        # 마지막 시도에서도 실패하면 대체 모델 시도
+                        fallback_models = ["gpt-3.5-turbo", "gpt-3.5-turbo-16k"]
+                        if used_model in fallback_models:
+                            fallback_models.remove(used_model)
+                        
+                        # 대체 모델 시도
+                        if fallback_models:
+                            status.update(label="Primary model failed. Trying fallback models...")
+                            for fb_model in fallback_models:
+                                try:
+                                    status.update(label=f"Trying with fallback model: {fb_model}...")
+                                    response = client.chat.completions.create(
+                                        model=fb_model,
+                                        messages=api_messages,
+                                        temperature=1,
+                                        max_tokens=min(MAX_TOKENS, 4096 if "16k" not in fb_model else 16000),
+                                        top_p=1,
+                                        request_timeout=90
+                                    )
+                                    answer = response.choices[0].message.content
+                                    used_model = fb_model
+                                    status.update(label=f"Blog generated with fallback model: {used_model}", state="complete")
+                                    break
+                                except Exception as fb_error:
+                                    logging.error(f"Fallback model {fb_model} also failed: {str(fb_error)}")
+                            
+                            # 대체 모델 중 하나가 성공했는지 확인
+                            if answer:
+                                break
+                        
+                        # 모든 모델이 실패한 경우
+                        if not answer:
+                            status.update(label="All models failed to generate content", state="error")
+                            user_message = "OpenAI API 연결 문제가 발생했습니다. 인터넷 연결을 확인하거나 나중에 다시 시도해 주세요."
+                            if "rate limit" in error_message.lower():
+                                user_message = "OpenAI API 속도 제한에 도달했습니다. 잠시 후 다시 시도해 주세요."
+                            elif "invalid api key" in error_message.lower():
+                                user_message = "유효하지 않은 API 키입니다. API 키를 확인해 주세요."
+                            
+                            raise Exception(user_message)
+            
+            # 결과가 생성되지 않은 경우 오류 발생
+            if not answer:
+                raise Exception("블로그 콘텐츠를 생성하지 못했습니다.")
             
             # 결과 표시
             placeholder.markdown(answer)
 
             # 이미지 생성
             answer_entry_saved = False
-            if st.session_state.generate_image:
+            if st.session_state.generate_image and answer:
                 with st.spinner("Generating image..."):
-                    ip = extract_image_prompt(answer, prompt)
-                    img, cap = generate_image(ip)
-                    if img:
-                        st.image(img, caption=cap)
-                        st.session_state.messages.append({
-                            "role": "assistant",
-                            "content": answer,
-                            "image": img,
-                            "image_caption": cap
-                        })
-                        answer_entry_saved = True
+                    try:
+                        ip = extract_image_prompt(answer, prompt)
+                        img, cap = generate_image(ip)
+                        if img:
+                            st.image(img, caption=cap)
+                            st.session_state.messages.append({
+                                "role": "assistant",
+                                "content": answer,
+                                "image": img,
+                                "image_caption": cap
+                            })
+                            answer_entry_saved = True
+                    except Exception as img_error:
+                        logging.error(f"Image generation error: {str(img_error)}")
+                        st.warning("이미지 생성에 실패했습니다. 블로그 콘텐츠만 저장됩니다.")
 
             # Save the answer if not saved above
-            if not answer_entry_saved:
+            if not answer_entry_saved and answer:
                 st.session_state.messages.append({"role": "assistant", "content": answer})
 
             # Download buttons
-            st.subheader("Download This Blog")
-            c1, c2 = st.columns(2)
-            c1.download_button(
-                "Markdown", 
-                data=answer, 
-                file_name=f"{prompt[:30]}.md",
-                mime="text/markdown"
-            )
-            c2.download_button(
-                "HTML",
-                data=md_to_html(answer, prompt[:30]),
-                file_name=f"{prompt[:30]}.html",
-                mime="text/html"
-            )
+            if answer:
+                st.subheader("Download This Blog")
+                c1, c2 = st.columns(2)
+                c1.download_button(
+                    "Markdown", 
+                    data=answer, 
+                    file_name=f"{prompt[:30]}.md",
+                    mime="text/markdown"
+                )
+                c2.download_button(
+                    "HTML",
+                    data=md_to_html(answer, prompt[:30]),
+                    file_name=f"{prompt[:30]}.html",
+                    mime="text/html"
+                )
 
             # Auto save
             if st.session_state.auto_save and st.session_state.messages: