webscout 5.0__py3-none-any.whl → 5.1__py3-none-any.whl

webscout/Extra/autollama.py

@@ -1,209 +1,179 @@
-import subprocess
-import argparse
+import warnings
+from datetime import time
 import os
-from rich.console import Console
-from rich.panel import Panel
-from rich.progress import track
-from yaspin import yaspin
-from pyfiglet import figlet_format
-import time
-
-console = Console()
-
-def autollama(model_path, gguf_file):
-    """Manages models with Ollama using the autollama.sh script.
-
-    Args:
-        model_path (str): The path to the Hugging Face model.
-        gguf_file (str): The name of the GGUF file. 
-    """
-    console.print(f"[bold green]{figlet_format('Autollama')}[/]\n", justify="center")
-
-    # Check if autollama.sh exists in the current working directory
-    script_path = os.path.join(os.getcwd(), "autollama.sh")
-    if not os.path.exists(script_path):
-        # Create autollama.sh with the content provided
-        with open(script_path, "w") as f:
-            f.write("""
-function show_art() {
-    cat << "EOF"
-    Made with love in India
-EOF
-}
-
-show_art
-
-# Initialize default values
-MODEL_PATH=""
-GGUF_FILE=""
-
-# Display help/usage information
-usage() {
-echo "Usage: $0 -m <model_path> -g <gguf_file>"
-echo
-echo "Options:"
-echo "  -m <model_path>    Set the path to the model"
-echo "  -g <gguf_file>     Set the GGUF file name"
-echo "  -h                 Display this help and exit"
-echo
-}
-
-# Parse command-line options
-while getopts ":m:g:h" opt; do
-case ${opt} in
-    m )
-    MODEL_PATH=$OPTARG
-    ;;
-    g )
-    GGUF_FILE=$OPTARG
-    ;;
-    h )
-    usage
-    exit 0
-    ;;
-    \? )
-    echo "Invalid Option: -$OPTARG" 1>&2
-    usage
-    exit 1
-    ;;
-    : )
-    echo "Invalid Option: -$OPTARG requires an argument" 1>&2
-    usage
-    exit 1
-    ;;
-esac
-done
-
-# Check required parameters
-if [ -z "$MODEL_PATH" ] || [ -z "$GGUF_FILE" ]; then
-    echo "Error: -m (model_path) and -g (gguf_file) are required."
-    usage
-    exit 1
-fi
-
-# Derive MODEL_NAME
-MODEL_NAME=$(echo $GGUF_FILE | sed 's/\(.*\)\.Q4.*/\\1/')
-
-# Log file where downloaded models are recorded
-DOWNLOAD_LOG="downloaded_models.log"
-
-# Composite logging name
-LOGGING_NAME="${MODEL_PATH}_${MODEL_NAME}"
-
-# Check if the model has been downloaded
-function is_model_downloaded {
-    grep -qxF "$LOGGING_NAME" "$DOWNLOAD_LOG" && return 0 || return 1
-}
-
-# Log the downloaded model
-function log_downloaded_model {
-    echo "$LOGGING_NAME" >> "$DOWNLOAD_LOG"
-}
-
-# Function to check if the model has already been created
-function is_model_created {
-    # 'ollama list' lists all models
-    ollama list | grep -q "$MODEL_NAME" && return 0 || return 1
-}
-
-# Check if huggingface-hub is installed, and install it if not
-if ! pip show huggingface-hub > /dev/null; then
-echo "Installing huggingface-hub..."
-pip install -U "huggingface_hub[cli]"
-else
-echo "huggingface-hub is already installed."
-fi
-
-# Check if the model has already been downloaded
-if is_model_downloaded; then
-    echo "Model $LOGGING_NAME has already been downloaded. Skipping download."
-else
-    echo "Downloading model $LOGGING_NAME..."
-    # Download the model
-    huggingface-cli download $MODEL_PATH $GGUF_FILE --local-dir downloads --local-dir-use-symlinks False
-
-    # Log the downloaded model
-    log_downloaded_model
-    echo "Model $LOGGING_NAME downloaded and logged."
-fi
-
-# Check if Ollama is installed, and install it if not
-if ! command -v ollama &> /dev/null; then
-echo "Installing Ollama..."
-curl -fsSL https://ollama.com/install.sh | sh
-else
-echo "Ollama is already installed."
-fi
-
-# Check if Ollama is already running
-if pgrep -f 'ollama serve' > /dev/null; then
-    echo "Ollama is already running. Skipping the start."
-else
-    echo "Starting Ollama..."
-    # Start Ollama in the background
-    ollama serve &
-
-    # Wait for Ollama to start
-    while true; do
-        if pgrep -f 'ollama serve' > /dev/null; then
-            echo "Ollama has started."
-            sleep 60
-            break
-        else
-            echo "Waiting for Ollama to start..."
-            sleep 1 # Wait for 1 second before checking again
-        fi
-    done
-fi
-
-# Check if the model has already been created
-if is_model_created; then
-    echo "Model $MODEL_NAME is already created. Skipping creation."
-else
-    echo "Creating model $MODEL_NAME..."
-    # Create the model in Ollama
-    # Prepare Modelfile with the downloaded path
-    echo "FROM ./downloads/$GGUF_FILE" > Modelfile
-    ollama create $MODEL_NAME -f Modelfile
-    echo "Model $MODEL_NAME created."
-fi
-
-
-echo "model name is > $MODEL_NAME"
-echo "Use Ollama run $MODEL_NAME"
-            """)
-        # Make autollama.sh executable (using chmod)
-        os.chmod(script_path, 0o755)
-
-    # Initialize command list
-    command = ["bash", script_path, "-m", model_path, "-g", gguf_file]
-
-    # Execute the command
-    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-
-    for line in iter(process.stdout.readline, ''): 
-        console.print(Panel(line.strip(), title="Autollama Output", expand=False)) 
-
-    for line in iter(process.stderr.readline, ''): 
-        console.print(Panel(line.strip(), title="Autollama Errors (if any)", expand=False))
-    
-    process.wait()
-    console.print("[green]Model is ready![/]")
-
-def main():
-    parser = argparse.ArgumentParser(description='Automatically create and run an Ollama model in Ollama')
-    parser.add_argument('-m', '--model_path', required=True, help='Set the huggingface model id to the Hugging Face model')
-    parser.add_argument('-g', '--gguf_file', required=True, help='Set the GGUF file name')
+import sys
+import subprocess
+import logging
+import psutil
+from huggingface_hub import hf_hub_url, cached_download
+import colorlog
+import ollama  # Import ollama for interactive chat
+import argparse  # Import argparse for command-line arguments
+
+# Suppress specific warnings
+warnings.filterwarnings(
+    "ignore", category=FutureWarning, module="huggingface_hub.file_download"
+)
+
+# Configure logging with colors
+handler = colorlog.StreamHandler()
+handler.setFormatter(
+    colorlog.ColoredFormatter(
+        "%(log_color)s%(asctime)s - %(levelname)s - %(message)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+        log_colors={
+            "DEBUG": "cyan",
+            "INFO": "green",
+            "WARNING": "yellow",
+            "ERROR": "red",
+            "CRITICAL": "red,bg_white",
+        },
+    )
+)
+
+logger = colorlog.getLogger(__name__)
+if not logger.hasHandlers():
+    logger.addHandler(handler)
+    logger.setLevel(logging.INFO)
+
+# Redirect warnings to the logger but avoid duplication
+logging.captureWarnings(True)
+py_warnings_logger = logging.getLogger("py.warnings")
+if not py_warnings_logger.hasHandlers():
+    py_warnings_logger.addHandler(handler)
+
+
+def show_art():
+    logger.info("Made with love in India")
+
+
+def usage():
+    logger.info("Usage: python script.py -m <model_path> -g <gguf_file>")
+    logger.info("Options:")
+    logger.info("  -m <model_path>    Set the path to the model")
+    logger.info("  -g <gguf_file>     Set the GGUF file name")
+    logger.info("  -h                 Display this help and exit")
+
+
+def is_model_downloaded(logging_name, download_log):
+    if not os.path.exists(download_log):
+        return False
+    with open(download_log, "r") as f:
+        for line in f:
+            if line.strip() == logging_name:
+                return True
+    return False
+
+
+def log_downloaded_model(logging_name, download_log):
+    with open(download_log, "a") as f:
+        f.write(logging_name + "\n")
+
+
+def is_model_created(model_name):
+    result = subprocess.run(["ollama", "list"], stdout=subprocess.PIPE)
+    return model_name in result.stdout.decode("utf-8")
+
+
+def download_model(repo_id, filename, token, cache_dir="downloads"):
+    url = hf_hub_url(repo_id, filename)
+    filepath = cached_download(
+        url, cache_dir=cache_dir, force_filename=filename, use_auth_token=token
+    )
+    return filepath
+
+
+def is_ollama_running():
+    for proc in psutil.process_iter(["name"]):
+        if proc.info["name"] in ["ollama", "ollama.exe"]:
+            return True
+    return False
+
+
+def main(model_path=None, gguf_file=None):  # Modified to handle both CLI and non-CLI
+    show_art()
+
+    # Parse command-line arguments if provided
+    parser = argparse.ArgumentParser(description="Download and create an Ollama model")
+    parser.add_argument("-m", "--model_path", help="Path to the model on Hugging Face Hub")
+    parser.add_argument("-g", "--gguf_file", help="Name of the GGUF file")
     args = parser.parse_args()
 
