webscout 8.0__py3-none-any.whl → 8.2__py3-none-any.whl

webscout/Provider/typegpt.py

@@ -14,195 +14,14 @@ class TypeGPT(Provider):
     """
     A class to interact with the TypeGPT.net API. Improved to match webscout standards.
     """
-    url = "https://chat.typegpt.net"
-
     AVAILABLE_MODELS = [
-        # OpenAI Models
-        "gpt-3.5-turbo",
-        "gpt-3.5-turbo-202201",
-        "gpt-4o",
-        "gpt-4o-2024-05-13",
-        "gpt-4o-2024-11-20",
-        "gpt-4o-mini",
+        # Working Models (based on testing)
         "gpt-4o-mini-2024-07-18",
-        # "gpt-4o-mini-ddg", >>>> NOT WORKING
-        "o1",
-        # "o1-mini-2024-09-12", >>>> NOT WORKING
-        "o1-preview",
-        "o3-mini",
         "chatgpt-4o-latest",
-        
-        # Claude Models
-        # "claude", >>>> NOT WORKING
-        "claude-3-5-sonnet",
-        "claude-3-5-sonnet-20240620",
-        "claude-3-5-sonnet-x",
-        # "claude-3-haiku-ddg", >>>> NOT WORKING
-        "claude-hybridspace",
-        "claude-sonnet-3.5",
-        "Claude-sonnet-3.7",
-        "anthropic/claude-3.5-sonnet",
-        "anthropic/claude-3.7-sonnet",
-        
-        # Meta/LLaMA Models
-        "@cf/meta/llama-2-7b-chat-fp16",
-        "@cf/meta/llama-2-7b-chat-int8",
-        "@cf/meta/llama-3-8b-instruct",
-        "@cf/meta/llama-3.1-8b-instruct",
-        "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
-        # "@cf/meta-llama/llama-2-7b-chat-hf-lora", >>>> NOT WORKING
-        "llama-3.1-405b",
-        "llama-3.1-70b",
-        # "llama-3.1-70b-ddg", >>>> NOT WORKING
-        "llama-3.1-8b",
-        # "llama-scaleway", >>>> NOT WORKING
-        "llama3.1-8b", # >>>> NOT WORKING
-        "llama3.3-70b",
-        # "llamalight", >>>> NOT WORKING
-        "Meta-Llama-3.1-405B-Instruct-Turbo",
-        "Meta-Llama-3.3-70B-Instruct-Turbo",
-        # "meta-llama/Llama-2-7b-chat-hf", >>>> NOT WORKING
-        # "meta-llama/Llama-3.1-70B-Instruct", >>>> NOT WORKING
-        # "meta-llama/Llama-3.1-8B-Instruct", >>>> NOT WORKING
-        "meta-llama/Llama-3.2-11B-Vision-Instruct",
-        # "meta-llama/Llama-3.2-1B-Instruct", >>>> NOT WORKING
-        # "meta-llama/Llama-3.2-3B-Instruct", >>>> NOT WORKING
-        "meta-llama/Llama-3.2-90B-Vision-Instruct",
-        "meta-llama/Llama-3.3-70B-Instruct",
-        "meta-llama/Llama-3.3-70B-Instruct-Turbo",
-        # "meta-llama/Llama-Guard-3-8B", >>>> NOT WORKING
-        # "meta-llama/Meta-Llama-3-70B-Instruct", >>>> NOT WORKING
-        # "meta-llama/Meta-Llama-3-8B-Instruct", >>>> NOT WORKING
-        "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo",
-        "meta-llama/Meta-Llama-3.1-8B-Instruct",
-        "meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo",
-        
-        # Mistral Models
-        "mistral",
-        "mistral-large",
-        "@cf/mistral/mistral-7b-instruct-v0.1",
-        # "@cf/mistral/mistral-7b-instruct-v0.2-lora", >>>> NOT WORKING
-        "@hf/mistralai/mistral-7b-instruct-v0.2",
-        "mistralai/Mistral-7B-Instruct-v0.2",
-        "mistralai/Mistral-7B-Instruct-v0.3",
-        "mistralai/Mixtral-8x22B-Instruct-v0.1",
-        "mistralai/Mixtral-8x7B-Instruct-v0.1",
-        # "mixtral-8x7b-ddg", >>>> NOT WORKING
-        "Mistral-7B-Instruct-v0.2",
-        
-        # Qwen Models
-        "@cf/qwen/qwen1.5-0.5b-chat",
-        "@cf/qwen/qwen1.5-1.8b-chat",
-        "@cf/qwen/qwen1.5-14b-chat-awq",
-        "@cf/qwen/qwen1.5-7b-chat-awq",
-        "Qwen/Qwen2.5-3B-Instruct",
-        "Qwen/Qwen2.5-72B-Instruct",
-        "Qwen/Qwen2.5-Coder-32B-Instruct",
-        "Qwen/Qwen2-72B-Instruct",
-        "Qwen/QwQ-32B",
-        "Qwen/QwQ-32B-Preview",
-        "Qwen2.5-72B-Instruct",
-        "qwen",
-        "qwen-coder",
-        # "Qwen-QwQ-32B-Preview", >>>> NOT WORKING
-        
-        # Google/Gemini Models
-        # "@cf/google/gemma-2b-it-lora", >>>> NOT WORKING
-        # "@cf/google/gemma-7b-it-lora", >>>> NOT WORKING
-        "@hf/google/gemma-7b-it",
-        "google/gemma-1.1-2b-it",
-        "google/gemma-1.1-7b-it",
-        "gemini-pro",
-        "gemini-1.5-pro",
-        "gemini-1.5-pro-latest",
-        "gemini-1.5-flash",
-        "gemini-flash-2.0",
-        "gemini-thinking",
-        
-        # Microsoft Models
-        "@cf/microsoft/phi-2",
-        "microsoft/DialoGPT-medium",
-        "microsoft/Phi-3-medium-4k-instruct",
-        "microsoft/Phi-3-mini-4k-instruct",
-        "microsoft/Phi-3.5-mini-instruct",
-        "microsoft/phi-4",
-        "microsoft/WizardLM-2-8x22B",
-        
-        # Yi Models
-        "01-ai/Yi-1.5-34B-Chat",
-        # "01-ai/Yi-34B-Chat", >>>> NOT WORKING
-        
-        # DeepSeek Models
-        "@cf/deepseek-ai/deepseek-math-7b-base",
-        "@cf/deepseek-ai/deepseek-math-7b-instruct",
-        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
-        "deepseek",
-        "deepseek-ai/DeepSeek-R1",
-        "deepseek-ai/DeepSeek-R1-Distill-Llama-70B",
-        # "deepseek-ai/DeepSeek-R1-Distill-Qwen-32B", >>>> NOT WORKING
-        # "deepseek-ai/DeepSeek-V2.5", >>>> NOT WORKING
-        "deepseek-llm-67b-chat",
         "deepseek-r1",
-        "deepseek-r1-distill-llama-70b",
-        # "deepseek-reasoner", >>>> NOT WORKING
         "deepseek-v3",
-        "uncensored-r1", 
-        
-        # Specialized Models and Tools
-        "@cf/defog/sqlcoder-7b-2",
-        "@cf/thebloke/discolm-german-7b-v1-awq",
-        "@cf/tiiuae/falcon-7b-instruct",
-        # "@cf/tinyllama/tinyllama-1.1b-chat-v1.0", >>>> NOT WORKING
-        # "@hf/nexusflow/starling-lm-7b-beta", >>>> NOT WORKING
-        # "@hf/nousresearch/hermes-2-pro-mistral-7b", >>>> NOT WORKING
-        # "@hf/thebloke/deepseek-coder-6.7b-base-awq", >>>> NOT WORKING
-        # "@hf/thebloke/deepseek-coder-6.7b-instruct-awq", >>>> NOT WORKING
-        # "@hf/thebloke/llama-2-13b-chat-awq", >>>> NOT WORKING
-        # "@hf/thebloke/llamaguard-7b-awq", >>>> NOT WORKING
-        # "@hf/thebloke/mistral-7b-instruct-v0.1-awq", >>>> NOT WORKING
-        # "@hf/thebloke/neural-chat-7b-v3-1-awq", >>>> NOT WORKING
-        # "@hf/thebloke/openhermes-2.5-mistral-7b-awq", >>>> NOT WORKING
-        # "@hf/thebloke/zephyr-7b-beta-awq", >>>> NOT WORKING
+        "uncensored-r1",
         "Image-Generator",
-        # "flux-1-schnell", >>>> NOT WORKING
-        # "HelpingAI-15B", >>>> NOT WORKING
-        # "HelpingAI2-3b", >>>> NOT WORKING
-        # "HelpingAI2-6B", >>>> NOT WORKING
-        # "HelpingAI2-9B", >>>> NOT WORKING
-        # "HelpingAI2.5-10B", >>>> NOT WORKING
-        # "Helpingai2.5-10b-1m", >>>> NOT WORKING
-        # "HelpingAI2.5-2B", >>>> NOT WORKING
-        # "HELVETE", >>>> NOT WORKING
-        # "HELVETE-X", >>>> NOT WORKING
-        # "evil", >>>> NOT WORKING
-        # "Image-Generator", >>>> NOT WORKING
-        # "Image-Generator-NSFW", >>>> NOT WORKING
-        # "midijourney", >>>> NOT WORKING
-        # "Niansuh", >>>> NOT WORKING
-        # "niansuh-t1", >>>> NOT WORKING
-        # "Nous-Hermes-2-Mixtral-8x7B-DPO", >>>> NOT WORKING
-        # "NousResearch/Hermes-3-Llama-3.1-8B", >>>> NOT WORKING
-        # "NousResearch/Nous-Hermes-2-Mixtral-8x7B-DPO", >>>> NOT WORKING
-        # "nvidia/Llama-3.1-Nemotron-70B-Instruct", >>>> NOT WORKING
-        # "openai", >>>> NOT WORKING
-        # "openai-audio", >>>> NOT WORKING
-        # "openai-large", >>>> NOT WORKING
-        # "openai-reasoning", >>>> NOT WORKING
-        # "openai/whisper-large-v3", >>>> NOT WORKING
-        # "openai/whisper-large-v3-turbo", >>>> NOT WORKING
-        # "openbmb/MiniCPM-Llama3-V-2_5", >>>> NOT WORKING
-        # "openchat/openchat-3.6-8b", >>>> NOT WORKING
-        # "p1", >>>> NOT WORKING
-        # "phi", >>>> NOT WORKING
-        # "Phi-4-multilmodal-instruct", >>>> NOT WORKING
-        # "Priya-3B", >>>> NOT WORKING
-        # "rtist", >>>> NOT WORKING
-        # "searchgpt", >>>> NOT WORKING
-        # "sur", >>>> NOT WORKING
-        # "sur-mistral", >>>> NOT WORKING
-        # "tiiuae/falcon-7b-instruct", >>>> NOT WORKING
-        # "TirexAi", >>>> NOT WORKING
-        # "unity", >>>> NOT WORKING
     ]
 
     def __init__(
@@ -230,7 +49,7 @@ class TypeGPT(Provider):
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
-        self.api_endpoint = "https://chat.typegpt.net/api/openai/typegpt/v1/chat/completions"
+        self.api_endpoint = "https://chat.typegpt.net/api/openai/v1/chat/completions"
         self.timeout = timeout
         self.last_response = {}
         self.model = model

webscout/Provider/uncovr.py

@@ -20,14 +20,14 @@ class UncovrAI(Provider):
         "gpt-4o-mini",
         "gemini-2-flash",
         "gemini-2-flash-lite",
-        "groq-llama-3-1-8b"
+        "groq-llama-3-1-8b",
+        "o3-mini",
+        "deepseek-r1-distill-qwen-32b",
         # The following models are not available in the free plan:
-        # "o3-mini",
         # "claude-3-7-sonnet",
         # "gpt-4o",
         # "claude-3-5-sonnet-v2",
         # "deepseek-r1-distill-llama-70b",
-        # "deepseek-r1-distill-qwen-32b",
         # "gemini-2-flash-lite-preview",
         # "qwen-qwq-32b"
     ]

