webscout 5.5__py3-none-any.whl → 5.7__py3-none-any.whl

webscout/Provider/meta.py

@@ -8,7 +8,7 @@ from typing import Dict, Generator, Iterator, List, Union
 import random
 
 
-from requests_html import HTMLSession
+from webscout.requestsHTMLfix import HTMLSession
 import requests
 from bs4 import BeautifulSoup
 
@@ -774,6 +774,6 @@ class Meta(Provider):
     
 if __name__ == "__main__":
     Meta = Meta()
-    ai = Meta.chat(input(">>> "))
+    ai = Meta.chat("hi")
     for chunk in ai:
         print(chunk, end="", flush=True)

webscout/Provider/turboseek.py

@@ -215,6 +215,6 @@ class TurboSeek(Provider):
 if __name__ == '__main__':
     from rich import print
     ai = TurboSeek()
-    response = ai.chat(input(">>> "))
+    response = ai.chat("hi")
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/upstage.py

@@ -0,0 +1,230 @@
+import requests
+import json
+from typing import Any, Dict, Optional
+
+from webscout.AIutel import Optimizers
+from webscout.AIutel import Conversation
+from webscout.AIutel import AwesomePrompts, sanitize_stream
+from webscout.AIbase import Provider
+from webscout import exceptions
+
+class Upstage(Provider):
+    """
+    A class to interact with the Upstage API.
+    """
+
+    AVAILABLE_MODELS = [
+        "upstage/solar-1-mini-chat",
+        "upstage/solar-1-mini-chat-ja",
+        "solar-pro"
+    ]
+
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 600,
+        timeout: int = 30,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+        model: str = "upstage/solar-1-mini-chat",
+    ) -> None:
+        """
+        Initializes the Upstage API with given parameters.
+
+        Args:
+            is_conversation (bool, optional): Flag for chatting conversationally. Defaults to True.
+            max_tokens (int, optional): Maximum number of tokens to be generated upon completion.
+                                        Defaults to 600.
+            timeout (int, optional): Http request timeout. Defaults to 30.
+            intro (str, optional): Conversation introductory prompt. Defaults to None.
+            filepath (str, optional): Path to file containing conversation history. Defaults to None.
+            update_file (bool, optional): Add new prompts and responses to the file. Defaults to True.
+            proxies (dict, optional): Http request proxies. Defaults to {}.
+            history_offset (int, optional): Limit conversation history to this number of last texts.
+                                            Defaults to 10250.
+            act (str|int, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
+            model (str, optional): AI model to use. Defaults to "upstage/solar-1-mini-chat". 
+                                    Available models: "upstage/solar-1-mini-chat",
+                                                     "upstage/solar-1-mini-chat-ja",
+                                                     "solar-pro"
+        """
+        if model not in self.AVAILABLE_MODELS:
+            raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
+
+        self.session = requests.Session()
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.api_endpoint = "https://ap-northeast-2.apistage.ai/v1/web/demo/chat/completions"
+        self.stream_chunk_size = 64
+        self.timeout = timeout
+        self.last_response = {}
+        self.model = model
+        self.headers = {
+            "Content-Type": "application/json",
+            "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",
+            "Origin": "https://console.upstage.ai",
+            "Referer": "https://console.upstage.ai/"
+        }
+
+        self.__available_optimizers = (
+            method
+            for method in dir(Optimizers)
+            if callable(getattr(Optimizers, method)) and not method.startswith("__")
+        )
+        self.session.headers.update(self.headers)
+        Conversation.intro = (
+            AwesomePrompts().get_act(
+                act, raise_not_found=True, default=None, case_insensitive=True
+            )
+            if act
+            else intro or Conversation.intro
+        )
+        self.conversation = Conversation(
+            is_conversation, self.max_tokens_to_sample, filepath, update_file
+        )
+        self.conversation.history_offset = history_offset
+        self.session.proxies = proxies
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Dict[str, Any]:
+        """
+        Sends a prompt to the Upstage API and returns the response.
+
+        Args:
+            prompt: The text prompt to generate text from.
+            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:
+                conversation_prompt = getattr(Optimizers, optimizer)(
+                    conversation_prompt if conversationally else prompt
+                )
+            else:
+                raise Exception(
+                    f"Optimizer is not one of {self.__available_optimizers}"
+                )
+
+        payload = {
+            "stream": True,
+            "messages": [
+                {
+                    "role": "user",
+                    "content": conversation_prompt
+                }
+            ],
+            "model": self.model
+        }
+
+        def for_stream():
+            response = self.session.post(
+                self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout
+            )
+
+            if not response.ok:
+                # If 'solar-pro' fails, try mini-chat model
+                if self.model == "solar-pro":
+                    print("solar-pro failed. Trying 'upstage/solar-1-mini-chat'...")
+                    self.model = "upstage/solar-1-mini-chat"
+                    return self.ask(prompt, stream, raw, optimizer, conversationally)  # Retry with mini-chat
+
+                raise exceptions.FailedToGenerateResponseError(
+                    f"Failed to generate response - ({response.status_code}, {response.reason})"
+                )
+
+            streaming_response = ""
+            for line in response.iter_lines(decode_unicode=True):
+                if line:
+                    if line.startswith("data: "):
+                        data = line[6:]  # Remove 'data: ' prefix
+                        if data != "[DONE]":
+                            try:
+                                json_data = json.loads(data)
+                                content = json_data['choices'][0]['delta'].get('content', '')
+                                if content:
+                                    streaming_response += content
+                                    yield content if raw else dict(text=streaming_response)
+                            except json.JSONDecodeError:
+                                print(f"Error decoding JSON: {data}")
+
+
+            self.last_response.update(dict(text=streaming_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
+
+        return for_stream() if stream else for_non_stream()
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        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
+            ):
+                yield self.get_message(response)
+
+        def for_non_stream():
+            return self.get_message(
+                self.ask(
+                    prompt,
+                    False,
+                    optimizer=optimizer,
+                    conversationally=conversationally,
+                )
+            )
+
+        return for_stream() if stream else for_non_stream()
+
+    def get_message(self, response: dict) -> str:
+        """Retrieves message only from response
+
+        Args:
+            response (dict): Response generated by `self.ask`
+
+        Returns:
+            str: Message extracted
+        """
+        assert isinstance(response, dict), "Response should be of dict data-type only"
+        return response["text"]
+if __name__ == '__main__':
+    from rich import print
+    ai = Upstage()
+    response = ai.chat("hi")
+    for chunk in response:
+        print(chunk, end="", flush=True)

webscout/Provider/x0gpt.py

@@ -177,6 +177,6 @@ class X0GPT(Provider):
 if __name__ == "__main__":
     from rich import print
     ai = X0GPT()
-    response = ai.chat(input(">>> "))
+    response = ai.chat("hi")
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/xdash.py

@@ -177,6 +177,6 @@ class XDASH(Provider):
 if __name__ == '__main__':
     from rich import print
     ai = XDASH()
-    response = ai.chat(input(">>> "))
+    response = ai.chat("hi")
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/yep.py

@@ -467,7 +467,7 @@ if __name__ == "__main__":
         else:
             return "No results found for your query."
 
-    ai = YEPCHAT(Tools=True)
+    ai = YEPCHAT(Tools=False)
 
     ai.tool_registry.register_tool("get_current_time", get_current_time, "Gets the current time.")
     ai.tool_registry.register_tool(
@@ -495,6 +495,6 @@ if __name__ == "__main__":
         },
     )
 
-    response = ai.chat(input(">>> "))
+    response = ai.chat("hi")
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/__init__.py

@@ -3,6 +3,7 @@ from .webscout_search_async import AsyncWEBS
 from .version import __version__
 from .DWEBS import *
 from .transcriber import *
+from .requestsHTMLfix import *
 from .tempid import *
 from .websx_search import WEBSX
 from .LLM import VLM, LLM