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

webscout/Agents/Onlinesearcher.py

@@ -2,14 +2,14 @@ import json
 import httpx
 from bs4 import BeautifulSoup
 from typing import List, Dict
-from webscout import WEBS, GEMINIAPI
+from webscout import GoogleS, GEMINIAPI
 import re
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
 
 class WebSearchAgent:
     def __init__(self):
-        self.webs = WEBS()
+        self.webs = GoogleS()
         self.ai = GEMINIAPI(is_conversation=False, api_key='AIzaSyAYlT5-V0MXZwaLYpXCF1Z-Yvy_tx1jylA')
 
     def generate_search_queries(self, information: str, num_queries: int = 10) -> List[str]:
@@ -62,16 +62,16 @@ Now, generate the optimal search queries: """
         else:
             return [information]
 
-    def search(self, information: str, region: str = 'wt-wt', safesearch: str = 'off',
-               timelimit: str = 'y', max_results: int = 10) -> List[Dict]:
+    def search(self, information: str, region: str = 'wt-wt', safe: str = 'off',
+               max_results: int = 10) -> List[Dict]:
         search_queries = self.generate_search_queries(information, num_queries=10)
         all_results = []
 
         for query in search_queries:
             results = []
             with self.webs as webs:
-                for result in webs.text(query, region=region, safesearch=safesearch,
-                                       timelimit=timelimit, max_results=max_results):
+                for result in webs.search(query, region=region, safe=safe,
+                                       max_results=max_results):
                     results.append(result)
             all_results.extend(results)
 
@@ -113,7 +113,7 @@ Now, generate the optimal search queries: """
 class OnlineSearcher:
     def __init__(self):
         self.agent = WebSearchAgent()
-        self.ai = GEMINIAPI(is_conversation=False, api_key='AIzaSyAYlT5-V0MXZwaLYpXCF1Z-Yvy_tx1jylA')
+        self.ai = GEMINIAPI(is_conversation=False, api_key='GOOGLE GEMINI API')
 
     def answer_question(self, question: str) -> None:
         search_results = self.agent.search(question, max_results=10)
@@ -148,7 +148,7 @@ Instructions:
 Your response should be informative, accurate, and properly sourced when possible. Begin your answer now: """
 
         for chunk in self.ai.chat(prompt, stream=True):
-            print(chunk, end='', flush=True)  # Print each chunk in real-time
+            print(chunk, end='', flush=True)
 
 
 
@@ -161,10 +161,22 @@ if __name__ == "__main__":
             if question.lower() == 'quit':
                 break
             print("=" * 50)
-            assistant.answer_question(question)  # The answer is printed in real-time
+            assistant.answer_question(question) 
             print("=" * 50)
         except KeyboardInterrupt:
             print("\nExiting.")
             break
         except Exception as e:
-            print(f"An error occurred: {e}")
+            print(f"An error occurred: {e}")
+
+"""
+def format_prompt(messages: Messages, add_special_tokens=False) -> str:
+
+    if not add_special_tokens and len(messages) <= 1:
+        return messages[0]["content"]
+    formatted = "\n".join([
+        f'{message["role"].capitalize()}: {message["content"]}'
+        for message in messages
+    ])
+    return f"{formatted}\nAssistant:
+"""

webscout/Agents/functioncall.py

@@ -4,12 +4,12 @@ import json
 import time
 from typing import Any, Dict, Optional
 import requests
-from webscout import WEBS, DeepInfra
+from webscout import WEBS, Julius
 
 class FunctionCallingAgent:
     def __init__(self, 
                  tools: list = None):
-        self.ai = DeepInfra(timeout=300, intro=None)
+        self.ai = Julius(timeout=300, intro=None)
         self.tools = tools if tools is not None else []
         self.knowledge_cutoff = "September 2022" 
 

webscout/Bard.py

@@ -6,8 +6,7 @@ import random
 import re
 import string
 import sys
-from typing import Dict
-from typing import List
+from typing import Dict, List, Tuple
 
 import httpx
 from prompt_toolkit import prompt
@@ -48,6 +47,22 @@ def __get_input(
     )
 
 
+def load_cookies(cookie_path: str) -> Tuple[str, str]:
+    """Loads cookies from the provided JSON file."""
+    try:
+        with open(cookie_path, 'r') as file:
+            cookies = json.load(file)
+        session_auth1 = next(item['value'] for item in cookies if item['name'] == '__Secure-1PSID')
+        session_auth2 = next(item['value'] for item in cookies if item['name'] == '__Secure-1PSIDTS')
+        return session_auth1, session_auth2
+    except FileNotFoundError:
+        raise Exception(f"Cookie file not found at path: {cookie_path}")
+    except json.JSONDecodeError:
+        raise Exception("Invalid JSON format in the cookie file.")
+    except StopIteration:
+        raise Exception("Required cookies not found in the cookie file.")
+
+
 class Chatbot:
     """
     Synchronous wrapper for the AsyncChatbot class.
@@ -55,14 +70,14 @@ class Chatbot:
 
     def __init__(
         self,
-        secure_1psid: str,
-        secure_1psidts: str,
+        cookie_path: str,
         proxy: dict = None,
         timeout: int = 20,
     ):
         self.loop = asyncio.get_event_loop()
+        self.secure_1psid, self.secure_1psidts = load_cookies(cookie_path)
         self.async_chatbot = self.loop.run_until_complete(
-            AsyncChatbot.create(secure_1psid, secure_1psidts, proxy, timeout),
+            AsyncChatbot.create(self.secure_1psid, self.secure_1psidts, proxy, timeout),
         )
 
     def save_conversation(self, file_path: str, conversation_name: str):
@@ -309,22 +324,7 @@ class AsyncChatbot:
 
 if __name__ == "__main__":
     import sys
-    console = Console()
-    if os.getenv("Gemini_QUICK"):
-        Secure_1PSID = os.getenv("Gemini__Secure_1PSID")
-        secure_1psidts = os.getenv("Gemini__secure_1psidts")
-        if not (Secure_1PSID and secure_1psidts):
-            print(
-                "Gemini__Secure_1PSID or Gemini__secure_1psidts environment variable not set.",
-            )
-            sys.exit(1)
-        chatbot = Chatbot(Secure_1PSID, secure_1psidts)
-        # Join arguments into a single string
-        MESSAGE = " ".join(sys.argv[1:])
-        response = chatbot.ask(MESSAGE)
-        console.print(Markdown(response["content"]))
-        console.print(response["images"] if response.get("images") else "")
-        sys.exit(0)
+    sys.exit(0)
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--session",

webscout/Local/__init__.py

@@ -2,10 +2,9 @@
 from ._version import __version__, __llama_cpp_version__
 
 
-from . import formats
-from . import samplers
-from . import utils
-
-from .model  import Model
-from .thread import Thread
-from .rawdog import *
+from .utils import *
+from .samplers import *
+from .formats import *
+from .ui import *
+from .model  import *
+from .thread import *