Skip to content

fix(openai): forward project to Batches and Files API clients #43430

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.

Sign up for GitHub

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

Open
Rainmemery wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(openai): forward project to Batches and Files API clients #43430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37841c2
feat(types): add project field to GenericLiteLLMParams
Rainmemery Sep 26, 2026
4510251
fix(openai): forward project to Batches and Files API clients
Rainmemery Sep 27, 2026
6799e00
fix(types): don't declare project on the files/batches request TypedD…
Rainmemery Sep 27, 2026
19b95a4
fix(proxy): forward OpenAI project across the full files/batches life…
Rainmemery Sep 28, 2026
57fd857
chore(dashboard): add project to the create_file multipart type in sc…
Rainmemery Sep 28, 2026
13cca7a
fix(lint): annotate the list_batches body copy as a rebind
Rainmemery Oct 6, 2026
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
8 changes: 8 additions & 0 deletions litellm/batches/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ def create_batch(
or os.getenv("OPENAI_ORGANIZATION", None)
or None # default - https://github.com/openai/openai-python/blob/284c1799070c723c6a553337134148a7ab088dd8/openai/util.py#L105
)
project: Final = optional_params.project or os.getenv("OPENAI_PROJECT", None) or None
# set API KEY
api_key = (
optional_params.api_key
Expand All @@ -305,6 +306,7 @@ def create_batch(
api_base=api_base,
api_key=api_key,
organization=organization,
project=project,
create_batch_data=_create_batch_request,
timeout=timeout,
max_retries=optional_params.max_retries,
Expand Down Expand Up @@ -455,6 +457,7 @@ def _handle_retrieve_batch_providers_without_provider_config(
or os.getenv("OPENAI_ORGANIZATION", None)
or None # default - https://github.com/openai/openai-python/blob/284c1799070c723c6a553337134148a7ab088dd8/openai/util.py#L105
)
project: Final = optional_params.project or os.getenv("OPENAI_PROJECT", None) or None
# set API KEY
api_key = (
optional_params.api_key
Expand All @@ -469,6 +472,7 @@ def _handle_retrieve_batch_providers_without_provider_config(
api_base=api_base,
api_key=api_key,
organization=organization,
project=project,
timeout=timeout,
max_retries=optional_params.max_retries,
)
Expand Down Expand Up @@ -809,6 +813,7 @@ def list_batches(
or os.getenv("OPENAI_ORGANIZATION", None)
or None # default - https://github.com/openai/openai-python/blob/284c1799070c723c6a553337134148a7ab088dd8/openai/util.py#L105
)
project: Final = optional_params.project or os.getenv("OPENAI_PROJECT", None) or None

response = openai_batches_instance.list_batches(
_is_async=_is_async,
Expand All @@ -817,6 +822,7 @@ def list_batches(
api_base=api_base,
api_key=api_key,
organization=organization,
project=project,
timeout=timeout,
max_retries=optional_params.max_retries,
)
Expand Down Expand Up @@ -1006,6 +1012,7 @@ def cancel_batch(
organization: Final = (
optional_params.organization or litellm.organization or os.getenv("OPENAI_ORGANIZATION", None) or None
)
project: Final = optional_params.project or os.getenv("OPENAI_PROJECT", None) or None
api_key = optional_params.api_key or litellm.api_key or litellm.openai_key or os.getenv("OPENAI_API_KEY")

response = openai_batches_instance.cancel_batch(
Expand All @@ -1014,6 +1021,7 @@ def cancel_batch(
api_base=api_base,
api_key=api_key,
organization=organization,
project=project,
timeout=timeout,
max_retries=optional_params.max_retries,
)
Expand Down
12 changes: 12 additions & 0 deletions litellm/files/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ def create_file(
api_base=optional_params.api_base,
api_key=optional_params.api_key,
organization=optional_params.organization,
project=optional_params.project,
)
response = openai_files_instance.create_file(
_is_async=_is_async,
Expand All @@ -261,6 +262,7 @@ def create_file(
timeout=timeout,
max_retries=optional_params.max_retries,
organization=openai_creds.organization,
project=openai_creds.project,
create_file_data=_create_file_request,
)
elif custom_llm_provider == "azure":
Expand Down Expand Up @@ -374,6 +376,7 @@ def file_retrieve(
api_base=optional_params.api_base,
api_key=optional_params.api_key,
organization=optional_params.organization,
project=optional_params.project,
)
response = openai_files_instance.retrieve_file(
file_id=file_id,
Expand All @@ -383,6 +386,7 @@ def file_retrieve(
timeout=timeout,
max_retries=optional_params.max_retries,
organization=openai_creds.organization,
project=openai_creds.project,
)
elif custom_llm_provider == "azure":
azure_creds: Final = get_azure_credentials(
Expand Down Expand Up @@ -555,6 +559,7 @@ def file_delete(
api_base=optional_params.api_base,
api_key=optional_params.api_key,
organization=optional_params.organization,
project=optional_params.project,
)
response = openai_files_instance.delete_file(
file_id=file_id,
Expand All @@ -564,6 +569,7 @@ def file_delete(
timeout=timeout,
max_retries=optional_params.max_retries,
organization=openai_creds.organization,
project=openai_creds.project,
)
elif custom_llm_provider == "azure":
azure_creds: Final = get_azure_credentials(
Expand Down Expand Up @@ -761,6 +767,7 @@ def file_list(
api_base=optional_params.api_base,
api_key=optional_params.api_key,
organization=optional_params.organization,
project=optional_params.project,
)
response = openai_files_instance.list_files(
purpose=purpose,
Expand All @@ -770,6 +777,7 @@ def file_list(
timeout=timeout,
max_retries=optional_params.max_retries,
organization=openai_creds.organization,
project=openai_creds.project,
)
elif custom_llm_provider == "azure":
azure_creds: Final = get_azure_credentials(
Expand Down Expand Up @@ -958,6 +966,7 @@ def file_content(
api_base=optional_params.api_base,
api_key=optional_params.api_key,
organization=optional_params.organization,
project=optional_params.project,
)
response = openai_files_instance.file_content(
_is_async=_is_async,
Expand All @@ -967,6 +976,7 @@ def file_content(
timeout=timeout,
max_retries=optional_params.max_retries,
organization=openai_creds.organization,
project=openai_creds.project,
)
elif custom_llm_provider == "azure":
azure_creds: Final = get_azure_credentials(
Expand Down Expand Up @@ -1077,6 +1087,7 @@ def _wrap_streaming_result(
api_base=optional_params.api_base,
api_key=optional_params.api_key,
organization=optional_params.organization,
project=optional_params.project,
)
response = openai_files_instance.file_content_streaming(
_is_async=_is_async,
Expand All @@ -1086,6 +1097,7 @@ def _wrap_streaming_result(
timeout=timeout,
max_retries=optional_params.max_retries,
organization=openai_creds.organization,
project=openai_creds.project,
chunk_size=chunk_size,
client=client if isinstance(client, (OpenAI, AsyncOpenAI)) else None,
)
Expand Down
4 changes: 4 additions & 0 deletions litellm/llms/openai/common_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,12 +353,14 @@ class OpenAICredentials(NamedTuple):
api_base: str
api_key: str | None
organization: str | None
project: str | None = None


def get_openai_credentials(
api_base: str | None = None,
api_key: str | None = None,
organization: str | None = None,
project: str | None = None,
) -> OpenAICredentials:
"""Resolve OpenAI credentials from params, litellm globals, and env vars."""
resolved_api_base: Final = (
Expand All @@ -369,9 +371,11 @@ def get_openai_credentials(
or "https://api.openai.com/v1"
)
resolved_organization = organization or litellm.organization or os.getenv("OPENAI_ORGANIZATION", None) or None
resolved_project: Final = project or os.getenv("OPENAI_PROJECT", None) or None
resolved_api_key: Final = api_key or litellm.api_key or litellm.openai_key or os.getenv("OPENAI_API_KEY")
return OpenAICredentials(
api_base=resolved_api_base,
api_key=resolved_api_key,
organization=resolved_organization,
project=resolved_project,
)
22 changes: 22 additions & 0 deletions litellm/llms/openai/openai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,6 +1701,7 @@ def get_openai_client(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | AsyncOpenAI | None = None,
_is_async: bool = False,
) -> OpenAI | AsyncOpenAI | None:
Expand Down Expand Up @@ -1741,6 +1742,7 @@ def create_file(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | AsyncOpenAI | None = None,
) -> OpenAIFileObject | Coroutine[None, None, OpenAIFileObject]:
openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
Expand All @@ -1749,6 +1751,7 @@ def create_file(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -1783,6 +1786,7 @@ def file_content(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | AsyncOpenAI | None = None,
) -> HttpxBinaryResponseContent | Coroutine[None, None, HttpxBinaryResponseContent]:
openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
Expand All @@ -1791,6 +1795,7 @@ def file_content(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -1847,6 +1852,7 @@ def file_content_streaming(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
chunk_size: int = 1024 * 1024,
client: OpenAI | AsyncOpenAI | None = None,
) -> FileContentStreamingResult:
Expand All @@ -1856,6 +1862,7 @@ def file_content_streaming(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -1911,6 +1918,7 @@ def retrieve_file(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | AsyncOpenAI | None = None,
):
openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
Expand All @@ -1919,6 +1927,7 @@ def retrieve_file(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -1957,6 +1966,7 @@ def delete_file(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | AsyncOpenAI | None = None,
):
openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
Expand All @@ -1965,6 +1975,7 @@ def delete_file(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -2005,6 +2016,7 @@ def list_files(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
purpose: str | None = None,
client: OpenAI | AsyncOpenAI | None = None,
):
Expand All @@ -2014,6 +2026,7 @@ def list_files(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -2059,6 +2072,7 @@ def get_openai_client(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | AsyncOpenAI | None = None,
_is_async: bool = False,
) -> OpenAI | AsyncOpenAI | None:
Expand Down Expand Up @@ -2099,6 +2113,7 @@ def create_batch(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | AsyncOpenAI | None = None,
) -> LiteLLMBatch | Coroutine[None, None, LiteLLMBatch]:
openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
Expand All @@ -2107,6 +2122,7 @@ def create_batch(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -2143,6 +2159,7 @@ def retrieve_batch(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | None = None,
):
openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
Expand All @@ -2151,6 +2168,7 @@ def retrieve_batch(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -2186,6 +2204,7 @@ def cancel_batch(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
client: OpenAI | None = None,
):
openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
Expand All @@ -2194,6 +2213,7 @@ def cancel_batch(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down Expand Up @@ -2233,6 +2253,7 @@ def list_batches(
timeout: float | httpx.Timeout,
max_retries: int | None,
organization: str | None,
project: str | None = None,
after: str | None = None,
limit: int | None = None,
client: OpenAI | None = None,
Expand All @@ -2243,6 +2264,7 @@ def list_batches(
timeout=timeout,
max_retries=max_retries,
organization=organization,
project=project,
client=client,
_is_async=_is_async,
)
Expand Down
Loading
Loading