webscout 8.3.1__tar.gz → 8.3.2__tar.gz

{webscout-8.3.1/webscout.egg-info → webscout-8.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webscout
-Version: 8.3.1
+Version: 8.3.2
 Summary: Search for anything using Google, DuckDuckGo, 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-email: OEvortex <helpingai5@gmail.com>
 License: HelpingAI
@@ -71,6 +71,8 @@ Requires-Dist: uvicorn[standard]; extra == "api"
 Requires-Dist: pydantic; extra == "api"
 Requires-Dist: python-multipart; extra == "api"
 Requires-Dist: tiktoken; extra == "api"
+Requires-Dist: motor; extra == "api"
+Requires-Dist: jinja2; extra == "api"
 Dynamic: license-file
 
 <div align="center">
@@ -227,14 +229,14 @@ uv add "webscout[api]"
 uv run webscout --help
 
 # Run with API dependencies
-uv run --extra api webscout-server
+uv run webscout --extra api webscout-server
 
 # Install as a UV tool for global access
 uv tool install webscout
 
 # Use UV tool commands
 webscout --help
-webscout-server --help
+webscout-server
 ```
 
 ### 🔧 Development Installation
@@ -308,7 +310,7 @@ uv run --extra api webscout-server
 ```bash
 # Traditional Python module execution
 python -m webscout --help
-python -m webscout.client  # Start API server
+python -m webscout-server
 ```
 
 <details open>
@@ -403,13 +405,19 @@ webscout-server --port 8080
 # Start with API key authentication
 webscout-server --api-key "your-secret-key"
 
+# Start in no-auth mode using command line flag (no API key required)
+webscout-server --no-auth
+
+# Start in no-auth mode using environment variable
+$env:WEBSCOUT_NO_AUTH='true'; webscout-server
+
 # Specify a default provider
 webscout-server --default-provider "Claude"
 
 # Run in debug mode
 webscout-server --debug
 
-# Get help for all options
+# Get help for all options (includes authentication options)
 webscout-server --help
 ```
 
@@ -420,17 +428,36 @@ webscout-server --help
 uv run --extra api webscout-server
 
 # Using Python module
-python -m webscout.client
+python -m webscout.auth.server
+```
+
+#### Environment Variables
+
+Webscout server supports configuration through environment variables:
 
-# Legacy method (still supported)
-python -m webscout.Provider.OPENAI.api
+```bash
+# Start server in no-auth mode (no API key required)
+$env:WEBSCOUT_NO_AUTH='true'; webscout-server
+
+# Disable rate limiting
+$env:WEBSCOUT_NO_RATE_LIMIT='true'; webscout-server
+
+# Start with custom port using environment variable
+$env:WEBSCOUT_PORT='7860'; webscout-server
 ```
 
+For a complete list of supported environment variables and Docker deployment options, see [DOCKER.md](DOCKER.md).
+
+
 #### From Python Code
 
+> **Recommended:**  
+> Use `start_server` from `webscout.client` for the simplest programmatic startup.  
+> For advanced control (custom host, debug, etc.), use `run_api`.
+
 ```python
-# Method 1: Using the helper function
-from webscout.client import start_server  # <--- Now recommended
+# Method 1: Using the helper function (recommended)
+from webscout.client import start_server
 
 # Start with default settings
 start_server()
@@ -438,7 +465,10 @@ start_server()
 # Start with custom settings
 start_server(port=8080, api_key="your-secret-key", default_provider="Claude")
 
-# Method 2: Using the run_api function for more control
+# Start in no-auth mode (no API key required)
+start_server(no_auth=True)
+
+# Method 2: Advanced usage with run_api
 from webscout.client import run_api
 
 run_api(

{webscout-8.3.1 → webscout-8.3.2}/README.md

@@ -152,14 +152,14 @@ uv add "webscout[api]"
 uv run webscout --help
 
 # Run with API dependencies
-uv run --extra api webscout-server
+uv run webscout --extra api webscout-server
 
 # Install as a UV tool for global access
 uv tool install webscout
 
 # Use UV tool commands
 webscout --help
-webscout-server --help
+webscout-server
 ```
 
 ### 🔧 Development Installation
@@ -233,7 +233,7 @@ uv run --extra api webscout-server
 ```bash
 # Traditional Python module execution
 python -m webscout --help
-python -m webscout.client  # Start API server
+python -m webscout-server
 ```
 
 <details open>
@@ -328,13 +328,19 @@ webscout-server --port 8080
 # Start with API key authentication
 webscout-server --api-key "your-secret-key"
 
+# Start in no-auth mode using command line flag (no API key required)
+webscout-server --no-auth
+
+# Start in no-auth mode using environment variable
+$env:WEBSCOUT_NO_AUTH='true'; webscout-server
+
 # Specify a default provider
 webscout-server --default-provider "Claude"
 
 # Run in debug mode
 webscout-server --debug
 
-# Get help for all options
+# Get help for all options (includes authentication options)
 webscout-server --help
 ```
 
@@ -345,17 +351,36 @@ webscout-server --help
 uv run --extra api webscout-server
 
 # Using Python module
-python -m webscout.client
+python -m webscout.auth.server
+```
+
+#### Environment Variables
+
+Webscout server supports configuration through environment variables:
 
-# Legacy method (still supported)
-python -m webscout.Provider.OPENAI.api
+```bash
+# Start server in no-auth mode (no API key required)
+$env:WEBSCOUT_NO_AUTH='true'; webscout-server
+
+# Disable rate limiting
+$env:WEBSCOUT_NO_RATE_LIMIT='true'; webscout-server
+
+# Start with custom port using environment variable
+$env:WEBSCOUT_PORT='7860'; webscout-server
 ```
 
+For a complete list of supported environment variables and Docker deployment options, see [DOCKER.md](DOCKER.md).
+
+
 #### From Python Code
 
+> **Recommended:**  
+> Use `start_server` from `webscout.client` for the simplest programmatic startup.  
+> For advanced control (custom host, debug, etc.), use `run_api`.
+
 ```python
-# Method 1: Using the helper function
-from webscout.client import start_server  # <--- Now recommended
+# Method 1: Using the helper function (recommended)
+from webscout.client import start_server
 
 # Start with default settings
 start_server()
@@ -363,7 +388,10 @@ start_server()
 # Start with custom settings
 start_server(port=8080, api_key="your-secret-key", default_provider="Claude")
 
-# Method 2: Using the run_api function for more control
+# Start in no-auth mode (no API key required)
+start_server(no_auth=True)
+
+# Method 2: Advanced usage with run_api
 from webscout.client import run_api
 
 run_api(

{webscout-8.3.1 → webscout-8.3.2}/pyproject.toml

@@ -78,7 +78,7 @@ dependencies = [
 [project.scripts]
 WEBS = "webscout.cli:main"
 webscout = "webscout.cli:main"
-webscout-server = "webscout.client:start_server"  # Instantly start the OpenAI-compatible API server
+webscout-server = "webscout.auth.server:main"  # Instantly start the OpenAI-compatible API server
 
 [project.urls]
 Source = "https://github.com/OE-LUCIFER/Webscout"
@@ -96,6 +96,8 @@ api = [
     "pydantic",
     "python-multipart",
     "tiktoken",  # Added tiktoken for token counting support
+    "motor",  # MongoDB async driver for enhanced authentication
+    "jinja2",  # Template engine for custom Swagger UI
 ]
 
 [tool.setuptools]

{webscout-8.3.1 → webscout-8.3.2}/webscout/AIutel.py

@@ -277,69 +277,50 @@ def _sanitize_stream_sync(
     processing_active = start_marker is None
     buffer = ""
     found_start = False if start_marker else True
+    line_iterator: Iterable[str]
 
-    # Fast path for single string processing
     if isinstance(data, str):
-        processed_item = None
-        if processing_active:
-            if to_json:
-                try:
-                    data = data.strip()
-                    if data:
-                        processed_item = json.loads(data)
-                except Exception as e:
-                    if error_handler:
-                        try:
-                            handled = error_handler(e, data)
-                            if handled is not None:
-                                processed_item = handled
-
-                        except Exception:
-                            pass
-                    if processed_item is None:
-                        processed_item = data if yield_raw_on_error else None
+        # If data is a string, decide whether to split it into lines
+        # or treat it as an iterable containing a single chunk.
+        temp_lines: List[str]
+        if line_delimiter is None:  # Default: split by newlines if present
+            if '\n' in data or '\r' in data:
+                temp_lines = data.splitlines()
             else:
-                processed_item = _process_chunk(
-                    data, intro_value, False, effective_skip_markers,
-                    strip_chars, yield_raw_on_error, error_handler
-                )
-            if processed_item is not None:
-                if content_extractor:
-                    try:
-                        final_content = content_extractor(processed_item)
-                        if final_content is not None:
-                            yield final_content
-                    except Exception:
-                        pass
-                else:
-                    yield processed_item
-        return
-
-    # Stream processing path
-    if not hasattr(data, '__iter__'):
-        raise TypeError(f"Input must be a string or an iterable, not {type(data).__name__}")
-
-    try:
-        iterator = iter(data)
-        first_item = next(iterator, None)
-        if first_item is None:
+                temp_lines = [data]  # Treat as a single line/chunk
+        elif line_delimiter in data:  # Custom delimiter found in string
+            temp_lines = data.split(line_delimiter)
+        else:  # Custom delimiter not found, or string is effectively a single segment
+            temp_lines = [data]
+        line_iterator = iter(temp_lines)
+    elif hasattr(data, '__iter__'):  # data is an iterable (but not a string)
+        _iter = iter(data)
+        first_item = next(_iter, None)
+
+        if first_item is None:  # Iterable was empty
             return
+
         from itertools import chain
-        stream = chain([first_item], iterator)
+        # Reconstruct the full iterable including the first_item
+        stream_input_iterable = chain([first_item], _iter)
 
-        # Determine if we're dealing with bytes or strings
         if isinstance(first_item, bytes):
+            # Ensure stream_input_iterable is typed as Iterable[bytes] for _decode_byte_stream
             line_iterator = _decode_byte_stream(
-                stream,
+                stream_input_iterable, # type: ignore
                 encoding=encoding,
                 errors=encoding_errors,
                 buffer_size=buffer_size
             )
         elif isinstance(first_item, str):
-            line_iterator = stream
+            # Ensure stream_input_iterable is typed as Iterable[str]
+            line_iterator = stream_input_iterable # type: ignore
         else:
-            raise TypeError(f"Stream must yield strings or bytes, not {type(first_item).__name__}")
+            raise TypeError(f"Iterable must yield strings or bytes, not {type(first_item).__name__}")
+    else:  # Not a string and not an iterable
+        raise TypeError(f"Input must be a string or an iterable, not {type(data).__name__}")
 
+    try:
         for line in line_iterator:
             if not line:
                 continue
@@ -683,20 +664,32 @@ def sanitize_stream(
         Union[Generator[Any, None, None], AsyncGenerator[Any, None]]:
             A generator or an asynchronous generator yielding the processed data.
     """
+    # Determine the actual data payload to process
+    payload: Any  # The type of payload can change based on data's attributes
 
-    if hasattr(data, "__aiter__"):
+    text_attr = getattr(data, "text", None)
+    content_attr = getattr(data, "content", None)
+
+    if isinstance(text_attr, str):
+        payload = text_attr
+    elif isinstance(content_attr, bytes):
+        payload = content_attr.decode(encoding, encoding_errors)
+    else:
+        # Use the original data if .text or .content are not applicable or not found
+        payload = data
+
+    # Dispatch to sync or async worker based on the nature of the 'payload'
+    if hasattr(payload, "__aiter__"):
         return _sanitize_stream_async(
-            data, intro_value, to_json, skip_markers, strip_chars,
+            payload, intro_value, to_json, skip_markers, strip_chars,
             start_marker, end_marker, content_extractor, yield_raw_on_error,
             encoding, encoding_errors, buffer_size, line_delimiter, error_handler,
         )
     return _sanitize_stream_sync(
-        data, intro_value, to_json, skip_markers, strip_chars,
+        payload, intro_value, to_json, skip_markers, strip_chars,
         start_marker, end_marker, content_extractor, yield_raw_on_error,
         encoding, encoding_errors, buffer_size, line_delimiter, error_handler,
     )
-
-
 from .conversation import Conversation  # noqa: E402,F401
 from .Extra.autocoder import AutoCoder  # noqa: E402,F401
 from .optimizers import Optimizers  # noqa: E402,F401