webscout 7.3__py3-none-any.whl → 7.5__py3-none-any.whl

webscout/Provider/yep.py

@@ -12,7 +12,6 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import WEBS, exceptions
-from webscout.Litlogger import Logger, LogFormat
 from webscout.litagent import LitAgent
 
 
@@ -39,14 +38,13 @@ class YEPCHAT(Provider):
         act: str = None,
         model: str = "DeepSeek-R1-Distill-Qwen-32B",
         temperature: float = 0.6,
-        top_p: float = 0.7,
-        logging: bool = False,
+        top_p: float = 0.7
     ):
         """
         Initializes the YEPCHAT provider with the specified parameters.
 
         Examples:
-            >>> ai = YEPCHAT(logging=True)
+            >>> ai = YEPCHAT()
             >>> ai.ask("What's the weather today?")
             Sends a prompt to the Yep API and returns the response.
 
@@ -85,7 +83,7 @@ class YEPCHAT(Provider):
             "Sec-CH-UA-Platform": '"Windows"',
             "User-Agent": self.agent.random(),  # Use LitAgent to generate a random user agent
         }
-        self.cookies = {"__Host-session": uuid.uuid4().hex}
+        self.cookies = {"__Host-session": uuid.uuid4().hex, '__cf_bm': uuid.uuid4().hex}
 
         self.__available_optimizers = (
             method
@@ -106,9 +104,6 @@ class YEPCHAT(Provider):
 
         self.knowledge_cutoff = "December 2023"
 
-        # Initialize logger
-        self.logger = Logger(name="YEPCHAT", format=LogFormat.MODERN_EMOJI) if logging else None
-
     def ask(
         self,
         prompt: str,
@@ -128,9 +123,6 @@ class YEPCHAT(Provider):
             >>> ai.ask("Tell me a joke", stream=True)
             Streams the response from the Yep API.
         """
-        if self.logger:
-            self.logger.debug(f"ask() called with prompt: {prompt}")
-
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             if optimizer in self.__available_optimizers:
@@ -138,8 +130,6 @@ class YEPCHAT(Provider):
                     conversation_prompt if conversationally else prompt
                 )
             else:
