webscout 5.2__py3-none-any.whl → 5.4__py3-none-any.whl

webscout/Provider/EDITEE.py

@@ -1,34 +1,11 @@
-import time
-import uuid
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-import click
 import requests
-from requests import get
-from uuid import uuid4
-from re import findall
-from requests.exceptions import RequestException
-from curl_cffi.requests import get, RequestsError
-import g4f
-from random import randint
-from PIL import Image
-import io
-import re
-import json
-import yaml
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation, Proxy
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import  Provider, AsyncProvider
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
-import logging
-import httpx
-import random 
-proxy = Proxy()
+
 
 class Editee(Provider):
     """
@@ -116,7 +93,7 @@ class Editee(Provider):
 
     def _get_session(self):
         """Gets the editeecom_session value."""
-        res = proxy.get("https://editee.com/chat-gpt")
+        res = self.session.get("https://editee.com/chat-gpt")
         if res.cookies.get_dict():
             first_cookie_name, session_value = next(iter(res.cookies.get_dict().items()))
         return session_value
@@ -159,7 +136,7 @@ class Editee(Provider):
             "user_input": conversation_prompt
         }
 
-        response = proxy.post(self.api_endpoint, headers=self.headers, json=payload, timeout=self.timeout)
+        response = self.session.post(self.api_endpoint, headers=self.headers, json=payload, timeout=self.timeout)
         if not response.ok:
             raise exceptions.FailedToGenerateResponseError(
                 f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"

webscout/Provider/Gemini.py

@@ -1,33 +1,10 @@
-import time
-import uuid
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-import click
-import requests
-from requests import get
-from uuid import uuid4
-from re import findall
-from requests.exceptions import RequestException
-from curl_cffi.requests import get, RequestsError
-import g4f
-from random import randint
-from PIL import Image
-import io
-import re
-import json
-import yaml
 from ..AIutel import Optimizers
 from ..AIutel import Conversation
 from ..AIutel import AwesomePrompts, sanitize_stream
 from ..AIbase import  Provider, AsyncProvider
-from Helpingai_T2 import Perplexity
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
-import logging
-import httpx    
+import logging 
 from ..Bard import Chatbot
 import logging
 from os import path

webscout/Provider/Groq.py

@@ -1,5 +1,3 @@
-import time
-import uuid
 from typing import Any, AsyncGenerator, Dict, Optional, Callable, List
 
 import httpx

webscout/Provider/Koboldai.py

@@ -1,32 +1,11 @@
-import time
-import uuid
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-import click
 import requests
-from requests import get
-from uuid import uuid4
-from re import findall
-from requests.exceptions import RequestException
-from curl_cffi.requests import get, RequestsError
-import g4f
-from random import randint
-from PIL import Image
-import io
-import re
 import json
-import yaml
 from ..AIutel import Optimizers
 from ..AIutel import Conversation
 from ..AIutel import AwesomePrompts, sanitize_stream
 from ..AIbase import  Provider, AsyncProvider
-from Helpingai_T2 import Perplexity
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
-import logging
 import httpx
 #------------------------------------------------------KOBOLDAI-----------------------------------------------------------
 class KOBOLDAI(Provider):

webscout/Provider/Llama.py

@@ -1,32 +1,15 @@
-import time
-import uuid
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-import click
+
 import requests
-from requests import get
-from uuid import uuid4
-from re import findall
-from requests.exceptions import RequestException
-from curl_cffi.requests import get, RequestsError
-import g4f
-from random import randint
-from PIL import Image
-import io
-import re
+
 import json
-import yaml
+
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
-import logging
-import httpx
+
 
 class LLAMA(Provider):
     def __init__(

webscout/Provider/NetFly.py

@@ -1,32 +1,16 @@
-import time
-import uuid
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-import click
 import requests
-from requests import get
-from uuid import uuid4
-from re import findall
-from requests.exceptions import RequestException
-from curl_cffi.requests import get, RequestsError
-import g4f
+
 from random import randint
-from PIL import Image
-import io
-import re
+
 import json
-import yaml
+
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
-import logging
-import httpx
+
 
 class NetFly(Provider):
     """
