@toloka-platform/sdk 0.2.1 → 0.3.1

package/src/cli/terminal-io.ts

@@ -1,8 +1,10 @@
+import select from "@inquirer/select";
 import { createInterface } from "node:readline/promises";
-import type { AuthPrompt } from "./auth";
+import type { AuthChoose, AuthPrompt } from "./auth";
 import type { CliIo } from "./context";
 import { pickPipeline } from "./runs";
 import { TolokaCliError } from "./cli-error";
+import { styleFor } from "./style";
 
 const stdinClosedError = () =>
   new TolokaCliError("Standard input closed before an API key was entered.", {
@@ -102,9 +104,14 @@ const promptFromTerminal: AuthPrompt = async (question, options = {}) => {
   }
 };
 
+const chooseFromTerminal: AuthChoose = (message, choices) => select({ message, choices });
+
 export const terminalIo = (): CliIo => ({
   stdout: (text) => console.log(text),
   stderr: (text) => console.error(text),
   readStdin: readStandardInput,
-  ...(process.stdin.isTTY ? { prompt: promptFromTerminal, select: pickPipeline } : {}),
+  style: styleFor(process.env, process.stdout.isTTY),
+  ...(process.stdin.isTTY
+    ? { prompt: promptFromTerminal, choose: chooseFromTerminal, select: pickPipeline }
+    : {}),
 });

package/src/client.ts

@@ -70,6 +70,7 @@ import type {
 } from "../openapi/gen/models";
 import { listAllPages } from "./pagination";
 import { createRequestOptions } from "./transport";
+import type { ClientCredential } from "./transport";
 import { pollUntilTerminal, type WaitForOptions } from "./wait-for";
 
 declare const __brand: unique symbol;
@@ -196,9 +197,8 @@ export type TerminalJob<T extends { status: string }> = Omit<T, "status"> & {
 
 export type ClientConfig = {
   readonly baseUrl: string;
-  readonly apiKey: string;
   readonly fetch?: typeof globalThis.fetch;
-};
+} & ClientCredential;
 
 export type DatasetUploadWaitTarget = {
   readonly type: "datasetUpload";
@@ -227,7 +227,7 @@ export type WaitForTarget =
   | PipelineRunWaitTarget;
 
 const createClientImplementation = (config: ClientConfig) => {
-  const requestOptions = createRequestOptions(config.baseUrl, config.apiKey, config.fetch);
+  const requestOptions = createRequestOptions(config.baseUrl, config, config.fetch);
 
   function waitFor(
     target: DatasetUploadWaitTarget,

package/src/pipeline-graph-v1.contract.json

@@ -614,7 +614,20 @@
                             "type": "string"
                           },
                           "input": {
-                            "type": "string"
+                            "anyOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "object",
+                                "propertyNames": {
+                                  "type": "string"
+                                },
+                                "additionalProperties": {
+                                  "type": "string"
+                                }
+                              }
+                            ]
                           }
                         },
                         "required": [
@@ -623,10 +636,7 @@
                           "input"
                         ]
                       }
-                    },
-                    "required": [
-                      "code"
-                    ]
+                    }
                   }
                 },
                 "required": [
@@ -2331,6 +2341,7 @@
                       "enum": [
                         "ui",
                         "llmqa",
+                        "annotation_qa",
                         "qc_lint",
                         "ui_types_lint",
                         "exam_dataset",
@@ -2349,7 +2360,20 @@
                             "type": "string"
                           },
                           "input": {
-                            "type": "string"
+                            "anyOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "object",
+                                "propertyNames": {
+                                  "type": "string"
+                                },
+                                "additionalProperties": {
+                                  "type": "string"
+                                }
+                              }
+                            ]
                           }
                         },
                         "required": [
@@ -2358,15 +2382,7 @@
                           "input"
                         ]
                       }
-                    },
-                    "required": [
-                      "ui",
-                      "llmqa",
-                      "qc_lint",
-                      "ui_types_lint",
-                      "exam_dataset",
-                      "synthgen"
-                    ]
+                    }
                   }
                 },
                 "required": [
@@ -4158,6 +4174,7 @@
                       "enum": [
                         "ui",
                         "llmqa",
+                        "annotation_qa",
                         "qc_lint",
                         "ui_types_lint",
                         "exam_dataset"
@@ -4175,7 +4192,20 @@
                             "type": "string"
                           },
                           "input": {
-                            "type": "string"
+                            "anyOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "object",
+                                "propertyNames": {
+                                  "type": "string"
+                                },
+                                "additionalProperties": {
+                                  "type": "string"
+                                }
+                              }
+                            ]
                           }
                         },
                         "required": [
@@ -4184,14 +4214,7 @@
                           "input"
                         ]
                       }
-                    },
-                    "required": [
-                      "ui",
-                      "llmqa",
-                      "qc_lint",
-                      "ui_types_lint",
-                      "exam_dataset"
-                    ]
+                    }
                   }
                 },
                 "required": [

package/src/transport.ts

@@ -3,26 +3,33 @@ import { PotatoApiError } from "./errors";
 
 const BASE_URL_HEADER = "x-potato-sdk-base-url";
 
+export type ClientCredential =
+  | { readonly apiKey: string; readonly accessToken?: undefined }
+  | { readonly accessToken: () => Promise<string>; readonly apiKey?: undefined };
+
 type TransportRequestInit = RequestInit & {
   readonly fetch?: typeof globalThis.fetch;
+  readonly authorization?: () => Promise<string>;
 };
 
 export const createRequestOptions = (
   baseUrl: string,
-  apiKey: string,
+  credential: ClientCredential,
   fetch?: typeof globalThis.fetch,
 ): TransportRequestInit => {
   assert(baseUrl.length > 0, "The SDK base URL cannot be empty");
-  assert(apiKey.length > 0, "The SDK API key cannot be empty");
-
-  return {
-    headers: {
-      Accept: "application/json",
-      Authorization: `ApiKey ${apiKey}`,
-      [BASE_URL_HEADER]: new URL(baseUrl).toString(),
-    },
-    fetch,
+  const headers = {
+    Accept: "application/json",
+    [BASE_URL_HEADER]: new URL(baseUrl).toString(),
   };
+
+  if (credential.accessToken !== undefined) {
+    const accessToken = credential.accessToken;
+    return { headers, fetch, authorization: async () => `Bearer ${await accessToken()}` };
+  }
+
+  assert(credential.apiKey.length > 0, "The SDK API key cannot be empty");
+  return { headers: { ...headers, Authorization: `ApiKey ${credential.apiKey}` }, fetch };
 };
 
 const prepareRequestInit = (requestOptions: RequestInit, headers: Headers): RequestInit => {
@@ -36,11 +43,12 @@ const prepareRequestInit = (requestOptions: RequestInit, headers: Headers): Requ
 
 export function potatoFetch<T>(url: string, options: TransportRequestInit): Promise<T>;
 export async function potatoFetch(url: string, options: TransportRequestInit): Promise<unknown> {
-  const { fetch: fetchImplementation = globalThis.fetch, ...requestOptions } = options;
+  const { fetch: fetchImplementation = globalThis.fetch, authorization, ...requestOptions } = options;
   const headers = new Headers(requestOptions.headers);
   const baseUrl = headers.get(BASE_URL_HEADER);
   assert(baseUrl, "The SDK base URL is missing");
   headers.delete(BASE_URL_HEADER);
+  if (authorization !== undefined) headers.set("Authorization", await authorization());
 
   const response = await fetchImplementation(
     new URL(url, baseUrl),