fix: stop a cleared Organization field from failing key creation

[devin-ai-integration]

TLDR

Problem this solves:

• Clearing the Organization field in Create Key fails the request
• Error shown: Organization doesn't exist in db. Organization=
• Regression since the shadcn dropdown migration (1.98.0+)

How it solves it:

• OrganizationDropdown emits null on clear instead of ""
• /key/generate treats project_id: "" as unset, like team_id and organization_id
• The organization_id half landed on base in fix: 1.99.0-rc2 UI bug batch (empty org on key create, session pagination, access group rename/delete) #39436; this PR adds project_id and the dropdown contract on top

User Flow

Before: an admin who picks an organization and then changes their mind cannot create the key

1. They open https://litellm-domain/ui/?page=api-keys and click Create New Key
2. They select an organization in the Organization field, then click the field's clear (x) button
3. They fill in a key alias and click Create Key
4. The modal shows Error creating the key: Error: Organization doesn't exist in db. Organization=. Create organization via /organization/new call. and no key is created

After: the same steps create a personal key with no organization

1. They open https://litellm-domain/ui/?page=api-keys and click Create New Key
2. They select an organization in the Organization field, then click the field's clear (x) button
3. They fill in a key alias and click Create Key
4. The modal shows the new sk-... key and the key list shows it with no organization

Relevant issues

Reported by a customer on 1.99.0-rc2 (Pylon #8102)

Linear ticket

Resolves LIT-6683

Pre-Submission checklist

Please complete all items before asking a LiteLLM maintainer to review your PR

• I have added meaningful tests
• The handful of test files covering my change pass locally, e.g. uv run pytest tests/test_litellm/<your_test_file>.py -v. Leave the suites (make test-unit-*, make test-unit) to CI: it finishes in ~15 minutes where a laptop takes an hour or more
• My PR passes all required CI/CD checks (e.g., lint, schema.d.ts sync check, etc.)
• My PR's scope is as isolated as possible; it only solves 1 specific problem
• I have received a Greptile Confidence Score of at least 4/5 before requesting a maintainer review (Greptile reviews automatically once the PR is opened; only comment @greptileai to re-request a review after pushing changes)

Delays in PR merge?

If you're seeing a delay in your PR being merged, ping the LiteLLM Team on Slack (#pr-review).

Screenshots / Proof of Fix

Proxy started locally with uv run litellm --config litellm/proxy/dev_config.yaml --port 4000 against a local Postgres. The request body below is exactly what the Create Key modal sends after the Organization field is cleared

Before (31ca4dd)

1. curl -s -X POST localhost:4000/key/generate -H 'Authorization: Bearer sk-1234' -H 'Content-Type: application/json' -d '{"organization_id": ""}'
2. {"error":{"message":"Organization doesn't exist in db. Organization=. Create organization via /organization/new call.","type":"internal_server_error","param":"None","code":"500"}}

After (6d88e7b; later commits only merge litellm_internal_staging, which fixed the organization_id half independently in #39436, so the request below still returns the same result)

1. curl -s -X POST localhost:4000/key/generate -H 'Authorization: Bearer sk-1234' -H 'Content-Type: application/json' -d '{"organization_id": "", "project_id": "", "key_alias": "pylon8102-after-1"}'
2. 200 with "key": "sk-gn5f...", "organization_id": null, "project_id": null, "team_id": null, "key_alias": "pylon8102-after-1"
3. Sanity check that a real but unknown org is still rejected: curl -s -X POST localhost:4000/key/generate -H 'Authorization: Bearer sk-1234' -H 'Content-Type: application/json' -d '{"organization_id": "org-does-not-exist"}'
4. {"error":{"message":"Organization doesn't exist in db. Organization=org-does-not-exist. Create organization via /organization/new call.", ... "code":"500"}}

UI check for a reviewer: run npm run dev in ui/litellm-dashboard, open http://localhost:3000/ui/?page=api-keys, Create New Key, pick an organization, clear it with the x button, set an alias, Create Key. The key is created instead of the Organization= error

Type

🐛 Bug Fix

Caveats (if any)

Low

• After merging base, the net change is project_id: "" normalization plus the dropdown's null-on-clear contract; organization_id normalization and the key edit null-on-clear write come from fix: 1.99.0-rc2 UI bug batch (empty org on key create, session pagination, access group rename/delete) #39436
• Overlapping regression tests from both PRs are kept

Final Attestation

• The tests check the right things, including the edge cases, and regressions in the respective real-world customer use-cases are not possible after this PR

Link to Devin session: https://app.devin.ai/sessions/07bfcc2b38864e0a8b5ddc506634111a
Open in Devin Desktop: https://app.devin.ai/desktop/session/07bfcc2b38864e0a8b5ddc506634111a?variant=devin
Requested by: @yassin-berriai

CI Status

Link to Devin session: https://app.devin.ai/sessions/ef392a8b1fe2494691ef39ec5f97b2d5
Open in Devin Desktop: https://app.devin.ai/desktop/session/ef392a8b1fe2494691ef39ec5f97b2d5?variant=devin

[devin-ai-integration]

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

• Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
• Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

• Disable automatic comment, CI, and merge conflict monitoring

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 2 committers have signed the CLA.

❌ yassin-berriai
❌ devin-ai-integration[bot]
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[devin-ai-integration]

PR #39316 has no labels (no enterprise label), so it is out of scope. No changes made; exiting.

[codspeed]

Merging this PR will not alter performance

✅ 31 untouched benchmarks

---

_{Comparing litellm_fix_create_key_empty_org_id (9129092) with litellm_internal_staging (e046aee)}

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

[greptile-apps]

Greptile Summary

The PR normalizes cleared organization and project identifiers so key creation treats them as unset.

• Updates proxy request validation to convert empty scope IDs to None.
• Updates the organization dropdown and form handlers to represent cleared selections consistently.
• Adds backend and UI regression coverage for cleared organization and project fields.

Confidence Score: 5/5

The PR appears safe to merge.

No blocking failure remains.

Important Files Changed

Filename	Overview
litellm/proxy/_types.py	Extends empty-string normalization from team IDs to organization and project IDs.
tests/test_litellm/proxy/management_endpoints/test_key_management_endpoints.py	Verifies cleared scope IDs are omitted while valid IDs remain unchanged; the previously flagged customer-specific docstring has been removed without weakening assertions.
ui/litellm-dashboard/src/components/common_components/OrganizationDropdown.tsx	Emits null when the organization selection is cleared.
ui/litellm-dashboard/src/components/common_components/OrganizationDropdown.test.tsx	Covers the dropdown’s null-on-clear contract.
ui/litellm-dashboard/src/components/organisms/create_key_button.tsx	Maps a cleared organization selection to an unset create-key form field.
ui/litellm-dashboard/src/components/templates/key_edit_view.tsx	Adapts the key-edit organization handler to the dropdown’s nullable callback contract.

_{Reviews (2): Last reviewed commit: "test: drop customer-specific docstring f..." | Re-trigger Greptile}

[devin-ai-integration]

@greptileai please re-review, the flagged test docstring was removed in af97cc0