Added use_httpx option for OpenAI client

PySubtitle/Providers/OpenAI/ChatGPTClient.py

@@ -34,7 +34,7 @@ def _send_messages(self, messages : list[str], temperature):
                 result = self.client.chat.completions.create(
                     model=self.model,
                     messages=messages,
-                    temperature=temperature 
+                    temperature=temperature,
                 )
 
                 if self.aborted:

PySubtitle/Providers/OpenAI/OpenAIClient.py

@@ -2,6 +2,7 @@
 
 try:
     import openai
+    import httpx
 
     from PySubtitle.Helpers import FormatMessages
     from PySubtitle.SubtitleError import TranslationError, TranslationImpossibleError
@@ -30,7 +31,10 @@ def __init__(self, settings : dict):
 
             logging.info(f"Translating with OpenAI model {self.model or 'default'}, Using API Base: {openai.base_url}")
 
-            self.client = openai.OpenAI(api_key=openai.api_key, base_url=openai.base_url)
+            # Optionally use httpx for requests
+            http_client = httpx.Client(base_url=openai.base_url, follow_redirects=True) if self.api_base and self.settings.get('use_httpx') else None
+
+            self.client = openai.OpenAI(api_key=openai.api_key, base_url=openai.base_url, http_client=http_client)
 
         @property
         def api_key(self):

PySubtitle/Providers/Provider_OpenAI.py

@@ -41,6 +41,7 @@ def __init__(self, settings : dict):
                 'rate_limit': settings.get('rate_limit', GetEnvFloat('OPENAI_RATE_LIMIT')),
                 "free_plan": settings.get('free_plan', os.getenv('OPENAI_FREE_PLAN') == "True"),
                 'max_instruct_tokens': settings.get('max_instruct_tokens', int(os.getenv('MAX_INSTRUCT_TOKENS', 2048))),
+                'use_httpx': settings.get('use_httpx', os.getenv('OPENAI_USE_HTTPX', "False") == "True")
             })
 
             self.refresh_when_changed = ['api_key', 'api_base', 'model']
@@ -71,6 +72,9 @@ def GetOptions(self) -> dict:
                 'api_base': (str, "The base URL to use for requests - leave as default unless you know you need something else"),
             }
 
+            if self.api_base:
+                options['use_httpx'] = (bool, "Use the httpx library for requests. May help if you receive a 307 redirect error with a custom api_base")
+
             if self.api_key:
                 models = self.available_models
                 if models:

gpt-subtrans.py

@@ -47,6 +47,7 @@
 parser.add_argument('--batchthreshold', type=float, default=None, help="Number of seconds between lines to consider for batching")
 parser.add_argument('--debug', action='store_true', help="Run with DEBUG log level")
 parser.add_argument('--description', type=str, default=None, help="A brief description of the film to give context")
+parser.add_argument('--httpx', action='store_true', help="Use the httpx library for custom api_base requests. May help if you receive a 307 redirect error.")
 parser.add_argument('--includeoriginal', action='store_true', help="Include the original text in the translated subtitles")
 parser.add_argument('--instruction', action='append', type=str, default=None, help="An instruction for the AI translator")
 parser.add_argument('--instructionfile', type=str, default=None, help="Name/path of a file to load instructions from")
@@ -95,6 +96,7 @@
         'substitutions': ParseSubstitutions(args.substitution),
         'target_language': args.target_language,
         'temperature': args.temperature,
+        'use_httpx': args.httpx,
         'write_backup': args.writebackup,
     })
 

readme.md

@@ -191,6 +191,9 @@ gpt-subtrans path/to/my/subtitles.srt --moviename "My Awesome Movie" --ratelimit
 - `-b`, `--apibase`:
   API base URL if you are using a custom instance. if it is not set, the default URL will be used.
 
+- '--httpx':
+  Use the [HTTPX library](https://github.com/projectdiscovery/httpx) for requests (only supported if apibase is specified)
+
 - `-m`, `--model`:
   Specify the [AI model](https://platform.openai.com/docs/models) to use for translation
 

requirements.txt

@@ -7,3 +7,4 @@ requests
 darkdetect
 setuptools
 pyside6
+httpx