@aws-amplify/data-schema 1.4.0 → 1.5.0

package/dist/esm/CustomOperation.mjs

@@ -4,15 +4,17 @@ import { allowForCustomOperations } from './Authorization.mjs';
 const queryBrand = 'queryCustomOperation';
 const mutationBrand = 'mutationCustomOperation';
 const subscriptionBrand = 'subscriptionCustomOperation';
+const generationBrand = 'generationCustomOperation';
 const CustomOperationNames = [
     'Query',
     'Mutation',
     'Subscription',
+    'Generation',
 ];
 function brandedBuilder(builder, brandValue) {
     return { ...builder, ...brand(brandValue) };
 }
-function _custom(typeName, brand) {
+function _custom(typeName, brand, input) {
     const data = {
         arguments: {},
         returnType: null,
@@ -20,6 +22,7 @@ function _custom(typeName, brand) {
         typeName: typeName,
         handlers: null,
         subscriptionSource: [],
+        input,
     };
     const builder = brandedBuilder({
         arguments(args) {
@@ -103,6 +106,22 @@ function mutation() {
 function subscription() {
     return _custom('Subscription', subscriptionBrand);
 }
+/**
+ * @experimental
+ *
+ * Define an AI generation route for single request-response interaction with specified AI model.
+ * @example
+ * makeRecipe: a.generation({
+ *   aiModel: { resourcePath },
+ *   systemPrompt: 'Please make a recipe from the provided ingredients',
+ * })
+ *   .arguments({ ingredients: a.string().array() })
+ *   .returns(a.ref("Recipe"))
+ * @returns a generation route definition
+ */
+function generation(input) {
+    return _custom('Generation', generationBrand, input);
+}
 
-export { CustomOperationNames, mutation, query, subscription };
+export { CustomOperationNames, generation, mutation, query, subscription };
 //# sourceMappingURL=CustomOperation.mjs.map

package/dist/esm/CustomOperation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"CustomOperation.mjs","sources":["../../src/CustomOperation.ts"],"sourcesContent":["import { brand } from './util';\nimport { allowForCustomOperations, } from './Authorization';\nconst queryBrand = 'queryCustomOperation';\nconst mutationBrand = 'mutationCustomOperation';\nconst subscriptionBrand = 'subscriptionCustomOperation';\nexport const CustomOperationNames = [\n    'Query',\n    'Mutation',\n    'Subscription',\n];\nfunction brandedBuilder(builder, brandValue) {\n    return { ...builder, ...brand(brandValue) };\n}\nfunction _custom(typeName, brand) {\n    const data = {\n        arguments: {},\n        returnType: null,\n        authorization: [],\n        typeName: typeName,\n        handlers: null,\n        subscriptionSource: [],\n    };\n    const builder = brandedBuilder({\n        arguments(args) {\n            data.arguments = args;\n            return this;\n        },\n        returns(returnType) {\n            data.returnType = returnType;\n            return this;\n        },\n        authorization(callback) {\n            const rules = callback(allowForCustomOperations);\n            data.authorization = Array.isArray(rules) ? rules : [rules];\n            return this;\n        },\n        handler(handlers) {\n            data.handlers = Array.isArray(handlers)\n                ? handlers\n                : [handlers];\n            return this;\n        },\n        for(source) {\n            data.subscriptionSource = Array.isArray(source) ? source : [source];\n            return this;\n        },\n    }, brand);\n    return { ...builder, data };\n}\n/**\n * Use a custom query to define an API request that will retrieve backend data.\n * @see {@link https://docs.amplify.aws/react/build-a-backend/data/custom-business-logic/}\n * @example\n * const schema = a.schema({\n *   echo: a\n *     .query()\n *     .arguments({ content: a.string() })\n *     .returns(a.ref('EchoResponse'))\n *     .authorization(allow => [allow.publicApiKey()])\n *     // 3. set the function has the handler\n *     .handler(a.handler.function(echoHandler)),\n *\n *   EchoResponse: a.customType({\n *     content: a.string(),\n *     executionDuration: a.float()\n *   }),\n * });\n * @returns a custom query\n */\nexport function query() {\n    return _custom('Query', queryBrand);\n}\n/**\n * Use a custom mutation to define an API request that will modify backend data or trigger a subscription event.\n * @see {@link https://docs.amplify.aws/react/build-a-backend/data/custom-business-logic/}\n * @example\n * likePost: a\n *   .mutation()\n *   .arguments({ postId: a.string() })\n *   .returns(a.ref('Post'))\n *   .authorization(allow => [allow.publicApiKey()])\n *   .handler(a.handler.function(echoHandler))\n * @returns a custom mutation\n */\nexport function mutation() {\n    return _custom('Mutation', mutationBrand);\n}\n/**\n * Define a custom subscription to receive an event when a mutation is triggered\n * @see {@link https://docs.amplify.aws/react/build-a-backend/data/custom-subscription/}\n * @example\n * // Subscribe to incoming messages\n * receive: a.subscription()\n *   // subscribes to the 'publish' mutation\n *   .for(a.ref('publish'))\n *   // subscription handler to set custom filters\n *   .handler(a.handler.custom({entry: './receive.js'}))\n *   // authorization rules as to who can subscribe to the data\n *   .authorization(allow => [allow.publicApiKey()]),\n * @returns a custom subscription\n */\nexport function subscription() {\n    return _custom('Subscription', subscriptionBrand);\n}\n"],"names":[],"mappings":";;;AAEA,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAC1C,MAAM,aAAa,GAAG,yBAAyB,CAAC;AAChD,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;AAC5C,MAAC,oBAAoB,GAAG;AACpC,IAAI,OAAO;AACX,IAAI,UAAU;AACd,IAAI,cAAc;AAClB,EAAE;AACF,SAAS,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE;AAC7C,IAAI,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;AAChD,CAAC;AACD,SAAS,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE;AAClC,IAAI,MAAM,IAAI,GAAG;AACjB,QAAQ,SAAS,EAAE,EAAE;AACrB,QAAQ,UAAU,EAAE,IAAI;AACxB,QAAQ,aAAa,EAAE,EAAE;AACzB,QAAQ,QAAQ,EAAE,QAAQ;AAC1B,QAAQ,QAAQ,EAAE,IAAI;AACtB,QAAQ,kBAAkB,EAAE,EAAE;AAC9B,KAAK,CAAC;AACN,IAAI,MAAM,OAAO,GAAG,cAAc,CAAC;AACnC,QAAQ,SAAS,CAAC,IAAI,EAAE;AACxB,YAAY,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;AAClC,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT,QAAQ,OAAO,CAAC,UAAU,EAAE;AAC5B,YAAY,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;AACzC,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT,QAAQ,aAAa,CAAC,QAAQ,EAAE;AAChC,YAAY,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAC7D,YAAY,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;AACxE,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT,QAAQ,OAAO,CAAC,QAAQ,EAAE;AAC1B,YAAY,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;AACnD,kBAAkB,QAAQ;AAC1B,kBAAkB,CAAC,QAAQ,CAAC,CAAC;AAC7B,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT,QAAQ,GAAG,CAAC,MAAM,EAAE;AACpB,YAAY,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;AAChF,YAAY,OAAO,IAAI,CAAC;AACxB,SAAS;AACT,KAAK,EAAE,KAAK,CAAC,CAAC;AACd,IAAI,OAAO,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC;AAChC,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,KAAK,GAAG;AACxB,IAAI,OAAO,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AACxC,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,QAAQ,GAAG;AAC3B,IAAI,OAAO,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAC9C,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,YAAY,GAAG;AAC/B,IAAI,OAAO,OAAO,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;AACtD;;;;"}
+{"version":3,"file":"CustomOperation.mjs","sources":["../../src/CustomOperation.ts"],"sourcesContent":["import { brand } from './util';\nimport { allowForCustomOperations, } from './Authorization';\nconst queryBrand = 'queryCustomOperation';\nconst mutationBrand = 'mutationCustomOperation';\nconst subscriptionBrand = 'subscriptionCustomOperation';\nconst generationBrand = 'generationCustomOperation';\nexport const CustomOperationNames = [\n    'Query',\n    'Mutation',\n    'Subscription',\n    'Generation',\n];\nfunction brandedBuilder(builder, brandValue) {\n    return { ...builder, ...brand(brandValue) };\n}\nfunction _custom(typeName, brand, input) {\n    const data = {\n        arguments: {},\n        returnType: null,\n        authorization: [],\n        typeName: typeName,\n        handlers: null,\n        subscriptionSource: [],\n        input,\n    };\n    const builder = brandedBuilder({\n        arguments(args) {\n            data.arguments = args;\n            return this;\n        },\n        returns(returnType) {\n            data.returnType = returnType;\n            return this;\n        },\n        authorization(callback) {\n            const rules = callback(allowForCustomOperations);\n            data.authorization = Array.isArray(rules) ? rules : [rules];\n            return this;\n        },\n        handler(handlers) {\n            data.handlers = Array.isArray(handlers)\n                ? handlers\n                : [handlers];\n            return this;\n        },\n        for(source) {\n            data.subscriptionSource = Array.isArray(source) ? source : [source];\n            return this;\n        },\n    }, brand);\n    return { ...builder, data };\n}\n/**\n * Use a custom query to define an API request that will retrieve backend data.\n * @see {@link https://docs.amplify.aws/react/build-a-backend/data/custom-business-logic/}\n * @example\n * const schema = a.schema({\n *   echo: a\n *     .query()\n *     .arguments({ content: a.string() })\n *     .returns(a.ref('EchoResponse'))\n *     .authorization(allow => [allow.publicApiKey()])\n *     // 3. set the function has the handler\n *     .handler(a.handler.function(echoHandler)),\n *\n *   EchoResponse: a.customType({\n *     content: a.string(),\n *     executionDuration: a.float()\n *   }),\n * });\n * @returns a custom query\n */\nexport function query() {\n    return _custom('Query', queryBrand);\n}\n/**\n * Use a custom mutation to define an API request that will modify backend data or trigger a subscription event.\n * @see {@link https://docs.amplify.aws/react/build-a-backend/data/custom-business-logic/}\n * @example\n * likePost: a\n *   .mutation()\n *   .arguments({ postId: a.string() })\n *   .returns(a.ref('Post'))\n *   .authorization(allow => [allow.publicApiKey()])\n *   .handler(a.handler.function(echoHandler))\n * @returns a custom mutation\n */\nexport function mutation() {\n    return _custom('Mutation', mutationBrand);\n}\n/**\n * Define a custom subscription to receive an event when a mutation is triggered\n * @see {@link https://docs.amplify.aws/react/build-a-backend/data/custom-subscription/}\n * @example\n * // Subscribe to incoming messages\n * receive: a.subscription()\n *   // subscribes to the 'publish' mutation\n *   .for(a.ref('publish'))\n *   // subscription handler to set custom filters\n *   .handler(a.handler.custom({entry: './receive.js'}))\n *   // authorization rules as to who can subscribe to the data\n *   .authorization(allow => [allow.publicApiKey()]),\n * @returns a custom subscription\n */\nexport function subscription() {\n    return _custom('Subscription', subscriptionBrand);\n}\n/**\n * @experimental\n *\n * Define an AI generation route for single request-response interaction with specified AI model.\n * @example\n * makeRecipe: a.generation({\n *   aiModel: { resourcePath },\n *   systemPrompt: 'Please make a recipe from the provided ingredients',\n * })\n *   .arguments({ ingredients: a.string().array() })\n *   .returns(a.ref(\"Recipe\"))\n * @returns a generation route definition\n */\nexport function generation(input) {\n    return _custom('Generation', generationBrand, input);\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/ModelSchema.d.ts

@@ -6,16 +6,18 @@ import type { CustomOperation, CustomOperationParamShape, InternalCustom, Mutati
 import { AllowModifier, SchemaAuthorization } from './Authorization';
 import { Brand, RenameUsingTuples } from './util';
 import { ModelRelationalField, ModelRelationalFieldParamShape } from './ModelRelationalField';
+import { ConversationType } from './ai/ConversationType';
 export { ModelType } from './ModelType';
 export { EnumType } from './EnumType';
 export { CustomType } from './CustomType';
 export { CustomOperation } from './CustomOperation';
+export { ConversationType } from './ai/ConversationType';
 export declare const rdsSchemaBrandName = "RDSSchema";
 export declare const rdsSchemaBrand: Brand<"RDSSchema">;
 export type RDSSchemaBrand = Brand<typeof rdsSchemaBrandName>;
 export declare const ddbSchemaBrandName = "DDBSchema";
 export type DDBSchemaBrand = Brand<typeof ddbSchemaBrandName>;
-type SchemaContent = BaseModelType | CustomType<CustomTypeParamShape> | EnumType | CustomOperation<CustomOperationParamShape, any>;
+type SchemaContent = BaseModelType | CustomType<CustomTypeParamShape> | EnumType | CustomOperation<CustomOperationParamShape, any> | ConversationType;
 type AddToSchemaContent = Exclude<SchemaContent, BaseModelType>;
 type AddToSchemaContents = Record<string, AddToSchemaContent>;
 type NonEmpty<T> = keyof T extends never ? never : T;

package/dist/esm/SchemaProcessor.d.ts

@@ -1,4 +1,4 @@
-import { type InternalSchema } from './ModelSchema';
+import type { InternalSchema } from './ModelSchema';
 import { DerivedApiDefinition } from '@aws-amplify/data-schema-types';
 /**
  * Returns API definition from ModelSchema or string schema

package/dist/esm/SchemaProcessor.mjs

@@ -6,6 +6,8 @@ import { getBrand } from './util/Brand.mjs';
 import { getHandlerData } from './Handler.mjs';
 import * as os from 'os';
 import * as path from 'path';
+import { brandName } from './ai/ConversationType.mjs';
+import { createConversationField, conversationTypes } from './ai/ConversationSchemaTypes.mjs';
 
 function isInternalModel(model) {
     if (model.data &&
@@ -27,6 +29,12 @@ function isCustomType(data) {
     }
     return false;
 }
+function isConversationRoute(type) {
+    return getBrand(type) === brandName;
+}
+function isGenerationInput(input) {
+    return Boolean(input?.aiModel && input?.systemPrompt);
+}
 function isCustomOperation(type) {
     if (CustomOperationNames.includes(type?.data?.typeName)) {
         return true;
@@ -275,6 +283,19 @@ function customOperationToGql(typeName, typeDef, authorization, isCustom = false
             .join('", "');
         gqlHandlerContent += `@aws_subscribe(mutations: ["${subscriptionSources}"]) `;
     }
+    if (opType === 'Generation') {
+        if (!isGenerationInput(typeDef.data.input)) {
+            throw new Error(`Invalid Generation Route definition. A Generation Route must include a valid input. ${typeName} has an invalid or no input defined.`);
+        }
+        const { aiModel, systemPrompt, inferenceConfiguration } = typeDef.data.input;
+        const inferenceConfigurationEntries = Object.entries(inferenceConfiguration ?? {});
+        const inferenceConfigurationGql = inferenceConfigurationEntries.length > 0
+            ? `, inferenceConfiguration: { ${inferenceConfigurationEntries
+                .map(([key, value]) => `${key}: ${value}`)
+                .join(', ')} }`
+            : '';
+        gqlHandlerContent += `@generation(aiModel: "${aiModel.resourcePath}", systemPrompt: "${systemPrompt}"${inferenceConfigurationGql}) `;
+    }
     const gqlField = `${callSignature}: ${returnTypeName} ${gqlHandlerContent}${authString}`;
     return {
         gqlField,
@@ -782,6 +803,7 @@ const schemaPreprocessor = (schema) => {
     const customQueries = [];
     const customMutations = [];
     const customSubscriptions = [];
+    let shouldAddConversationTypes = false;
     // Dict of auth rules to be applied to custom types
     // Inherited from the auth configured on the custom operations that return these custom types
     const customTypeInheritedAuthRules = {};
@@ -825,6 +847,7 @@ const schemaPreprocessor = (schema) => {
                 gqlModels.push(model);
             }
             else if (isCustomOperation(typeDef)) {
+                // TODO: add generation route logic.
                 const { typeName: opType } = typeDef.data;
                 const { gqlField, implicitTypes, customTypeAuthRules, jsFunctionForField, lambdaFunctionDefinition, customSqlDataSourceStrategy, } = transformCustomOperations(typeDef, typeName, mostRelevantAuthRules, databaseType, getRefType);
                 topLevelTypes.push(...implicitTypes);
@@ -847,6 +870,7 @@ const schemaPreprocessor = (schema) => {
                 }
                 switch (opType) {
                     case 'Query':
+                    case 'Generation':
                         customQueries.push(gqlField);
                         break;
                     case 'Mutation':
@@ -857,6 +881,11 @@ const schemaPreprocessor = (schema) => {
                         break;
                 }
             }
+            else if (isConversationRoute(typeDef)) {
+                // TODO: add inferenceConfiguration values to directive.
+                customMutations.push(createConversationField(typeDef, typeName));
+                shouldAddConversationTypes = true;
+            }
         }
         else if (staticSchema) {
             const fields = { ...typeDef.data.fields };
@@ -915,6 +944,9 @@ const schemaPreprocessor = (schema) => {
         subscriptions: customSubscriptions,
     };
     gqlModels.push(...generateCustomOperationTypes(customOperations));
+    if (shouldAddConversationTypes) {
+        gqlModels.push(...conversationTypes);
+    }
     const processedSchema = gqlModels.join('\n\n');
     return {
         schema: processedSchema,
@@ -928,8 +960,9 @@ function validateCustomOperations(typeDef, typeName, authRules, getRefType) {
     const { handlers, typeName: opType, subscriptionSource } = typeDef.data;
     const handlerConfigured = handlers?.length;
     const authConfigured = authRules.length > 0;
-    if ((authConfigured && !handlerConfigured) ||
-        (handlerConfigured && !authConfigured)) {
+    if (opType !== 'Generation' &&
+        ((authConfigured && !handlerConfigured) ||
+            (handlerConfigured && !authConfigured))) {
         // Deploying a custom operation with auth and no handler reference OR
         // with a handler reference but no auth
         // causes the CFN stack to reach an unrecoverable state. Ideally, this should be fixed
@@ -948,8 +981,9 @@ function validateCustomOperations(typeDef, typeName, authRules, getRefType) {
         }
     }
     if (typeDef.data.returnType === null &&
-        (opType === 'Query' || opType === 'Mutation')) {
-        throw new Error(`Invalid Custom ${opType} definition. A Custom ${opType} must include a return type. ${typeName} has no return type specified.`);
+        (opType === 'Query' || opType === 'Mutation' || opType === 'Generation')) {
+        const typeDescription = opType === 'Generation' ? 'Generation Route' : `Custom ${opType}`;
+        throw new Error(`Invalid ${typeDescription} definition. A ${typeDescription} must include a return type. ${typeName} has no return type specified.`);
     }
     if (opType !== 'Subscription' && subscriptionSource.length > 0) {
         throw new Error(`The .for() modifier function can only be used with a custom subscription. ${typeName} is not a custom subscription.`);
@@ -1063,7 +1097,9 @@ function transformCustomOperations(typeDef, typeName, authRules, databaseType, g
     let jsFunctionForField = undefined;
     validateCustomOperations(typeDef, typeName, authRules, getRefType);
     if (isCustomHandler(handlers)) {
-        jsFunctionForField = handleCustom(handlers, opType, typeName);
+        jsFunctionForField = handleCustom(handlers, 
+        // Generation routes should not have handlers
+        opType, typeName);
     }
     const isCustom = Boolean(jsFunctionForField);
     const { gqlField, implicitTypes, customTypeAuthRules, lambdaFunctionDefinition, customSqlDataSourceStrategy, } = customOperationToGql(typeName, typeDef, authRules, isCustom, databaseType, getRefType);