Merge pull request #156 from aws-samples/add_sample_tags

feat(samples): Added SAES metric dashboard tag to samples

Author: dineshSajwan

samples/content-generation/bin/content-generation.ts

@@ -18,7 +18,7 @@ const app = new cdk.App();
 new GenerateContentStack(app, 'GenerateContentStack', {
   natGateways: 1,
   clientUrl:env.clientUrl,
-  description: '(uksb-1tupboc43) Image generation stack',
+  //description: '(uksb-1tupboc43) (tag: Image generation stack)',
 env: { account: process.env.CDK_DEFAULT_ACCOUNT,
     region: process.env.CDK_DEFAULT_REGION },
   /* If you don't specify 'env', this stack will be environment-agnostic.
@@ -34,4 +34,4 @@ env: { account: process.env.CDK_DEFAULT_ACCOUNT,
   // env: { account: '123456789012', region: 'us-east-1' },
 
   /* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */
-});
+});

samples/content-generation/lib/content-generation-stack.ts

@@ -30,6 +30,10 @@ export class GenerateContentStack extends cdk.Stack {
   constructor(scope: Construct, id: string, props: GenerateContentStackProps) {
     super(scope, id, props);
 
+    const key=  '(uksb-1tupboc43)'
+    const tag = ' Image generation stack'
+
+
     console.log(`Deploying to account ${this.account} in region ${this.region}`);
 
   //---------------------------------------------------------------------
@@ -246,6 +250,9 @@ export class GenerateContentStack extends cdk.Stack {
       existingGeneratedAssetsBucketObj: this.generatedAssetsBucket,
       observability: true,
     });
+
+    this.templateOptions.description = `Description: ${key}  (tag:${ tag}) `
+  
 
     NagSuppressions.addResourceSuppressions(grapdhQLApiRole, [{id: 'AwsSolutions-IAM5', reason: '* used after ARN prefix'}], true)
 

samples/contract-compliance-analysis/back-end/app.py

@@ -25,7 +25,7 @@
 stack_name = os.environ.get('STACK_NAME', "MainBackendStack")
 
 main_backend_stack = BackendStack(
-    app, stack_name, description=f'{(USAGE_METRIC)} (version:{VERSION}) (tag:{SOLUTION_NAME})'
+    app, stack_name, description=f'({USAGE_METRIC})(tag: {SOLUTION_NAME})'
 )
 
 cdk.Aspects.of(app).add(AwsSolutionsChecks())

samples/document_explorer/bin/document_explorer.ts

@@ -59,7 +59,6 @@ cdk.Tags.of(persistence).add("stack", "persistence");
 //-----------------------------------------------------------------------------
 const api = new ApiStack(app, 'ApiStack', {
   env: env,
-  description: '(uksb-1tupboc43) API Layer stack',
   existingOpensearchServerlessCollection: persistence.opensearchCollection,
   existingVpc: network.vpc,
   existingSecurityGroup: network.securityGroups[0],

samples/document_explorer/lib/api-stack.ts

@@ -271,6 +271,9 @@ export class ApiStack extends Stack {
         `${this.mergedApi.attrArn}/sourceApiAssociations/*`,
       ]
     }));
+
+    this.templateOptions.description = `Description: (uksb-1tupboc43) (tag: document explorer)`
+
     NagSuppressions.addResourceSuppressions(mergedApiRole, [{id: 'AwsSolutions-IAM5', reason: '* used after ARN prefix'}], true)
 
     // Add Source API

samples/documentation-Agent/lib/documentation-agent-stack.ts

@@ -0,0 +1,37 @@
+import * as cdk from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import * as s3 from 'aws-cdk-lib/aws-s3';
+import * as fs from 'fs';
+import * as path from 'path';
+import { bedrock } from '@cdklabs/generative-ai-cdk-constructs';
+
+
+export class DocumentationAgentStack extends cdk.Stack {
+  
+  constructor(scope: Construct, id: string, props?: cdk.StackProps) {
+    super(scope, id, props);
+
+     const key=  '(uksb-1tupboc43)'
+     const tag = ' Document Agent'
+     
+     // Read instruction from file
+     const instructionPath = path.join(__dirname, '..', 'instructions', 'readme-instructions.txt');
+     const instruction = fs.readFileSync(instructionPath, 'utf-8');
+ 
+
+     // print instruction
+     new cdk.CfnOutput(this, 'Instruction', {
+      value: instruction,
+      description: 'Instruction for the agent'
+    });
+    
+    const agent = new bedrock.Agent(this, 'documentationAgent', {
+      foundationModel: bedrock.BedrockFoundationModel.AMAZON_NOVA_MICRO_V1,
+      instruction: instruction,
+      enableUserInput: true,
+      shouldPrepareAgent:true
+    });
+    
+     this.templateOptions.description = `Description: ${key}  (tag:${ tag}) `
+  }
+}

samples/image-description/bin/image-description.ts

@@ -25,5 +25,5 @@ const imageDescStack = new ImageDescriptionStack(app, "ImageDesStack", {
     account: process.env.CDK_DEFAULT_ACCOUNT,
     region: process.env.CDK_DEFAULT_REGION,
   },
-  description: "(uksb-1tupboc43) GenAI Image Description Stack",
+  
 });

samples/image-description/lib/image-description-stack.ts

@@ -140,6 +140,7 @@ export class ImageDescriptionStack extends cdk.Stack {
       }
     );
 
+    this.templateOptions.description =  "Description: (uksb-1tupboc43) (tag: Image Description sample)",
 
     summarization.inputAssetBucket.grantReadWrite(this.authenticatedRole);
     summarization.processedAssetBucket.grantRead(this.authenticatedRole);

samples/llamaindex-basic-data-loader/bin/llamaindex_basic_data_loader_stack.py

@@ -37,3 +37,5 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
             # docker_image_asset_directory=path.dirname(__file__) + path.sep + ".." + path.sep + "docker",
             container_logging_level="DEBUG",
         )
+
+        self.template_options.description= "Description: (uksb-1tupboc43) (tag: llamaindex data loader sample)",

samples/python-samples/python_samples/bedrock_opensearch_stack.py

@@ -72,7 +72,6 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
             user_input_enabled= True,
             should_prepare_agent=True
             )
-       
      ## associate action group  with agent
         agent.add_action_group(ag)   
 
@@ -82,7 +81,8 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                                         description='alias for my agent',
                                         agent=agent)
 
-
+        self.template_options.description='Description: (uksb-1tupboc43) (tag: python bedrock sample)'
+        
         CfnOutput(self, "KnowledgeBaseId", value=kb.knowledge_base_id)
         CfnOutput(self, 'agentid', value= agent.agent_id)
         CfnOutput(self, 'DataSourceId', value= dataSource.data_source_id)