mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-16 09:22:22 +00:00
fix(team): keep the transactional member create an upsert on user_id
The transaction path was creating the email-identified user row outright, where the regular client path upserts on user_id. Share one upsert helper between both member paths so the create stays idempotent on the lock holder's connection. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
parent
286c839848
commit
ba08e8a612
2 changed files with 43 additions and 32 deletions
|
|
@ -79,8 +79,6 @@ class _PrismaUserTable(Protocol):
|
|||
self, *, where: Mapping[str, object], data: Mapping[str, Mapping[str, object]]
|
||||
) -> _PrismaUserRecord | None: ...
|
||||
|
||||
async def create(self, *, data: Mapping[str, object]) -> _PrismaUserRecord | None: ...
|
||||
|
||||
async def find_many(self, *, where: Mapping[str, object]) -> Sequence[_PrismaUserRecord]: ...
|
||||
|
||||
|
||||
|
|
@ -133,11 +131,27 @@ async def _find_users_by_email(
|
|||
return rows if rows is not None else ()
|
||||
|
||||
|
||||
async def _upsert_user_row(
|
||||
user_table: _PrismaUserTable, user_id: str, create_data: Mapping[str, object]
|
||||
) -> _PrismaUserRecord | None:
|
||||
"""Insert the user row if it is absent, leaving an existing row as it is.
|
||||
|
||||
Upserting keeps concurrent provisioning of the same new user from racing on create.
|
||||
The update branch re-states user_id rather than being empty because Prisma only
|
||||
compiles an upsert down to INSERT ... ON CONFLICT when the update is non-empty, and
|
||||
otherwise falls back to a racy SELECT-then-INSERT.
|
||||
"""
|
||||
return await user_table.upsert(
|
||||
where={"user_id": user_id},
|
||||
data={"create": create_data, "update": {"user_id": user_id}},
|
||||
)
|
||||
|
||||
|
||||
async def _create_user_row(
|
||||
prisma_client: PrismaClient, tx: MemberWriteTx | None, user_data: dict[str, object]
|
||||
) -> _PrismaUserRecord | None:
|
||||
if tx is not None:
|
||||
return await tx.litellm_usertable.create(data=jsonify_object(user_data))
|
||||
return await _upsert_user_row(tx.litellm_usertable, str(user_data["user_id"]), jsonify_object(user_data))
|
||||
return await prisma_client.insert_data(data=user_data, table_name="user")
|
||||
|
||||
|
||||
|
|
@ -404,21 +418,12 @@ async def add_new_member(
|
|||
## ADD TEAM ID, to USER TABLE IF NEW ##
|
||||
if new_member.user_id is not None:
|
||||
new_user_defaults = get_new_internal_user_defaults(user_id=new_member.user_id)
|
||||
# Upsert ensures the user row exists atomically (no create race when the
|
||||
# same new user is provisioned concurrently), seeding teams on create.
|
||||
# The teams append lives in the filtered update below rather than the
|
||||
# upsert's update branch so an already-existing user does not get a
|
||||
# duplicate team id. The update branch still has to write something:
|
||||
# Prisma only compiles an upsert down to INSERT ... ON CONFLICT when it
|
||||
# is non-empty, and falls back to a racy SELECT-then-INSERT when it is
|
||||
# not, so this re-states user_id as a no-op rather than being empty.
|
||||
user_table: Final[_PrismaUserTable] = _user_table(prisma_client, tx)
|
||||
_returned_user: _PrismaUserRecord | None = await user_table.upsert(
|
||||
where={"user_id": new_member.user_id},
|
||||
data={
|
||||
"create": {"teams": [team_id], **new_user_defaults},
|
||||
"update": {"user_id": new_member.user_id},
|
||||
},
|
||||
# The teams append lives in the filtered update below rather than the upsert's
|
||||
# update branch so an already-existing user does not get a duplicate team id.
|
||||
_returned_user: _PrismaUserRecord | None = await _upsert_user_row(
|
||||
_user_table(prisma_client, tx),
|
||||
new_member.user_id,
|
||||
{"teams": [team_id], **new_user_defaults},
|
||||
)
|
||||
await _append_team_id_if_absent(prisma_client, new_member.user_id, team_id, tx)
|
||||
if _returned_user is not None:
|
||||
|
|
|
|||
|
|
@ -1169,6 +1169,22 @@ async def test_create_user_default_budget(prisma_client, user_role): # noqa: F8
|
|||
assert mock_client.call_args.kwargs["data"]["budget_duration"] is None
|
||||
|
||||
|
||||
def _member_add_tx_cm(team_table):
|
||||
"""Transaction whose member writes land on whatever tables are mocked on `prisma_client.db`"""
|
||||
|
||||
class _Tx:
|
||||
query_raw = AsyncMock(return_value=[{"members_with_roles": []}])
|
||||
litellm_teamtable = team_table
|
||||
|
||||
def __getattr__(self, table_name):
|
||||
return getattr(litellm.proxy.proxy_server.prisma_client.db, table_name)
|
||||
|
||||
tx_cm = MagicMock()
|
||||
tx_cm.__aenter__ = AsyncMock(return_value=_Tx())
|
||||
tx_cm.__aexit__ = AsyncMock(return_value=None)
|
||||
return tx_cm
|
||||
|
||||
|
||||
@pytest.mark.parametrize("new_member_method", ["user_id", "user_email"])
|
||||
@pytest.mark.asyncio
|
||||
@pytest.mark.skip(reason="Requires reliable external DB connection (prisma).")
|
||||
|
|
@ -1230,7 +1246,7 @@ async def test_create_team_member_add(prisma_client, new_member_method): # noqa
|
|||
)
|
||||
)
|
||||
mock_litellm_usertable.upsert = mock_client
|
||||
mock_litellm_usertable.find_many = AsyncMock(return_value=None)
|
||||
mock_litellm_usertable.find_many = AsyncMock(return_value=[])
|
||||
# Mock find_first for user_email validation (returns None for new users)
|
||||
mock_litellm_usertable.find_first = AsyncMock(return_value=None)
|
||||
# Mock find_unique for user_id validation (returns None for new users)
|
||||
|
|
@ -1245,12 +1261,7 @@ async def test_create_team_member_add(prisma_client, new_member_method): # noqa
|
|||
return_value=LiteLLM_TeamTableCachedObj(team_id="1234")
|
||||
)
|
||||
|
||||
tx_mock = AsyncMock()
|
||||
tx_mock.query_raw = AsyncMock(return_value=[{"members_with_roles": []}])
|
||||
tx_mock.litellm_teamtable = team_mock_client
|
||||
tx_cm = MagicMock()
|
||||
tx_cm.__aenter__ = AsyncMock(return_value=tx_mock)
|
||||
tx_cm.__aexit__ = AsyncMock(return_value=None)
|
||||
tx_cm = _member_add_tx_cm(team_mock_client)
|
||||
original_tx = litellm.proxy.proxy_server.prisma_client.tx
|
||||
litellm.proxy.proxy_server.prisma_client.tx = MagicMock(
|
||||
return_value=tx_cm
|
||||
|
|
@ -1432,7 +1443,7 @@ async def test_create_team_member_add_team_admin(
|
|||
)
|
||||
)
|
||||
mock_litellm_usertable.upsert = mock_client
|
||||
mock_litellm_usertable.find_many = AsyncMock(return_value=None)
|
||||
mock_litellm_usertable.find_many = AsyncMock(return_value=[])
|
||||
# Mock find_first for user_email validation (returns None for new users)
|
||||
mock_litellm_usertable.find_first = AsyncMock(return_value=None)
|
||||
# Mock find_unique for user_id validation (returns None for new users)
|
||||
|
|
@ -1443,12 +1454,7 @@ async def test_create_team_member_add_team_admin(
|
|||
return_value=LiteLLM_TeamTableCachedObj(team_id="1234")
|
||||
)
|
||||
|
||||
tx_mock = AsyncMock()
|
||||
tx_mock.query_raw = AsyncMock(return_value=[{"members_with_roles": []}])
|
||||
tx_mock.litellm_teamtable = team_mock_client
|
||||
tx_cm = MagicMock()
|
||||
tx_cm.__aenter__ = AsyncMock(return_value=tx_mock)
|
||||
tx_cm.__aexit__ = AsyncMock(return_value=None)
|
||||
tx_cm = _member_add_tx_cm(team_mock_client)
|
||||
|
||||
with (
|
||||
patch.object(
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue