@daocloud-proto/hydra 0.18.0-dev-11 → 0.18.0-dev-13

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

@@ -6,7 +6,6 @@
 
 import * as HydraCommonCommon from "../../../common/common.pb"
 import * as fm from "../../../fetch.pb"
-import * as GoogleApiHttpbody from "../../../google/api/httpbody.pb"
 import * as GoogleProtobufTimestamp from "../../../google/protobuf/timestamp.pb"
 
 type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
@@ -281,7 +280,7 @@ export class AIGuardrailsService {
   static QueryAIAuditLogStatistics(req: QueryAIAuditLogStatisticsRequest, initReq?: fm.InitReq): Promise<QueryAIAuditLogStatisticsResponse> {
     return fm.fetchReq<QueryAIAuditLogStatisticsRequest, QueryAIAuditLogStatisticsResponse>(`/apis/admin.hydra.io/v1alpha1/ai-guardrails-logs/statistics?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
-  static ExportAIAuditLog(req: ExportAIAuditLogRequest, initReq?: fm.InitReq): Promise<GoogleApiHttpbody.HttpBody> {
-    return fm.fetchReq<ExportAIAuditLogRequest, GoogleApiHttpbody.HttpBody>(`/apis/admin.hydra.io/v1alpha1/ai-guardrails-logs/export?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  static ExportAIAuditLog(req: ExportAIAuditLogRequest, initReq?: fm.InitReq): Promise<Response> {
+    return fm.fetchRawReq(`/apis/admin.hydra.io/v1alpha1/ai-guardrails-logs/export?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
 }

package/fetch.pb.ts

@@ -338,4 +338,21 @@ export function renderURLSearchParams<T extends RequestPayload>(
   );
 
   return new URLSearchParams(urlSearchParams).toString();
-}
+}
+
+export async function fetchRawReq(path: string, init?: InitReq): Promise<Response> {
+  const {pathPrefix, ...req} = init || {}
+  const url = pathPrefix ? `${pathPrefix}${path}` : path
+  const response = await fetch(url, req)
+  if (!response.ok) {
+    const text = await response.text()
+    let body: unknown = text
+    try {
+      body = JSON.parse(text)
+    } catch {
+      // Preserve a non-JSON error body when an intermediary does not use the gateway error schema.
+    }
+    throw body
+  }
+  return response
+}

package/management-api/apikey/v1alpha1/apikey.pb.ts

@@ -32,6 +32,12 @@ export enum TimePeriod {
   TIME_PERIOD_MONTH = "TIME_PERIOD_MONTH",
 }
 
+export enum ModelUsageExportFormat {
+  MODEL_USAGE_EXPORT_FORMAT_UNSPECIFIED = "MODEL_USAGE_EXPORT_FORMAT_UNSPECIFIED",
+  MODEL_USAGE_EXPORT_FORMAT_CSV = "MODEL_USAGE_EXPORT_FORMAT_CSV",
+  MODEL_USAGE_EXPORT_FORMAT_EXCEL = "MODEL_USAGE_EXPORT_FORMAT_EXCEL",
+}
+
 export enum APIKeyUsageQueryStatus {
   API_KEY_USAGE_QUERY_STATUS_UNSPECIFIED = "API_KEY_USAGE_QUERY_STATUS_UNSPECIFIED",
   API_KEY_USAGE_QUERY_STATUS_COMPLETED = "API_KEY_USAGE_QUERY_STATUS_COMPLETED",
@@ -236,6 +242,61 @@ export type APIKeyUsageStatisticsResponse = {
   warnings?: APIKeyUsageWarning[]
 }
 
+export type ExportModelUsageRequest = {
+  startTime?: GoogleProtobufTimestamp.Timestamp
+  endTime?: GoogleProtobufTimestamp.Timestamp
+  apiKeyIds?: string[]
+  models?: string[]
+  responseCodes?: string[]
+  format?: ModelUsageExportFormat
+}
+
+export type WSExportModelUsageRequest = {
+  startTime?: GoogleProtobufTimestamp.Timestamp
+  endTime?: GoogleProtobufTimestamp.Timestamp
+  apiKeyIds?: string[]
+  models?: string[]
+  responseCodes?: string[]
+  format?: ModelUsageExportFormat
+  workspace?: number
+}
+
+export type ListModelUsageRequest = {
+  startTime?: GoogleProtobufTimestamp.Timestamp
+  endTime?: GoogleProtobufTimestamp.Timestamp
+  apiKeyIds?: string[]
+  models?: string[]
+  page?: HydraCommonCommon.Pagination
+  responseCodes?: string[]
+}
+
+export type WSListModelUsageRequest = {
+  startTime?: GoogleProtobufTimestamp.Timestamp
+  endTime?: GoogleProtobufTimestamp.Timestamp
+  apiKeyIds?: string[]
+  models?: string[]
+  page?: HydraCommonCommon.Pagination
+  responseCodes?: string[]
+  workspace?: number
+}
+
+export type ModelUsageItem = {
+  requestTime?: GoogleProtobufTimestamp.Timestamp
+  requestId?: string
+  model?: string
+  apiKeyName?: string
+  statusCode?: string
+  totalTokens?: string
+  inputTokens?: string
+  outputTokens?: string
+  userId?: string
+}
+
+export type ListModelUsageResponse = {
+  items?: ModelUsageItem[]
+  page?: HydraCommonCommon.Pagination
+}
+
 export type APIKeyUsageWarning = {
   code?: string
   message?: string
@@ -297,6 +358,12 @@ export class APIKeyManagement {
   static GetAPIKeyUsageStatistics(req: APIKeyUsageStatisticsRequest, initReq?: fm.InitReq): Promise<APIKeyUsageStatisticsResponse> {
     return fm.fetchReq<APIKeyUsageStatisticsRequest, APIKeyUsageStatisticsResponse>(`/apis/hydra.io/v1alpha1/apikeys-stats`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
+  static ListModelUsage(req: ListModelUsageRequest, initReq?: fm.InitReq): Promise<ListModelUsageResponse> {
+    return fm.fetchReq<ListModelUsageRequest, ListModelUsageResponse>(`/apis/hydra.io/v1alpha1/model-usage?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+  static ExportModelUsage(req: ExportModelUsageRequest, initReq?: fm.InitReq): Promise<Response> {
+    return fm.fetchRawReq(`/apis/hydra.io/v1alpha1/model-usage/export?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
   static CheckAPIKeyCreation(req: CheckAPIKeyCreationRequest, initReq?: fm.InitReq): Promise<CheckAPIKeyCreationResponse> {
     return fm.fetchReq<CheckAPIKeyCreationRequest, CheckAPIKeyCreationResponse>(`/apis/hydra.io/v1alpha1/apikeys/check-creation`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
@@ -341,4 +408,10 @@ export class WSAPIKeyManagement {
   static GetAPIKeyUsageStatistics(req: WSAPIKeyUsageStatisticsRequest, initReq?: fm.InitReq): Promise<APIKeyUsageStatisticsResponse> {
     return fm.fetchReq<WSAPIKeyUsageStatisticsRequest, APIKeyUsageStatisticsResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/apikeys-stats`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
+  static ListModelUsage(req: WSListModelUsageRequest, initReq?: fm.InitReq): Promise<ListModelUsageResponse> {
+    return fm.fetchReq<WSListModelUsageRequest, ListModelUsageResponse>(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/model-usage?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
+  }
+  static ExportModelUsage(req: WSExportModelUsageRequest, initReq?: fm.InitReq): Promise<Response> {
+    return fm.fetchRawReq(`/apis/hydra.io/v1alpha1/workspaces/${req["workspace"]}/model-usage/export?${fm.renderURLSearchParams(req, ["workspace"])}`, {...initReq, method: "GET"})
+  }
 }

package/package.json

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