optimizations

diezo · Feb 11, 2024 · 8986e08 · 8986e08
1 parent a7ed841
commit 8986e08
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 216 deletions.
diff --git a/ProGPT/Authentication.py b/ProGPT/Authentication.py
diff --git a/ProGPT/Conversation.py b/ProGPT/Conversation.py
@@ -8,65 +8,26 @@ class Conversation:
 
     session: Session
 
-    session_token: str
+    access_token: str
     conversation_id: str = None
     history_and_training_enabled: bool
-    bearer_token: str
     logging: bool
 
     def __init__(
             self,
-            session_token: str,
+            access_token: str,
             history_and_training_enabled: bool = False,
             logging: bool = False
     ) -> None:
 
         self.logging = logging
-        self.session_token = session_token
+        self.access_token = access_token
         self.history_and_training_enabled = history_and_training_enabled
         self.session: Session = requests.Session()
 
         self.session.headers["user-agent"] = "node"
 
-        self.refresh_bearer_token()
-
-    def refresh_bearer_token(self) -> None:
-
-        response: Response = requests.get(
-            url="https://chat.openai.com/api/auth/session",
-            headers={
-                "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
-                              "(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-                "accept": "*/*",
-                "accept-language": "en-US",
-                "content-type": "application/json",
-                "sec-fetch-dest": "empty",
-                "sec-fetch-mode": "cors",
-                "sec-fetch-site": "same-origin",
-                "cookie": f"__Secure-next-auth.session-token={self.session_token}",
-                "Referer": "https://chat.openai.com",
-                "Referrer-Policy": "strict-origin-when-cross-origin"
-            }
-        )
-
-        try:
-            response_json: dict = response.json()
-
-            if "accessToken" not in response_json:
-                raise Exception(
-                    "Key 'accessToken' not in response JSON. Most probably you're not "
-                    "logged in. Please check your credentials and try deleting the session file."
-                )
-
-            self.bearer_token = response_json["accessToken"]
-
-        except JSONDecodeError:
-            raise Exception(
-                "HTTP Response is not a valid JSON. "
-                "Please check your network connection or switch to another network."
-            )
-
-    def send(self, text: str) -> str:
+    def prompt(self, text: str) -> str:
 
         body: dict = {
             "action": "next",
@@ -99,7 +60,7 @@ def send(self, text: str) -> str:
             headers={
                 "accept": "text/event-stream",
                 "accept-language": "en-US",
-                "authorization": f"Bearer {self.bearer_token}",
+                "authorization": f"Bearer {self.access_token}",
                 "content-type": "application/json",
                 "sec-fetch-dest": "empty",
                 "sec-fetch-mode": "cors",

diff --git a/ProGPT/Generative.py b/ProGPT/Generative.py
@@ -8,65 +8,24 @@ class Generative:
 
     session: Session
 
-    email: str
-    password: str
-
-    session_token: str
-    bearer_token: str
+    access_token: str
+    history_and_training_enabled: bool
     logging: bool
 
     def __init__(
             self,
-            session_token: str,
+            access_token: str,
             history_and_training_enabled: bool = False,
             logging: bool = False
     ) -> None:
 
         self.logging = logging
-        self.session_token = session_token
+        self.access_token = access_token
         self.history_and_training_enabled = history_and_training_enabled
         self.session: Session = requests.Session()
 
         self.session.headers["user-agent"] = "node"
 
-        self.refresh_bearer_token()
-
-    def refresh_bearer_token(self) -> None:
-
-        response: Response = requests.get(
-            url="https://chat.openai.com/api/auth/session",
-            headers={
-                "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
-                              "(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-                "accept": "*/*",
-                "accept-language": "en-US",
-                "content-type": "application/json",
-                "sec-fetch-dest": "empty",
-                "sec-fetch-mode": "cors",
-                "sec-fetch-site": "same-origin",
-                "cookie": f"__Secure-next-auth.session-token={self.session_token}",
-                "Referer": "https://chat.openai.com",
-                "Referrer-Policy": "strict-origin-when-cross-origin"
-            }
-        )
-
-        try:
-            response_json: dict = response.json()
-
-            if "accessToken" not in response_json:
-                raise Exception(
-                    "Key 'accessToken' not in response JSON. Most probably you're not "
-                    "logged in. Please check your credentials and try deleting the session file."
-                )
-
-            self.bearer_token = response_json["accessToken"]
-
-        except JSONDecodeError:
-            raise Exception(
-                "HTTP Response is not a valid JSON. "
-                "Please check your network connection or switch to another network."
-            )
-
     def prompt(self, text: str) -> str:
 
         body: dict = {
@@ -98,7 +57,7 @@ def prompt(self, text: str) -> str:
             headers={
                 "accept": "text/event-stream",
                 "accept-language": "en-US",
-                "authorization": f"Bearer {self.bearer_token}",
+                "authorization": f"Bearer {self.access_token}",
                 "content-type": "application/json",
                 "sec-fetch-dest": "empty",
                 "sec-fetch-mode": "cors",

diff --git a/ProGPT/__init__.py b/ProGPT/__init__.py
@@ -1,3 +1,2 @@
 from .Generative import Generative
 from .Conversation import Conversation
-from .Authentication import Authentication
diff --git a/README.md b/README.md
@@ -17,13 +17,11 @@ Both **Generative** & **Conversation** modes are supported.
 $ pip install progpt
 ```
 
-### How to get *session_token*?
-On your computer:
-1. Open [**chat.openai.com**](https://chat.openai.com) and login
-2. Open DevTools by pressing **F12**
-3. Open **Application** tab
-4. Under **Cookies**, tap **https://chat.openai.com**
-5. From the list of cookies, copy value of **__Secure-next-auth.session-token**
+### How to get *access_token*?
+In your browser:
+1. Login to [**chat.openai.com**](https://chat.openai.com)
+2. Open [**this page**](https://chat.openai.com/api/auth/session), and you'll see **JSON** data
+3. Copy value of **accessToken**
 
 
 ### Generative Mode
@@ -32,7 +30,7 @@ Answers individual prompts, doesn't remember past messages.
 ```python
 from ProGPT import Generative
 
-bot = Generative(session_token)
+bot = Generative(access_token)
 
 print(bot.prompt("who invented electricity?"))
 ```
@@ -43,10 +41,10 @@ Creates a conversation thread and remembers your chat history.
 ```python
 from ProGPT import Conversation
 
-bot = Conversation(session_token)
+bot = Conversation(access_token)
 
-print(bot.send("hello"))
-print(bot.send("how are you?"))
+print(bot.prompt("hello"))
+print(bot.prompt("how are you?"))
 ```
 
 ## Rate Limits