@orq-ai/node 3.8.0-rc.2 → 3.8.0-rc.21

package/src/lib/matchers.ts

@@ -3,12 +3,11 @@
  */
 
 import { APIError } from "../models/errors/apierror.js";
-import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
-import { Result } from "../types/fp.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
+import { ERR, OK, Result } from "../types/fp.js";
 import { discardSentinel } from "./event-streams.js";
 import { matchResponse, matchStatusCode, StatusCodePredicate } from "./http.js";
 import { isPlainObject } from "./is-plain-object.js";
-import { safeParse } from "./schemas.js";
 
 export type Encoding =
   | "jsonl"
@@ -177,17 +176,19 @@ export type MatchedError<Matchers> = Matchers extends Matcher<any, infer E>[]
   : never;
 export type MatchFunc<T, E> = (
   response: Response,
+  request: Request,
   options?: { resultKey?: string; extraFields?: Record<string, unknown> },
 ) => Promise<[result: Result<T, E>, raw: unknown]>;
 
 export function match<T, E>(
   ...matchers: Array<Matcher<T, E>>
-): MatchFunc<T, E | APIError | SDKValidationError> {
+): MatchFunc<T, E | APIError | ResponseValidationError> {
   return async function matchFunc(
     response: Response,
+    request: Request,
     options?: { resultKey?: string; extraFields?: Record<string, unknown> },
   ): Promise<
-    [result: Result<T, E | APIError | SDKValidationError>, raw: unknown]
+    [result: Result<T, E | APIError | ResponseValidationError>, raw: unknown]
   > {
     let raw: unknown;
     let matcher: Matcher<T, E> | undefined;
@@ -206,21 +207,22 @@ export function match<T, E>(
     }
 
     if (!matcher) {
-      const responseBody = await response.text();
       return [{
         ok: false,
-        error: new APIError(
-          "Unexpected API response status or content-type",
+        error: new APIError("Unexpected Status or Content-Type", {
           response,
-          responseBody,
-        ),
-      }, responseBody];
+          request,
+          body: await response.text().catch(() => ""),
+        }),
+      }, raw];
     }
 
     const encoding = matcher.enc;
