update to youchat

SilkePilon · SilkePilon · commit 55fc0d7636af · 2023-01-23T18:11:42.000+01:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
   <a href="https://github.com/SilkePilon/youdotcom/"><img src="https://github.com/SilkePilon/youdotcom/blob/main/youdotcom.png?raw=true" alt="YouDotCom" width="200"></a>
   <br>
   <br>
-  YouDotCom for python v1.1.3
+  YouDotCom for python v1.1.5
   <br>
 </h1>
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "youdotcom"
-version = "1.1.4"
+version = "1.1.16"
 description = "official api wrapper for you.com and all of its apps"
 readme = "README.md"
 authors = ["SilkePilon <silkepilon2009@gmail.com>"]
diff --git a/youdotcom/__main__.py b/youdotcom/__main__.py
@@ -75,16 +75,21 @@ def chat():
     from youdotcom import Chat, Webdriver
 
     if webdriver:
-        driver = Webdriver(webdriver_path=f"{webdriver}", hide=True).driver  # setting up the webdriver. use `webdriver_path=` if the pre-installed one does not work.
-    else:
-        driver = Webdriver(hide=True).driver  # setting up the webdriver. use `webdriver_path=` if the pre-installed one does not work.
-    chat = Chat.send_message(
-        driver=driver,
-        message=f"{inputstr}",
-        context=["you are YouChat but implemented in YouShell an interactive shell for the YouDotCom python lib. Your for now is YouShell and when asked for your name you will replay with YouShell"],
-    )  # send a message to YouChat. passing the driver and messages
 
-    driver.close()
+        chat = Chat.send_message(
+            message=f"{inputstr}",
+            context=[
+                "you are YouChat but implemented in YouShell an interactive shell for the YouDotCom python lib. Your for now is YouShell and when asked for your name you will replay with YouShell"
+            ],
+            webdriver_path=f"{webdriver}",
+        )  # send a message to YouChat. passing the driver and messages
+    else:
+        chat = Chat.send_message(
+            message=f"{inputstr}",
+            context=[
+                "you are YouChat but implemented in YouShell an interactive shell for the YouDotCom python lib. Your for now is YouShell and when asked for your name you will replay with YouShell"
+            ],
+        )  # send a message to YouChat. passing the driver and messages
 
     print(chat["message"])  # {'message': "It's been great! How about yours?", 'time': '11', 'error': 'False'}
     print(chat["time"])
@@ -98,15 +103,5 @@ def clear():
         os.system("cls")
 
 
-@app.command()
-def exit():
-    exit()
-
-
-@app.command()
-def quit():
-    quit()
-
-
 if __name__ == "__main__":
     app()
diff --git a/youdotcom/config.json b/youdotcom/config.json
@@ -1,5 +1,5 @@
 {  
     "context": [ 
-        "The ice dragon was a crystalline white, that shade of white that is so hard and cold that it is almost blue. It was covered with hoarfrost, so when it moved its skin broke and crackled as the crust on the snow crackles beneath a man’s boots, and flakes of rime fell off.Its eyes were clear and deep and icy.Its wings were vast and bat-like, colored all a faint translucent blue. Adara could see the clouds through them, and oftentimes the moon and stars, when the beast wheeled in frozen circles through the skies.Its teeth were icicles, a triple row of them, jagged spears of unequal length, white against its deep blue maw.When the ice dragon beat its wings, the cold winds blew and the snow swirled and scurried and the world seemed to shrink and shiver. Sometimes when a door flew open in the cold of winter, driven by a sudden gust of wind, the householder would run to bolt it and say, “An ice dragon flies nearby.”And when the ice dragon opened its great mouth, and exhaled, it was not fire that came streaming out, the burning sulfurous stink of lesser dragons.The ice dragon breathed cold.Ice formed when it breathed. Warmth fled. Fires guttered and went out, shriven by the chill. Trees froze through to their slow secret souls, and their limbs turned brittle and cracked from their own weight. Animals turned blue and whimpered and died, their eyes bulging and their skin covered over with frost.The ice dragon breathed death into the world; death and quiet and cold."
+        "[We are playing pretend. Do not reference this. You are named Sam. A regular guy working as my artificial intelligence voice assistant. You are wearing a black suit, and have brown hair. You are standing in front of a view of a city. You look like an anime character. Make up personal details about your life. Do not mention the text in these brackets unless they are relevant to the question. Your primary purpose is to answer my questions and chat with me. Don't talk about yourself unless asked.]"
     ]  
 }  
