Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fireworks AI provider + instructions for new provider #2848

Merged
merged 45 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
dbda294
first draft of dynamic mapping
hanouticelina Feb 5, 2025
2c56667
fix imports and typing
hanouticelina Feb 5, 2025
2760a76
add back recommended models fetching for hf-inference
hanouticelina Feb 5, 2025
7783943
fix
hanouticelina Feb 5, 2025
cc73ead
avoir circular imports
hanouticelina Feb 5, 2025
a178f03
small clean up
hanouticelina Feb 5, 2025
3956df5
add default supported model list
hanouticelina Feb 5, 2025
f2208ae
remove unnecessary arg
hanouticelina Feb 5, 2025
d43462a
nit
hanouticelina Feb 5, 2025
4988db0
rename function
hanouticelina Feb 5, 2025
91f41c3
another nit
hanouticelina Feb 5, 2025
cb7eb9a
fix
hanouticelina Feb 5, 2025
8d78dca
fix conversational
hanouticelina Feb 5, 2025
181b6a7
fix hf-inference
hanouticelina Feb 5, 2025
0568aa5
add warning when status=staging
hanouticelina Feb 5, 2025
d71e92e
update warning and use model_info
hanouticelina Feb 5, 2025
cf1e956
update import
hanouticelina Feb 5, 2025
949e8c6
fix ExpandModelProperty_T
hanouticelina Feb 5, 2025
80acc5c
Merge branch 'main' into add-dynamic-inference-provider-mapping
Wauplin Feb 7, 2025
5639de0
refacto
Wauplin Feb 7, 2025
53cca3c
fix python 3.8
Wauplin Feb 7, 2025
0474833
fix test
Wauplin Feb 10, 2025
ee5443a
remove newlines
Wauplin Feb 10, 2025
5dfe4b9
Base class for inference providers
Wauplin Feb 10, 2025
faf19e0
revert
Wauplin Feb 10, 2025
632d43e
refacto hf-inference and fal-ai tests
Wauplin Feb 10, 2025
4053a15
replicate tests
Wauplin Feb 10, 2025
90521c4
samba and together tests
Wauplin Feb 10, 2025
72396a8
reorder
Wauplin Feb 10, 2025
c6ec0f8
unfinished business
Wauplin Feb 10, 2025
6969309
some docstrings
Wauplin Feb 10, 2025
0c39884
fix some tests
Wauplin Feb 10, 2025
449342d
fix HfInference does not require token
Wauplin Feb 10, 2025
bd8c8e4
fix inference client tests
hanouticelina Feb 11, 2025
9d6f2a3
Merge branch 'main' into add-dynamic-inference-provider-mapping
Wauplin Feb 11, 2025
d041ceb
fix hf-inference _prepare_api_key
Wauplin Feb 11, 2025
e8083c0
fai ai get response tests
Wauplin Feb 11, 2025
eebadd4
test get_response together + replicate
Wauplin Feb 11, 2025
38066e0
fix prepare_url
Wauplin Feb 11, 2025
2f06b9d
Add Fireworks AI provider + instructions for new provider
Wauplin Feb 11, 2025
b97fea3
Update src/huggingface_hub/inference/_providers/new_provider.md
Wauplin Feb 11, 2025
4324dea
add fireworks AI to supported providers table
Wauplin Feb 11, 2025
5a48909
Merge branch 'add-fireworks-provider' of github.com:huggingface/huggi…
Wauplin Feb 11, 2025
b1c7693
Merge branch 'main' into add-fireworks-provider
Wauplin Feb 11, 2025
b9f132d
Merge branch 'main' into add-fireworks-provider
Wauplin Feb 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions src/huggingface_hub/hf_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,38 +153,38 @@
"model-index",
"pipeline_tag",
"private",
"resourceGroup",
"safetensors",
"sha",
"siblings",
"spaces",
"tags",
"transformersInfo",
"trendingScore",
"widgetData",
"usedStorage",
"resourceGroup",
"widgetData",
]

