summaryrefslogtreecommitdiffstats
path: root/g4f
diff options
context:
space:
mode:
authorHeiner Lohaus <hlohaus@users.noreply.github.com>2023-11-03 22:24:35 +0100
committerHeiner Lohaus <hlohaus@users.noreply.github.com>2023-11-03 22:24:35 +0100
commitdfefd22aa18f3a8efc32748300ee7dbe8fbb450f (patch)
tree1a6b4c7712697cb1d4f98b0169e096fb4b373c37 /g4f
parentFix NotImplementedError on WIn (diff)
downloadgpt4free-dfefd22aa18f3a8efc32748300ee7dbe8fbb450f.tar
gpt4free-dfefd22aa18f3a8efc32748300ee7dbe8fbb450f.tar.gz
gpt4free-dfefd22aa18f3a8efc32748300ee7dbe8fbb450f.tar.bz2
gpt4free-dfefd22aa18f3a8efc32748300ee7dbe8fbb450f.tar.lz
gpt4free-dfefd22aa18f3a8efc32748300ee7dbe8fbb450f.tar.xz
gpt4free-dfefd22aa18f3a8efc32748300ee7dbe8fbb450f.tar.zst
gpt4free-dfefd22aa18f3a8efc32748300ee7dbe8fbb450f.zip
Diffstat (limited to 'g4f')
-rw-r--r--g4f/Provider/needs_auth/OpenaiChat.py46
1 files changed, 25 insertions, 21 deletions
diff --git a/g4f/Provider/needs_auth/OpenaiChat.py b/g4f/Provider/needs_auth/OpenaiChat.py
index 119626e5..bd44628f 100644
--- a/g4f/Provider/needs_auth/OpenaiChat.py
+++ b/g4f/Provider/needs_auth/OpenaiChat.py
@@ -145,11 +145,6 @@ class OpenaiChat(AsyncGeneratorProvider):
return f"g4f.provider.{cls.__name__} supports: ({param})"
async def get_arkose_token(proxy: str = None) -> str:
- node = shutil.which("node")
- if not node:
- if debug.logging:
- print('OpenaiChat: "node" not found')
- return
dir = os.path.dirname(os.path.dirname(__file__))
include = f'{dir}/npm/node_modules/funcaptcha'
config = {
@@ -175,23 +170,32 @@ fun.getToken(config).then(token => {
tmp.write(source.encode())
tmp.close()
try:
- if sys.platform == 'win32':
- p = subprocess.Popen(
- [node, tmp.name],
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE
- )
- if p.returncode == 0:
- return p.stdout.read().decode()
- raise RuntimeError(f"Exec Error: {p.stderr.read().decode()}")
- p = await asyncio.create_subprocess_exec(
- node, tmp.name,
- stderr=asyncio.subprocess.PIPE,
- stdout=asyncio.subprocess.PIPE
+ return await exec_js(tmp.name)
+ finally:
+ os.unlink(tmp.name)
+
+async def exec_js(file: str) -> str:
+ node = shutil.which("node")
+ if not node:
+ if debug.logging:
+ print('OpenaiChat: "node" not found')
+ return
+ if sys.platform == 'win32':
+ p = subprocess.Popen(
+ [node, file],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE
)
- stdout, stderr = await p.communicate()
+ stdout, stderr = p.communicate()
if p.returncode == 0:
return stdout.decode()
raise RuntimeError(f"Exec Error: {stderr.decode()}")
- finally:
- os.unlink(tmp.name) \ No newline at end of file
+ p = await asyncio.create_subprocess_exec(
+ node, file,
+ stderr=asyncio.subprocess.PIPE,
+ stdout=asyncio.subprocess.PIPE
+ )
+ stdout, stderr = await p.communicate()
+ if p.returncode == 0:
+ return stdout.decode()
+ raise RuntimeError(f"Exec Error: {stderr.decode()}") \ No newline at end of file