@vertesia/common 0.79.2 → 0.79.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertesia/common",
-  "version": "0.79.2",
+  "version": "0.79.4",
   "type": "module",
   "types": "./lib/types/index.d.ts",
   "files": [
@@ -27,7 +27,7 @@
   "dependencies": {
     "ajv": "^8.16.0",
     "json-schema": "^0.4.0",
-    "@llumiverse/common": "0.22.2"
+    "@llumiverse/common": "0.22.3"
   },
   "ts_dual_module": {
     "outDir": "lib"

package/src/interaction.ts

@@ -78,6 +78,9 @@ export interface InteractionEndpoint {
     visibility?: InteractionVisibility;
     version: number;
     tags: string[];
+    /**
+     * @deprecated This is deprecated. Use CompletionResult.type information instead.
+     */
     output_modality?: Modalities;
     result_schema?: JSONSchema;
     params_schema?: JSONSchema;
@@ -185,6 +188,10 @@ export interface Interaction {
     model: string;
     model_options?: ModelOptions;
     prompts: PromptSegmentDef[];
+
+    /**
+     * @deprecated This is deprecated. Use CompletionResult.type information instead.
+     */
     output_modality?: Modalities;
     environment: string | ExecutionEnvironmentRef;
     restriction?: RunDataStorageLevel;
@@ -248,7 +255,8 @@ export interface InteractionExecutionPayload {
      */
     data?: Record<string, any> | `memory:${string}`;
     config?: InteractionExecutionConfiguration;
-    result_schema?: JSONSchema4;
+    //Use null to explicitly state no schema, will not fallback to interaction schema
+    result_schema?: JSONSchema4 | null;
     stream?: boolean;
     do_validate?: boolean;
     tags?: string | string[]; // tags to be added to the execution run
@@ -463,7 +471,11 @@ export interface ExecutionRun<P = any> {
     config: InteractionExecutionConfiguration;
     error?: InteractionExecutionError;
     source: RunSource;
-    output_modality: Modalities;
+
+    /**
+     * @deprecated This is deprecated. Use CompletionResult.type information instead.
+     */
+    output_modality?: Modalities;
     created_by: string;
     updated_by: string;
 

package/src/utils/schemas.ts

@@ -5,6 +5,28 @@ import { InteractionRefWithSchema, PopulatedInteraction } from "../interaction.j
 import { PopulatedPromptSegmentDef, PromptSegmentDef, PromptSegmentDefType, PromptTemplateRefWithSchema } from "../prompt.js";
 
 
+// Remove custom properties from the JSON before sending further down execution pipeline
+export function removeExtraProperties<T>(schema: T): T {
+    if (!schema) return schema;
+    if (Array.isArray(schema)) {
+        for (const item of schema) {
+            removeExtraProperties(item);
+        }
+    } else if (typeof schema === 'object') {
+        const obj = schema as Record<string, any>;
+        for (const [key, value] of Object.entries(obj)) {
+            if (key === 'editor' && (value === 'textarea' || value === 'document' || value === 'media')) {
+                delete obj[key];
+            } else if (key === 'format' && (value === 'textarea' || value === 'document' || value === 'media')) {
+                delete obj[key];
+            } else if (typeof value === 'object') {
+                removeExtraProperties(value)
+            }
+        }
+    }
+    return schema;
+}
+
 export function mergeJSONSchemas(schemas: JSONSchema[]) {
     const props: Record<string, JSONSchema4> = {};
     let required: string[] = [];

package/lib/cjs/sts-token-types.js

@@ -1,32 +0,0 @@
-"use strict";
-/**
- * STS Token Request Types
- * These types define the structure for token requests to the Security Token Service
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isApiKeyRequest = isApiKeyRequest;
-exports.isUserRequest = isUserRequest;
-exports.isProjectRequest = isProjectRequest;
-exports.isEnvironmentRequest = isEnvironmentRequest;
-exports.isAgentRequest = isAgentRequest;
-exports.isServiceAccountRequest = isServiceAccountRequest;
-// Helper type guards for type narrowing
-function isApiKeyRequest(req) {
-    return req.type === 'apikey';
-}
-function isUserRequest(req) {
-    return req.type === 'user';
-}
-function isProjectRequest(req) {
-    return req.type === 'project';
-}
-function isEnvironmentRequest(req) {
-    return req.type === 'environment';
-}
-function isAgentRequest(req) {
-    return req.type === 'agent';
-}
-function isServiceAccountRequest(req) {
-    return req.type === 'service_account';
-}
-//# sourceMappingURL=sts-token-types.js.map

package/lib/cjs/sts-token-types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sts-token-types.js","sourceRoot":"","sources":["../../src/sts-token-types.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAgFH,0CAEC;AAED,sCAEC;AAED,4CAEC;AAED,oDAEC;AAED,wCAEC;AAED,0DAEC;AAvBD,wCAAwC;AACxC,SAAgB,eAAe,CAAC,GAAsB;IAClD,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC;AACjC,CAAC;AAED,SAAgB,aAAa,CAAC,GAAsB;IAChD,OAAO,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC;AAC/B,CAAC;AAED,SAAgB,gBAAgB,CAAC,GAAsB;IACnD,OAAO,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC;AAClC,CAAC;AAED,SAAgB,oBAAoB,CAAC,GAAsB;IACvD,OAAO,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC;AACtC,CAAC;AAED,SAAgB,cAAc,CAAC,GAAsB;IACjD,OAAO,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC;AAChC,CAAC;AAED,SAAgB,uBAAuB,CAAC,GAAsB;IAC1D,OAAO,GAAG,CAAC,IAAI,KAAK,iBAAiB,CAAC;AAC1C,CAAC"}

package/lib/esm/sts-token-types.js

@@ -1,24 +0,0 @@
-/**
- * STS Token Request Types
- * These types define the structure for token requests to the Security Token Service
- */
-// Helper type guards for type narrowing
-export function isApiKeyRequest(req) {
-    return req.type === 'apikey';
-}
-export function isUserRequest(req) {
-    return req.type === 'user';
-}
-export function isProjectRequest(req) {
-    return req.type === 'project';
-}
-export function isEnvironmentRequest(req) {
-    return req.type === 'environment';
-}
-export function isAgentRequest(req) {
-    return req.type === 'agent';
-}
-export function isServiceAccountRequest(req) {
-    return req.type === 'service_account';
-}
-//# sourceMappingURL=sts-token-types.js.map

package/lib/esm/sts-token-types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sts-token-types.js","sourceRoot":"","sources":["../../src/sts-token-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA+EH,wCAAwC;AACxC,MAAM,UAAU,eAAe,CAAC,GAAsB;IAClD,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAsB;IAChD,OAAO,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAsB;IACnD,OAAO,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAsB;IACvD,OAAO,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAsB;IACjD,OAAO,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAsB;IAC1D,OAAO,GAAG,CAAC,IAAI,KAAK,iBAAiB,CAAC;AAC1C,CAAC"}

package/lib/types/sts-token-types.d.ts

@@ -1,72 +0,0 @@
-/**
- * STS Token Request Types
- * These types define the structure for token requests to the Security Token Service
- */
-export type TokenType = 'apikey' | 'user' | 'project' | 'environment' | 'agent' | 'service_account';
-export type SigningAlgorithm = 'ES256' | 'RS256';
-interface BaseTokenRequest {
-    type: TokenType;
-    audience?: string;
-    /** Signing algorithm - defaults to ES256. Use RS256 for Azure AD compatibility. */
-    algorithm?: SigningAlgorithm;
-}
-export interface ApiKeyTokenRequest extends BaseTokenRequest {
-    type: 'apikey';
-    key: string;
-}
-export interface UserTokenRequest extends BaseTokenRequest {
-    type: 'user';
-    user_id?: string;
-    account_id?: string;
-    project_id?: string;
-    expires_at?: number;
-    on_behalf_of?: string;
-}
-export interface ProjectTokenRequest extends BaseTokenRequest {
-    type: 'project';
-    project_id: string;
-    account_id: string;
-}
-export interface EnvironmentTokenRequest extends BaseTokenRequest {
-    type: 'environment';
-    environment_id: string;
-    environment_name: string;
-    project_id: string;
-    account_id: string;
-}
-export interface AgentTokenRequest extends BaseTokenRequest {
-    type: 'agent';
-    account_id: string;
-    project_id: string;
-    name?: string;
-    on_behalf_of: string;
-}
-export interface ServiceAccountTokenRequest extends BaseTokenRequest {
-    type: 'service_account';
-    account_id: string;
-    project_id: string;
-    roles?: string[];
-    name?: string;
-}
-export type IssueTokenRequest = ApiKeyTokenRequest | UserTokenRequest | ProjectTokenRequest | EnvironmentTokenRequest | AgentTokenRequest | ServiceAccountTokenRequest;
-export interface RefreshTokenRequest {
-    token: string;
-}
-export interface RevokeTokenRequest {
-    token: string;
-}
-export declare function isApiKeyRequest(req: IssueTokenRequest): req is ApiKeyTokenRequest;
-export declare function isUserRequest(req: IssueTokenRequest): req is UserTokenRequest;
-export declare function isProjectRequest(req: IssueTokenRequest): req is ProjectTokenRequest;
-export declare function isEnvironmentRequest(req: IssueTokenRequest): req is EnvironmentTokenRequest;
-export declare function isAgentRequest(req: IssueTokenRequest): req is AgentTokenRequest;
-export declare function isServiceAccountRequest(req: IssueTokenRequest): req is ServiceAccountTokenRequest;
-export interface TokenResponse {
-    token: string;
-}
-export interface ValidateTokenResponse {
-    valid: boolean;
-    payload?: any;
-    error?: string;
-}
-export {};

package/lib/types/sts-token-types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sts-token-types.d.ts","sourceRoot":"","sources":["../../src/sts-token-types.ts"],"names":[],"mappings":"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"}