webscout 6.7__py3-none-any.whl → 6.9__py3-none-any.whl

webscout/Provider/RUBIKSAI.py

@@ -1,4 +1,4 @@
-import requests
+import cloudscraper
 import json
 from typing import Any, Dict, Optional
 
@@ -30,6 +30,7 @@ class RUBIKSAI(Provider):
         history_offset: int = 10250,
         act: str = None,
         model: str = "gpt-4o-mini",
+        temperature: float = 0.6,
     ) -> None:
         """
         Initializes the RUBIKSAI API with given parameters.
@@ -48,25 +49,54 @@ class RUBIKSAI(Provider):
             act (str|int, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
             model (str, optional): AI model to use. Defaults to "gpt-4o-mini". 
                                     Available models: "gpt-4o-mini", "gemini-1.5-pro"
+            temperature (float, optional): Sampling temperature. Defaults to 0.6.
         """
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
-        self.session = requests.Session()
+        self.temperature = temperature
+        self.session = cloudscraper.create_scraper()
+        self.api_endpoint = "https://rubiks.ai/search/api/"
+        
+        # Updated headers with all necessary fields
+        self.headers = {
+            "authority": "rubiks.ai",
+            "accept": "*/*",
+            "accept-encoding": "gzip, deflate, br, zstd",
+            "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
+            "content-type": "application/json",
+            "dnt": "1",
+            "origin": "https://rubiks.ai",
+            "referer": f"https://rubiks.ai/search/?q=&model={model}",
+            "sec-ch-ua": '"Microsoft Edge";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"Windows"',
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-origin",
+            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Edg/131.0.0.0"
+        }
+
+        # Get initial cookies
+        init_response = self.session.get("https://rubiks.ai/search/")
+        if not init_response.ok:
+            raise exceptions.FailedToGenerateResponseError("Failed to initialize session")
+
+        # Extract cf_clearance and other cookies
+        self.cookies = {
+            'cf_clearance': init_response.cookies.get('cf_clearance', ''),
+        }
+        
+        # Update session with cookies and headers
+        self.session.headers.update(self.headers)
+        self.session.cookies.update(self.cookies)
+
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
-        self.api_endpoint = "https://rubiks.ai/search/api.php"
         self.stream_chunk_size = 64
         self.timeout = timeout
         self.last_response = {}
         self.model = model