+    let body = "";
     switch (encoding) {
       case "json":
-        raw = await response.json();
+        body = await response.text();
+        raw = JSON.parse(body);
         break;
       case "jsonl":
         raw = response.body;
@@ -232,7 +234,8 @@ export function match<T, E>(
         raw = response.body;
         break;
       case "text":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       case "sse":
         raw = response.body && matcher.sseSentinel
@@ -240,10 +243,12 @@ export function match<T, E>(
           : response.body;
         break;
       case "nil":
-        raw = await discardResponseBody(response);
+        body = await response.text();
+        raw = undefined;
         break;
       case "fail":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       default:
         encoding satisfies never;
@@ -253,11 +258,7 @@ export function match<T, E>(
     if (matcher.enc === "fail") {
       return [{
         ok: false,
-        error: new APIError(
-          "API error occurred",
-          response,
-          typeof raw === "string" ? raw : "",
-        ),
+        error: new APIError("API error occurred", { request, response, body }),
       }, raw];
     }
 
@@ -269,6 +270,9 @@ export function match<T, E>(
         ...options?.extraFields,
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
         ...(isPlainObject(raw) ? raw : null),
+        request$: request,
+        response$: response,
+        body$: body,
       };
     } else if (resultKey) {
       data = {
@@ -287,18 +291,20 @@ export function match<T, E>(
     }
 
     if ("err" in matcher) {
-      const result = safeParse(
+      const result = safeParseResponse(
         data,
         (v: unknown) => matcher.schema.parse(v),
         "Response validation failed",
+        { request, response, body },
       );
       return [result.ok ? { ok: false, error: result.value } : result, raw];
     } else {
       return [
-        safeParse(
+        safeParseResponse(
           data,
           (v: unknown) => matcher.schema.parse(v),
           "Response validation failed",
+          { request, response, body },
         ),
         raw,
       ];
@@ -321,25 +327,22 @@ export function unpackHeaders(headers: Headers): Record<string, string[]> {
   return out;
 }
 
-/**
- * Discards the response body to free up resources.
- *
- * To learn why this is need, see the undici docs:
- * https://undici.nodejs.org/#/?id=garbage-collection
- */
-export async function discardResponseBody(res: Response) {
-  const reader = res.body?.getReader();
-  if (reader == null) {
-    return;
-  }
-
+function safeParseResponse<Inp, Out>(
+  rawValue: Inp,
+  fn: (value: Inp) => Out,
+  errorMessage: string,
+  httpMeta: { response: Response; request: Request; body: string },
+): Result<Out, ResponseValidationError> {
   try {
-    let done = false;
-    while (!done) {
-      const res = await reader.read();
-      done = res.done;
-    }
-  } finally {
-    reader.releaseLock();
+    return OK(fn(rawValue));
+  } catch (err) {
+    return ERR(
+      new ResponseValidationError(errorMessage, {
+        cause: err,
+        rawValue,
+        rawMessage: errorMessage,
+        ...httpMeta,
+      }),
+    );
   }
 }

package/src/mcp-server/mcp-server.ts

@@ -19,7 +19,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "3.8.0-rc.2",
+    currentVersion: "3.8.0-rc.21",
   },
 });
 

package/src/mcp-server/server.ts

@@ -80,6 +80,7 @@ import { tool$filesCreate } from "./tools/filesCreate.js";
 import { tool$filesDelete } from "./tools/filesDelete.js";
 import { tool$filesGet } from "./tools/filesGet.js";
 import { tool$filesList } from "./tools/filesList.js";
+import { tool$getV2ModelsLitellmModels } from "./tools/getV2ModelsLitellmModels.js";
 import { tool$knowledgeCreate } from "./tools/knowledgeCreate.js";
 import { tool$knowledgeCreateChunks } from "./tools/knowledgeCreateChunks.js";
 import { tool$knowledgeCreateDatasource } from "./tools/knowledgeCreateDatasource.js";
@@ -97,6 +98,7 @@ import { tool$knowledgeUpdate } from "./tools/knowledgeUpdate.js";
 import { tool$knowledgeUpdateChunk } from "./tools/knowledgeUpdateChunk.js";
 import { tool$knowledgeUpdateDatasource } from "./tools/knowledgeUpdateDatasource.js";
 import { tool$modelsList } from "./tools/modelsList.js";
+import { tool$postV2ModelsLitellmImport } from "./tools/postV2ModelsLitellmImport.js";
 import { tool$promptsCreate } from "./tools/promptsCreate.js";
 import { tool$promptsDelete } from "./tools/promptsDelete.js";
 import { tool$promptsGetVersion } from "./tools/promptsGetVersion.js";
@@ -118,7 +120,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "Orq",
-    version: "3.8.0-rc.2",
+    version: "3.8.0-rc.21",
   });
 
   const client = new OrqCore({
@@ -150,6 +152,8 @@ export function createMCPServer(deps: {
   const register = { tool, resource, resourceTemplate, prompt };
   void register; // suppress unused warnings
 
+  tool(tool$getV2ModelsLitellmModels);
+  tool(tool$postV2ModelsLitellmImport);
   tool(tool$contactsCreate);
   tool(tool$contactsList);
   tool(tool$contactsRetrieve);

package/src/mcp-server/tools/getV2ModelsLitellmModels.ts

@@ -0,0 +1,30 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { getV2ModelsLitellmModels } from "../../funcs/getV2ModelsLitellmModels.js";
+import { formatResult, ToolDefinition } from "../tools.js";
+
+export const tool$getV2ModelsLitellmModels: ToolDefinition = {
+  name: "get-v2-models-litellm-models",
+  description: `Get available models from LiteLLM
+
+Fetches all available models from the configured LiteLLM instance`,
+  tool: async (client, ctx) => {
+    const [result, apiCall] = await getV2ModelsLitellmModels(
+      client,
+      { fetchOptions: { signal: ctx.signal } },
+    ).$inspect();
+
+    if (!result.ok) {
+      return {
+        content: [{ type: "text", text: result.error.message }],
+        isError: true,
+      };
+    }
+
+    const value = result.value;
+
+    return formatResult(value, apiCall);
+  },
+};

package/src/mcp-server/tools/postV2ModelsLitellmImport.ts

@@ -0,0 +1,38 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { postV2ModelsLitellmImport } from "../../funcs/postV2ModelsLitellmImport.js";
+import * as operations from "../../models/operations/index.js";
+import { formatResult, ToolDefinition } from "../tools.js";
+
+const args = {
+  request: z.array(operations.RequestBody$inboundSchema).optional(),
+};
+
+export const tool$postV2ModelsLitellmImport: ToolDefinition<typeof args> = {
+  name: "post-v2-models-litellm-import",
+  description: `Import models from LiteLLM
+
+Imports selected models from LiteLLM instance into the model garden`,
+  args,
+  tool: async (client, args, ctx) => {
+    const [result, apiCall] = await postV2ModelsLitellmImport(
+      client,
+      args.request,
+      { fetchOptions: { signal: ctx.signal } },
+    ).$inspect();
+
+    if (!result.ok) {
+      return {
+        content: [{ type: "text", text: result.error.message }],
+        isError: true,
+      };
+    }
+
+    const value = result.value;
+
+    return formatResult(value, apiCall);
+  },
+};

package/src/models/errors/apierror.ts

@@ -2,41 +2,33 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-export class APIError extends Error {
-  /**
-   * HTTP status code
-   */
-  public readonly statusCode: number;
-  /**
-   * HTTP content type
-   */
-  public readonly contentType: string;
-  /**
-   * HTTP body
-   */
-  public readonly body: string;
-  /**
-   * Raw response
-   */
-  public readonly rawResponse: Response;
+import { OrqError } from "./orqerror.js";
 
+/** The fallback error class if no more specific error class is matched */
+export class APIError extends OrqError {
   constructor(
     message: string,
-    rawResponse: Response,
-    body: string = "",
+    httpMeta: {
+      response: Response;
+      request: Request;
+      body: string;
+    },
   ) {
-    const statusCode = rawResponse.status;
-    const contentType = rawResponse.headers.get("content-type") || "";
-    const bodyString = body.length > 0 ? `\n${body}` : "";
-    super(
-      `${message}: Status ${statusCode} Content-Type ${contentType} Body ${bodyString}`,
-    );
-
-    this.body = body;
-    this.rawResponse = rawResponse;
-    this.statusCode = statusCode;
-    this.contentType = contentType;
-
+    if (message) {
+      message += `: `;
+    }
+    message += `Status ${httpMeta.response.status}`;
+    const contentType = httpMeta.response.headers.get("content-type") || `""`;
+    if (contentType !== "application/json") {
+      message += ` Content-Type ${
+        contentType.includes(" ") ? `"${contentType}"` : contentType
+      }`;
+    }
+    const body = httpMeta.body || `""`;
+    message += body.length > 100 ? "\n" : " ";
+    message += `Body ${body}`;
+    message = message.trim();
+    super(message, httpMeta);
     this.name = "APIError";
   }
 }

package/src/models/errors/createeval.ts

@@ -3,6 +3,7 @@
  */
 
 import * as z from "zod";
+import { OrqError } from "./orqerror.js";
 
 /**
  * Workspace ID is not found on the request
@@ -14,15 +15,18 @@ export type CreateEvalResponseBodyData = {
 /**
  * Workspace ID is not found on the request
  */
-export class CreateEvalResponseBody extends Error {
+export class CreateEvalResponseBody extends OrqError {
   /** The original data that was passed to this error instance. */
   data$: CreateEvalResponseBodyData;
 
-  constructor(err: CreateEvalResponseBodyData) {
+  constructor(
+    err: CreateEvalResponseBodyData,
+    httpMeta: { response: Response; request: Request; body: string },
+  ) {
     const message = "message" in err && typeof err.message === "string"
       ? err.message
       : `API error occurred: ${JSON.stringify(err)}`;
-    super(message);
+    super(message, httpMeta);
     this.data$ = err;
 
     this.name = "CreateEvalResponseBody";
@@ -36,9 +40,16 @@ export const CreateEvalResponseBody$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   message: z.string(),
+  request$: z.instanceof(Request),
+  response$: z.instanceof(Response),
+  body$: z.string(),
 })
   .transform((v) => {
-    return new CreateEvalResponseBody(v);
+    return new CreateEvalResponseBody(v, {
+      request: v.request$,
+      response: v.response$,
+      body: v.body$,
+    });
   });
 
 /** @internal */

package/src/models/errors/deletecontact.ts

@@ -3,6 +3,7 @@
  */
 
 import * as z from "zod";
+import { OrqError } from "./orqerror.js";
 
 /**
  * Contact not found
@@ -17,7 +18,7 @@ export type DeleteContactResponseBodyData = {
 /**
  * Contact not found
  */
-export class DeleteContactResponseBody extends Error {
+export class DeleteContactResponseBody extends OrqError {
   /**
    * Error message
    */
@@ -26,13 +27,15 @@ export class DeleteContactResponseBody extends Error {
   /** The original data that was passed to this error instance. */
   data$: DeleteContactResponseBodyData;
 
-  constructor(err: DeleteContactResponseBodyData) {
+  constructor(
+    err: DeleteContactResponseBodyData,
+    httpMeta: { response: Response; request: Request; body: string },
+  ) {
     const message = "message" in err && typeof err.message === "string"
       ? err.message
       : `API error occurred: ${JSON.stringify(err)}`;
-    super(message);
+    super(message, httpMeta);
     this.data$ = err;
-
     this.error = err.error;
 
     this.name = "DeleteContactResponseBody";
@@ -46,9 +49,16 @@ export const DeleteContactResponseBody$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   error: z.string(),
+  request$: z.instanceof(Request),
+  response$: z.instanceof(Response),
+  body$: z.string(),
 })
   .transform((v) => {
-    return new DeleteContactResponseBody(v);
+    return new DeleteContactResponseBody(v, {
+      request: v.request$,
+      response: v.response$,
+      body: v.body$,
+    });
   });
 
 /** @internal */

package/src/models/errors/deleteeval.ts

@@ -3,6 +3,7 @@
  */
 
 import * as z from "zod";
+import { OrqError } from "./orqerror.js";
 
 /**
  * Workspace ID is not found on the request
@@ -14,15 +15,18 @@ export type DeleteEvalResponseBodyData = {
 /**
  * Workspace ID is not found on the request
  */
-export class DeleteEvalResponseBody extends Error {
+export class DeleteEvalResponseBody extends OrqError {
   /** The original data that was passed to this error instance. */
   data$: DeleteEvalResponseBodyData;
 
-  constructor(err: DeleteEvalResponseBodyData) {
+  constructor(
+    err: DeleteEvalResponseBodyData,
+    httpMeta: { response: Response; request: Request; body: string },
+  ) {
     const message = "message" in err && typeof err.message === "string"
       ? err.message
       : `API error occurred: ${JSON.stringify(err)}`;
-    super(message);
+    super(message, httpMeta);
     this.data$ = err;
 
     this.name = "DeleteEvalResponseBody";
@@ -36,9 +40,16 @@ export const DeleteEvalResponseBody$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   message: z.string(),
+  request$: z.instanceof(Request),
+  response$: z.instanceof(Response),
+  body$: z.string(),
 })
   .transform((v) => {
-    return new DeleteEvalResponseBody(v);
+    return new DeleteEvalResponseBody(v, {
+      request: v.request$,
+      response: v.response$,
+      body: v.body$,
+    });
   });
 
 /** @internal */

package/src/models/errors/evalsageappropriate.ts

@@ -3,6 +3,7 @@
  */
 
 import * as z from "zod";
+import { OrqError } from "./orqerror.js";
 
 /**
  * Internal server error
@@ -14,15 +15,18 @@ export type EvalsAgeAppropriateEvalsResponseBodyData = {
 /**
  * Internal server error
  */
-export class EvalsAgeAppropriateEvalsResponseBody extends Error {
+export class EvalsAgeAppropriateEvalsResponseBody extends OrqError {
   /** The original data that was passed to this error instance. */
   data$: EvalsAgeAppropriateEvalsResponseBodyData;
 
-  constructor(err: EvalsAgeAppropriateEvalsResponseBodyData) {
+  constructor(
+    err: EvalsAgeAppropriateEvalsResponseBodyData,
+    httpMeta: { response: Response; request: Request; body: string },
+  ) {
     const message = "message" in err && typeof err.message === "string"
       ? err.message
       : `API error occurred: ${JSON.stringify(err)}`;
-    super(message);
+    super(message, httpMeta);
     this.data$ = err;
 
     this.name = "EvalsAgeAppropriateEvalsResponseBody";
@@ -39,15 +43,18 @@ export type EvalsAgeAppropriateResponseBodyData = {
 /**
  * Evaluator not found
  */
-export class EvalsAgeAppropriateResponseBody extends Error {
+export class EvalsAgeAppropriateResponseBody extends OrqError {
   /** The original data that was passed to this error instance. */
   data$: EvalsAgeAppropriateResponseBodyData;
 
-  constructor(err: EvalsAgeAppropriateResponseBodyData) {
+  constructor(
+    err: EvalsAgeAppropriateResponseBodyData,
+    httpMeta: { response: Response; request: Request; body: string },
+  ) {
     const message = "message" in err && typeof err.message === "string"
       ? err.message
       : `API error occurred: ${JSON.stringify(err)}`;
-    super(message);
+    super(message, httpMeta);
     this.data$ = err;
 
     this.name = "EvalsAgeAppropriateResponseBody";
@@ -61,9 +68,16 @@ export const EvalsAgeAppropriateEvalsResponseBody$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   message: z.string(),
+  request$: z.instanceof(Request),
+  response$: z.instanceof(Response),
+  body$: z.string(),
 })
   .transform((v) => {
-    return new EvalsAgeAppropriateEvalsResponseBody(v);
+    return new EvalsAgeAppropriateEvalsResponseBody(v, {
+      request: v.request$,
+      response: v.response$,
+      body: v.body$,
+    });
   });
 
 /** @internal */
@@ -104,9 +118,16 @@ export const EvalsAgeAppropriateResponseBody$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   message: z.string(),
+  request$: z.instanceof(Request),
+  response$: z.instanceof(Response),
+  body$: z.string(),
 })
   .transform((v) => {
-    return new EvalsAgeAppropriateResponseBody(v);
+    return new EvalsAgeAppropriateResponseBody(v, {
+      request: v.request$,
+      response: v.response$,
+      body: v.body$,
+    });
   });
 
 /** @internal */

package/src/models/errors/evalsbertscore.ts

@@ -3,6 +3,7 @@
  */
 
 import * as z from "zod";
+import { OrqError } from "./orqerror.js";
 
 /**
  * Internal server error
@@ -14,15 +15,18 @@ export type EvalsBertScoreEvalsResponseBodyData = {
 /**
  * Internal server error
  */
-export class EvalsBertScoreEvalsResponseBody extends Error {
+export class EvalsBertScoreEvalsResponseBody extends OrqError {
   /** The original data that was passed to this error instance. */
   data$: EvalsBertScoreEvalsResponseBodyData;
 
-  constructor(err: EvalsBertScoreEvalsResponseBodyData) {
+  constructor(
+    err: EvalsBertScoreEvalsResponseBodyData,
+    httpMeta: { response: Response; request: Request; body: string },
+  ) {
     const message = "message" in err && typeof err.message === "string"
       ? err.message
       : `API error occurred: ${JSON.stringify(err)}`;
-    super(message);
+    super(message, httpMeta);
     this.data$ = err;
 
     this.name = "EvalsBertScoreEvalsResponseBody";
@@ -39,15 +43,18 @@ export type EvalsBertScoreResponseBodyData = {
 /**
  * Evaluator not found
  */
-export class EvalsBertScoreResponseBody extends Error {
+export class EvalsBertScoreResponseBody extends OrqError {
   /** The original data that was passed to this error instance. */
   data$: EvalsBertScoreResponseBodyData;
 
-  constructor(err: EvalsBertScoreResponseBodyData) {
+  constructor(
+    err: EvalsBertScoreResponseBodyData,
+    httpMeta: { response: Response; request: Request; body: string },
+  ) {
     const message = "message" in err && typeof err.message === "string"
       ? err.message
       : `API error occurred: ${JSON.stringify(err)}`;
-    super(message);
+    super(message, httpMeta);
     this.data$ = err;
 
     this.name = "EvalsBertScoreResponseBody";
@@ -61,9 +68,16 @@ export const EvalsBertScoreEvalsResponseBody$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   message: z.string(),
+  request$: z.instanceof(Request),
+  response$: z.instanceof(Response),
+  body$: z.string(),
 })
   .transform((v) => {
-    return new EvalsBertScoreEvalsResponseBody(v);
+    return new EvalsBertScoreEvalsResponseBody(v, {
+      request: v.request$,
+      response: v.response$,
+      body: v.body$,
+    });
   });
 
 /** @internal */
@@ -102,9 +116,16 @@ export const EvalsBertScoreResponseBody$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   message: z.string(),
+  request$: z.instanceof(Request),
+  response$: z.instanceof(Response),
+  body$: z.string(),
 })
   .transform((v) => {
-    return new EvalsBertScoreResponseBody(v);
+    return new EvalsBertScoreResponseBody(v, {
+      request: v.request$,
+      response: v.response$,
+      body: v.body$,
+    });
   });
 
 /** @internal */