webscout/conversation.py

@@ -281,11 +281,11 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
             if not os.path.exists(self.file):
                 with open(self.file, "w", encoding="utf-8") as fh:
                     fh.write(self.intro + "\n")
-            
+
             # Append new history
             with open(self.file, "a", encoding="utf-8") as fh:
                 fh.write(new_history)
-        
+
         self.chat_history += new_history
         # logger.info(f"Chat history updated with prompt: {prompt}")
 
@@ -317,21 +317,21 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
             "tool": tool_name,
             "result": tool_result
         }
-        
+
         if self.file and self.update_file:
             # Create file if it doesn't exist
             if not os.path.exists(self.file):
                 with open(self.file, "w", encoding="utf-8") as fh:
                     fh.write(self.intro + "\n")
-            
+
             # Append new history
             with open(self.file, "a", encoding="utf-8") as fh:
                 fh.write(new_history)
-        
+
         self.chat_history += new_history
 
     def add_message(self, role: str, content: str) -> None:
-        """Add a new message to the chat - simple and clean! 
+        """Add a new message to the chat - simple and clean!
 
         This method:
         - Validates the message role
@@ -379,10 +379,10 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
 
     def _parse_function_call(self, response: str) -> FunctionCallData:
         """Parse a function call from the LLM's response.
-        
+
         Args:
             response (str): The LLM's response containing a function call
-            
+
         Returns:
             FunctionCallData: Parsed function call data or error
         """
