Merge pull request #1166 from catmeowjiao/add-proxy

add proxy support
xtekky · Oct 27, 2023 · 0e700a5 · 0e700a5
2 parents 6937ee6 + 325f855
commit 0e700a5
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 11 deletions.
diff --git a/g4f/api/__init__.py b/g4f/api/__init__.py
@@ -105,9 +105,25 @@ async def chat_completions(self):
 
         logger.info(f'model: {model}, stream: {stream}, request: {messages[-1]["content"]}')
 
-        response = self.engine.ChatCompletion.create(model=model, 
-                                                     stream=stream, messages=messages,
-                                                     ignored=self.list_ignored_providers)
+        config = None
+        proxy = None
+
+        try:
+            config = json.load(open("config.json","r",encoding="utf-8"))
+            proxy = config["proxy"]
+
+        except Exception:
+            pass
+
+        if proxy != None:
+            response = self.engine.ChatCompletion.create(model=model,
+                                                        stream=stream, messages=messages,
+                                                        ignored=self.list_ignored_providers,
+                                                        proxy=proxy)
+        else:
+            response = self.engine.ChatCompletion.create(model=model,
+                                                        stream=stream, messages=messages,
+                                                        ignored=self.list_ignored_providers)
 
         completion_id        = ''.join(random.choices(string.ascii_letters + string.digits, k=28))
         completion_timestamp = int(time.time())

diff --git a/g4f/gui/server/backend.py b/g4f/gui/server/backend.py
@@ -1,4 +1,5 @@
 import g4f
+import json
 
 from flask      import request
 from .internet  import search
@@ -43,6 +44,15 @@ def _gen_title(self):
         }
 
     def _conversation(self):
+        config = None
+        proxy = None
+        try:
+            config = json.load(open("config.json","r",encoding="utf-8"))
+            proxy = config["proxy"]
+
+        except Exception:
+            pass
+
         try:
             jailbreak       = request.json['jailbreak']
             internet_access = request.json['meta']['content']['internet_access']
@@ -54,14 +64,25 @@ def _conversation(self):
             messages = special_instructions[jailbreak] + conversation + search(internet_access, prompt) + [prompt]
 
             def stream():
-                yield from g4f.ChatCompletion.create(
-                    model=model,
-                    provider=get_provider(provider),
-                    messages=messages,
-                    stream=True,
-                ) if provider else g4f.ChatCompletion.create(
-                    model=model, messages=messages, stream=True
-                )
+                if proxy != None:
+                    yield from g4f.ChatCompletion.create(
+                        model=model,
+                        provider=get_provider(provider),
+                        messages=messages,
+                        stream=True,
+                        proxy=proxy
+                    ) if provider else g4f.ChatCompletion.create(
+                        model=model, messages=messages, stream=True, proxy=proxy
+                    )
+                else:
+                    yield from g4f.ChatCompletion.create(
+                        model=model,
+                        provider=get_provider(provider),
+                        messages=messages,
+                        stream=True,
+                    ) if provider else g4f.ChatCompletion.create(
+                        model=model, messages=messages, stream=True
+                    )
 
             return self.app.response_class(stream(), mimetype='text/event-stream')