@daocloud-proto/hydra 0.18.0-dev-14 → 0.18.0-dev-17

package/admin-api/core/v1alpha1/core.pb.ts

@@ -22,6 +22,7 @@ export enum AdminPermission {
   FILES_STORAGE_CREATE = "FILES_STORAGE_CREATE",
   FILES_STORAGE_UPDATE = "FILES_STORAGE_UPDATE",
   FILES_STORAGE_DELETE = "FILES_STORAGE_DELETE",
+  BASIC_INFO_GET = "BASIC_INFO_GET",
 }
 
 export enum ExportModule {
@@ -44,6 +45,72 @@ export type ConstantsResponse = {
   defaultModelServingPort?: number
 }
 
+export type APIKeyInfo = {
+  id?: string
+  name?: string
+  workspace?: number
+  userId?: string
+}
+
+export type UserInfo = {
+  id?: string
+  name?: string
+}
+
+export type AccountBasicInfo = {
+  id?: string
+  name?: string
+  hasSubAccount?: boolean
+}
+
+export type ListAPIKeysRequest = {
+  accountID?: string
+  subAccountID?: string
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListAPIKeysResponse = {
+  items?: APIKeyInfo[]
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListUsersRequest = {
+  workspace?: number
+  name?: string
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListUsersResponse = {
+  items?: UserInfo[]
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListAccountsRequest = {
+  name?: string
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListAccountsResponse = {
+  items?: AccountBasicInfo[]
+  page?: HydraCommonCommon.Pagination
+}
+
+export type ListSubAccountsRequest = {
+  accountId?: string
+  name?: string
+  page?: HydraCommonCommon.Pagination
+}
+
+export type SubAccountInfo = {
+  id?: string
+  name?: string
+}
+
+export type ListSubAccountsResponse = {
+  items?: SubAccountInfo[]
+  page?: HydraCommonCommon.Pagination
+}
+
 export type ListPlatformRolePermissionsForCurrentUserResponse = {
   permissions?: AdminPermission[]
 }
@@ -148,4 +215,16 @@ export class CoreService {
   static AdminListPersistentVolumeClaims(req: AdminListPersistentVolumeClaimsRequest, initReq?: fm.InitReq): Promise<AdminListPersistentVolumeClaimsResponse> {
     return fm.fetchReq<AdminListPersistentVolumeClaimsRequest, AdminListPersistentVolumeClaimsResponse>(`/apis/admin.hydra.io/v1alpha1/clusters/${req["cluster"]}/persistentvolumeclaims?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
   }
+  static AdminListUsers(req: ListUsersRequest, initReq?: fm.InitReq): Promise<ListUsersResponse> {
+    return fm.fetchReq<ListUsersRequest, ListUsersResponse>(`/apis/admin.hydra.io/v1alpha1/users?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+  static AdminListAPIKeys(req: ListAPIKeysRequest, initReq?: fm.InitReq): Promise<ListAPIKeysResponse> {
+    return fm.fetchReq<ListAPIKeysRequest, ListAPIKeysResponse>(`/apis/admin.hydra.io/v1alpha1/apikeys?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+  static AdminListAccounts(req: ListAccountsRequest, initReq?: fm.InitReq): Promise<ListAccountsResponse> {
+    return fm.fetchReq<ListAccountsRequest, ListAccountsResponse>(`/apis/admin.hydra.io/v1alpha1/accounts?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+  static AdminListSubAccounts(req: ListSubAccountsRequest, initReq?: fm.InitReq): Promise<ListSubAccountsResponse> {
+    return fm.fetchReq<ListSubAccountsRequest, ListSubAccountsResponse>(`/apis/admin.hydra.io/v1alpha1/accounts/${req["accountId"]}/subaccounts?${fm.renderURLSearchParams(req, ["accountId"])}`, {...initReq, method: "GET"})
+  }
 }

package/admin-api/maas/v1alpha1/maas.pb.ts

@@ -140,8 +140,18 @@ export type CreateMAASModelRequest = {
   tokenWeight?: string
   workspaceVisibility?: MAASWorkspaceVisibility
   capabilityRoutes?: MAASCapabilityRoute[]
+  modelRatelimitConfig?: ModelRatelimitConfig
 }
 
+
+type BaseModelRatelimitConfig = {
+  enabled?: boolean
+}
+
+export type ModelRatelimitConfig = BaseModelRatelimitConfig
+  & OneOf<{ rpm: number }>
+  & OneOf<{ tpm: number }>
+
 export type MAASModel = {
   model?: HydraAdmin_apiModelV1alpha1Model.Model
   upstreamModels?: UpstreamModel[]
@@ -156,6 +166,7 @@ export type MAASModel = {
   capabilityRoutes?: MAASCapabilityRoute[]
   healthStatus?: MAASModelHealthStatus
   clusterStatus?: HydraManagement_apiWorkspaceV1alpha1Workspace.ClusterStatus
+  modelRatelimitConfig?: ModelRatelimitConfig
 }
 
 export type LoadBalanceConfig = {
@@ -236,6 +247,7 @@ export type UpdateMAASModelRequest = {
   tokenWeight?: string
   workspaceVisibility?: MAASWorkspaceVisibility
   capabilityRoutes?: MAASCapabilityRoute[]
+  modelRatelimitConfig?: ModelRatelimitConfig
 }
 
 export type UpdateMAASModelStatusRequest = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/hydra",
-  "version": "v0.18.0-dev-14",
+  "version": "v0.18.0-dev-17",
   "description": "",
   "author": "",
   "license": "ISC"