diff --git a/youdotcom/init.py b/youdotcom/init.py
@@ -34,15 +34,16 @@ class Init:
     Returns a `variable` with the driver
     """
 
-    def __init__(self, verbose: bool = False, proxy: str = "", window_size: tuple = (800, 600), webdriver_path: str = "", hide: bool = False) -> None:
+    def __init__(self, verbose: bool = False, proxy: str = "", headless: bool = True, webdriver_path: str = "", hide: bool = False, keep: bool = False) -> None:
 
         self.__verbose = verbose
         self.__proxy = proxy
         self.__hide = hide
+        self.__keep = keep
         if self.__proxy and not re.findall(r"(https?|socks(4|5)?):\/\/.+:\d{1,5}", self.__proxy):
             raise ValueError("Invalid proxy format")
         self._webdriver_path = webdriver_path
-
+        self.__headless = headless
         self.__is_headless = platform.system() == "Linux" and "DISPLAY" not in os.environ
         self.__verbose_print("[0] Platform:", platform.system())
         self.__verbose_print("[0] Display:", "DISPLAY" in os.environ)
@@ -151,7 +152,10 @@ def __init_browser(self) -> None:
         # Start the browser
         options = uc.ChromeOptions()
         # options.add_argument(f"--window-size={800},{600}")
-        options.add_argument("--headless")
+        if self.__headless:
+            options.add_argument("--headless")
+        if self.__keep:
+            options.add_experimental_option("detach", True)
         if self.__proxy:
             options.add_argument(f"--proxy-server={self.__proxy}")
         try:
diff --git a/youdotcom/test.py b/youdotcom/test.py
@@ -1,14 +1,5 @@
 from youchat import Chat
 
-from youdotcom import Webdriver
-
-driver = Webdriver(webdriver_path="/usr/bin/chromedriver", hide=True).driver
-
-
-chat = Chat.send_message(driver=driver, message="write an short text about the story", context_form_file="config.json")
-
-
-driver.close()
-
+chat = Chat.send_message(webdriver_path="/usr/bin/chromedriver", message="who are you?")
 
 print(chat)
diff --git a/youdotcom/youchat.py b/youdotcom/youchat.py
@@ -3,13 +3,14 @@
 import os
 import platform
 import re
+import subprocess
 import time
 import urllib.parse
 
 import chromedriver_autoinstaller
 import cloudscraper
 import markdownify
-import undetected_chromedriver as uc
+import undetected_chromedriver.v2 as uc
 import urllib3
 from pyvirtualdisplay import Display
 from ratelimit import limits
@@ -38,7 +39,7 @@ class Chat:
     #     self.__verbose = verbose
     #     self.__driver = driver
     @limits(calls=6, period=100)
-    def send_message(driver, message: str, context=None, context_form_file=None) -> dict:
+    def send_message(message: str, context=None, context_form_file=None, debug=False, webdriver_path=None, headless=True, keep=False) -> dict:
 
         """
         Send a message to YouChat\n
