honeyhive 1.0.21 → 1.0.25

package/src/funcs/toolsGetTools.ts

@@ -46,20 +46,12 @@ export async function toolsGetTools(
 
   const secConfig = await extractSecurity(client._options.bearerAuth);
   const securityInput = secConfig == null ? {} : { bearerAuth: secConfig };
-  const requestSecurity = resolveGlobalSecurity(securityInput);
-
   const context = {
     operationID: "getTools",
     oAuth2Scopes: [],
-
-    resolvedSecurity: requestSecurity,
-
     securitySource: client._options.bearerAuth,
-    retryConfig: options?.retries
-      || client._options.retryConfig
-      || { strategy: "none" },
-    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
   };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const requestRes = client._createRequest(context, {
     security: requestSecurity,
@@ -76,8 +68,9 @@ export async function toolsGetTools(
   const doResult = await client._do(req, {
     context,
     errorCodes: ["4XX", "5XX"],
-    retryConfig: context.retryConfig,
-    retryCodes: context.retryCodes,
+    retryConfig: options?.retries
+      || client._options.retryConfig,
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
   });
   if (!doResult.ok) {
     return doResult;

package/src/funcs/toolsUpdateTool.ts

@@ -61,20 +61,12 @@ export async function toolsUpdateTool(
 
   const secConfig = await extractSecurity(client._options.bearerAuth);
   const securityInput = secConfig == null ? {} : { bearerAuth: secConfig };
-  const requestSecurity = resolveGlobalSecurity(securityInput);
-
   const context = {
     operationID: "updateTool",
     oAuth2Scopes: [],
-
-    resolvedSecurity: requestSecurity,
-
     securitySource: client._options.bearerAuth,
-    retryConfig: options?.retries
-      || client._options.retryConfig
-      || { strategy: "none" },
-    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
   };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const requestRes = client._createRequest(context, {
     security: requestSecurity,
@@ -92,8 +84,9 @@ export async function toolsUpdateTool(
   const doResult = await client._do(req, {
     context,
     errorCodes: ["4XX", "5XX"],
-    retryConfig: context.retryConfig,
-    retryCodes: context.retryCodes,
+    retryConfig: options?.retries
+      || client._options.retryConfig,
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
   });
   if (!doResult.ok) {
     return doResult;

package/src/hooks/types.ts

@@ -3,15 +3,11 @@
  */
 
 import { HTTPClient, RequestInput } from "../lib/http.js";
-import { RetryConfig } from "../lib/retries.js";
-import { SecurityState } from "../lib/security.js";
 
 export type HookContext = {
   operationID: string;
   oAuth2Scopes?: string[];
   securitySource?: any | (() => Promise<any>);
-  retryConfig: RetryConfig;
-  resolvedSecurity: SecurityState | null;
 };
 
 export type Awaitable<T> = T | Promise<T>;

package/src/index.ts

@@ -1,7 +1,3 @@
-/*
- * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
- */
-
 export * from "./lib/config.js";
 export * as files from "./lib/files.js";
 export * from "./sdk/sdk.js";

package/src/lib/config.ts

@@ -53,8 +53,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 
 export const SDK_METADATA = {
   language: "typescript",
-  openapiDocVersion: "1.0.4",
-  sdkVersion: "1.4.3",
-  genVersion: "2.457.1",
-  userAgent: "speakeasy-sdk/typescript 1.4.3 2.457.1 1.0.4 honeyhive",
+  openapiDocVersion: "1.0.21",
+  sdkVersion: "1.29.0",
+  genVersion: "2.429.0",
+  userAgent: "speakeasy-sdk/typescript 1.29.0 2.429.0 1.0.21 honeyhive",
 } as const;

package/src/lib/primitives.ts

@@ -2,26 +2,6 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-class InvariantError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "InvariantError";
-  }
-}
-
-export function invariant(
-  condition: unknown,
-  message: string,
-): asserts condition {
-  if (!condition) {
-    throw new InvariantError(message);
-  }
-}
-
-export type ExactPartial<T> = {
-  [P in keyof T]?: T[P] | undefined;
-};
-
 export type Remap<Inp, Mapping extends { [k in keyof Inp]?: string | null }> = {
   [k in keyof Inp as Mapping[k] extends string /* if we have a string mapping for this key then use it */
     ? Mapping[k]

package/src/lib/retries.ts

@@ -26,44 +26,23 @@ export type RetryConfig =
       retryConnectionErrors?: boolean;
     };
 
-/**
- * PermanentError is an error that is not recoverable. Throwing this error will
- * cause a retry loop to terminate.
- */
-export class PermanentError extends Error {
-  /** The underlying cause of the error. */
-  override readonly cause: unknown;
-
-  constructor(message: string, options?: { cause?: unknown }) {
-    let msg = message;
-    if (options?.cause) {
-      msg += `: ${options.cause}`;
-    }
+class PermanentError extends Error {
+  inner: unknown;
 
-    super(msg, options);
-    this.name = "PermanentError";
-    // In older runtimes, the cause field would not have been assigned through
-    // the super() call.
-    if (typeof this.cause === "undefined") {
-      this.cause = options?.cause;
-    }
+  constructor(inner: unknown) {
+    super("Permanent error");
+    this.inner = inner;
 
     Object.setPrototypeOf(this, PermanentError.prototype);
   }
 }
 
-/**
- * TemporaryError is an error is used to signal that an HTTP request can be
- * retried as part of a retry loop. If retry attempts are exhausted and this
- * error is thrown, the response will be returned to the caller.
- */
-export class TemporaryError extends Error {
-  response: Response;
+class TemporaryError extends Error {
+  res: Response;
 
-  constructor(message: string, response: Response) {
-    super(message);
-    this.response = response;
-    this.name = "TemporaryError";
+  constructor(res: Response) {
+    super("Temporary error");
+    this.res = res;
 
     Object.setPrototypeOf(this, TemporaryError.prototype);
   }
@@ -101,14 +80,11 @@ function wrapFetcher(
     try {
       const res = await fn();
       if (isRetryableResponse(res, options.statusCodes)) {
-        throw new TemporaryError(
-          "Response failed with retryable status code",
-          res,
-        );
+        throw new TemporaryError(res);
       }
 
       return res;
-    } catch (err: unknown) {
+    } catch (err) {
       if (err instanceof TemporaryError) {
         throw err;
       }
@@ -120,7 +96,7 @@ function wrapFetcher(
         throw err;
       }
 
-      throw new PermanentError("Permanent error", { cause: err });
+      throw new PermanentError(err);
     }
   };
 }
@@ -163,25 +139,37 @@ async function retryBackoff(
     try {
       const res = await fn();
       return res;
-    } catch (err: unknown) {
+    } catch (err) {
       if (err instanceof PermanentError) {
-        throw err.cause;
+        throw err.inner;
       }
       const elapsed = Date.now() - start;
       if (elapsed > maxElapsedTime) {
         if (err instanceof TemporaryError) {
-          return err.response;
+          return err.res;
         }
 
         throw err;
       }
 
       let retryInterval = 0;
-      if (err instanceof TemporaryError) {
-        retryInterval = retryIntervalFromResponse(err.response);
+      if (err instanceof TemporaryError && err.res && err.res.headers) {
+        const retryVal = err.res.headers.get("retry-after") || "";
+        if (retryVal != "") {
+          const parsedNumber = Number(retryVal);
+          if (!isNaN(parsedNumber) && Number.isInteger(parsedNumber)) {
+            retryInterval = parsedNumber * 1000;
+          } else {
+            const parsedDate = Date.parse(retryVal);
+            if (!isNaN(parsedDate)) {
+              const deltaMS = parsedDate - Date.now();
+              retryInterval = deltaMS > 0 ? Math.ceil(deltaMS) : 0;
+            }
+          }
+        }
       }
 
-      if (retryInterval <= 0) {
+      if (retryInterval == 0) {
         retryInterval =
           initialInterval * Math.pow(x, exponent) + Math.random() * 1000;
       }
@@ -194,26 +182,6 @@ async function retryBackoff(
   }
 }
 
-function retryIntervalFromResponse(res: Response): number {
-  const retryVal = res.headers.get("retry-after") || "";
-  if (!retryVal) {
-    return 0;
-  }
-
-  const parsedNumber = Number(retryVal);
-  if (Number.isInteger(parsedNumber)) {
-    return parsedNumber * 1000;
-  }
-
-  const parsedDate = Date.parse(retryVal);
-  if (Number.isInteger(parsedDate)) {
-    const deltaMS = parsedDate - Date.now();
-    return deltaMS > 0 ? Math.ceil(deltaMS) : 0;
-  }
-
-  return 0;
-}
-
 async function delay(delay: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, delay));
 }

package/src/lib/sdks.ts

@@ -220,8 +220,8 @@ export class ClientSDK {
     options: {
       context: HookContext;
       errorCodes: number | string | (number | string)[];
-      retryConfig: RetryConfig;
-      retryCodes: string[];
+      retryConfig?: RetryConfig | undefined;
+      retryCodes?: string[] | undefined;
     },
   ): Promise<
     Result<
@@ -233,6 +233,8 @@ export class ClientSDK {
     >
   > {
     const { context, errorCodes } = options;
+    const retryConfig = options.retryConfig || { strategy: "none" };
+    const retryCodes = options.retryCodes || [];
 
     return retry(
       async () => {
@@ -243,28 +245,22 @@ export class ClientSDK {
 
         let response = await this.#httpClient.request(req);
 
-        try {
-          if (matchStatusCode(response, errorCodes)) {
-            const result = await this.#hooks.afterError(
-              context,
-              response,
-              null,
-            );
-            if (result.error) {
-              throw result.error;
-            }
-            response = result.response || response;
-          } else {
-            response = await this.#hooks.afterSuccess(context, response);
+        if (matchStatusCode(response, errorCodes)) {
+          const result = await this.#hooks.afterError(context, response, null);
+          if (result.error) {
+            throw result.error;
           }
-        } finally {
-          await logResponse(this.#logger, response, req)
-            .catch(e => this.#logger?.log("Failed to log response:", e));
+          response = result.response || response;
+        } else {
+          response = await this.#hooks.afterSuccess(context, response);
         }
 
+        await logResponse(this.#logger, response, req)
+          .catch(e => this.#logger?.log("Failed to log response:", e));
+
         return response;
       },
-      { config: options.retryConfig, statusCodes: options.retryCodes },
+      { config: retryConfig, statusCodes: retryCodes },
     ).then(
       (r) => OK(r),
       (err) => {

package/src/lib/security.ts

@@ -4,14 +4,6 @@
 
 import * as components from "../models/components/index.js";
 
-type OAuth2PasswordFlow = {
-  username: string;
-  password?: string | undefined;
-  clientID: string;
-  clientSecret?: string | undefined;
-  tokenURL: string;
-};
-
 export enum SecurityErrorCode {
   Incomplete = "incomplete",
   UnrecognisedSecurityType = "unrecognized_security_type",
@@ -45,7 +37,6 @@ export type SecurityState = {
   headers: Record<string, string>;
   queryParams: Record<string, string>;
   cookies: Record<string, string>;
-  oauth2: ({ type: "password" } & OAuth2PasswordFlow) | { type: "none" };
 };
 
 type SecurityInputBasic = {
@@ -82,18 +73,7 @@ type SecurityInputOAuth2 = {
 
 type SecurityInputOAuth2ClientCredentials = {
   type: "oauth2:client_credentials";
-  value:
-    | { clientID?: string | undefined; clientSecret?: string | undefined }
-    | null
-    | undefined;
-};
-
-type SecurityInputOAuth2PasswordCredentials = {
-  type: "oauth2:password";
-  value:
-    | string
-    | null
-    | undefined;
+  value: string | null | undefined;
   fieldName: string;
 };
 
@@ -109,7 +89,6 @@ export type SecurityInput =
   | SecurityInputAPIKey
   | SecurityInputOAuth2
   | SecurityInputOAuth2ClientCredentials
-  | SecurityInputOAuth2PasswordCredentials
   | SecurityInputOIDC
   | SecurityInputCustom;
 
@@ -121,7 +100,6 @@ export function resolveSecurity(
     headers: {},
     queryParams: {},
     cookies: {},
-    oauth2: { type: "none" },
   };
 
   const option = options.find((opts) => {
@@ -132,12 +110,6 @@ export function resolveSecurity(
         return o.value.username != null || o.value.password != null;
       } else if (o.type === "http:custom") {
         return null;
-      } else if (o.type === "oauth2:password") {
-        return (
-          typeof o.value === "string" && !!o.value
-        );
-      } else if (o.type === "oauth2:client_credentials") {
-        return o.value.clientID != null || o.value.clientSecret != null;
       } else if (typeof o.value === "string") {
         return !!o.value;
       } else {
@@ -180,9 +152,6 @@ export function resolveSecurity(
       case "oauth2":
         applyBearer(state, spec);
         break;
-      case "oauth2:password":
-        applyBearer(state, spec);
-        break;
       case "oauth2:client_credentials":
         break;
       case "openIdConnect":
@@ -210,13 +179,9 @@ function applyBasic(
 
 function applyBearer(
   state: SecurityState,
-  spec:
-    | SecurityInputBearer
-    | SecurityInputOAuth2
-    | SecurityInputOIDC
-    | SecurityInputOAuth2PasswordCredentials,
+  spec: SecurityInputBearer | SecurityInputOAuth2 | SecurityInputOIDC,
 ) {
-  if (typeof spec.value !== "string" || !spec.value) {
+  if (spec.value == null) {
     return;
   }
 
@@ -227,7 +192,6 @@ function applyBearer(
 
   state.headers[spec.fieldName] = value;
 }
-
 export function resolveGlobalSecurity(
   security: Partial<components.Security> | null | undefined,
 ): SecurityState | null {

package/src/models/components/metric.ts

@@ -102,6 +102,14 @@ export type Metric = {
    * Type of event that the metric is set to be computed on
    */
   eventType?: string | undefined;
+  /**
+   * Provider of the model, formatted as a LiteLLM provider prefix
+   */
+  modelProvider?: string | undefined;
+  /**
+   * Name of the model, formatted as a LiteLLM model name
+   */
+  modelName?: string | undefined;
   /**
    * Child metrics added under composite events
    */
@@ -203,6 +211,8 @@ export const Metric$inboundSchema: z.ZodType<Metric, z.ZodTypeDef, unknown> = z
     _id: z.string().optional(),
     event_name: z.string().optional(),
     event_type: z.string().optional(),
+    model_provider: z.string().optional(),
+    model_name: z.string().optional(),
     child_metrics: z.array(z.record(z.any())).optional(),
   }).transform((v) => {
     return remap$(v, {
@@ -214,6 +224,8 @@ export const Metric$inboundSchema: z.ZodType<Metric, z.ZodTypeDef, unknown> = z
       "_id": "id",
       "event_name": "eventName",
       "event_type": "eventType",
+      "model_provider": "modelProvider",
+      "model_name": "modelName",
       "child_metrics": "childMetrics",
     });
   });
@@ -235,6 +247,8 @@ export type Metric$Outbound = {
   _id?: string | undefined;
   event_name?: string | undefined;
   event_type?: string | undefined;
+  model_provider?: string | undefined;
+  model_name?: string | undefined;
   child_metrics?: Array<{ [k: string]: any }> | undefined;
 };
 
@@ -259,6 +273,8 @@ export const Metric$outboundSchema: z.ZodType<
   id: z.string().optional(),
   eventName: z.string().optional(),
   eventType: z.string().optional(),
+  modelProvider: z.string().optional(),
+  modelName: z.string().optional(),
   childMetrics: z.array(z.record(z.any())).optional(),
 }).transform((v) => {
   return remap$(v, {
@@ -270,6 +286,8 @@ export const Metric$outboundSchema: z.ZodType<
     id: "_id",
     eventName: "event_name",
     eventType: "event_type",
+    modelProvider: "model_provider",
+    modelName: "model_name",
     childMetrics: "child_metrics",
   });
 });

package/src/models/components/metricedit.ts

@@ -112,6 +112,14 @@ export type MetricEdit = {
    * Type of event that the metric is set to be computed on
    */
   eventType?: MetricEditEventType | undefined;
+  /**
+   * Provider of the model, formatted as a LiteLLM provider prefix
+   */
+  modelProvider?: string | undefined;
+  /**
+   * Name of the model, formatted as a LiteLLM model name
+   */
+  modelName?: string | undefined;
   /**
    * Child metrics added under composite events
    */
@@ -240,6 +248,8 @@ export const MetricEdit$inboundSchema: z.ZodType<
   pass_when: z.boolean().optional(),
   event_name: z.string().optional(),
   event_type: MetricEditEventType$inboundSchema.optional(),
+  model_provider: z.string().optional(),
+  model_name: z.string().optional(),
   child_metrics: z.array(z.record(z.any())).optional(),
 }).transform((v) => {
   return remap$(v, {
@@ -251,6 +261,8 @@ export const MetricEdit$inboundSchema: z.ZodType<
     "pass_when": "passWhen",
     "event_name": "eventName",
     "event_type": "eventType",
+    "model_provider": "modelProvider",
+    "model_name": "modelName",
     "child_metrics": "childMetrics",
   });
 });
@@ -271,6 +283,8 @@ export type MetricEdit$Outbound = {
   pass_when?: boolean | undefined;
   event_name?: string | undefined;
   event_type?: string | undefined;
+  model_provider?: string | undefined;
+  model_name?: string | undefined;
   child_metrics?: Array<{ [k: string]: any }> | undefined;
 };
 
@@ -294,6 +308,8 @@ export const MetricEdit$outboundSchema: z.ZodType<
   passWhen: z.boolean().optional(),
   eventName: z.string().optional(),
   eventType: MetricEditEventType$outboundSchema.optional(),
+  modelProvider: z.string().optional(),
+  modelName: z.string().optional(),
   childMetrics: z.array(z.record(z.any())).optional(),
 }).transform((v) => {
   return remap$(v, {
@@ -305,6 +321,8 @@ export const MetricEdit$outboundSchema: z.ZodType<
     passWhen: "pass_when",
     eventName: "event_name",
     eventType: "event_type",
+    modelProvider: "model_provider",
+    modelName: "model_name",
     childMetrics: "child_metrics",
   });
 });