@aws-amplify/data-schema 1.25.1 → 1.25.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.25.1",
+  "version": "1.25.3",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/SchemaProcessor.ts

@@ -1821,13 +1821,23 @@ const schemaPreprocessor = (
       const refersToString = typeDef.data.originalName
         ? ` @refersTo(name: "${typeDef.data.originalName}")`
         : '';
-      // TODO: update @model(timestamps: null) once a longer term solution gets
-      // determined.
-      //
-      // Context: SQL schema should not be automatically inserted with timestamp fields,
-      // passing (timestamps: null) to @model to suppress this behavior as a short
-      // term solution.
-      const model = `type ${typeName} @model(timestamps: null) ${authString}${refersToString}\n{\n  ${joined}\n}`;
+
+      const disabledAttrs = modelAttributesFromDisabledOps(
+        typeDef.data.disabledOperations,
+      );
+      const modelAttrs = disabledAttrs
+        ? `timestamps: null, ${disabledAttrs}`
+        : 'timestamps: null';
+
+      /*
+       * TODO: update @model(timestamps: null) once a longer term solution gets
+       * determined.
+       *
+       * Context: SQL schema should not be automatically inserted with timestamp
+       * fields, passing (timestamps: null) to @model to suppress this behavior
+       * as a short term solution.
+       */
+      const model = `type ${typeName} @model(${modelAttrs}) ${authString}${refersToString}\n{\n  ${joined}\n}`;
       gqlModels.push(model);
     } else {
       const fields = typeDef.data.fields as Record<string, BaseModelField>;

package/src/ai/ConversationSchemaProcessor.ts

@@ -6,12 +6,14 @@ import type {
   InternalConversationType,
   DataToolDefinition,
 } from './ConversationType';
+import type { InferenceConfiguration } from './ModelType';
 
 export const createConversationField = (
   typeDef: InternalConversationType,
   typeName: string,
 ): { field: string; functionHandler: LambdaFunctionDefinition } => {
-  const { aiModel, systemPrompt, handler, tools } = typeDef;
+  const { aiModel, systemPrompt, inferenceConfiguration, handler, tools } =
+    typeDef;
   const { strategy, provider } = extractAuthorization(typeDef, typeName);
 
   const args: Record<string, string> = {
@@ -28,9 +30,21 @@ export const createConversationField = (
     systemPrompt: systemPrompt.replace(/\r?\n/g, '\\n'),
   };
 
-  const argsString = Object.entries(args)
-    .map(([key, value]) => `${key}: "${value}"`)
-    .join(', ');
+  // Add each arg with quotes (aiModel and systemPrompt)
+  const argsParts = [];
+  for (const [key, value] of Object.entries(args)) {
+    argsParts.push(`${key}: "${value}"`);
+  }
+
+  // Add inferenceConfiguration (do nothing if it doesn't exist or is empty)
+  const formattedInferenceConfig = formatInferenceConfig(
+    inferenceConfiguration,
+  );
+  if (formattedInferenceConfig) {
+    argsParts.push(`inferenceConfiguration: ${formattedInferenceConfig}`);
+  }
+
+  const argsString = argsParts.join(', ');
 
   const authString = `, auth: { strategy: ${strategy}, provider: ${provider} }`;
   const functionHandler: LambdaFunctionDefinition = {};
@@ -52,6 +66,25 @@ export const createConversationField = (
   return { field, functionHandler };
 };
 
+/**
+ * Format inferenceConfiguration as GraphQL input syntax.
+ * Returns null if config is undefined or has no valid properties.
+ */
+const formatInferenceConfig = (
+  config: InferenceConfiguration | undefined,
+): string | null => {
+  if (!config) return null;
+
+  const parts: string[] = [];
+  if (config.temperature !== undefined)
+    parts.push(`temperature: ${config.temperature}`);
+  if (config.maxTokens !== undefined)
+    parts.push(`maxTokens: ${config.maxTokens}`);
+  if (config.topP !== undefined) parts.push(`topP: ${config.topP}`);
+
+  return parts.length > 0 ? `{ ${parts.join(', ')} }` : null;
+};
+
 const isRef = (query: unknown): query is { data: InternalRef['data'] } =>
   (query as any)?.data?.type === 'ref';