@@ -121,18 +105,6 @@ class NetFly(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> dict:
-        """Chat with AI
-
-        Args:
-            prompt (str): Prompt to be send.
-            stream (bool, optional): Whether to stream the response. Defaults to False.
-            raw (bool, optional): Whether to return the raw response. Defaults to False.
-            optimizer (str, optional): The name of the optimizer to use. Defaults to None.
-            conversationally (bool, optional): Whether to chat conversationally. Defaults to False.
-
-        Returns:
-            The response from the API.
-        """
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             if optimizer in self.__available_optimizers:
@@ -166,7 +138,8 @@ class NetFly(Provider):
                 raise exceptions.FailedToGenerateResponseError(
                     f"Failed to generate response - ({response.status_code}, {response.reason})"
                 )
-            buffer = ""
+
+            full_response = ""
             for line in response.iter_lines(decode_unicode=True):
                 if line:
                     if line.startswith("data: "):
@@ -175,30 +148,25 @@ class NetFly(Provider):
                             break
                         try:
                             data = json.loads(json_data)
-                            # Check if 'content' key exists in 'delta' dictionary
-                            if 'content' in data["choices"][0]["delta"]:
-                                content = data["choices"][0]["delta"].get("content", "")
-                                buffer += content
-                                # Check for completion marker (period in this case)
-                                if buffer.endswith(".") or buffer.endswith("\n"):
-                                    yield buffer if raw else dict(text=buffer)
-                                    buffer = ""  # Clear the buffer
+                            content = data["choices"][0]["delta"].get("content", "")
+                            full_response += content
+                            yield content if raw else dict(text=content)
                         except json.decoder.JSONDecodeError:
                             continue
 
-            # Yield any remaining text in the buffer
-            if buffer:
-                yield buffer if raw else dict(text=buffer)
-
-            self.last_response.update(dict(text=buffer))
+            self.last_response.update(dict(text=full_response))
             self.conversation.update_chat_history(
                 prompt, self.get_message(self.last_response)
             )
 
         def for_non_stream():
-            for _ in for_stream():
-                pass
-            return self.last_response
+            full_response = ""
+            for chunk in for_stream():
+                if isinstance(chunk, dict):
+                    full_response += chunk['text']
+                else:
+                    full_response += chunk
+            return dict(text=full_response)
 
         return for_stream() if stream else for_non_stream()
 
@@ -209,16 +177,6 @@ class NetFly(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str:
-        """Generate response `str`
-        Args:
-            prompt (str): Prompt to be send.
-            stream (bool, optional): Flag for streaming response. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
-        Returns:
-            str: Response generated
-        """
-
         def for_stream():
             for response in self.ask(
                 prompt, True, optimizer=optimizer, conversationally=conversationally
@@ -248,9 +206,11 @@ class NetFly(Provider):
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
+
 if __name__ == '__main__':
     from rich import print
     ai = NetFly()
-    response = ai.chat("tell me about india")
+    response = ai.chat("tell me about india", stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)
+    print()  # Add a newline at the end

webscout/Provider/OLLAMA.py

@@ -1,26 +1,9 @@
-import time
-import uuid
-import requests
-from requests import get
-from uuid import uuid4
-from re import findall
-from requests.exceptions import RequestException
-from curl_cffi.requests import get, RequestsError
-import g4f
-from random import randint
-from PIL import Image
-import io
-import re
-import json
-import yaml
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
-import logging
-import httpx
 import ollama
 
 class OLLAMA(Provider):

webscout/Provider/Openai.py

@@ -1,32 +1,12 @@
-import time
-import uuid
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-import click
-import requests
-from requests import get
-from uuid import uuid4
-from re import findall
-from requests.exceptions import RequestException
-from curl_cffi.requests import get, RequestsError
-import g4f
-from random import randint
-from PIL import Image
-import io
-import re
 import json
-import yaml
 from ..AIutel import Optimizers
 from ..AIutel import Conversation
 from ..AIutel import AwesomePrompts, sanitize_stream
 from ..AIbase import  Provider, AsyncProvider
-from Helpingai_T2 import Perplexity
+
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
-import logging
+
 import httpx
 #----------------------------------------------------------OpenAI-----------------------------------
 class OPENAI(Provider):

webscout/Provider/Perplexity.py

@@ -1,6 +1,5 @@
 import json
 import time
-import uuid
 from typing import Iterable, Dict, Any, Generator
 
 from os import listdir
@@ -11,7 +10,7 @@ from json import loads, dumps
 from random import getrandbits
 from websocket import WebSocketApp
 from requests import Session, get, post
-import yaml
+
 
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation