perplexityai 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

perplexityai/__init__.py

@@ -1,14 +1,13 @@
 __author__ = "Ruu3f"
-__version__ = "1.0.2"
+__version__ = "1.0.5"
 
-from labs import Labs
 from uuid import uuid4
+from requests import Session
 from time import sleep, time
 from threading import Thread
 from json import loads, dumps
 from random import getrandbits
 from websocket import WebSocketApp
-from requests import Session
 
 
 class Perplexity:
@@ -20,11 +19,10 @@ class Perplexity:
         }
         self.session.headers.update(self.user_agent)
         self.t = format(getrandbits(32), "08x")
-        self.sid = loads(
-            self.session.get(
-                url=f"https://www.perplexity.ai/socket.io/?EIO=4&transport=polling&t={self.t}"
-            ).text[1:]
-        )["sid"]
+        response = self.session.get(
+            url=f"https://www.perplexity.ai/socket.io/?EIO=4&transport=polling&t={self.t}"
+        ).text[1:]
+        self.sid = loads(response)["sid"]
         self.n = 1
         self.base = 420
         self.finished = True
@@ -71,17 +69,18 @@ class Perplexity:
                         self.queue.append(message)
                         self.finished = True
 
-        cookies = ""
-        for key, value in self.session.cookies.get_dict().items():
-            cookies += f"{key}={value}; "
-        return WebSocketApp(
+        cookies = "; ".join(
+            [f"{key}={value}" for key, value in self.session.cookies.get_dict().items()]
+        )
+        ws = WebSocketApp(
             url=f"wss://www.perplexity.ai/socket.io/?EIO=4&transport=websocket&sid={self.sid}",
             header=self.user_agent,
-            cookie=cookies[:-2],
+            cookie=cookies,
             on_open=on_open,
             on_message=on_message,
             on_error=lambda ws, err: print(f"WebSocket error: {err}"),
         )
+        return ws
 
     def generate_answer(self, query):
         self.finished = False
@@ -116,3 +115,99 @@ class Perplexity:
             if len(self.queue) != 0:
                 yield self.queue.pop(0)
         self.ws.close()
+
+
+class Labs:
+    def __init__(self):
+        self.history = []
+        self.session = Session()
+        self.session.headers.update(
+            {
+                "User-Agent": "Ask/2.2.1/334 (iOS; iPhone) isiOSOnMac/false",
+                "X-Client-Name": "Perplexity-iOS",
+            }
+        )
+        self.session.get(url=f"https://www.perplexity.ai/search/{str(uuid4())}")
+        self.t = format(getrandbits(32), "08x")
+        response = self.session.get(
+            url="https://labs-api.perplexity.ai/socket.io/?transport=polling&EIO=4"
+        ).text[1:]
+        self.sid = loads(response)["sid"]
+
+        self.queue = []
+        self.finished = True
+
+        response = self.session.post(
+            url=f"https://labs-api.perplexity.ai/socket.io/?EIO=4&transport=polling&t={self.t}&sid={self.sid}",
+            data='40{"jwt":"anonymous-ask-user"}',
+        ).text
+        assert response == "OK", "failed to ask anonymous user"
+
+        self._init_websocket()
+
+        while not (self.ws.sock and self.ws.sock.connected):
+            sleep(0.01)
+
+    def _init_websocket(self):
+        def on_open(ws):
+            ws.send("2probe")
+            ws.send("5")
+
+        def on_message(ws, message):
+            if message == "2":
+                ws.send("3")
+            elif message.startswith("42"):
+                message = loads(message[2:])[1]
+                if "status" not in message:
+                    self.queue.append(message)
+                elif message["status"] == "completed":
+                    self.finished = True
+                    self.history.append(
+                        {
+                            "role": "assistant",
+                            "content": message["output"],
+                            "priority": 0,
+                        }
+                    )
+                elif message["status"] == "failed":
+                    self.finished = True
+
+        cookies = "; ".join(
+            [f"{key}={value}" for key, value in self.session.cookies.get_dict().items()]
+        )
+        self.ws = WebSocketApp(
+            url=f"wss://labs-api.perplexity.ai/socket.io/?EIO=4&transport=websocket&sid={self.sid}",
+            header={
+                "User-Agent": "Ask/2.2.1/334 (iOS; iPhone) isiOSOnMac/false",
+                "Cookie": cookies,
+            },
+            on_open=on_open,
+            on_message=on_message,
+            on_error=lambda ws, err: print(f"websocket error: {err}"),
+        )
+        Thread(target=self.ws.run_forever).start()
+        self.session.get(url="https://www.perplexity.ai/api/auth/session")
+
+    def generate_answer(self, prompt, model="mistral-7b-instruct"):
+        assert self.finished, "already searching"
+        assert model in [
+            "mixtral-8x7b-instruct",
+            "llava-7b-chat",
+            "llama-2-70b-chat",
+            "codellama-34b-instruct",
+            "mistral-7b-instruct",
+            "pplx-7b-chat",
+            "pplx-70b-chat",
+            "pplx-7b-online",
+            "pplx-70b-online",
+        ]
+        self.finished = False
+        self.history.append({"role": "user", "content": prompt, "priority": 0})
+        self.ws.send(
+            f'42["perplexity_labs",{{"version":"2.2","source":"default","model":"{model}","messages":{dumps(self.history)}}}]'
+        )
+
+        while (not self.finished) or (len(self.queue) != 0):
+            if len(self.queue) > 0:
+                yield self.queue.pop(0)
+        self.ws.close()

{perplexityai-1.0.3.dist-info → perplexityai-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: perplexityai
-Version: 1.0.3
+Version: 1.0.5
 Summary: A simple module to use Perplexity AI in Python.
 Home-page: https://github.com/Ruu3f/perplexityai
 Author: Ruu3f

perplexityai-1.0.5.dist-info/RECORD

@@ -0,0 +1,6 @@
+perplexityai/__init__.py,sha256=5QhLPh6qnDIgZJB-iiUs5z4EKD4TsFSfwqcZMIVPwjc,7671
+perplexityai-1.0.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+perplexityai-1.0.5.dist-info/METADATA,sha256=SPSxIS0hVxOsaHCSMGnxB9XxXqKX8ZThHnf6PxRHzD8,2783
+perplexityai-1.0.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+perplexityai-1.0.5.dist-info/top_level.txt,sha256=FjfrNBQgBFDzSUW0lbumU3KJrpdyFC7rx_cn96Jt7Ik,13
+perplexityai-1.0.5.dist-info/RECORD,,

perplexityai/labs.py

@@ -1,114 +0,0 @@
-from uuid import uuid4
-from requests import Session
-from threading import Thread
-from json import loads, dumps
-from random import getrandbits
-from websocket import WebSocketApp
-
-
-class Labs:
-    def __init__(self):
-        self.history = []
-        self.session = Session()
-        self.session.headers.update(
-            {
-                "User-Agent": "Ask/2.2.1/334 (iOS; iPhone) isiOSOnMac/false",
-                "X-Client-Name": "Perplexity-iOS",
-            }
-        )
-        self._init_session_without_login()
-
-        self.t = format(getrandbits(32), "08x")
-        self.sid = loads(
-            self.session.get(
-                url="https://labs-api.perplexity.ai/socket.io/?transport=polling&EIO=4"
-            ).text[1:]
-        )["sid"]
-
-        self.queue = []
-        self.finished = True
-
-        assert self._ask_anonymous_user(), "failed to ask anonymous user"
-        self.ws = WebSocketApp(
-            url=f"wss://labs-api.perplexity.ai/socket.io/?EIO=4&transport=websocket&sid={self.sid}",
-            header=self._get_headers(),
-            on_open=self._on_open,
-            on_message=self._on_message,
-            on_error=lambda ws, err: print(f"websocket error: {err}"),
-        )
-        Thread(target=self.ws.run_forever).start()
-        self._auth_session()
-
-        while not (self.ws.sock and self.ws.sock.connected):
-            import time
-
-            time.sleep(0.01)
-
-    def _init_session_without_login(self):
-        self.session.get(url=f"https://www.perplexity.ai/search/{str(uuid4())}")
-        self.session.headers.update(
-            {"User-Agent": "Ask/2.2.1/334 (iOS; iPhone) isiOSOnMac/false"}
-        )
-
-    def _auth_session(self):
-        self.session.get(url="https://www.perplexity.ai/api/auth/session")
-
-    def _ask_anonymous_user(self):
-        response = self.session.post(
-            url=f"https://labs-api.perplexity.ai/socket.io/?EIO=4&transport=polling&t={self.t}&sid={self.sid}",
-            data='40{"jwt":"anonymous-ask-user"}',
-        ).text
-        return response == "OK"
-
-    def _get_cookies_str(self):
-        return "; ".join(
-            [f"{key}={value}" for key, value in self.session.cookies.get_dict().items()]
-        )
-
-    def _get_headers(self):
-        headers = {"User-Agent": "Ask/2.2.1/334 (iOS; iPhone) isiOSOnMac/false"}
-        headers["Cookie"] = self._get_cookies_str()
-        return headers
-
-    def _on_open(self, ws):
-        ws.send("2probe")
-        ws.send("5")
-
-    def _on_message(self, ws, message):
-        if message == "2":
-            ws.send("3")
-        elif message.startswith("42"):
-            message = loads(message[2:])[1]
-            if "status" not in message:
-                self.queue.append(message)
-            elif message["status"] == "completed":
-                self.finished = True
-                self.history.append(
-                    {"role": "assistant", "content": message["output"], "priority": 0}
-                )
-            elif message["status"] == "failed":
-                self.finished = True
-
-    def generate_answer(self, prompt, model="mistral-7b-instruct"):
-        assert self.finished, "already searching"
-        assert model in [
-            "mixtral-8x7b-instruct",
-            "llava-7b-chat",
-            "llama-2-70b-chat",
-            "codellama-34b-instruct",
-            "mistral-7b-instruct",
-            "pplx-7b-chat",
-            "pplx-70b-chat",
-            "pplx-7b-online",
-            "pplx-70b-online",
-        ]
-        self.finished = False
-        self.history.append({"role": "user", "content": prompt, "priority": 0})
-        self.ws.send(
-            f'42["perplexity_labs",{{"version":"2.2","source":"default","model":"{model}","messages":{dumps(self.history)}}}]'
-        )
-
-        while (not self.finished) or (len(self.queue) != 0):
-            if len(self.queue) > 0:
-                yield self.queue.pop(0)
-        self.ws.close()

perplexityai-1.0.3.dist-info/RECORD

@@ -1,7 +0,0 @@
-perplexityai/__init__.py,sha256=LtVe3dvryPOwxGgEWaj0pAV-WEoXhu3xab2s61DHK2I,4218
-perplexityai/labs.py,sha256=jQTBrQVg9SCqjef96IplUikcN7FZt1z8r_PTF9j0N8k,4027
-perplexityai-1.0.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-perplexityai-1.0.3.dist-info/METADATA,sha256=pXKPDcgjIu-bJiQa04Jr0mx933YcYNkDyQOuuc8nD5c,2783
-perplexityai-1.0.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-perplexityai-1.0.3.dist-info/top_level.txt,sha256=FjfrNBQgBFDzSUW0lbumU3KJrpdyFC7rx_cn96Jt7Ik,13
-perplexityai-1.0.3.dist-info/RECORD,,