feat(new service account flow): service account owners creation

Author: murarryreddy

litellm/proxy/_types.py

@@ -1431,6 +1431,7 @@ class NewUserRequest(GenerateRequestBase):
     send_invite_email: Optional[bool] = None
     sso_user_id: Optional[str] = None
     organizations: Optional[List[str]] = None
+    owner_ids: Optional[List[str]] = None
 
 
 class NewUserResponse(GenerateKeyResponse):

litellm/proxy/management_endpoints/internal_user_endpoints.py

@@ -482,6 +482,7 @@ async def new_user(
         organization_ids = cast(
             Optional[List[str]], data_json.pop("organizations", None)
         )
+        owner_ids = cast(Optional[List[str]], data_json.pop("owner_ids", None))
 
         response = await generate_key_helper_fn(request_type="user", **data_json)
         # Admin UI Logic
@@ -516,6 +517,21 @@ async def new_user(
                 user_api_key_dict=user_api_key_dict,
             )
 
+        # If owner_ids provided, create a service account entry linked to this user
+        if owner_ids is not None and len(owner_ids) > 0 and user_id is not None:
+            if len(data.owner_ids) < 2:
+                raise HTTPException(
+                    status_code=400,
+                    detail="owner_ids must contain at least 2 user IDs",
+                )
+            await prisma_client.db.litellm_serviceaccounttable.upsert(
+                where={"user_id": user_id},
+                data={
+                    "create": {"user_id": user_id, "owner_ids": owner_ids},
+                    "update": {"owner_ids": owner_ids},
+                },
+            )
+
         special_keys = ["token", "token_id"]
         response_dict = {}
         for key, value in response.items():

ui/litellm-dashboard/src/components/CreateUserButton.tsx

@@ -3,7 +3,8 @@ import { useQueryClient } from "@tanstack/react-query";
 import { useOrganizations } from "@/app/(dashboard)/hooks/organizations/useOrganizations";
 import { Accordion, AccordionBody, AccordionHeader, SelectItem, TextInput } from "@tremor/react";
 import { Alert, Button, Form, Input, Modal, Select, Select as Select2, Space, Tooltip, Typography } from "antd";
-import React, { useEffect, useMemo, useState } from "react";
+import debounce from "lodash/debounce";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import BulkCreateUsers from "./bulk_create_users_button";
 import TeamDropdown from "./common_components/team_dropdown";
 import { getModelDisplayName } from "./key_team_helpers/fetch_available_models_team_key";
@@ -14,6 +15,7 @@ import {
   invitationCreateCall,
   modelAvailableCall,
   userCreateCall,
+  userFilterUICall,
 } from "./networking";
 import OnboardingModal, { InvitationLink } from "./onboarding_link";
 const { Option } = Select;
@@ -66,6 +68,33 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
   const [invitationLinkData, setInvitationLinkData] = useState<InvitationLink | null>(null);
   const [baseUrl, setBaseUrl] = useState<string | null>(null);
   const { data: organizations = [] } = useOrganizations();
+  const [ownerOptions, setOwnerOptions] = useState<{ label: string; value: string }[]>([]);
+  const [ownerSearchLoading, setOwnerSearchLoading] = useState(false);
+
+  const fetchOwners = async (searchText: string) => {
+    if (!searchText) {
+      setOwnerOptions([]);
+      return;
+    }
+    setOwnerSearchLoading(true);
+    try {
+      const params = new URLSearchParams();
+      params.append("user_email", searchText);
+      const results = await userFilterUICall(accessToken, params);
+      setOwnerOptions(
+        results.map((u: { user_email: string; user_id: string }) => ({
+          label: `${u.user_email} (${u.user_id})`,
+          value: u.user_id,
+        }))
+      );
+    } catch {
+      // silently ignore search errors
+    } finally {
+      setOwnerSearchLoading(false);
+    }
+  };
+
+  const debouncedOwnerSearch = useCallback(debounce(fetchOwners, 300), [accessToken]);
 
   // Derive teams from the user's organizations, falling back to the teams prop
   const availableTeams = useMemo(() => {
@@ -113,6 +142,7 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
     user_role: string;
     organization_ids?: string[];
     organizations?: string[];
+    owner_ids?: string[];
   }) => {
     try {
       NotificationsManager.info("Making API Call");
@@ -213,6 +243,41 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <TeamDropdown />
         </Form.Item>
 
+        <Form.Item
+          label={
+            <span>
+              Owners{" "}
+              <Tooltip title="At least 2 users who own this service account">
+                <InfoCircleOutlined style={{ marginLeft: "4px" }} />
+              </Tooltip>
+            </span>
+          }
+          name="owner_ids"
+          required={false}
+          rules={[
+            {
+              validator: async (_, value) => {
+                if (value && value.length > 0 && value.length < 2) {
+                  throw new Error("If specifying owners, please select at least 2");
+                }
+              },
+            },
+          ]}
+          help="optional — if provided, minimum 2 owners"
+        >
+          <Select2
+            mode="multiple"
+            showSearch
+            placeholder="Search by email to add owners"
+            filterOption={false}
+            onSearch={(v) => debouncedOwnerSearch(v)}
+            loading={ownerSearchLoading}
+            options={ownerOptions}
+            notFoundContent={ownerSearchLoading ? "Searching..." : "No users found"}
+            style={{ width: "100%" }}
+          />
+        </Form.Item>
+
         <Form.Item label="Metadata" name="metadata">
           <Input.TextArea rows={4} placeholder="Enter metadata as JSON" />
         </Form.Item>
@@ -309,6 +374,41 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
             </Select>
           </Form.Item>
 
+          <Form.Item
+            label={
+              <span>
+                Owners{" "}
+                <Tooltip title="At least 2 users who own this service account">
+                  <InfoCircleOutlined style={{ marginLeft: "4px" }} />
+                </Tooltip>
+              </span>
+            }
+            name="owner_ids"
+            required={false}
+            rules={[
+              {
+                validator: async (_, value) => {
+                  if (value && value.length > 0 && value.length < 2) {
+                    throw new Error("If specifying owners, please select at least 2");
+                  }
+                },
+              },
+            ]}
+            help="optional — if provided, minimum 2 owners"
+          >
+            <Select2
+              mode="multiple"
+              showSearch
+              placeholder="Search by email to add owners"
+              filterOption={false}
+              onSearch={(v) => debouncedOwnerSearch(v)}
+              loading={ownerSearchLoading}
+              options={ownerOptions}
+              notFoundContent={ownerSearchLoading ? "Searching..." : "No users found"}
+              style={{ width: "100%" }}
+            />
+          </Form.Item>
+
           <Form.Item label="Metadata" name="metadata">
             <Input.TextArea rows={4} placeholder="Enter metadata as JSON" />
           </Form.Item>