revert(stepfunctions-tasks): "feat(stepfunctions-tasks): allow Bedroc…

…kInvokeModel to use JsonPath" (aws#31308)

Reverts aws#30298 to resolve aws#31302

BREAKING CHANGE: Reverting the original PR will come with the following breaking changes
* **stepfunctions-tasks:** The `BedrockInvokeModel.outputPath` parameter will no longer be an S3Uri

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/bedrock/integ.invoke-model.js.snapshot/aws-stepfunctions-tasks-bedrock-invoke-model-integ.template.json

@@ -41,25 +41,6 @@
  ]
  ]
  }
- },
- {
- "Action": [
- "s3:GetObject",
- "s3:PutObject"
- ],
- "Effect": "Allow",
- "Resource": {
- "Fn::Join": [
- "",
- [
- "arn:",
- {
- "Ref": "AWS::Partition"
- },
- ":s3:::*"
- ]
- ]
- }
  }
  ],
  "Version": "2012-10-17"
@@ -91,19 +72,7 @@
  {
  "Ref": "AWS::Region"
  },
- "::foundation-model/amazon.titan-text-express-v1\",\"Body\":{\"inputText\":\"Generate a list of five first names.\",\"textGenerationConfig\":{\"maxTokenCount\":100,\"temperature\":1}}}},\"Prompt2\":{\"Next\":\"Prompt3\",\"Type\":\"Task\",\"ResultPath\":\"$\",\"ResultSelector\":{\"names.$\":\"$.Body.results[0].outputText\"},\"Resource\":\"arn:",
- {
- "Ref": "AWS::Partition"
- },
- ":states:::bedrock:invokeModel\",\"Parameters\":{\"ModelId\":\"arn:",
- {
- "Ref": "AWS::Partition"
- },
- ":bedrock:",
- {
- "Ref": "AWS::Region"
- },
- "::foundation-model/amazon.titan-text-express-v1\",\"Body\":{\"inputText.$\":\"States.Format('Alphabetize this list of first names:\\n{}', $.names)\",\"textGenerationConfig\":{\"maxTokenCount\":100,\"temperature\":1}}}},\"Prompt3\":{\"End\":true,\"Type\":\"Task\",\"InputPath\":\"$.names\",\"OutputPath\":\"$.names\",\"Resource\":\"arn:",
+ "::foundation-model/amazon.titan-text-express-v1\",\"Body\":{\"inputText\":\"Generate a list of five first names.\",\"textGenerationConfig\":{\"maxTokenCount\":100,\"temperature\":1}}}},\"Prompt2\":{\"End\":true,\"Type\":\"Task\",\"ResultPath\":\"$\",\"ResultSelector\":{\"names.$\":\"$.Body.results[0].outputText\"},\"Resource\":\"arn:",
  {
  "Ref": "AWS::Partition"
  },
@@ -115,7 +84,7 @@
  {
  "Ref": "AWS::Region"
  },
- "::foundation-model/amazon.titan-text-express-v1\",\"Input\":{\"S3Uri.$\":\"$.names\"},\"Output\":{\"S3Uri.$\":\"$.names\"}}}},\"TimeoutSeconds\":30}"
+ "::foundation-model/amazon.titan-text-express-v1\",\"Body\":{\"inputText.$\":\"States.Format('Alphabetize this list of first names:\\n{}', $.names)\",\"textGenerationConfig\":{\"maxTokenCount\":100,\"temperature\":1}}}}},\"TimeoutSeconds\":30}"
  ]
  ]
  },

packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/bedrock/integ.invoke-model.ts

@@ -52,13 +52,7 @@ const prompt2 = new BedrockInvokeModel(stack, 'Prompt2', {
  resultPath: '$',
 });
 
