Change custom_openai_client and deepseek_client

custom_openai_client.py

@@ -102,20 +102,20 @@ class CustomOpenAI(OpenAI):
             print(f"Unexpected error: {str(e)}")
             return None
 
-    def deepseek_chat(
+    def openai_chat(
         self,
         messages: List[Dict[str, str]],
-        model: str = "deepseek-chat",
+        model: str = "gpt-4-mini",
         temperature: float = 0.7,
         max_tokens: Optional[int] = None,
         **kwargs
     ) -> Optional[str]:
         """
-        Chat completion method for DeepSeek models.
+        Chat completion method for OpenAI models.
         
         Args:
             messages: List of message dictionaries with 'role' and 'content'
-            model: DeepSeek model identifier
+            model: OpenAI model identifier
             temperature: Sampling temperature (0-2)
             max_tokens: Maximum number of tokens to generate
             **kwargs: Additional parameters to pass to the API
@@ -123,14 +123,14 @@ class CustomOpenAI(OpenAI):
         Returns:
             Generated message content or None if an error occurs
         """
-        if not self.deepseek_api_key:
-            raise ValueError("DeepSeek API key is required for deepseek_chat")
+        if not self.api_key:
+            raise ValueError("OpenAI API key is required for openai_chat")
 
         try:
             headers = {
                 "Content-Type": "application/json",
-                "Authorization": f"Bearer {self.deepseek_api_key}",
-                "User-Agent": "DeepseekClient/1.0"
+                "Authorization": f"Bearer {self.api_key}",
+                "OpenAI-Organization": self.organization if self.organization else ""
             }
             
             data = {
@@ -146,7 +146,7 @@ class CustomOpenAI(OpenAI):
             # Add any additional kwargs to the request data
             data.update(kwargs)
             
-            config = self.API_CONFIGS[ModelProvider.DEEPSEEK]
+            config = self.API_CONFIGS[ModelProvider.OPENAI]
             response = requests.post(
                 config.chat_endpoint,
                 headers=headers,
@@ -159,7 +159,7 @@ class CustomOpenAI(OpenAI):
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
             
             if response.status_code != 200:
-                error_msg = f"DeepSeek API request failed with status {response.status_code}"
+                error_msg = f"OpenAI API request failed with status {response.status_code}"
                 try:
                     error_data = response.json()
                     print(f"[DEBUG] Error response: {error_data}")
@@ -172,18 +172,18 @@ class CustomOpenAI(OpenAI):
             response_data = response.json()
             
             if not response_data.get("choices"):
-                raise ValueError("No choices in DeepSeek API response")
+                raise ValueError("No choices in OpenAI API response")
 
             return response_data["choices"][0]["message"]["content"]
 
         except requests.exceptions.RequestException as e:
-            print(f"Network error during DeepSeek API call: {str(e)}")
+            print(f"Network error during OpenAI API call: {str(e)}")
             return None
         except ValueError as e:
-            print(f"DeepSeek API Error: {str(e)}")
+            print(f"OpenAI API Error: {str(e)}")
             return None
         except Exception as e:
-            print(f"Unexpected error in DeepSeek chat: {str(e)}")
+            print(f"Unexpected error in OpenAI chat: {str(e)}")
             return None
 
     def chat_with_retry(
@@ -205,7 +205,10 @@ class CustomOpenAI(OpenAI):
         Returns:
             Generated message content or None if all retries fail
         """
-        chat_method = self.simple_chat if provider == ModelProvider.OPENAI else self.deepseek_chat
+        chat_method = {
+            ModelProvider.OPENAI: self.openai_chat,
+            ModelProvider.DEEPSEEK: self.deepseek_chat
+        }.get(provider, self.simple_chat)
         
         for attempt in range(max_retries):
             try:

deepseek_client.py

@@ -1,7 +1,11 @@
 import os
-from typing import List, Dict
+from typing import List, Dict, Optional
 from config import Config
-from custom_openai_client import CustomOpenAI
+from custom_openai_client import CustomOpenAI, ModelProvider
+import requests
+from dataclasses import dataclass
+from enum import Enum
+import urllib3
 
 class DeepseekClient(CustomOpenAI):
     def __init__(self, api_key=None, **kwargs):
@@ -18,6 +22,89 @@ class DeepseekClient(CustomOpenAI):
             print(f"[DEBUG] Initialization error: {str(e)}")
             raise
 
+    def deepseek_chat(
+        self,
+        messages: List[Dict[str, str]],
+        model: str = "deepseek-chat",
+        temperature: float = 0.7,
+        max_tokens: Optional[int] = None,
+        **kwargs
+    ) -> Optional[str]:
+        """
+        Chat completion method for DeepSeek models.
+        
+        Args:
+            messages: List of message dictionaries with 'role' and 'content'
+            model: DeepSeek model identifier
+            temperature: Sampling temperature (0-2)
+            max_tokens: Maximum number of tokens to generate
+            **kwargs: Additional parameters to pass to the API
+        
+        Returns:
+            Generated message content or None if an error occurs
+        """
+        if not self.deepseek_api_key:
+            raise ValueError("DeepSeek API key is required for deepseek_chat")
+
+        try:
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {self.deepseek_api_key}",
+                "User-Agent": "DeepseekClient/1.0"
+            }
+            
+            data = {
+                "model": model,
+                "messages": messages,
+                "temperature": temperature,
+                "stream": False
+            }
+            
+            if max_tokens is not None:
+                data["max_tokens"] = max_tokens
+            
+            # Add any additional kwargs to the request data
+            data.update(kwargs)
+            
+            config = self.API_CONFIGS[ModelProvider.DEEPSEEK]
+            response = requests.post(
+                config.chat_endpoint,
+                headers=headers,
+                json=data,
+                verify=False,  # SSL検証を無効化（開発環境のみ）
+                timeout=(10, 60)  # 接続タイムアウト10秒、読み取りタイムアウト60秒に延長
+            )
+            # SSL検証を無効にした警告を抑制
+            urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+            
+            if response.status_code != 200:
+                error_msg = f"DeepSeek API request failed with status {response.status_code}"
+                try:
+                    error_data = response.json()
+                    print(f"[DEBUG] Error response: {error_data}")
+                    if "error" in error_data:
+                        error_msg += f": {error_data['error']}"
+                except Exception as e:
+                    print(f"[DEBUG] Failed to parse error response: {str(e)}")
+                raise ValueError(error_msg)
+            
+            response_data = response.json()
+            
+            if not response_data.get("choices"):
+                raise ValueError("No choices in DeepSeek API response")
+
+            return response_data["choices"][0]["message"]["content"]
+
+        except requests.exceptions.RequestException as e:
+            print(f"Network error during DeepSeek API call: {str(e)}")
+            return None
+        except ValueError as e:
+            print(f"DeepSeek API Error: {str(e)}")
+            return None
+        except Exception as e:
+            print(f"Unexpected error in DeepSeek chat: {str(e)}")
+            return None
+
     def create(self, messages: List[Dict[str, str]], model: str = None, **kwargs) -> str:
         print(f"[DEBUG] Starting DeepseekClient::create")
         print(f"[DEBUG] Model: {model or 'deepseek-chat'}")