+    # Use arguments from command line or function parameters
+    model_path = args.model_path if args.model_path else model_path
+    gguf_file = args.gguf_file if args.gguf_file else gguf_file
+
+    if not model_path or not gguf_file:
+        logger.error("Error: model_path and gguf_file are required.")
+        usage()
+        sys.exit(2)
+
+    model_name = gguf_file.split(".Q4")[0]
+    download_log = "downloaded_models.log"
+    logging_name = f"{model_path}_{model_name}"
+
+    # Ensure the log file exists
+    if not os.path.exists(download_log):
+        with open(download_log, 'w') as f:
+            pass
+
+    # Check if huggingface-hub is installed, and install it if not
     try:
-        with yaspin(text="Processing...") as spinner:
-            autollama(args.model_path, args.gguf_file)
-        spinner.ok("Done!")
-    except Exception as e:
-        console.print(f"[red]Error: {e}[/]")
-        exit(1)
+        subprocess.check_output(['pip', 'show', 'huggingface-hub'])
+    except subprocess.CalledProcessError:
+        logger.info("Installing huggingface-hub...")
+        subprocess.check_call(['pip', 'install', '-U', 'huggingface_hub[cli]'])
+    else:
+        logger.info("huggingface-hub is already installed.")
+
+    # Check if the model has already been downloaded
+    if is_model_downloaded(logging_name, download_log):
+        logger.info(f"Model {logging_name} has already been downloaded. Skipping download.")
+    else:
+        logger.info(f"Downloading model {logging_name}...")
+        token = os.getenv('HUGGINGFACE_TOKEN', None)
+        if not token:
+            logger.warning("Warning: HUGGINGFACE_TOKEN environment variable is not set. Using None.")
+            token = None
+
+        filepath = download_model(model_path, gguf_file, token)
+        log_downloaded_model(logging_name, download_log)
+        logger.info(f"Model {logging_name} downloaded and logged.")
+
+    # Check if Ollama is installed, and install it if not
+    try:
+        subprocess.check_output(['ollama', '--version'])
+    except subprocess.CalledProcessError:
+        logger.info("Installing Ollama...")
+        subprocess.check_call(['curl', '-fsSL', 'https://ollama.com/install.sh', '|', 'sh'])
+    else:
+        logger.info("Ollama is already installed.")
+
+    # Check if Ollama is already running
+    if is_ollama_running():
+        logger.info("Ollama is already running. Skipping the start.")
+    else:
+        logger.info("Starting Ollama...")
+        subprocess.Popen(['ollama', 'serve'])
+
+        while not is_ollama_running():
+            logger.info("Waiting for Ollama to start...")
+            time.sleep(1)
+
+        logger.info("Ollama has started.")
+
+    # Check if the model has already been created
+    if is_model_created(model_name):
+        logger.info(f"Model {model_name} is already created. Skipping creation.")
+    else:
+        logger.info(f"Creating model {model_name}...")
+        with open('Modelfile', 'w') as f:
+            f.write(f"FROM ./downloads/{gguf_file}")
+        subprocess.check_call(['ollama', 'create', model_name, '-f', 'Modelfile'])
+        logger.info(f"Model {model_name} created.")
+
+    logger.info(f"model name is > {model_name}")
+    logger.info(f"Use Ollama run {model_name}")
 
 if __name__ == "__main__":
