webscout 7.4__py3-none-any.whl → 7.6__py3-none-any.whl

webscout/cli.py

@@ -1,34 +1,12 @@
-import os
 import sys
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from datetime import datetime
-from urllib.parse import unquote
-from pathlib import Path
-from .swiftcli import CLI, option, argument, group
-from curl_cffi import requests
-import pyreqwest_impersonate as pri
+from .swiftcli import CLI, option
 from .webscout_search import WEBS
-from .utils import json_dumps, json_loads
 from .version import __version__
-from .Litlogger import LitLogger, LogFormat, ColorScheme
 from rich.console import Console
 from rich.panel import Panel
-from rich.markdown import Markdown
 from rich.table import Table
-from rich.style import Style
 from rich.text import Text
-from rich.align import Align
-from rich.progress import track, Progress
-from rich.prompt import Prompt, Confirm
-from rich.columns import Columns
-from pyfiglet import figlet_format
 
-logger = LitLogger(
-    name="webscout",
-    format=LogFormat.MODERN_EMOJI,
-    color_scheme=ColorScheme.CYBERPUNK,
-    console_output=True
-)
 
 COLORS = {
     0: "black",
@@ -89,7 +67,7 @@ def chat(proxy: str = None, model: str = "gpt-4o-mini"):
     console = Console()
     
     # Display header
-    console.print(f"[bold blue]{figlet_format('Webscout Chat')}[/]\n", justify="center")
+    # console.print(f"[bold blue]{figlet_format('Webscout Chat')}[/]\n", justify="center")
     console.print(f"[bold green]Using model:[/] {model}\n")
     console.print("[cyan]Type your message and press Enter. Press Ctrl+C or type 'exit' to quit.[/]\n")
     
@@ -97,23 +75,18 @@ def chat(proxy: str = None, model: str = "gpt-4o-mini"):
     try:
         while True:
             try:
-                user_input = input("You: ").strip()
+                user_input = input(">>> ").strip()
                 if not user_input or user_input.lower() in ['exit', 'quit']:
                     break
                     
-                logger.info(f"Sending message to {model}")
                 response = webs.chat(keywords=user_input, model=model)
                 console.print(f"\nAI: {response}\n")
-                logger.success("Received response from AI")
                 
             except Exception as e:
-                logger.error(f"Error in chat: {str(e)}")
                 console.print(f"[bold red]Error:[/] {str(e)}\n")
                 
     except KeyboardInterrupt:
-        logger.info("Chat session terminated by user")
-        
-    console.print("\n[cyan]Chat session ended. Goodbye![/]")
+        console.print("\n[bold red]Chat session interrupted. Exiting...[/]")
 
 @app.command()
 @option("--keywords", "-k", help="Search keywords", required=True)
@@ -130,7 +103,6 @@ def text(keywords: str, region: str, safesearch: str, timelimit: str, backend: s
         results = webs.text(keywords, region, safesearch, timelimit, backend, max_results)
         _print_data(results)
     except Exception as e:
-        logger.error(f"Error in text search: {e}")
         raise e
 
 @app.command()
@@ -143,7 +115,6 @@ def answers(keywords: str, proxy: str = None):
         results = webs.answers(keywords)
         _print_data(results)
     except Exception as e:
-        logger.error(f"Error in answers search: {e}")
         raise e
 
 @app.command()
@@ -177,7 +148,6 @@ def images(
         results = webs.images(keywords, region, safesearch, timelimit, size, color, type, layout, license, max_results)
         _print_data(results)
     except Exception as e:
-        logger.error(f"Error in images search: {e}")
         raise e
 
 @app.command()
@@ -207,7 +177,6 @@ def videos(
         results = webs.videos(keywords, region, safesearch, timelimit, resolution, duration, license, max_results)
         _print_data(results)
     except Exception as e:
-        logger.error(f"Error in videos search: {e}")
         raise e
 
 @app.command()
@@ -224,7 +193,6 @@ def news(keywords: str, region: str, safesearch: str, timelimit: str, max_result
         results = webs.news(keywords, region, safesearch, timelimit, max_results)
         _print_data(results)
     except Exception as e:
-        logger.error(f"Error in news search: {e}")
         raise e
 
 @app.command()
@@ -275,7 +243,6 @@ def maps(
         )
         _print_data(results)
     except Exception as e:
-        logger.error(f"Error in maps search: {e}")
         raise e
 
 @app.command()
@@ -290,7 +257,6 @@ def translate(keywords: str, from_: str, to: str, proxy: str = None):
         results = webs.translate(keywords, from_, to)
         _print_data(results)
     except Exception as e:
-        logger.error(f"Error in translation: {e}")
         raise e
 
 @app.command()
@@ -304,7 +270,6 @@ def suggestions(keywords: str, region: str, proxy: str = None):
         results = webs.suggestions(keywords, region)
         _print_data(results)
     except Exception as e:
-        logger.error(f"Error in suggestions search: {e}")
         raise e
 
 def main():
@@ -312,7 +277,6 @@ def main():
     try:
         app.run()
     except Exception as e:
-        logger.error(f"Error: {e}")
         sys.exit(1)
 
 if __name__ == "__main__":

webscout/conversation.py

@@ -1,13 +1,6 @@
 import os
-import logging
 from typing import Optional
-from .Litlogger import Logger, LogFormat
 
-# Create a logger instance for this module
-logger = Logger(
-    name="Conversation",
-    format=LogFormat.MODERN_EMOJI,
-)
 
 class Conversation:
     """Handles prompt generation based on history and maintains chat context.
@@ -79,11 +72,9 @@ class Conversation:
         ), f"File '{filepath}' does not exist"
 
         if not os.path.isfile(filepath):
-            logging.debug(f"Creating new chat-history file - '{filepath}'")
             with open(filepath, "w", encoding="utf-8") as fh:
                 fh.write(self.intro)
         else:
-            logging.debug(f"Loading conversation from '{filepath}'")
             with open(filepath, encoding="utf-8") as fh:
                 file_contents = fh.readlines()
                 if file_contents:
@@ -221,7 +212,7 @@ class Conversation:
         if role in role_formats:
             self.chat_history += f"\n{role_formats[role]} : {content}"
         else:
-            logger.warning(f"Unknown role '{role}' for message: {content}")
+            raise ValueError(f"Invalid role: {role}. Must be one of {list(role_formats.keys())}")
 
     #     # Enhanced logging for message addition
     #     logger.info(f"Added message from {role}: {content}")

webscout/exceptions.py

@@ -11,7 +11,7 @@ class WebscoutE(Exception):
     pass
 
 
-class APIConnectionError(Exception):
+class APIConnectionError(WebscoutE):
     """
     Exception raised when there are issues connecting to an API.
 
@@ -21,7 +21,17 @@ class APIConnectionError(Exception):
     pass
 
 
-class RatelimitE(Exception):
+class AuthenticationError(WebscoutE):
+    """
+    Exception raised when authentication to a service fails.
+
+    This exception is raised when the provided credentials are invalid or expired.
+    It indicates that the application cannot authenticate with the service.
+    """
+    pass
+
+
+class RatelimitE(WebscoutE):
     """
     Exception raised when an API rate limit is exceeded.
 
@@ -31,7 +41,7 @@ class RatelimitE(Exception):
     pass
 
 
-class ConversationLimitException(Exception):
+class ConversationLimitException(WebscoutE):
     """
     Exception raised when a conversation limit is exceeded.
 
@@ -41,7 +51,7 @@ class ConversationLimitException(Exception):
     pass
 
 
-class TimeoutE(Exception):
+class TimeoutE(WebscoutE):
     """
     Exception raised when a request to an API times out.
 
@@ -51,7 +61,7 @@ class TimeoutE(Exception):
     pass
 
 
-class FailedToGenerateResponseError(Exception):
+class FailedToGenerateResponseError(WebscoutE):
     """
     Exception raised when a provider fails to generate a response.
 
@@ -61,7 +71,7 @@ class FailedToGenerateResponseError(Exception):
     pass
 
 
-class AllProvidersFailure(Exception):
+class AllProvidersFailure(WebscoutE):
     """
     Exception raised when all providers fail to generate a response.
 
@@ -71,7 +81,7 @@ class AllProvidersFailure(Exception):
     pass
 
 
-class FacebookInvalidCredentialsException(Exception):
+class FacebookInvalidCredentialsException(WebscoutE):
     """
     Exception raised when Facebook credentials are invalid.
 
@@ -81,7 +91,7 @@ class FacebookInvalidCredentialsException(Exception):
     pass
 
 
-class FacebookRegionBlocked(Exception):
+class FacebookRegionBlocked(WebscoutE):
     """
     Exception raised when Facebook access is blocked due to region restrictions.
 
@@ -91,7 +101,7 @@ class FacebookRegionBlocked(Exception):
     pass
 
 
-class ModelUnloadedException(Exception):
+class ModelUnloadedException(WebscoutE):
     """
     Exception raised when a model is unloaded.
 

webscout/litagent/__init__.py

@@ -22,8 +22,8 @@ Examples:
 """
 
 from .agent import LitAgent
-from .constants import BROWSERS, OS_VERSIONS, DEVICES
+from .constants import BROWSERS, OS_VERSIONS, DEVICES, FINGERPRINTS
 
 agent = LitAgent()
 
-__all__ = ['LitAgent', 'agent', 'BROWSERS', 'OS_VERSIONS', 'DEVICES']
+__all__ = ['LitAgent', 'agent', 'BROWSERS', 'OS_VERSIONS', 'DEVICES', 'FINGERPRINTS']