From 6d96a1efd27b94c564da6da9cddf3bfceaf7c0ed Mon Sep 17 00:00:00 2001 From: abc <98614666+xtekky@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:57:37 +0200 Subject: ~ | major refractoring | v0.0.2.0 --- g4f/Provider/Bing.py | 6 +++--- g4f/Provider/Raycast.py | 2 +- g4f/__init__.py | 12 ++++++------ g4f/models.py | 2 +- g4f/typing.py | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/g4f/Provider/Bing.py b/g4f/Provider/Bing.py index 40e112a9..48b5477d 100644 --- a/g4f/Provider/Bing.py +++ b/g4f/Provider/Bing.py @@ -9,7 +9,7 @@ import aiohttp import certifi import requests -from ..typing import Any, AsyncGenerator, CreateResult, Tuple +from ..typing import Any, AsyncGenerator, CreateResult, Tuple, Union from .base_provider import BaseProvider @@ -79,7 +79,7 @@ def _format(msg: dict[str, Any]) -> str: async def stream_generate( prompt: str, mode: dict[str, list[str]] = jailbreak, - context: bool | str = False, + context: Union[bool, str] = False, ): timeout = aiohttp.ClientTimeout(total=900) session = aiohttp.ClientSession(timeout=timeout) @@ -350,7 +350,7 @@ class Defaults: } -def run(generator: AsyncGenerator[Any | str, Any]): +def run(generator: AsyncGenerator[Union[Any, str], Any]): loop = asyncio.get_event_loop() gen = generator.__aiter__() diff --git a/g4f/Provider/Raycast.py b/g4f/Provider/Raycast.py index 9441f629..49481202 100644 --- a/g4f/Provider/Raycast.py +++ b/g4f/Provider/Raycast.py @@ -2,7 +2,7 @@ import json import requests -from ..provider.base_provider import BaseProvider +from ..Provider.base_provider import BaseProvider from ..typing import Any, CreateResult diff --git a/g4f/__init__.py b/g4f/__init__.py index d90faf06..47d2a7a3 100644 --- a/g4f/__init__.py +++ b/g4f/__init__.py @@ -1,6 +1,6 @@ from . import models -from .provider import BaseProvider -from .typing import Any, CreateResult +from .Provider import BaseProvider +from .typing import Any, CreateResult, Union logging = False @@ -8,13 +8,13 @@ logging = False class ChatCompletion: @staticmethod def create( - model: models.Model | str, + model: Union[models.Model, str], messages: list[dict[str, str]], - provider: type[BaseProvider] | None = None, + provider: Union[type[BaseProvider], None] = None, stream: bool = False, - auth: str | None = None, + auth: Union[str, None] = None, **kwargs: Any, - ) -> CreateResult | str: + ) -> Union[CreateResult, str]: if isinstance(model, str): try: model = models.ModelUtils.convert[model] diff --git a/g4f/models.py b/g4f/models.py index 40d21f2a..c675c280 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -1,6 +1,6 @@ from dataclasses import dataclass -from .provider import Bard, BaseProvider, GetGpt, H2o, Liaobots, Vercel +from .Provider import Bard, BaseProvider, GetGpt, H2o, Liaobots, Vercel @dataclass diff --git a/g4f/typing.py b/g4f/typing.py index 5d4489f9..2e123112 100644 --- a/g4f/typing.py +++ b/g4f/typing.py @@ -1,4 +1,4 @@ -from typing import Any, AsyncGenerator, Generator, NewType, Tuple, TypedDict +from typing import Any, AsyncGenerator, Generator, NewType, Tuple, TypedDict, Union SHA256 = NewType("sha_256_hash", str) CreateResult = Generator[str, None, None] -- cgit v1.2.3