mirror of
https://github.com/xtekky/gpt4free.git
synced 2025-12-15 14:51:19 -08:00
feat: add EdgeTTS audio provider and global image→media refactor
- **Docs**
- `docs/file.md`: update upload instructions to use inline `bucket` content parts instead of `tool_calls/bucket_tool`.
- `docs/media.md`: add asynchronous audio transcription example, detailed explanation, and notes.
- **New audio provider**
- Add `g4f/Provider/audio/EdgeTTS.py` implementing Edge Text‑to‑Speech (`EdgeTTS`).
- Create `g4f/Provider/audio/__init__.py` for provider export.
- Register provider in `g4f/Provider/__init__.py`.
- **Refactor image → media**
- Introduce `generated_media/` directory and `get_media_dir()` helper in `g4f/image/copy_images.py`; add `ensure_media_dir()`; keep back‑compat with legacy `generated_images/`.
- Replace `images_dir` references with `get_media_dir()` across:
- `g4f/api/__init__.py`
- `g4f/client/stubs.py`
- `g4f/gui/server/api.py`
- `g4f/gui/server/backend_api.py`
- `g4f/image/copy_images.py`
- Rename CLI/API config field/flag from `image_provider` to `media_provider` (`g4f/cli.py`, `g4f/api/__init__.py`, `g4f/client/__init__.py`).
- Extend `g4f/image/__init__.py`
- add `MEDIA_TYPE_MAP`, `get_extension()`
- revise `is_allowed_extension()`, `to_input_audio()` to support wider media types.
- **Provider adjustments**
- `g4f/Provider/ARTA.py`: swap `raise_error()` parameter order.
- `g4f/Provider/Cloudflare.py`: drop unused `MissingRequirementsError` import; move `get_args_from_nodriver()` inside try; handle `FileNotFoundError`.
- **Core enhancements**
- `g4f/providers/any_provider.py`: use `default_model` instead of literal `"default"`; broaden model/provider matching; update model list cleanup.
- `g4f/models.py`: safeguard provider count logic when model name is falsy.
- `g4f/providers/base_provider.py`: catch `json.JSONDecodeError` when reading auth cache, delete corrupted file.
- `g4f/providers/response.py`: allow `AudioResponse` to accept extra kwargs.
- **Misc**
- Remove obsolete `g4f/image.py`.
- `g4f/Provider/Cloudflare.py`, `g4f/client/types.py`: minor whitespace and import tidy‑ups.
This commit is contained in:
parent
0a070bdf10
commit
e83282fc4b
23 changed files with 253 additions and 387 deletions
|
|
@ -40,7 +40,7 @@ from g4f.client import AsyncClient, ChatCompletion, ImagesResponse, convert_to_p
|
|||
from g4f.providers.response import BaseConversation, JsonConversation
|
||||
from g4f.client.helper import filter_none
|
||||
from g4f.image import is_data_an_media, EXTENSIONS_MAP
|
||||
from g4f.image.copy_images import images_dir, copy_media, get_source_url
|
||||
from g4f.image.copy_images import get_media_dir, copy_media, get_source_url
|
||||
from g4f.errors import ProviderNotFoundError, ModelNotFoundError, MissingAuthError, NoValidHarFileError
|
||||
from g4f.cookies import read_cookie_files, get_cookies_dir
|
||||
from g4f.providers.types import ProviderType
|
||||
|
|
@ -130,7 +130,7 @@ class AppConfig:
|
|||
ignore_cookie_files: bool = False
|
||||
model: str = None
|
||||
provider: str = None
|
||||
image_provider: str = None
|
||||
media_provider: str = None
|
||||
proxy: str = None
|
||||
gui: bool = False
|
||||
demo: bool = False
|
||||
|
|
@ -419,12 +419,13 @@ class Api:
|
|||
):
|
||||
if config.provider is None:
|
||||
config.provider = provider
|
||||
if config.provider is None:
|
||||
config.provider = AppConfig.media_provider
|
||||
if credentials is not None and credentials.credentials != "secret":
|
||||
config.api_key = credentials.credentials
|
||||
try:
|
||||
response = await self.client.images.generate(
|
||||
**config.dict(exclude_none=True),
|
||||
provider=AppConfig.image_provider if config.provider is None else config.provider
|
||||
)
|
||||
for image in response.data:
|
||||
if hasattr(image, "url") and image.url.startswith("/"):
|
||||
|
|
@ -562,9 +563,9 @@ class Api:
|
|||
HTTP_404_NOT_FOUND: {}
|
||||
})
|
||||
async def get_media(filename, request: Request):
|
||||
target = os.path.join(images_dir, os.path.basename(filename))
|
||||
target = os.path.join(get_media_dir(), os.path.basename(filename))
|
||||
if not os.path.isfile(target):
|
||||
other_name = os.path.join(images_dir, os.path.basename(quote_plus(filename)))
|
||||
other_name = os.path.join(get_media_dir(), os.path.basename(quote_plus(filename)))
|
||||
if os.path.isfile(other_name):
|
||||
target = other_name
|
||||
ext = os.path.splitext(filename)[1][1:]
|
||||
|
|
@ -627,7 +628,7 @@ class Api:
|
|||
|
||||
def format_exception(e: Union[Exception, str], config: Union[ChatCompletionsConfig, ImageGenerationConfig] = None, image: bool = False) -> str:
|
||||
last_provider = {} if not image else g4f.get_last_provider(True)
|
||||
provider = (AppConfig.image_provider if image else AppConfig.provider)
|
||||
provider = (AppConfig.media_provider if image else AppConfig.provider)
|
||||
model = AppConfig.model
|
||||
if config is not None:
|
||||
if config.provider is not None:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue