webscout 3.5__py3-none-any.whl → 3.7__py3-none-any.whl

webscout/AIutel.py

@@ -648,14 +648,14 @@ Current Datetime : {datetime.datetime.now()}
         else:
             logging.info(message)
 
-    def main(self, response: str) -> None:
+    def main(self, response: str):
         """Exec code in response accordingly
 
         Args:
-            response (str): AI response
+            response: AI response
 
         Returns:
-            None|str: None if script executed successfully else stdout data
+            Optional[str]: None if script executed successfully else stdout data
         """
         code_blocks = re.findall(r"```python.*?```", response, re.DOTALL)
         if len(code_blocks) != 1:
@@ -691,6 +691,7 @@ Current Datetime : {datetime.datetime.now()}
                         self.log("Returning success feedback")
                         return f"LAST SCRIPT OUTPUT:\n{proc.stdout}"
                     else:
+                        
                         self.log("Returning error feedback", "error")
                         return f"PREVIOUS SCRIPT EXCEPTION:\n{proc.stderr}"
                 else:
@@ -701,12 +702,14 @@ Current Datetime : {datetime.datetime.now()}
                     self.log("Executing script internally")
                     exec(raw_code_plus)
                 except Exception as e:
+                    error_message = str(e)
                     self.log(
-                        "Exception occurred while executing script. Responding with error: "
-                        f"{e.args[1] if len(e.args)>1 else str(e)}",
-                        "error",
+                        f"Exception occurred while executing script. Responding with error: {error_message}",
+                        "error" 
                     )
-                    return f"PREVIOUS SCRIPT EXCEPTION:\n{str(e)}"
+                    # Return the exact error message
+                    return f"PREVIOUS SCRIPT EXCEPTION:\n{error_message}"
+
 class Audio:
     # Request headers
     headers: dict[str, str] = {

webscout/Extra/__init__.py

@@ -0,0 +1,2 @@
+from .gguf import *
+from .autollama import *

webscout/Extra/autollama.py

@@ -0,0 +1,47 @@
+import subprocess
+import argparse
+import os
+
+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. 
+    """
+
+    # Get the directory where this script is located
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+
+    # Construct the path to the shell script
+    script_path = os.path.join(script_dir, "autollama.sh") 
+
+    # 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)
+
+    # Print the output and error in real-time
+    for line in process.stdout:
+        print(line, end='')
+
+    for line in process.stderr:
+        print(line, end='')
+
+    process.wait()
+
+def main():
+    parser = argparse.ArgumentParser(description='Run autollama.sh to manage models with Ollama')
+    parser.add_argument('-m', '--model_path', required=True, help='Set the path to the Hugging Face model')
+    parser.add_argument('-g', '--gguf_file', required=True, help='Set the GGUF file name')
+    args = parser.parse_args()
+
+    try:
+        autollama(args.model_path, args.gguf_file)
+    except Exception as e:
+        print(f"Error: {e}")
+        exit(1)
+
+if __name__ == "__main__":
+    main()

webscout/Extra/gguf.py

@@ -0,0 +1,80 @@
+import subprocess
+import argparse
+import os 
+
+def convert(model_id, username=None, token=None, quantization_methods="q4_k_m,q5_k_m"):
+    """Converts and quantizes a Hugging Face model to GGUF format.
+
+    Args:
+        model_id (str): The Hugging Face model ID (e.g., 'google/flan-t5-xl').
+        username (str, optional): Your Hugging Face username. Required for uploads.
+        token (str, optional): Your Hugging Face API token. Required for uploads. 
+        quantization_methods (str, optional): Comma-separated quantization methods. 
+                                                Defaults to "q4_k_m,q5_k_m".
+
+    Raises:
+        ValueError: If an invalid quantization method is provided.
+    """
+
+    # List of valid quantization methods
+    valid_methods = [
+        "q2_k", "q3_k_l", "q3_k_m", "q3_k_s", 
+        "q4_0", "q4_1", "q4_k_m", "q4_k_s", 
+        "q5_0", "q5_1", "q5_k_m", "q5_k_s", 
+        "q6_k", "q8_0"
+    ]
+    
+    # Validate the selected quantization methods
+    selected_methods_list = quantization_methods.split(',')
+    for method in selected_methods_list:
+        if method not in valid_methods:
+            raise ValueError(f"Invalid method: {method}. Please select from the available methods: {', '.join(valid_methods)}")
+    
+    # Get the directory where this script is located
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+
+    # Construct the path to the shell script
+    script_path = os.path.join(script_dir, "gguf.sh")
+
+    # Construct the command
+    command = ["bash", script_path, "-m", model_id]
+    
+    if username:
+        command.extend(["-u", username])
+    
+    if token:
+        command.extend(["-t", token])
+    
+    if quantization_methods:
+        command.extend(["-q", quantization_methods])
+    
+    # Execute the command
+    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+
+    # Print the output and error in real-time
+    for line in process.stdout:
+        print(line, end='')
+
+    for line in process.stderr:
+        print(line, end='')
+    
+    process.wait()
+
+def main():
+    parser = argparse.ArgumentParser(description='Convert and quantize model using gguf.sh')
+    parser.add_argument('-m', '--model_id', required=True, help='Set the HF model ID (e.g., "google/flan-t5-xl")')
+    parser.add_argument('-u', '--username', help='Set your Hugging Face username (required for uploads)')
+    parser.add_argument('-t', '--token', help='Set your Hugging Face API token (required for uploads)')
+    parser.add_argument('-q', '--quantization_methods', default="q4_k_m,q5_k_m", 
+                        help='Comma-separated quantization methods (default: q4_k_m,q5_k_m). Valid methods: q2_k, q3_k_l, q3_k_m, q3_k_s, q4_0, q4_1, q4_k_m, q4_k_s, q5_0, q5_1, q5_k_m, q5_k_s, q6_k, q8_0')
+    
+    args = parser.parse_args()
+    
+    try:
+        convert(args.model_id, args.username, args.token, args.quantization_methods)
+    except ValueError as e:
+        print(e)
+        exit(1)
+
+if __name__ == "__main__":
+    main()

webscout/Local/_version.py

@@ -1,3 +1,3 @@
 from llama_cpp import __version__ as __llama_cpp_version__
 
-__version__ = '3.4'
+__version__ = '3.7'