-    main()
-
+    main()

webscout/Provider/Llama3.py

@@ -21,7 +21,7 @@ class LLAMA3(Provider):
         history_offset: int = 10250,
         act: str = None,
         model: str = "llama3-8b",  
-        system: str = "Answer as concisely as possible.",
+        system: str = "GPT syle",
     ):
         """Instantiates Snova
 

webscout/Provider/OLLAMA.py

@@ -36,11 +36,12 @@ class OLLAMA(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
+        system_prompt: str = "You are a helpful and friendly AI assistant.", 
     ):
         """Instantiates Ollama
 
         Args:
-            model (str, optional): Model name. Defaults to 'llama2'.
+            model (str, optional): Model name. Defaults to 'qwen2:0.5b'.
             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.
@@ -50,12 +51,14 @@ class OLLAMA(Provider):
             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.
+            system_prompt (str, optional): System prompt for Ollama. Defaults to "You are a helpful and friendly AI assistant.". 
         """
         self.model = model
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
         self.timeout = timeout
         self.last_response = {}
+        self.system_prompt = system_prompt
 
         self.__available_optimizers = (
             method
@@ -110,21 +113,19 @@ class OLLAMA(Provider):
                 )
 
         def for_stream():
+            # Correctly call ollama.chat with stream=True
             stream = ollama.chat(model=self.model, messages=[
+                {'role': 'system', 'content': self.system_prompt}, 
                 {'role': 'user', 'content': conversation_prompt}
             ], stream=True)
 
-            message_load = ""
+            # Yield each chunk directly
             for chunk in stream:
-                message_load += chunk['message']['content']
-                yield chunk['message']['content'] if raw else dict(text=message_load)
-            self.last_response.update(dict(text=message_load))
-            self.conversation.update_chat_history(
-                prompt, self.get_message(self.last_response)
-            )
+                yield chunk['message']['content'] if raw else dict(text=chunk['message']['content'])
 
         def for_non_stream():
             response = ollama.chat(model=self.model, messages=[
+                {'role': 'system', 'content': self.system_prompt}, # Add system message
                 {'role': 'user', 'content': conversation_prompt}
             ])
             self.last_response.update(dict(text=response['message']['content']))
@@ -183,6 +184,6 @@ class OLLAMA(Provider):
         return response["text"]
 if __name__ == "__main__":
     ollama_provider = OLLAMA(model="qwen:0.5b")
-    response = ollama_provider.chat("hi")
+    response = ollama_provider.chat("hi", stream=True)
     for r in response:
-        print(r, end="", flush=True)
+        print(r, end="", flush=True)

{webscout-5.0.dist-info → webscout-5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 5.0
+Version: 5.1
 Summary: Search for anything using Google, DuckDuckGo, brave, qwant,  phind.com, Contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, webai (terminal gpt and open interpreter) and offline LLMs and more
 Author: OEvortex
 Author-email: helpingai5@gmail.com
@@ -66,6 +66,8 @@ Requires-Dist: requests-html
 Requires-Dist: bson
 Requires-Dist: cloudscraper
 Requires-Dist: emoji
+Requires-Dist: colorlog
+Requires-Dist: openai
 Provides-Extra: dev
 Requires-Dist: ruff >=0.1.6 ; extra == 'dev'
 Requires-Dist: pytest >=7.4.2 ; extra == 'dev'
@@ -1645,15 +1647,13 @@ gguf.convert(
 
 Webscout's `autollama` utility download model from huggingface and then automatically makes it ollama ready
 
-**Example:**
-
 ```python
 from webscout import autollama
 
-autollama(
-    model_path="OEvortex/HelpingAI-Lite-1.5T",  # Hugging Face model ID
-    gguf_file="HelpingAI-Lite-1.5T.q4_k_m.gguf" #  GGUF file ID
-)
+model_path = "Vortex4ai/Jarvis-0.5B"
+gguf_file = "test2-q4_k_m.gguf"
+
+autollama.main(model_path, gguf_file)  
 ```
 
 **Command Line Usage:**

{webscout-5.0.dist-info → webscout-5.1.dist-info}/RECORD

@@ -26,7 +26,7 @@ webscout/Agents/Onlinesearcher.py,sha256=GzF2JcMfj07d74mxQEoaxwtxahgLHl3b_ugTbXj
 webscout/Agents/__init__.py,sha256=VbGyW5pulh3LRqbVTv54n5TwWsrTqOANRioG18xtdJ0,58
 webscout/Agents/functioncall.py,sha256=qH1Tofi4h5CK5RhXaLQhXu8swEUmcyK9R5xpS6jMLrs,5784
 webscout/Extra/__init__.py,sha256=GG1qUwS-HspT4TeeAIT4qFpM8PaO1ZdQhpelctaM7Rs,99
-webscout/Extra/autollama.py,sha256=8lyodIWAgJABzlMMHytlolPCgvUKh8ynkZD6MMEltXs,5970
+webscout/Extra/autollama.py,sha256=qM8alxlWzg10BGIYKZBUtIEAXrkvEOWBwSxdPp3zq9I,6226
 webscout/Extra/gguf.py,sha256=RvSp7xuaD6epAA9iAzthUnAQ3HA5N-svMyKUadAVnw8,7009
 webscout/Extra/weather.py,sha256=wdSrQxZRpbNfyaux0BeLdaDWyde5KwxZjSUM13820X0,2460
 webscout/Extra/weather_ascii.py,sha256=Aed-_EUzvTEjBXbOpNRxkJBLa6fXsclknXP06HnQD18,808
@@ -53,8 +53,8 @@ webscout/Provider/Gemini.py,sha256=V79nIi5vhPfvjlGYg5XuH6RfY7AyNnBqnJM-OBK99hE,8
 webscout/Provider/Groq.py,sha256=h_dPKwqXRwmgvmEmkDYKdXwrlI4Zm2vZuCnSMItoa2w,28662
 webscout/Provider/Koboldai.py,sha256=KwWx2yPlvT9BGx37iNvSbgzWkJ9I8kSOmeg7sL1hb0M,15806
 webscout/Provider/Llama.py,sha256=pqjpB09MFufImzTav1PwTWsukSCr3QiB-yFGJIIBAu8,8293
-webscout/Provider/Llama3.py,sha256=qO5R5mNznrobi7eKZR8opb_UekmO0_PUEOkPTnNw9nE,7583
-webscout/Provider/OLLAMA.py,sha256=Modmkp_WiZaBYsv4-_5y7fHpqBJY20zWxyZZwtSfqVs,7117
+webscout/Provider/Llama3.py,sha256=UnSWyBMSkp4WAxU4zNI9VNsZY0aAOHvT7AK0xJlJW90,7559
+webscout/Provider/OLLAMA.py,sha256=g8ejBjEZN0zya-10-v_njADZ796Uxu4Nbj_gaNrlj5I,7374
 webscout/Provider/Openai.py,sha256=SjfVOwY94unVnXhvN0Fkome-q2-wi4mPJk_vCGq5Fjc,20617
 webscout/Provider/PI.py,sha256=IodVvGR_RIZpGJ0ypFF4U6NBMZAZ5O1BlRFMelot8so,8364
 webscout/Provider/Perplexity.py,sha256=gUnXyVNbl6tWAqirwHEoPkjCzxpORcKxL77aoFKepBk,21485
@@ -75,9 +75,9 @@ webscout/Provider/meta.py,sha256=3iBylmAk9d673Axvw6hFi0-0x_Fq7ZgtH_1j2_rcDwY,307
 webscout/Provider/turboseek.py,sha256=BNx_urbs6Ixr7SEOgL4Uo1iZdjYC7CxoefJcsN4LK6I,9138
 webscout/Provider/xdash.py,sha256=KUDTEX8I0z72bIDi-w5Se7xmB_lbmaX7KlCmIl2ad4c,7925
 webscout/Provider/yep.py,sha256=RbEBzHeEFxgfdnHXHuBny6NKHcYYYNA6bvTggvAzoLk,10399
-webscout-5.0.dist-info/LICENSE.md,sha256=9P0imsudI7MEvZe2pOcg8rKBn6E5FGHQ-riYozZI-Bk,2942
-webscout-5.0.dist-info/METADATA,sha256=anlsD-HmXJT4_UV8LyrT5mxdnEKznprEDn2oPcf-Ucg,50819
-webscout-5.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-webscout-5.0.dist-info/entry_points.txt,sha256=Hh4YIIjvkqB9SVxZ2ri4DZUkgEu_WF_5_r_nZDIvfG8,73
-webscout-5.0.dist-info/top_level.txt,sha256=nYIw7OKBQDr_Z33IzZUKidRD3zQEo8jOJYkMVMeN334,9
-webscout-5.0.dist-info/RECORD,,
+webscout-5.1.dist-info/LICENSE.md,sha256=9P0imsudI7MEvZe2pOcg8rKBn6E5FGHQ-riYozZI-Bk,2942
+webscout-5.1.dist-info/METADATA,sha256=5QksBKkY8zwt12vphkMh6GFj6SiwZrQXYdetRMd0HMY,50812
+webscout-5.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+webscout-5.1.dist-info/entry_points.txt,sha256=Hh4YIIjvkqB9SVxZ2ri4DZUkgEu_WF_5_r_nZDIvfG8,73
+webscout-5.1.dist-info/top_level.txt,sha256=nYIw7OKBQDr_Z33IzZUKidRD3zQEo8jOJYkMVMeN334,9
+webscout-5.1.dist-info/RECORD,,