-                if self.logger:
-                    self.logger.error(f"Invalid optimizer: {optimizer}")
                 raise Exception(
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
@@ -157,8 +147,6 @@ class YEPCHAT(Provider):
             try:
                 with self.session.post(self.chat_endpoint, headers=self.headers, cookies=self.cookies, json=data, stream=True, timeout=self.timeout) as response:
                     if not response.ok:
-                        if self.logger:
-                            self.logger.error(f"Failed to generate response: {response.status_code} {response.reason}")
                         raise exceptions.FailedToGenerateResponseError(
                             f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                         )
@@ -183,13 +171,9 @@ class YEPCHAT(Provider):
                                             resp = dict(text=content) 
                                             yield resp if raw else resp
                                 except json.JSONDecodeError:
-                                    if self.logger:
-                                        self.logger.warning("JSONDecodeError encountered.")
                                     pass
                     self.conversation.update_chat_history(prompt, streaming_text)
             except Exception as e:
-                if self.logger:
-                    self.logger.error(f"Request failed: {e}")
                 raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
 
         def for_non_stream():
@@ -217,9 +201,6 @@ class YEPCHAT(Provider):
             >>> ai.chat("What's the weather today?", stream=True)
             Streams the chat response from the Yep API.
         """
-        if self.logger:
-            self.logger.debug(f"chat() called with prompt: {prompt}")
-
         def for_stream():
             for response in self.ask(
                 prompt, True, optimizer=optimizer, conversationally=conversationally
@@ -255,8 +236,7 @@ class YEPCHAT(Provider):
 if __name__ == "__main__":
     from rich import print
 
-    ai = YEPCHAT(logging=False)
-
+    ai = YEPCHAT(model="DeepSeek-R1-Distill-Qwen-32B")
     response = ai.chat("how many r in 'strawberry'", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

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/update_checker.py

@@ -1,43 +1,28 @@
 """
-Ayy, check it out! 👀
+Webscout Update Checker
 >>> from webscout import check_for_updates
->>> check_for_updates()
-'Yo, new Webscout version just dropped: 2.0.0! 🔥
-Level up with: `pip install --upgrade webscout`'
+>>> result = check_for_updates()
+>>> print(result)
+'New Webscout version available: 2.0.0 - Update with: pip install --upgrade webscout'
 """
 
-import subprocess
 import sys
 import os
-from typing import Optional
+from typing import Optional, Tuple, Dict, Any, Literal, Union
 
 import requests
 from packaging import version
-import re
-
-from webscout.Litlogger import Logger
 from importlib.metadata import version as get_package_version
 from importlib.metadata import PackageNotFoundError
-from importlib.metadata import metadata as get_package_metadata
-
-# Setting up that clean logger format, no cap! 💯
-CUSTOM_FORMAT = """{message}"""
 
-logger = Logger(
-    name="WebscoutUpdate",
-    format=CUSTOM_FORMAT,
-)
+# Version comparison result type
+VersionCompareResult = Literal[-1, 0, 1]
 
 def get_installed_version() -> Optional[str]:
-    """Yo, let's check what version you're running! 🔍
-
-    What this function's all about:
-    - Checking your setup real quick 💨
-    - Getting them version deets 📱
-    - Handling any problems like a boss 💪
+    """Get the currently installed version of webscout.
 
     Returns:
-        Optional[str]: Your version number or None if we can't find it
+        Optional[str]: The installed version string or None if not found
 
     Examples:
         >>> version = get_installed_version()
@@ -48,19 +33,14 @@ def get_installed_version() -> Optional[str]:
         return get_package_version('webscout')
     except PackageNotFoundError:
         return None
-    except Exception as e:
+    except Exception:
         return None
 
 def get_pypi_version() -> Optional[str]:
-    """Let's see what's fresh on PyPI! 🚀
-
-    This function's vibe:
-    - Hitting up PyPI for the latest drop 🌐
-    - Keeping it smooth with timeout handling ⚡
-    - Making sure we get good data fr fr 💯
+    """Get the latest version available on PyPI.
 
     Returns:
-        Optional[str]: Latest version or None if something's not right
+        Optional[str]: The latest version string or None if retrieval failed
 
     Examples:
         >>> latest = get_pypi_version()
@@ -73,24 +53,20 @@ def get_pypi_version() -> Optional[str]:
             timeout=10
         )
         response.raise_for_status()
-        return response.json()['info']['version']
-    except requests.RequestException as e:
-        pass
-    except (KeyError, ValueError) as e:
-        pass
-    except Exception as e:
-        pass
-    return None
+        data: Dict[str, Any] = response.json()
+        return data['info']['version']
+    except (requests.RequestException, KeyError, ValueError, Exception):
+        return None
 
-def version_compare(v1: str, v2: str) -> int:
-    """Time to compare these versions! 💪
+def version_compare(v1: str, v2: str) -> VersionCompareResult:
+    """Compare two version strings.
 
     Args:
-        v1: First version we checking
-        v2: Second version to compare with
+        v1: First version string
+        v2: Second version string to compare with
 
     Returns:
-        int: -1 if v1's older, 1 if v1's newer, 0 if they twins
+        VersionCompareResult: -1 if v1 < v2, 1 if v1 > v2, 0 if equal
 
     Examples:
         >>> version_compare('1.0.0', '2.0.0')
@@ -104,71 +80,57 @@ def version_compare(v1: str, v2: str) -> int:
         if version1 > version2:
             return 1
         return 0
-    except version.InvalidVersion as e:
-        pass
-        return 0
-    except Exception as e:
-        pass
+    except (version.InvalidVersion, Exception):
         return 0
 
-def display_version_info(installed: Optional[str], latest: Optional[str]) -> None:
-    """Let's break down your version status! 📱
-
-    What we doing here:
-    - Comparing your version with the latest drop 🔄
-    - Letting you know if you need to level up ⬆️
-    - Keeping you in the loop with style 💯
+def get_update_message(installed: str, latest: str) -> Optional[str]:
+    """Generate appropriate update message based on version comparison.
 
     Args:
-        installed: What you running rn
-        latest: What's fresh out there
+        installed: Currently installed version
+        latest: Latest available version
+
+    Returns:
+        Optional[str]: Update message if needed, None if already on latest version
 
     Examples:
-        >>> display_version_info('1.0.0', '2.0.0')
-        'Yo, new Webscout version just dropped: 2.0.0! 🔥'
+        >>> get_update_message('1.0.0', '2.0.0')
+        'New Webscout version available: 2.0.0 - Update with: pip install --upgrade webscout'
     """
-    if installed:
-        pass
-    
-    if latest and installed:
-        comparison_result = version_compare(installed, latest)
-        if comparison_result < 0:
-            logger.warning(
-                f"Yo, new Webscout version just dropped: {latest}! 🔥\n"
-                f"Level up with: `pip install --upgrade webscout`"
-            )
-        elif comparison_result > 0:
-            logger.success("You already got the latest version, no cap! 💯")
-
-def check_for_updates() -> None:
-    """Time to check if you're running the latest! 🚀
-
-    What we doing:
-    - Peeking at your current setup 📱
-    - Checking what's new out there 🌐
-    - Keeping you updated fr fr ⚡
+    comparison_result = version_compare(installed, latest)
+    if comparison_result < 0:
+        return f"New Webscout version available: {latest} - Update with: pip install --upgrade webscout"
+    elif comparison_result > 0:
+        return f"You're running a development version ({installed}) ahead of latest release ({latest})"
+    return None  # Already on the latest version
+
+def check_for_updates() -> Optional[str]:
+    """Check if a newer version of Webscout is available.
+
+    Returns:
+        Optional[str]: Update message if newer version exists, None otherwise
 
     Examples:
-        >>> check_for_updates()
-        # We got you with them version checks fam!
+        >>> result = check_for_updates()
+        >>> print(result)
+        'New Webscout version available: 2.0.0 - Update with: pip install --upgrade webscout'
     """
     installed_version = get_installed_version()
-    latest_version = get_pypi_version()
-    
     if not installed_version:
-        pass
-        return
+        return None
         
+    latest_version = get_pypi_version()
     if not latest_version:
-        pass
-        return
+        return None
     
-    display_version_info(installed_version, latest_version)
+    return get_update_message(installed_version, latest_version)
 
 if __name__ == "__main__":
     try:
-        check_for_updates()
+        update_message = check_for_updates()
+        if update_message:
+            print(update_message)
     except KeyboardInterrupt:
-        logger.warning("Update check got cancelled, no worries fam! 🤚")
+        print("Update check canceled")
     except Exception as e:
-        logger.error(f"Uh oh, something went wrong: {str(e)} 😔")
+        print(f"Update check failed: {str(e)}")

webscout/version.py

@@ -1,2 +1,2 @@
-__version__ = "7.3"
+__version__ = "7.5"
 __prog__ = "webscout"

webscout-7.5.dist-info/LICENSE.md

@@ -0,0 +1,146 @@
+Apache License
+                           Version 2.0, March 2025
+                           Webscout License
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work.
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file; and
+
+      (e) You must include the following attribution notice prominently 
+          displayed in any Derivative Works:
+          "Based on Webscout (https://github.com/webscout)"
+
+   5. API Usage and Third-Party Services. When using the APIs and services
+      accessed through this Work, you must:
+
+      (a) Comply with all terms of service of the respective API providers; and
+
+      (b) Maintain appropriate attribution and licenses for third-party services; and
+
+      (c) Be responsible for obtaining any necessary permissions or licenses; and
+
+      (d) Not use the Work in any way that could damage or overload third-party services.
+
+   6. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+
+   7. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   8. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   9. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, consequential, or exemplary damages of any character
+      arising as a result of this License or out of the use or inability
+      to use the Work.
+
+END OF TERMS AND CONDITIONS
+
+Copyright 2024-2025 Webscout Contributors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.