From feb83c168b0a57ecd8c511aa654209c5f40da30e Mon Sep 17 00:00:00 2001
From: H Lohaus <hlohaus@users.noreply.github.com>
Date: Fri, 26 Jan 2024 07:54:13 +0100
Subject: New minimum requirements (#1515)

* New minimum requirements
* Add ConversationStyleOptionSets to Bing
* Add image.ImageRequest
* Improve python version support
* Improve unittests
---
 g4f/Provider/deprecated/ChatgptDuo.py |  4 ++--
 g4f/Provider/deprecated/GetGpt.py     | 30 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'g4f/Provider/deprecated')

diff --git a/g4f/Provider/deprecated/ChatgptDuo.py b/g4f/Provider/deprecated/ChatgptDuo.py
index c2d2de7a..bd9e195d 100644
--- a/g4f/Provider/deprecated/ChatgptDuo.py
+++ b/g4f/Provider/deprecated/ChatgptDuo.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from ...typing import Messages
-from curl_cffi.requests import AsyncSession
+from ...requests import StreamSession
 from ..base_provider import AsyncProvider, format_prompt
 
 
@@ -19,7 +19,7 @@ class ChatgptDuo(AsyncProvider):
         timeout: int = 120,
         **kwargs
     ) -> str:
-        async with AsyncSession(
+        async with StreamSession(
             impersonate="chrome107",
             proxies={"https": proxy},
             timeout=timeout
diff --git a/g4f/Provider/deprecated/GetGpt.py b/g4f/Provider/deprecated/GetGpt.py
index 69851ee5..dd586569 100644
--- a/g4f/Provider/deprecated/GetGpt.py
+++ b/g4f/Provider/deprecated/GetGpt.py
@@ -5,10 +5,10 @@ import os
 import uuid
 
 import requests
-try:
-    from Crypto.Cipher import AES
-except ImportError:
-    from Cryptodome.Cipher import AES
+# try:
+#     from Crypto.Cipher import AES
+# except ImportError:
+#     from Cryptodome.Cipher import AES
 
 from ...typing import Any, CreateResult
 from ..base_provider import AbstractProvider
@@ -57,19 +57,21 @@ class GetGpt(AbstractProvider):
 
 
 def _encrypt(e: str):
-    t = os.urandom(8).hex().encode('utf-8')
-    n = os.urandom(8).hex().encode('utf-8')
-    r = e.encode('utf-8')
+    # t = os.urandom(8).hex().encode('utf-8')
+    # n = os.urandom(8).hex().encode('utf-8')
+    # r = e.encode('utf-8')
     
-    cipher     = AES.new(t, AES.MODE_CBC, n)
-    ciphertext = cipher.encrypt(_pad_data(r))
+    # cipher     = AES.new(t, AES.MODE_CBC, n)
+    # ciphertext = cipher.encrypt(_pad_data(r))
     
-    return ciphertext.hex() + t.decode('utf-8') + n.decode('utf-8')
+    # return ciphertext.hex() + t.decode('utf-8') + n.decode('utf-8')
+    return
 
 
 def _pad_data(data: bytes) -> bytes:
-    block_size   = AES.block_size
-    padding_size = block_size - len(data) % block_size
-    padding      = bytes([padding_size] * padding_size)
+    # block_size   = AES.block_size
+    # padding_size = block_size - len(data) % block_size
+    # padding      = bytes([padding_size] * padding_size)
     
-    return data + padding
+    # return data + padding
+    return
\ No newline at end of file
-- 
cgit v1.2.3