-        self.headers = {
-            "accept": "text/event-stream",
-            "accept-encoding": "gzip, deflate, br, zstd",
-            "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
-            "cache-control": "no-cache",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0"
-        }
 
         self.__available_optimizers = (
             method
@@ -119,41 +149,66 @@ class RUBIKSAI(Provider):
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
 
-        params = {
-            "q": conversation_prompt,
+        payload = {
             "model": self.model,
+            "stream": True,
+            "messages": [{"role": "user", "content": conversation_prompt}],
+            "temperature": self.temperature,
+            "search": ""
         }
 
         def for_stream():
-            response = self.session.get(
-                self.api_endpoint, params=params, headers=self.headers, stream=True, timeout=self.timeout
-            )
+            try:
+                response = self.session.post(
+                    self.api_endpoint,
+                    json=payload,
+                    stream=True,
+                    timeout=self.timeout
+                )
+                
+                if response.status_code == 403:
+                    # Try to refresh the session
+                    init_response = self.session.get("https://rubiks.ai/search/")
+                    self.cookies['cf_clearance'] = init_response.cookies.get('cf_clearance', '')
+                    self.session.cookies.update(self.cookies)
+                    
+                    # Retry the request
+                    response = self.session.post(
+                        self.api_endpoint,
+                        json=payload,
+                        stream=True,
+                        timeout=self.timeout
+                    )
+
+                if not response.ok:
+                    raise exceptions.FailedToGenerateResponseError(
+                        f"Failed to generate response - ({response.status_code}, {response.reason})"
+                    )
 
-            if not response.ok:
-                raise exceptions.FailedToGenerateResponseError(
-                    f"Failed to generate response - ({response.status_code}, {response.reason})"
+                # ...rest of the streaming code...
+                streaming_response = ""
+                for line in response.iter_lines(decode_unicode=True):
+                    if line:
+                        if line.startswith("data: "):
+                            json_data = line[6:]
+                            if json_data == "[DONE]":
+                                break
+                            try:
+                                data = json.loads(json_data)
+                                if "choices" in data and len(data["choices"]) > 0:
+                                    content = data["choices"][0]["delta"].get("content", "")
+                                    streaming_response += content
+                                    yield content if raw else dict(text=content)
+                            except json.decoder.JSONDecodeError:
+                                continue
+
+                self.last_response.update(dict(text=streaming_response))
+                self.conversation.update_chat_history(
+                    prompt, self.get_message(self.last_response)
                 )
 
-            streaming_response = ""
-            for line in response.iter_lines(decode_unicode=True):
-                if line:
-                    if line.startswith("data: "):
-                        json_data = line[6:]
-                        if json_data == "[DONE]":
-                            break
-                        try:
-                            data = json.loads(json_data)
-                            if "choices" in data and len(data["choices"]) > 0:
-                                content = data["choices"][0]["delta"].get("content", "")
-                                streaming_response += content
-                                yield content if raw else dict(text=content) 
-                        except json.decoder.JSONDecodeError:
-                            continue
-
-            self.last_response.update(dict(text=streaming_response))
-            self.conversation.update_chat_history(
-                prompt, self.get_message(self.last_response)
-            )
+            except Exception as e:
+                raise exceptions.FailedToGenerateResponseError(f"Request failed: {str(e)}")
 
         def for_non_stream():
             for _ in for_stream():

webscout/Provider/__init__.py

@@ -14,9 +14,7 @@ from .Phind import PhindSearch
 from .Phind import Phindv2
 from .ai4chat import *
 from .Gemini import GEMINI
-from .Deepseek import DeepSeek
 from .Deepinfra import DeepInfra
-from .Farfalle import *
 from .cleeai import *
 from .OLLAMA import OLLAMA
 from .Andi import AndiSearch
@@ -54,18 +52,15 @@ from .bagoodex import *
 from .aimathgpt import *
 from .gaurish import *
 from .geminiprorealtime import *
-from .NinjaChat import *
 from .llmchat import *
 from .talkai import *
 from .askmyai import *
 from .llama3mitril import *
 from .Marcus import *
 from .typegpt import *
-from .mhystical import *
 from .multichat import *
 from .Jadve import *
 __all__ = [
-    'Farfalle',
     'LLAMA', 
     'Cohere',
     'REKA',
@@ -78,7 +73,6 @@ __all__ = [
     'BLACKBOXAI', 
     'PhindSearch', 
     'GEMINI',
-    'DeepSeek',
     'DeepInfra',
     'AI4Chat',
     'Phindv2',
@@ -121,13 +115,11 @@ __all__ = [
     'AIMathGPT',
     'GaurishCerebras',
     'GeminiPro',
-    'NinjaChat',
     'LLMChat',
     'Talkai',
     'Llama3Mitril',
     'Marcus',
     'TypeGPT',
-    'Mhystical',
     'Netwrck',
     'MultiChatAI',
     'JadveOpenAI',

webscout/Provider/cerebras.py

@@ -6,7 +6,7 @@ from typing import Any, Dict, Optional, Generator, List, Union
 from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-from fake_useragent import UserAgent
+from webscout import LitAgent as UserAgent
 
 class Cerebras(Provider):
     """
@@ -89,7 +89,7 @@ class Cerebras(Provider):
             "Content-Type": "application/json",
             "Origin": "https://inference.cerebras.ai",
             "Referer": "https://inference.cerebras.ai/",
-            "user-agent": UserAgent().random,
+            "user-agent": UserAgent().random(),
         }
 
         json_data = {
@@ -119,7 +119,7 @@ class Cerebras(Provider):
         headers = {
             "Authorization": f"Bearer {self.api_key}",
             "Content-Type": "application/json",
-            "User-Agent": UserAgent().random
+            "User-Agent": UserAgent().random(),
         }
 
         payload = {

webscout/Provider/cleeai.py

@@ -6,7 +6,7 @@ from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
-
+import webscout
 class Cleeai(Provider):
     """
     A class to interact with the Cleeai.com API.
@@ -59,7 +59,7 @@ class Cleeai(Provider):
             "sec-fetch-dest": "empty",
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "same-site",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
+            "user-agent": webscout.LitAgent().random()
         }
 
         self.__available_optimizers = (

webscout/Provider/elmo.py

@@ -3,7 +3,7 @@ from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
-
+from webscout import LitAgent
 
 class Elmo(Provider):
     """
@@ -62,7 +62,7 @@ class Elmo(Provider):
             "sec-fetch-dest": "empty",
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "cross-site",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
+            "user-agent": LitAgent().random(),
         }
 
         self.__available_optimizers = (

webscout/Provider/gaurish.py

@@ -10,7 +10,7 @@ from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
 
-
+from webscout import LitAgent
 class GaurishCerebras(Provider):
     """
     A class to interact with the Gaurish Cerebras API.
@@ -65,7 +65,7 @@ class GaurishCerebras(Provider):
             "sec-fetch-dest": "empty",
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "same-site",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0",
+            "user-agent": LitAgent().random(),
             "x-stainless-arch": "unknown",
             "x-stainless-lang": "js",
             "x-stainless-os": "Unknown",

webscout/Provider/geminiprorealtime.py

@@ -9,7 +9,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
-
+from webscout import LitAgent
 
 class GeminiPro(Provider):
     """
@@ -47,7 +47,7 @@ class GeminiPro(Provider):
             'sec-fetch-dest': 'empty',
             'sec-fetch-mode': 'cors',
             'sec-fetch-site': 'same-origin',
-            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36 Edg/129.0.0.0',
+            'user-agent': LitAgent().random(),
             'x-requested-with': 'XMLHttpRequest'
         }
         self.session = requests.Session()

webscout/Provider/lepton.py

@@ -6,7 +6,7 @@ from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
-
+from webscout import LitAgent as Lit
 class Lepton(Provider):
     """
     A class to interact with the Lepton.run API.
@@ -58,7 +58,7 @@ class Lepton(Provider):
             "sec-fetch-dest": "empty",
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "same-origin",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
+            "user-agent": Lit().random(),
         }
 
         self.__available_optimizers = (

webscout/Provider/llama3mitril.py

@@ -7,7 +7,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-
+from webscout import LitAgent as Lit
 
 class Llama3Mitril(Provider):
     """
@@ -40,7 +40,7 @@ class Llama3Mitril(Provider):
         self.headers = {
             "Content-Type": "application/json",
             "DNT": "1",
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0"
+            "User-Agent": Lit().random(),
         }
         self.__available_optimizers = (
             method
@@ -177,4 +177,4 @@ if __name__ == "__main__":
     )
 
     for response in ai.chat("Hello", stream=True):
-        print(response)
+        print(response, end="", flush=True)

webscout/Provider/llamatutor.py

@@ -6,7 +6,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-
+from webscout import LitAgent as Lit
 class LlamaTutor(Provider):
     """
     A class to interact with the LlamaTutor API (Together.ai).
@@ -63,7 +63,7 @@ class LlamaTutor(Provider):
             "Sec-Fetch-Dest": "empty",
             "Sec-Fetch-Mode": "cors",
             "Sec-Fetch-Site": "same-origin",
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0"
+            "User-Agent": Lit().random(),
         }
 
         self.__available_optimizers = (

webscout/Provider/llmchat.py

@@ -7,7 +7,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-
+from webscout import LitAgent as Lit
 class LLMChat(Provider):
     """
     A class to interact with the LLMChat API.
@@ -18,6 +18,7 @@ class LLMChat(Provider):
         "@cf/meta/llama-3.1-8b-instruct",
         "@cf/meta/llama-3.2-3b-instruct",
         "@cf/meta/llama-3.2-1b-instruct"
+        "@cf/meta/llama-3.3-70b-instruct-fp8-fast"
     ]
 
     def __init__(
@@ -51,7 +52,7 @@ class LLMChat(Provider):
         self.headers = {
             "Content-Type": "application/json",
             "Accept": "*/*",
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0",
+            "User-Agent": Lit().random(),
             "Origin": "https://llmchat.in",
             "Referer": "https://llmchat.in/"
         }

webscout/Provider/meta.py

@@ -14,7 +14,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider
 from webscout import exceptions
-
+from webscout import LitAgent as Lit
 MAX_RETRIES = 3
 
 def generate_offline_threading_id() -> str:
@@ -103,7 +103,7 @@ def get_fb_session(email, password, proxies=None):
         "sec-fetch-site": "none",
         "sec-fetch-user": "?1",
         "upgrade-insecure-requests": "1",
-        "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+        "user-agent": Lit().random(),
     }
     # Send the GET request
     response = requests.get(login_url, headers=headers, proxies=proxies)

webscout/Provider/tutorai.py

@@ -48,7 +48,7 @@ class TutorAI(Provider):
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
-        self.api_endpoint = "https://tutorai.me/api/generate-homeworkify-response"
+        self.api_endpoint = "https://ai-tutor.ai/api/generate-homeworkify-response"
         self.stream_chunk_size = 1024
         self.timeout = timeout
         self.last_response = {}

webscout/__init__.py

@@ -17,7 +17,6 @@ from .swiftcli import *
 from .litagent import LitAgent
 from .scout import *
 from .zeroart import *
-from .zerodir import *
 agent = LitAgent()
 
 __repo__ = "https://github.com/OE-LUCIFER/Webscout"

webscout/swiftcli/__init__.py

@@ -27,6 +27,7 @@ Advanced Usage:
 For more examples, check out the documentation!
 """
 
+import importlib
 import os
 import sys
 import json

webscout/version.py

@@ -1,2 +1,2 @@
-__version__ = "6.7"
+__version__ = "6.9"
 __prog__ = "webscout"