diff --git a/litellm/proxy/_experimental/out/404.html b/litellm/proxy/_experimental/out/404.html
deleted file mode 100644
index 0f6c985e6b..0000000000
--- a/litellm/proxy/_experimental/out/404.html
+++ /dev/null
@@ -1 +0,0 @@
-404: This page could not be found.LiteLLM Dashboard
404
This page could not be found.
\ No newline at end of file
diff --git a/litellm/proxy/_experimental/out/model_hub.html b/litellm/proxy/_experimental/out/model_hub.html
deleted file mode 100644
index 4840c21fde..0000000000
--- a/litellm/proxy/_experimental/out/model_hub.html
+++ /dev/null
@@ -1 +0,0 @@
-LiteLLM Dashboard
\ No newline at end of file
diff --git a/litellm/proxy/_experimental/out/onboarding.html b/litellm/proxy/_experimental/out/onboarding.html
deleted file mode 100644
index f9d79ee914..0000000000
--- a/litellm/proxy/_experimental/out/onboarding.html
+++ /dev/null
@@ -1 +0,0 @@
-LiteLLM Dashboard
\ No newline at end of file
diff --git a/litellm/proxy/management_endpoints/team_endpoints.py b/litellm/proxy/management_endpoints/team_endpoints.py
index 5beafc13e2..0b99b4c436 100644
--- a/litellm/proxy/management_endpoints/team_endpoints.py
+++ b/litellm/proxy/management_endpoints/team_endpoints.py
@@ -499,28 +499,10 @@ async def team_member_add(
},
)
- if isinstance(data.member, Member):
- # add to team db
- new_member = data.member
-
- complete_team_data.members_with_roles.append(new_member)
-
- elif isinstance(data.member, List):
- # add to team db
- new_members = data.member
-
- complete_team_data.members_with_roles.extend(new_members)
-
- # ADD MEMBER TO TEAM
- _db_team_members = [m.model_dump() for m in complete_team_data.members_with_roles]
- updated_team = await prisma_client.db.litellm_teamtable.update(
- where={"team_id": data.team_id},
- data={"members_with_roles": json.dumps(_db_team_members)}, # type: ignore
- )
-
updated_users: List[LiteLLM_UserTable] = []
updated_team_memberships: List[LiteLLM_TeamMembership] = []
+ ## VALIDATE IF NEW MEMBER ##
if isinstance(data.member, Member):
try:
updated_user, updated_tm = await add_new_member(
@@ -571,6 +553,41 @@ async def team_member_add(
await asyncio.gather(*tasks)
+ ## ADD TO TEAM ##
+ if isinstance(data.member, Member):
+ # add to team db
+ new_member = data.member
+
+ # get user id
+ if new_member.user_id is None and new_member.user_email is not None:
+ for user in updated_users:
+ if (
+ user.user_email is not None
+ and user.user_email == new_member.user_email
+ ):
+ new_member.user_id = user.user_id
+
+ complete_team_data.members_with_roles.append(new_member)
+
+ elif isinstance(data.member, List):
+ # add to team db
+ new_members = data.member
+
+ for nm in new_members:
+ if nm.user_id is None and nm.user_email is not None:
+ for user in updated_users:
+ if user.user_email is not None and user.user_email == nm.user_email:
+ nm.user_id = user.user_id
+
+ complete_team_data.members_with_roles.extend(new_members)
+
+ # ADD MEMBER TO TEAM
+ _db_team_members = [m.model_dump() for m in complete_team_data.members_with_roles]
+ updated_team = await prisma_client.db.litellm_teamtable.update(
+ where={"team_id": data.team_id},
+ data={"members_with_roles": json.dumps(_db_team_members)}, # type: ignore
+ )
+
# Check if updated_team is None
if updated_team is None:
raise HTTPException(
@@ -897,7 +914,17 @@ async def team_info(
# if using pydantic v1
key = key.dict()
key.pop("token", None)
- return {"team_id": team_id, "team_info": team_info, "keys": keys}
+
+ ## GET ALL MEMBERSHIPS ##
+ team_memberships = await prisma_client.db.litellm_teammembership.find_many(
+ where={"team_id": team_id}
+ )
+ return {
+ "team_id": team_id,
+ "team_info": team_info,
+ "keys": keys,
+ "team_memberships": team_memberships,
+ }
except Exception as e:
verbose_proxy_logger.error(
diff --git a/litellm/proxy/management_helpers/utils.py b/litellm/proxy/management_helpers/utils.py
index ec494ccf55..efbe667fb6 100644
--- a/litellm/proxy/management_helpers/utils.py
+++ b/litellm/proxy/management_helpers/utils.py
@@ -120,7 +120,11 @@ async def add_new_member(
)
# Check if trying to set a budget for team member
- if max_budget_in_team is not None and new_member.user_id is not None:
+ if (
+ max_budget_in_team is not None
+ and returned_user is not None
+ and returned_user.user_id is not None
+ ):
# create a new budget item for this member
response = await prisma_client.db.litellm_budgettable.create(
data={
@@ -135,7 +139,7 @@ async def add_new_member(
await prisma_client.db.litellm_teammembership.create(
data={
"team_id": team_id,
- "user_id": new_member.user_id,
+ "user_id": returned_user.user_id,
"budget_id": _budget_id,
},
include={"litellm_budget_table": True},