|
|
@ -145,11 +145,6 @@ class OpenaiChat(AsyncGeneratorProvider):
|
|
|
|
return f"g4f.provider.{cls.__name__} supports: ({param})"
|
|
|
|
return f"g4f.provider.{cls.__name__} supports: ({param})"
|
|
|
|
|
|
|
|
|
|
|
|
async def get_arkose_token(proxy: str = None) -> str:
|
|
|
|
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__))
|
|
|
|
dir = os.path.dirname(os.path.dirname(__file__))
|
|
|
|
include = f'{dir}/npm/node_modules/funcaptcha'
|
|
|
|
include = f'{dir}/npm/node_modules/funcaptcha'
|
|
|
|
config = {
|
|
|
|
config = {
|
|
|
@ -175,23 +170,32 @@ fun.getToken(config).then(token => {
|
|
|
|
tmp.write(source.encode())
|
|
|
|
tmp.write(source.encode())
|
|
|
|
tmp.close()
|
|
|
|
tmp.close()
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
if sys.platform == 'win32':
|
|
|
|
return await exec_js(tmp.name)
|
|
|
|
p = subprocess.Popen(
|
|
|
|
finally:
|
|
|
|
[node, tmp.name],
|
|
|
|
os.unlink(tmp.name)
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
|
|
|
|
stderr=subprocess.PIPE
|
|
|
|
async def exec_js(file: str) -> str:
|
|
|
|
)
|
|
|
|
node = shutil.which("node")
|
|
|
|
if p.returncode == 0:
|
|
|
|
if not node:
|
|
|
|
return p.stdout.read().decode()
|
|
|
|
if debug.logging:
|
|
|
|
raise RuntimeError(f"Exec Error: {p.stderr.read().decode()}")
|
|
|
|
print('OpenaiChat: "node" not found')
|
|
|
|
p = await asyncio.create_subprocess_exec(
|
|
|
|
return
|
|
|
|
node, tmp.name,
|
|
|
|
if sys.platform == 'win32':
|
|
|
|
stderr=asyncio.subprocess.PIPE,
|
|
|
|
p = subprocess.Popen(
|
|
|
|
stdout=asyncio.subprocess.PIPE
|
|
|
|
[node, file],
|
|
|
|
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
|
|
|
|
stderr=subprocess.PIPE
|
|
|
|
)
|
|
|
|
)
|
|
|
|
stdout, stderr = await p.communicate()
|
|
|
|
stdout, stderr = p.communicate()
|
|
|
|
if p.returncode == 0:
|
|
|
|
if p.returncode == 0:
|
|
|
|
return stdout.decode()
|
|
|
|
return stdout.decode()
|
|
|
|
raise RuntimeError(f"Exec Error: {stderr.decode()}")
|
|
|
|
raise RuntimeError(f"Exec Error: {stderr.decode()}")
|
|
|
|
finally:
|
|
|
|
p = await asyncio.create_subprocess_exec(
|
|
|
|
os.unlink(tmp.name)
|
|
|
|
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()}")
|