webscout 5.8__py3-none-any.whl → 6.0__py3-none-any.whl

webscout/Provider/twitterclone.py

@@ -149,45 +149,31 @@ class AIUncensored(Provider):
 
 
         def for_stream():
-
-            try:
-                with requests.post(self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout) as response:
-
-                    if response.status_code == 200:
-                        full_content = ''
-                        for line in response.iter_lines():
-                            decoded_line = line.decode('utf-8').strip()
-                            if decoded_line:
-
-                                if decoded_line == "data: [DONE]":
-
-                                    break
-                                if decoded_line.startswith("data: "):
-                                    data_str = decoded_line[len("data: "):]  
-                                    try:
-                                        data_json = json.loads(data_str)
-                                        content = data_json.get("data", "")
-                                        if content:
-                                            full_content += content
-
-                                            yield content if raw else {"text": full_content}
-                                    except json.JSONDecodeError:
-                                        if data_str != "[DONE]":
-                                            return None
-                    else:
-
-                        raise exceptions.FailedToGenerateResponseError(
-                            f"Request failed with status code: {response.status_code}"
-                        )
-                self.last_response = {"text": full_content}
-
+            with requests.post(self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout) as response:
+
+                if response.status_code == 200:
+                    full_content = ''
+                    for line in response.iter_lines():
+                        decoded_line = line.decode('utf-8').strip()
+                        if decoded_line:
+
+                            if decoded_line == "data: [DONE]":
+
+                                break
+                            if decoded_line.startswith("data: "):
+                                data_str = decoded_line[len("data: "):]  
+                                try:
+                                    data_json = json.loads(data_str)
+                                    content = data_json.get("data", "")
+                                    if content:
+                                        full_content += content
+                                        yield content if raw else dict(text=content)
+                                except json.JSONDecodeError:
+                                    raise Exception
+                self.last_response.update(dict(text=full_content))
                 self.conversation.update_chat_history(
                     prompt, self.get_message(self.last_response)
                 )
-            except requests.exceptions.RequestException as e:
-
-                raise exceptions.FailedToGenerateResponseError(f"An error occurred: {e}")
-
         def for_non_stream():
 
             for _ in for_stream():
@@ -252,9 +238,7 @@ class AIUncensored(Provider):
 
 if __name__ == "__main__":
     from rich import print
-    ai = AIUncensored()
-    user_input = 'hi'
-    response = ai.chat(user_input)
+    ai = AIUncensored(timeout=5000)
+    response = ai.chat("write a poem about AI", stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
-    print()  # For a newline after streaming completes
+        print(chunk, end="", flush=True)

webscout/Provider/upstage.py

@@ -159,7 +159,7 @@ class Upstage(Provider):
                                 content = json_data['choices'][0]['delta'].get('content', '')
                                 if content:
                                     streaming_response += content
-                                    yield content if raw else dict(text=streaming_response)
+                                    yield content if raw else dict(text=content)
                             except json.JSONDecodeError:
                                 print(f"Error decoding JSON: {data}")
 
@@ -224,7 +224,7 @@ class Upstage(Provider):
         return response["text"]
 if __name__ == '__main__':
     from rich import print
-    ai = Upstage()
-    response = ai.chat("hi")
+    ai = Upstage(timeout=5000)
+    response = ai.chat("write a poem about AI", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/x0gpt.py

@@ -118,13 +118,13 @@ class X0GPT(Provider):
                     f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                 )
             streaming_response = ""
-            for line in response.iter_lines(decode_unicode=True, chunk_size=64):
+            for line in response.iter_lines(decode_unicode=True):
                 if line:
                     match = re.search(r'0:"(.*?)"', line)
                     if match:
                         content = match.group(1)
                         streaming_response += content
-                        yield content if raw else dict(text=streaming_response)
+                        yield content if raw else dict(text=content)
             self.last_response.update(dict(text=streaming_response))
             self.conversation.update_chat_history(
                 prompt, self.get_message(self.last_response)
@@ -152,7 +152,7 @@ class X0GPT(Provider):
             for response in self.ask(
                 prompt, True, optimizer=optimizer, conversationally=conversationally
             ):
-                yield self.get_message(response).replace("\n", "\n\n")
+                yield self.get_message(response)
 
         def for_non_stream():
             return self.get_message(
@@ -162,7 +162,7 @@ class X0GPT(Provider):
                     optimizer=optimizer,
                     conversationally=conversationally,
                 )
-            ).replace("\n", "\n\n")
+            )
 
         return for_stream() if stream else for_non_stream()
 
@@ -176,7 +176,7 @@ class X0GPT(Provider):
 
 if __name__ == "__main__":
     from rich import print
-    ai = X0GPT()
-    response = ai.chat("hi")
+    ai = X0GPT(timeout=5000)
+    response = ai.chat("write a poem about AI", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/version.py

@@ -1,2 +1,2 @@
-__version__ = "5.8"
+__version__ = "6.0"
 __prog__ = "webscout"