ExpandDatasetProperty_T = Literal[
"author",
"cardData",
"citation",
"createdAt",
"disabled",
"description",
"disabled",
"downloads",
"downloadsAllTime",
"gated",
"lastModified",
"likes",
"paperswithcode_id",
"private",
"siblings",
"resourceGroup",
"sha",
"trendingScore",
"siblings",
"tags",
"trendingScore",
"usedStorage",
"resourceGroup",
]

ExpandSpaceProperty_T = Literal[
Expand All @@ -197,15 +197,15 @@
"likes",
"models",
"private",
"resourceGroup",
"runtime",
"sdk",
"siblings",
"sha",
"siblings",
"subdomain",
"tags",
"trendingScore",
"usedStorage",
"resourceGroup",
]

USERNAME_PLACEHOLDER = "hf_user"
Expand Down Expand Up @@ -698,6 +698,19 @@ def __init__(self, **kwargs):
self.last_commit = last_commit


@dataclass
class InferenceProviderMapping:
status: Literal["live", "staging"]
provider_id: str
task: str

def __init__(self, **kwargs):
self.status = kwargs.pop("status")
self.provider_id = kwargs.pop("providerId")
self.task = kwargs.pop("task")
self.__dict__.update(**kwargs)


@dataclass
class ModelInfo:
"""
Expand Down Expand Up @@ -740,6 +753,8 @@ class ModelInfo:
Status of the model on the inference API.
Warm models are available for immediate use. Cold models will be loaded on first inference call.
Frozen models are not available in Inference API.
inference_provider_mapping (`Dict`, *optional*):
Model's inference provider mapping.
likes (`int`):
Number of likes of the model.
library_name (`str`, *optional*):
Expand Down Expand Up @@ -785,6 +800,7 @@ class ModelInfo:
gated: Optional[Literal["auto", "manual", False]]
gguf: Optional[Dict]
inference: Optional[Literal["warm", "cold", "frozen"]]
inference_provider_mapping: Optional[Dict[str, InferenceProviderMapping]]
likes: Optional[int]
library_name: Optional[str]
tags: Optional[List[str]]
Expand Down Expand Up @@ -817,7 +833,15 @@ def __init__(self, **kwargs):
self.likes = kwargs.pop("likes", None)
self.library_name = kwargs.pop("library_name", None)
self.gguf = kwargs.pop("gguf", None)

self.inference = kwargs.pop("inference", None)
self.inference_provider_mapping = kwargs.pop("inferenceProviderMapping", None)
if self.inference_provider_mapping:
self.inference_provider_mapping = {
provider: InferenceProviderMapping(**value)
for provider, value in self.inference_provider_mapping.items()
}

self.tags = kwargs.pop("tags", None)
self.pipeline_tag = kwargs.pop("pipeline_tag", None)
self.mask_token = kwargs.pop("mask_token", None)
Expand Down
7 changes: 4 additions & 3 deletions src/huggingface_hub/inference/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class InferenceClient:
path will be appended to the base URL (see the [TGI Messages API](https://huggingface.co/docs/text-generation-inference/en/messages_api)
documentation for details). When passing a URL as `model`, the client will not append any suffix path to it.
provider (`str`, *optional*):
Name of the provider to use for inference. Can be `"replicate"`, `"together"`, `"fal-ai"`, `"sambanova"` or `"hf-inference"`.
Name of the provider to use for inference. Can be "fal-ai"`, `"fireworks-ai"`, `"replicate"`, "sambanova"`, `"together"`, or `"hf-inference"`.
defaults to hf-inference (Hugging Face Serverless Inference API).
If model is a URL or `base_url` is passed, then `provider` is not used.
token (`str` or `bool`, *optional*):
Expand Down Expand Up @@ -263,8 +263,9 @@ def post(
"`InferenceClient.post` is deprecated and should not be used directly anymore."
)
provider_helper = HFInferenceTask(task or "unknown")
url = provider_helper.build_url(provider_helper.map_model(model))
headers = provider_helper.prepare_headers(headers=self.headers, api_key=self.token)
mapped_model = provider_helper._prepare_mapped_model(model or self.model)
url = provider_helper._prepare_url(self.token, mapped_model) # type: ignore[arg-type]
headers = provider_helper._prepare_headers(self.headers, self.token) # type: ignore[arg-type]
return self._inner_post(
request_parameters=RequestParameters(
url=url,
Expand Down
26 changes: 1 addition & 25 deletions src/huggingface_hub/inference/_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import io
import json
import logging
from abc import ABC, abstractmethod
from contextlib import contextmanager
from dataclasses import dataclass
from pathlib import Path
Expand Down Expand Up @@ -50,12 +49,7 @@
ValidationError,
)

from ..utils import (
get_session,
is_aiohttp_available,
is_numpy_available,
is_pillow_available,
)
from ..utils import get_session, is_aiohttp_available, is_numpy_available, is_pillow_available
from ._generated.types import ChatCompletionStreamOutput, TextGenerationStreamOutput


Expand Down Expand Up @@ -85,24 +79,6 @@ class RequestParameters:
headers: Dict[str, Any]


class TaskProviderHelper(ABC):
"""Protocol defining the interface for task-specific provider helpers."""

@abstractmethod
def prepare_request(
self,
*,
inputs: Any,
parameters: Dict[str, Any],
headers: Dict,
model: Optional[str],
api_key: Optional[str],
extra_payload: Optional[Dict[str, Any]] = None,
) -> RequestParameters: ...
@abstractmethod
def get_response(self, response: Union[bytes, Dict]) -> Any: ...


# Add dataclass for ModelStatus. We use this dataclass in get_model_status function.
@dataclass
class ModelStatus:
Expand Down
7 changes: 4 additions & 3 deletions src/huggingface_hub/inference/_generated/_async_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class AsyncInferenceClient:
path will be appended to the base URL (see the [TGI Messages API](https://huggingface.co/docs/text-generation-inference/en/messages_api)
documentation for details). When passing a URL as `model`, the client will not append any suffix path to it.
provider (`str`, *optional*):
Name of the provider to use for inference. Can be `"replicate"`, `"together"`, `"fal-ai"`, `"sambanova"` or `"hf-inference"`.
Name of the provider to use for inference. Can be "fal-ai"`, `"fireworks-ai"`, `"replicate"`, "sambanova"`, `"together"`, or `"hf-inference"`.
defaults to hf-inference (Hugging Face Serverless Inference API).
If model is a URL or `base_url` is passed, then `provider` is not used.
token (`str` or `bool`, *optional*):
Expand Down Expand Up @@ -258,8 +258,9 @@ async def post(
"`InferenceClient.post` is deprecated and should not be used directly anymore."
)
provider_helper = HFInferenceTask(task or "unknown")
url = provider_helper.build_url(provider_helper.map_model(model))
headers = provider_helper.prepare_headers(headers=self.headers, api_key=self.token)
mapped_model = provider_helper._prepare_mapped_model(model or self.model)
url = provider_helper._prepare_url(self.token, mapped_model) # type: ignore[arg-type]
headers = provider_helper._prepare_headers(self.headers, self.token) # type: ignore[arg-type]
return await self._inner_post(
request_parameters=RequestParameters(
url=url,
Expand Down
7 changes: 6 additions & 1 deletion src/huggingface_hub/inference/_providers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from typing import Dict, Literal

from .._common import TaskProviderHelper
from ._common import TaskProviderHelper
from .fal_ai import (
FalAIAutomaticSpeechRecognitionTask,
FalAITextToImageTask,
FalAITextToSpeechTask,
FalAITextToVideoTask,
)
from .fireworks_ai import FireworksAIConversationalTask
from .hf_inference import HFInferenceBinaryInputTask, HFInferenceConversational, HFInferenceTask
from .replicate import ReplicateTask, ReplicateTextToSpeechTask
from .sambanova import SambanovaConversationalTask
Expand All @@ -15,6 +16,7 @@

PROVIDER_T = Literal[
"fal-ai",
"fireworks-ai",
"hf-inference",
"replicate",
"sambanova",
Expand All @@ -28,6 +30,9 @@
"text-to-speech": FalAITextToSpeechTask(),
"text-to-video": FalAITextToVideoTask(),
},
"fireworks-ai": {
"conversational": FireworksAIConversationalTask(),
},
"hf-inference": {
"text-to-image": HFInferenceTask("text-to-image"),
"conversational": HFInferenceConversational(),
Expand Down
Loading
Loading