From d4ab83a45bfef2910936dcabf3f875268631e65b Mon Sep 17 00:00:00 2001 From: abc <98614666+xtekky@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:14:48 +0100 Subject: ~ automatic models fetching in GUI. --- g4f/__init__.py | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'g4f/__init__.py') diff --git a/g4f/__init__.py b/g4f/__init__.py index 492d4e5b..1342452a 100644 --- a/g4f/__init__.py +++ b/g4f/__init__.py @@ -1,14 +1,13 @@ from __future__ import annotations -from requests import get -from g4f.models import Model, ModelUtils -from .Provider import BaseProvider, RetryProvider -from .typing import Messages, CreateResult, Union, List -from .debug import logging +from requests import get +from .models import Model, ModelUtils, _all_models +from .Provider import BaseProvider, RetryProvider +from .typing import Messages, CreateResult, Union, List +from .debug import logging -version = '0.1.6.6' +version = '0.1.6.6' version_check = True - def check_pypi_version() -> None: try: response = get("https://pypi.org/pypi/g4f/json").json() @@ -20,7 +19,6 @@ def check_pypi_version() -> None: except Exception as e: print(f'Failed to check g4f pypi version: {e}') - def get_model_and_provider(model : Union[Model, str], provider : Union[type[BaseProvider], None], stream : bool, @@ -56,7 +54,7 @@ def get_model_and_provider(model : Union[Model, str], class ChatCompletion: @staticmethod - def create(model: Union[Model, str], + def create(model : Union[Model, str], messages : Messages, provider : Union[type[BaseProvider], None] = None, stream : bool = False, @@ -76,12 +74,11 @@ class ChatCompletion: return result if stream else ''.join(result) @staticmethod - async def create_async( - model : Union[Model, str], - messages: Messages, - provider: Union[type[BaseProvider], None] = None, - stream : bool = False, - ignored : List[str] = None, **kwargs) -> str: + async def create_async(model : Union[Model, str], + messages : Messages, + provider : Union[type[BaseProvider], None] = None, + stream : bool = False, + ignored : List[str] = None, **kwargs) -> str: if stream: raise ValueError(f'"create_async" does not support "stream" argument') @@ -90,17 +87,13 @@ class ChatCompletion: return await provider.create_async(model.name, messages, **kwargs) - class Completion: @staticmethod - def create( - model: str, - prompt: str, - provider: Union[type[BaseProvider], None] = None, - stream: bool = False, - ignored : List[str] = None, - **kwargs - ) -> Union[CreateResult, str]: + def create(model : Union[Model, str], + prompt : str, + provider : Union[type[BaseProvider], None] = None, + stream : bool = False, + ignored : List[str] = None, **kwargs) -> Union[CreateResult, str]: allowed_models = [ 'code-davinci-002', -- cgit v1.2.3