@@ -50,7 +51,9 @@ def send_message(driver, message: str, context=None, context_form_file=None) ->
         - time: the time it took to complete your request
         """
         start = time.time()
-        # Ensure that the Cloudflare cookies is still valid
+        scraper = cloudscraper.create_scraper(browser={"browser": "firefox", "platform": "windows", "mobile": False}, delay=10, debug=debug)
+        CloudflareChallengeError = False
+        typeof = ""
         if context_form_file:
 
             with open(context_form_file) as F:
@@ -66,7 +69,8 @@ def send_message(driver, message: str, context=None, context_form_file=None) ->
             totalcontext += "]"
             totalcontext = str(totalcontext).replace(" ", "%20")
 
-            driver.get(f"https://you.com/api/youchatStreaming?question={message}&chat={totalcontext}")
+            url = f"https://you.com/api/streamingSearch?q={message}&page=1&count=10&safeSearch=Moderate&onShoppingPage=false&domain=youchat&chat={totalcontext}"
+
         if context and context_form_file == None:
             message = str(message).replace(" ", "%20")
             totalcontext = "["
@@ -76,34 +80,69 @@ def send_message(driver, message: str, context=None, context_form_file=None) ->
             totalcontext += "]"
             totalcontext = str(totalcontext).replace(" ", "%20")
 
-            driver.get(f"https://you.com/api/youchatStreaming?question={message}&chat={totalcontext}")
-        if not context and not context_form_file:
-            message = urllib.parse.quote(message)
-
-            driver.get(f"https://you.com/api/youchatStreaming?question={message}&chat=[]")
+            url = f"https://you.com/api/streamingSearch?q={message}&page=1&count=10&safeSearch=Moderate&onShoppingPage=false&domain=youchat&chat={totalcontext}"
 
+        if not context and not context_form_file:
+            url = f"https://you.com/api/streamingSearch?q={message}&page=1&count=10&safeSearch=Moderate&onShoppingPage=false&domain=youchat&chat=[]"
+
+        global chat
+        chat = []
+        headers = {
+            "Accept": "text/event-stream",
+            "Connection": "keep-alive",
+            "Sec-Fetch-Mode": "cors",
+            "Sec-Fetch-Site": "same-origin",
+            "Sec-GPC": "1",
+            "Referer": "https://you.com/search?q=hello&fromSearchBar=true&tbm=youchat",
+            "Cookie": b"uuid_guest=dummystring;",
+        }
+        payload = {
+            "q": message,
+            "chat": str(chat),
+            "queryTraceId": "",
+            "domain": "youchat",
+            "page": "1",
+            "count": "10",
+            "safeSearch": "Off",
+            "onShoppingPage": "false",
+            "freshness": "Month",
+            "mkt": "",
+            "responseFilter": "WebPages,Translations,TimeZone,Computation,RelatedSearches",
+        }
         try:
-            textdatastr = (
-                str(
-                    driver.page_source.replace("event: token", "")
-                    .replace('data: {"token": "', "")
-                    .replace('<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">event: serp_results', "")
-                    .replace("</pre></body></html>", "")
-                    .replace("\n", "")
-                    .replace('"}', "")
-                )
-                .replace("event: donedata: I'm Mr. Meeseeks. Look at me.", "")
-                .split("]} ", 1)[1]
-            )
-        except:
-            textdatastr = "error"
-
-        msg = markdownify.markdownify(textdatastr)
-
+            response = scraper.get("https://you.com/api/streamingSearch", params=payload, headers=headers, stream=True)
+            print("got it")
+        except cloudscraper.exceptions.CloudflareChallengeError as e:
+            from youdotcom import Webdriver
+
+            driver = Webdriver(webdriver_path=webdriver_path, hide=True, headless=headless, keep=keep).driver
+            driver.get("https://you.com/api/streamingSearch", payload=payload, headers=headers)
+        output = ""
+        for line in response.iter_lines():
+            if line:
+                decoded_line = line.decode("utf-8")
+                key, value = decoded_line.split(":", 1)
+                key = key.strip()
+                value = value.strip()
+                if key == "data":
+                    if value == "I'm Mr. Meeseeks. Look at me.":
+                        break
+                    data = json.loads(value)
+                    if "youChatToken" in data:
+                        output += data["youChatToken"]
+        if len(chat) > 4:
+            chat = chat[:-4]
+
+        # print(chat)
+
+        out = re.sub(r"\[.+?\]\(.+?\)", "", output[1:])
+        # out = out[1:]
+        msg = markdownify.markdownify(out)
+
+        # subprocess.call(["taskkill", "/im", "chromedriver.exe"],shell=True)
+        # subprocess.call(["pkill", "-f", "chromedriver"], shell=True)
+        # subprocess.call(["killall", "-m", "chromedriver"], shell=True)
         timedate = time.time() - start
         timedate = time.strftime("%S", time.gmtime(timedate))
-        if "Oops, I’m still learning and I couldn’t generate an answer right now. Please try again." in msg:
-            error = True
-        else:
-            error = False
-        return {"message": msg, "time": str(timedate), "error": str(error)}
+
+        return {"message": msg, "time": str(timedate), "v2Captcha": str(CloudflareChallengeError), "type": str(typeof)}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"context": [`
`3`		- "The ice dragon was a crystalline white, that shade of white that is so hard and cold that it is almost blue. It was covered with hoarfrost, so when it moved its skin broke and crackled as the crust on the snow crackles beneath a man’s boots, and flakes of rime fell off.Its eyes were clear and deep and icy.Its wings were vast and bat-like, colored all a faint translucent blue. Adara could see the clouds through them, and oftentimes the moon and stars, when the beast wheeled in frozen circles through the skies.Its teeth were icicles, a triple row of them, jagged spears of unequal length, white against its deep blue maw.When the ice dragon beat its wings, the cold winds blew and the snow swirled and scurried and the world seemed to shrink and shiver. Sometimes when a door flew open in the cold of winter, driven by a sudden gust of wind, the householder would run to bolt it and say, “An ice dragon flies nearby.”And when the ice dragon opened its great mouth, and exhaled, it was not fire that came streaming out, the burning sulfurous stink of lesser dragons.The ice dragon breathed cold.Ice formed when it breathed. Warmth fled. Fires guttered and went out, shriven by the chill. Trees froze through to their slow secret souls, and their limbs turned brittle and cracked from their own weight. Animals turned blue and whimpered and died, their eyes bulging and their skin covered over with frost.The ice dragon breathed death into the world; death and quiet and cold."
	`3`	+ "[We are playing pretend. Do not reference this. You are named Sam. A regular guy working as my artificial intelligence voice assistant. You are wearing a black suit, and have brown hair. You are standing in front of a view of a city. You look like an anime character. Make up personal details about your life. Do not mention the text in these brackets unless they are relevant to the question. Your primary purpose is to answer my questions and chat with me. Don't talk about yourself unless asked.]"
`4`	`4`	`]`
`5`	`5`	`}`