-const prompt3 = new BedrockInvokeModel(stack, 'Prompt3', {
- model,
- inputPath: sfn.JsonPath.stringAt('$.names'),
- outputPath: sfn.JsonPath.stringAt('$.names'),
-});
-
-const chain = sfn.Chain.start(prompt1).next(prompt2).next(prompt3);
+const chain = sfn.Chain.start(prompt1).next(prompt2);
 
 new sfn.StateMachine(stack, 'StateMachine', {
  definitionBody: sfn.DefinitionBody.fromChainable(chain),

packages/aws-cdk-lib/aws-stepfunctions-tasks/README.md

@@ -398,27 +398,6 @@ const task = new tasks.BedrockInvokeModel(this, 'Prompt Model', {
  names: sfn.JsonPath.stringAt('$.Body.results[0].outputText'),
  },
 });
-```
-### Using Input Path
-
-Provide S3 URI as an input or output path to invoke a model
-
-```ts
-
-import * as bedrock from 'aws-cdk-lib/aws-bedrock';
-
-const model = bedrock.FoundationModel.fromFoundationModelId(
- this,
- 'Model',
- bedrock.FoundationModelIdentifier.AMAZON_TITAN_TEXT_G1_EXPRESS_V1,
-);
-
-const task = new tasks.BedrockInvokeModel(this, 'Prompt Model', {
- model,
- inputPath: sfn.JsonPath.stringAt('$.prompt'),
- outputPath: sfn.JsonPath.stringAt('$.prompt'),
-});
-
 ```
 
 You can apply a guardrail to the invocation by setting `guardrail`.

packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/bedrock/invoke-model.ts

@@ -140,14 +140,12 @@ export class BedrockInvokeModel extends sfn.TaskStateBase {
 
  constructor(scope: Construct, id: string, private readonly props: BedrockInvokeModelProps) {
  super(scope, id, props);
-
  this.integrationPattern = props.integrationPattern ?? sfn.IntegrationPattern.REQUEST_RESPONSE;
 
  validatePatternSupported(this.integrationPattern, BedrockInvokeModel.SUPPORTED_INTEGRATION_PATTERNS);
 
  const isBodySpecified = props.body !== undefined;
- //Either specific props.input with bucket name and object key or input s3 path
- const isInputSpecified = (props.input !== undefined && props.input.s3Location !== undefined) || (props.inputPath !== undefined);
+ const isInputSpecified = props.input !== undefined && props.input.s3Location !== undefined;
 
  if (isBodySpecified && isInputSpecified) {
  throw new Error('Either `body` or `input` must be specified, but not both.');
@@ -173,21 +171,7 @@ export class BedrockInvokeModel extends sfn.TaskStateBase {
  }),
  ];
 
- if (this.props.inputPath !== undefined) {
- policyStatements.push(
- new iam.PolicyStatement({
- actions: ['s3:GetObject'],
- resources: [
- Stack.of(this).formatArn({
- region: '',
- account: '',
- service: 's3',
- resource: '*',
- }),
- ],
- }),
- );
- } else if (this.props.input !== undefined && this.props.input.s3Location !== undefined) {
+ if (this.props.input !== undefined && this.props.input.s3Location !== undefined) {
  policyStatements.push(
  new iam.PolicyStatement({
  actions: ['s3:GetObject'],
@@ -204,21 +188,7 @@ export class BedrockInvokeModel extends sfn.TaskStateBase {
  );
  }
 
- if (this.props.outputPath !== undefined) {
- policyStatements.push(
- new iam.PolicyStatement({
- actions: ['s3:PutObject'],
- resources: [
- Stack.of(this).formatArn({
- region: '',
- account: '',
- service: 's3',
- resource: '*',
- }),
- ],
- }),
- );
- } else if (this.props.output !== undefined && this.props.output.s3Location !== undefined) {
+ if (this.props.output !== undefined && this.props.output.s3Location !== undefined) {
  policyStatements.push(
  new iam.PolicyStatement({
  actions: ['s3:PutObject'],
@@ -271,10 +241,10 @@ export class BedrockInvokeModel extends sfn.TaskStateBase {
  Body: this.props.body?.value,
  Input: this.props.input?.s3Location ? {
  S3Uri: `s3://${this.props.input.s3Location.bucketName}/${this.props.input.s3Location.objectKey}`,
- } : this.props.inputPath ? { S3Uri: this.props.inputPath } : undefined,
+ } : undefined,
  Output: this.props.output?.s3Location ? {
  S3Uri: `s3://${this.props.output.s3Location.bucketName}/${this.props.output.s3Location.objectKey}`,
- } : this.props.outputPath ? { S3Uri: this.props.outputPath }: undefined,
+ } : undefined,
  GuardrailIdentifier: this.props.guardrail?.guardrailIdentifier,
  GuardrailVersion: this.props.guardrail?.guardrailVersion,
  Trace: this.props.traceEnabled === undefined
@@ -284,6 +254,5 @@ export class BedrockInvokeModel extends sfn.TaskStateBase {
  : 'DISABLED',
  }),
  };
- };
+ }
 }
-