From 5756586cde6ed6da147119113fb5a5fd640d5f83 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sun, 14 Jan 2024 07:45:41 +0100 Subject: Refactor code with AI Add doctypes to many functions Add file upload for text files Add alternative url to FreeChatgpt Add webp to allowed image types --- g4f/version.py | 69 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 10 deletions(-) (limited to 'g4f/version.py') diff --git a/g4f/version.py b/g4f/version.py index bb4b7f17..c976c8fd 100644 --- a/g4f/version.py +++ b/g4f/version.py @@ -5,45 +5,94 @@ from importlib.metadata import version as get_package_version, PackageNotFoundEr from subprocess import check_output, CalledProcessError, PIPE from .errors import VersionNotFoundError -def get_latest_version() -> str: +def get_pypi_version(package_name: str) -> str: + """ + Get the latest version of a package from PyPI. + + :param package_name: The name of the package. + :return: The latest version of the package as a string. + """ try: - get_package_version("g4f") - response = requests.get("https://pypi.org/pypi/g4f/json").json() + response = requests.get(f"https://pypi.org/pypi/{package_name}/json").json() return response["info"]["version"] - except PackageNotFoundError: - url = "https://api.github.com/repos/xtekky/gpt4free/releases/latest" - response = requests.get(url).json() + except requests.RequestException as e: + raise VersionNotFoundError(f"Failed to get PyPI version: {e}") + +def get_github_version(repo: str) -> str: + """ + Get the latest release version from a GitHub repository. + + :param repo: The name of the GitHub repository. + :return: The latest release version as a string. + """ + try: + response = requests.get(f"https://api.github.com/repos/{repo}/releases/latest").json() return response["tag_name"] + except requests.RequestException as e: + raise VersionNotFoundError(f"Failed to get GitHub release version: {e}") + +def get_latest_version(): + """ + Get the latest release version from PyPI or the GitHub repository. -class VersionUtils(): + :return: The latest release version as a string. + """ + try: + # Is installed via package manager? + get_package_version("g4f") + return get_pypi_version("g4f") + except PackageNotFoundError: + # Else use Github version: + return get_github_version("xtekky/gpt4free") + +class VersionUtils: + """ + Utility class for managing and comparing package versions. + """ @cached_property def current_version(self) -> str: + """ + Get the current version of the g4f package. + + :return: The current version as a string. + """ # Read from package manager try: return get_package_version("g4f") except PackageNotFoundError: pass + # Read from docker environment version = environ.get("G4F_VERSION") if version: return version + # Read from git repository try: command = ["git", "describe", "--tags", "--abbrev=0"] return check_output(command, text=True, stderr=PIPE).strip() except CalledProcessError: pass + raise VersionNotFoundError("Version not found") - + @cached_property def latest_version(self) -> str: + """ + Get the latest version of the g4f package. + + :return: The latest version as a string. + """ return get_latest_version() - + def check_version(self) -> None: + """ + Check if the current version is up to date with the latest version. + """ try: if self.current_version != self.latest_version: print(f'New g4f version: {self.latest_version} (current: {self.current_version}) | pip install -U g4f') except Exception as e: print(f'Failed to check g4f version: {e}') - + utils = VersionUtils() \ No newline at end of file -- cgit v1.2.3 From 32252def150da94f12d1f3c07f977af6d8931402 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sun, 14 Jan 2024 15:04:37 +0100 Subject: Change doctypes style to Google Fix typo in latest_version Fix Phind Provider Add unittest worklow and main tests --- g4f/version.py | 56 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 15 deletions(-) (limited to 'g4f/version.py') diff --git a/g4f/version.py b/g4f/version.py index c976c8fd..9201c75c 100644 --- a/g4f/version.py +++ b/g4f/version.py @@ -7,10 +7,16 @@ from .errors import VersionNotFoundError def get_pypi_version(package_name: str) -> str: """ - Get the latest version of a package from PyPI. + Retrieves the latest version of a package from PyPI. - :param package_name: The name of the package. - :return: The latest version of the package as a string. + Args: + package_name (str): The name of the package for which to retrieve the version. + + Returns: + str: The latest version of the specified package from PyPI. + + Raises: + VersionNotFoundError: If there is an error in fetching the version from PyPI. """ try: response = requests.get(f"https://pypi.org/pypi/{package_name}/json").json() @@ -20,10 +26,16 @@ def get_pypi_version(package_name: str) -> str: def get_github_version(repo: str) -> str: """ - Get the latest release version from a GitHub repository. + Retrieves the latest release version from a GitHub repository. + + Args: + repo (str): The name of the GitHub repository. + + Returns: + str: The latest release version from the specified GitHub repository. - :param repo: The name of the GitHub repository. - :return: The latest release version as a string. + Raises: + VersionNotFoundError: If there is an error in fetching the version from GitHub. """ try: response = requests.get(f"https://api.github.com/repos/{repo}/releases/latest").json() @@ -31,11 +43,16 @@ def get_github_version(repo: str) -> str: except requests.RequestException as e: raise VersionNotFoundError(f"Failed to get GitHub release version: {e}") -def get_latest_version(): +def get_latest_version() -> str: """ - Get the latest release version from PyPI or the GitHub repository. + Retrieves the latest release version of the 'g4f' package from PyPI or GitHub. - :return: The latest release version as a string. + Returns: + str: The latest release version of 'g4f'. + + Note: + The function first tries to fetch the version from PyPI. If the package is not found, + it retrieves the version from the GitHub repository. """ try: # Is installed via package manager? @@ -47,14 +64,19 @@ def get_latest_version(): class VersionUtils: """ - Utility class for managing and comparing package versions. + Utility class for managing and comparing package versions of 'g4f'. """ @cached_property def current_version(self) -> str: """ - Get the current version of the g4f package. + Retrieves the current version of the 'g4f' package. + + Returns: + str: The current version of 'g4f'. - :return: The current version as a string. + Raises: + VersionNotFoundError: If the version cannot be determined from the package manager, + Docker environment, or git repository. """ # Read from package manager try: @@ -79,15 +101,19 @@ class VersionUtils: @cached_property def latest_version(self) -> str: """ - Get the latest version of the g4f package. + Retrieves the latest version of the 'g4f' package. - :return: The latest version as a string. + Returns: + str: The latest version of 'g4f'. """ return get_latest_version() def check_version(self) -> None: """ - Check if the current version is up to date with the latest version. + Checks if the current version of 'g4f' is up to date with the latest version. + + Note: + If a newer version is available, it prints a message with the new version and update instructions. """ try: if self.current_version != self.latest_version: -- cgit v1.2.3