@@ -399,13 +399,13 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
                 end_tag = "</tool_call>"
                 start_idx = response.find(start_tag)
                 end_idx = response.rfind(end_tag)
-                
+
                 if start_idx == -1 or end_idx == -1 or end_idx <= start_idx:
                     raise ValueError("No valid <tool_call> JSON structure found in the response.")
-                
+
                 # Extract JSON content - for the format without brackets
                 json_str: str = response[start_idx + len(start_tag):end_idx].strip()
-                
+
                 # Try to parse the JSON directly
                 try:
                     parsed_response: Any = json.loads(json_str)
@@ -425,7 +425,7 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
                 # Extract JSON content - for the format with brackets
                 json_str: str = response[start_idx + len(start_tag):end_idx].strip()
                 parsed_response: Any = json.loads(json_str)
-                
+
                 if isinstance(parsed_response, list):
                     return {"tool_calls": parsed_response}
                 elif isinstance(parsed_response, dict):
@@ -439,10 +439,10 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
 
     def execute_function(self, function_call_data: FunctionCallData) -> str:
         """Execute a function call and return the result.
-        
+
         Args:
             function_call_data (FunctionCallData): The function call data
-            
+
         Returns:
             str: Result of the function execution
         """
@@ -450,7 +450,7 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
 
         if not tool_calls or not isinstance(tool_calls, list):
             return "Invalid tool_calls format."
-        
+
         results: List[str] = []
         for tool_call in tool_calls:
             function_name: str = tool_call.get("name")
@@ -465,19 +465,19 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
             results.append(f"Executed {function_name} with arguments {arguments}")
 
         return "; ".join(results)
-        
+
     def _convert_fns_to_tools(self, fns: Optional[List[Fn]]) -> List[ToolDefinition]:
         """Convert functions to tool definitions for the LLM.
-        
+
         Args:
             fns (Optional[List[Fn]]): List of function definitions
-            
+
         Returns:
             List[ToolDefinition]: List of tool definitions
         """
         if not fns:
             return []
-        
+
         tools: List[ToolDefinition] = []
         for fn in fns:
             tool: ToolDefinition = {
@@ -499,55 +499,55 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
             }
             tools.append(tool)
         return tools
-        
+
     def get_tools_description(self) -> str:
         """Get a formatted string of available tools for the intro prompt.
-        
+
         Returns:
             str: Formatted tools description
         """
         if not self.tools:
             return ""
-            
+
         tools_desc = []
         for fn in self.tools:
             params_desc = ", ".join([f"{name}: {typ}" for name, typ in fn.parameters.items()])
             tools_desc.append(f"- {fn.name}: {fn.description} (Parameters: {params_desc})")
-            
+
         return "\n".join(tools_desc)
 
     def handle_tool_response(self, response: str) -> Dict[str, Any]:
         """Process a response that might contain a tool call.
-        
+
         This method:
         - Checks if the response contains a tool call
         - Parses and executes the tool call if present
         - Returns the appropriate result
-        
+
         Args:
             response (str): The LLM's response
-            
+
         Returns:
             Dict[str, Any]: Result containing 'is_tool_call', 'result', and 'original_response'
         """
         # Check if response contains a tool call
         if "<tool_call>" in response:
             function_call_data = self._parse_function_call(response)
-            
+
             if "error" in function_call_data:
                 return {
-                    "is_tool_call": True, 
+                    "is_tool_call": True,
                     "success": False,
                     "result": function_call_data["error"],
                     "original_response": response
                 }
-                
+
             # Execute the function call
             result = self.execute_function(function_call_data)
-            
+
             # Add the result to chat history as a tool message
             self.add_message("tool", result)
-            
+
             return {
                 "is_tool_call": True,
                 "success": True,
@@ -555,7 +555,7 @@ Your goal is to assist the user effectively. Analyze each query and choose one o
                 "tool_calls": function_call_data.get("tool_calls", []),
                 "original_response": response
             }
-        
+
         return {
             "is_tool_call": False,
             "result": response,

webscout/prompt_manager.py

@@ -110,7 +110,8 @@ class AwesomePrompts:
         self,
         key: Union[str, int],
         default: Optional[str] = None,
-        case_insensitive: bool = True
+        case_insensitive: bool = True,
+        raise_not_found: bool = False # currently unused
     ) -> Optional[str]:
         """Get that perfect prompt! 🎯
 

webscout/version.py

@@ -1,2 +1,2 @@
-__version__ = "8.0"
+__version__ = "8.2"
 __prog__ = "webscout"