From efa83dc34627c83862726871958e1f6868d66770 Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Thu, 9 Nov 2023 13:57:37 -0600 Subject: [PATCH 01/10] update publication namespace --- .projenrc.ts | 3 ++- package.json | 2 +- src/patterns/gen-ai/aws-langchain-common-layer/README.md | 4 ++-- src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md | 4 ++-- .../gen-ai/aws-rag-appsync-stepfn-opensearch/README.md | 2 +- .../gen-ai/aws-summarization-appsync-stepfn/README.md | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.projenrc.ts b/.projenrc.ts index b77235dd..8be6c2fc 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -22,6 +22,7 @@ import { // Constants const GITHUB_USER = 'awslabs'; +const PUBLICATION_NAMESPACE = 'awscdk'; const PROJECT_NAME = 'generative-ai-cdk-constructs'; const CDK_VERSION: string = '2.103.1'; @@ -40,7 +41,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ repositoryUrl: 'https://github.com/' + GITHUB_USER + '/' + PROJECT_NAME, // description: undefined, /* The description is just a string that helps people understand the purpose of the package. */ - packageName: '@' + GITHUB_USER + '/' + PROJECT_NAME, /* The "name" in package.json. */ + packageName: '@' + PUBLICATION_NAMESPACE + '/' + PROJECT_NAME, /* The "name" in package.json. */ keywords: ['constructs', 'aws-cdk', 'generative-ai', 'emerging-tech'], devDeps: ['eslint-plugin-header'], //bundledDeps: ['deepmerge', '@types/deep-diff', '@types/npmlog'], diff --git a/package.json b/package.json index 8af2b7fb..a87e0893 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@awslabs/generative-ai-cdk-constructs", + "name": "@awscdk/generative-ai-cdk-constructs", "repository": { "type": "git", "url": "https://github.com/awslabs/generative-ai-cdk-constructs" diff --git a/src/patterns/gen-ai/aws-langchain-common-layer/README.md b/src/patterns/gen-ai/aws-langchain-common-layer/README.md index e840a0b5..0b7b848a 100644 --- a/src/patterns/gen-ai/aws-langchain-common-layer/README.md +++ b/src/patterns/gen-ai/aws-langchain-common-layer/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awslabs/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awscdk/generative-ai-cdk-constructs`| ## Table of contents @@ -54,7 +54,7 @@ Typescript ``` typescript import { Construct } from 'constructs'; import { Stack, StackProps, Aws } from 'aws-cdk-lib'; -import { LangchainCommonDepsLayer, LangchainCommonLayer } from '@awslabs/generative-ai-cdk-constructs'; +import { LangchainCommonDepsLayer, LangchainCommonLayer } from '@awscdk/generative-ai-cdk-constructs'; const lambdaArchitecture = lambda.Architecture.ARM_64; const lambdaRuntime = lambda.Runtime.PYTHON_3_10; diff --git a/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md b/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md index a13bf7ae..cb30ab9e 100644 --- a/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md +++ b/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awslabs/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awscdk/generative-ai-cdk-constructs`| ## Table of contents @@ -51,7 +51,7 @@ import { Construct } from 'constructs'; import { Stack, StackProps } from 'aws-cdk-lib'; import * as os from 'aws-cdk-lib/aws-opensearchservice'; import * as cognito from 'aws-cdk-lib/aws-cognito'; -import { QaAppsyncOpensearch, QaAppsyncOpensearchProps } from '@awslabs/generative-ai-cdk-constructs'; +import { QaAppsyncOpensearch, QaAppsyncOpensearchProps } from '@awscdk/generative-ai-cdk-constructs'; // get an existing OpenSearch provisioned cluster const osDomain = os.Domain.fromDomainAttributes(this, 'osdomain', { diff --git a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md index 0de663dd..65a8a2bd 100644 --- a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md +++ b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awslabs/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awscdk/generative-ai-cdk-constructs`| ## Table of contents diff --git a/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md b/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md index be2b6acd..93135fcb 100644 --- a/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md +++ b/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awslabs/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awscdk/generative-ai-cdk-constructs`| ## Table of contents @@ -59,7 +59,7 @@ Create a CDK typescript project and then update the stack with below configurati import { Construct } from 'constructs'; import { Stack, StackProps } from 'aws-cdk-lib'; import * as cognito from 'aws-cdk-lib/aws-cognito'; -import { SummarizationAppsyncStepfn, SummarizationAppsyncStepfnProps } from '@awslabs/generative-ai-cdk-constructs'; +import { SummarizationAppsyncStepfn, SummarizationAppsyncStepfnProps } from '@awscdk/generative-ai-cdk-constructs'; // get an existing userpool const cognitoPoolId = 'us-east-1_XXXXX'; From da95042a20d0def1fb4c3e5897a168544130370c Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Thu, 9 Nov 2023 15:49:03 -0600 Subject: [PATCH 02/10] added forgotten dash --- .projenrc.ts | 2 +- package.json | 2 +- src/patterns/gen-ai/aws-langchain-common-layer/README.md | 4 ++-- src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md | 4 ++-- .../gen-ai/aws-rag-appsync-stepfn-opensearch/README.md | 2 +- .../gen-ai/aws-summarization-appsync-stepfn/README.md | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.projenrc.ts b/.projenrc.ts index 8be6c2fc..b1337b61 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -22,7 +22,7 @@ import { // Constants const GITHUB_USER = 'awslabs'; -const PUBLICATION_NAMESPACE = 'awscdk'; +const PUBLICATION_NAMESPACE = 'aws-cdk'; const PROJECT_NAME = 'generative-ai-cdk-constructs'; const CDK_VERSION: string = '2.103.1'; diff --git a/package.json b/package.json index a87e0893..02eb211a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@awscdk/generative-ai-cdk-constructs", + "name": "@aws-cdk/generative-ai-cdk-constructs", "repository": { "type": "git", "url": "https://github.com/awslabs/generative-ai-cdk-constructs" diff --git a/src/patterns/gen-ai/aws-langchain-common-layer/README.md b/src/patterns/gen-ai/aws-langchain-common-layer/README.md index 0b7b848a..a49480e5 100644 --- a/src/patterns/gen-ai/aws-langchain-common-layer/README.md +++ b/src/patterns/gen-ai/aws-langchain-common-layer/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awscdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| ## Table of contents @@ -54,7 +54,7 @@ Typescript ``` typescript import { Construct } from 'constructs'; import { Stack, StackProps, Aws } from 'aws-cdk-lib'; -import { LangchainCommonDepsLayer, LangchainCommonLayer } from '@awscdk/generative-ai-cdk-constructs'; +import { LangchainCommonDepsLayer, LangchainCommonLayer } from '@aws-cdk/generative-ai-cdk-constructs'; const lambdaArchitecture = lambda.Architecture.ARM_64; const lambdaRuntime = lambda.Runtime.PYTHON_3_10; diff --git a/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md b/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md index cb30ab9e..316f15e7 100644 --- a/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md +++ b/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awscdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| ## Table of contents @@ -51,7 +51,7 @@ import { Construct } from 'constructs'; import { Stack, StackProps } from 'aws-cdk-lib'; import * as os from 'aws-cdk-lib/aws-opensearchservice'; import * as cognito from 'aws-cdk-lib/aws-cognito'; -import { QaAppsyncOpensearch, QaAppsyncOpensearchProps } from '@awscdk/generative-ai-cdk-constructs'; +import { QaAppsyncOpensearch, QaAppsyncOpensearchProps } from '@aws-cdk/generative-ai-cdk-constructs'; // get an existing OpenSearch provisioned cluster const osDomain = os.Domain.fromDomainAttributes(this, 'osdomain', { diff --git a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md index 65a8a2bd..ef4adf81 100644 --- a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md +++ b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awscdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| ## Table of contents diff --git a/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md b/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md index 93135fcb..ff41053f 100644 --- a/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md +++ b/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awscdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| ## Table of contents @@ -59,7 +59,7 @@ Create a CDK typescript project and then update the stack with below configurati import { Construct } from 'constructs'; import { Stack, StackProps } from 'aws-cdk-lib'; import * as cognito from 'aws-cdk-lib/aws-cognito'; -import { SummarizationAppsyncStepfn, SummarizationAppsyncStepfnProps } from '@awscdk/generative-ai-cdk-constructs'; +import { SummarizationAppsyncStepfn, SummarizationAppsyncStepfnProps } from '@aws-cdk/generative-ai-cdk-constructs'; // get an existing userpool const cognitoPoolId = 'us-east-1_XXXXX'; From f8212606ecbd276f531b59c2d2e4abfb221bb12f Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Tue, 14 Nov 2023 11:36:03 -0600 Subject: [PATCH 03/10] update namespace --- src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md | 4 ++-- .../gen-ai/aws-rag-appsync-stepfn-opensearch/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md b/src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md index 53db28c1..3bee051c 100644 --- a/src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md +++ b/src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md @@ -15,7 +15,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@awslabs/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| ## Table of contents @@ -51,7 +51,7 @@ Here is a minimal deployable pattern definition: import { Construct } from 'constructs'; import { Stack, StackProps, Aws } from 'aws-cdk-lib'; -import { JumpStartSageMakerEndpoint, JumpStartModel, SageMakerInstanceType, HuggingFaceSageMakerEndpoint, DeepLearningContainerImage } from '@awslabs/generative-ai-cdk-constructs'; +import { JumpStartSageMakerEndpoint, JumpStartModel, SageMakerInstanceType, HuggingFaceSageMakerEndpoint, DeepLearningContainerImage } from '@aws-cdk/generative-ai-cdk-constructs'; // Deploy a model from SageMaker Foundation Models or SageMaker JumpStart new JumpStartSageMakerEndpoint(this, 'LLAMA2', { diff --git a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md index 776e8c1e..ea6c064e 100644 --- a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md +++ b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md @@ -64,7 +64,7 @@ import { Construct } from 'constructs'; import { Stack, StackProps } from 'aws-cdk-lib'; import * as os from 'aws-cdk-lib/aws-opensearchservice'; import * as cognito from 'aws-cdk-lib/aws-cognito'; -import { RagApiGatewayOpensearch, RagApiGatewayOpensearchProps } from '@awslabs/generative-ai-cdk-constructs'; +import { RagApiGatewayOpensearch, RagApiGatewayOpensearchProps } from '@aws-cdk/generative-ai-cdk-constructs'; // get an existing OpenSearch provisioned cluster in the same VPC as of RagAppsyncStepfnOpensearch construct // Security group for the existing opensearch cluster should allow traffic on 443. From f40543f1a21a3ef81b6dcd216c13521891264724 Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Wed, 15 Nov 2023 10:12:44 -0600 Subject: [PATCH 04/10] update namespace --- .projenrc.ts | 3 +-- package.json | 2 +- src/patterns/gen-ai/aws-langchain-common-layer/README.md | 4 ++-- src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md | 4 ++-- src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md | 4 ++-- .../gen-ai/aws-rag-appsync-stepfn-opensearch/README.md | 4 ++-- .../gen-ai/aws-summarization-appsync-stepfn/README.md | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.projenrc.ts b/.projenrc.ts index b1337b61..564225ee 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -22,7 +22,7 @@ import { // Constants const GITHUB_USER = 'awslabs'; -const PUBLICATION_NAMESPACE = 'aws-cdk'; +const PUBLICATION_NAMESPACE = 'cdklabs'; const PROJECT_NAME = 'generative-ai-cdk-constructs'; const CDK_VERSION: string = '2.103.1'; @@ -44,7 +44,6 @@ const project = new awscdk.AwsCdkConstructLibrary({ packageName: '@' + PUBLICATION_NAMESPACE + '/' + PROJECT_NAME, /* The "name" in package.json. */ keywords: ['constructs', 'aws-cdk', 'generative-ai', 'emerging-tech'], devDeps: ['eslint-plugin-header'], - //bundledDeps: ['deepmerge', '@types/deep-diff', '@types/npmlog'], // Keep synchronized with https://github.com/nodejs/release#release-schedule minNodeVersion: '18.12.0', // 'MAINTENANCE' (first LTS) diff --git a/package.json b/package.json index 02eb211a..243f150f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@aws-cdk/generative-ai-cdk-constructs", + "name": "@cdklabs/generative-ai-cdk-constructs", "repository": { "type": "git", "url": "https://github.com/awslabs/generative-ai-cdk-constructs" diff --git a/src/patterns/gen-ai/aws-langchain-common-layer/README.md b/src/patterns/gen-ai/aws-langchain-common-layer/README.md index a49480e5..6fa2b43f 100644 --- a/src/patterns/gen-ai/aws-langchain-common-layer/README.md +++ b/src/patterns/gen-ai/aws-langchain-common-layer/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@cdklabs/generative-ai-cdk-constructs`| ## Table of contents @@ -54,7 +54,7 @@ Typescript ``` typescript import { Construct } from 'constructs'; import { Stack, StackProps, Aws } from 'aws-cdk-lib'; -import { LangchainCommonDepsLayer, LangchainCommonLayer } from '@aws-cdk/generative-ai-cdk-constructs'; +import { LangchainCommonDepsLayer, LangchainCommonLayer } from '@cdklabs/generative-ai-cdk-constructs'; const lambdaArchitecture = lambda.Architecture.ARM_64; const lambdaRuntime = lambda.Runtime.PYTHON_3_10; diff --git a/src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md b/src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md index 3bee051c..a0278ea1 100644 --- a/src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md +++ b/src/patterns/gen-ai/aws-model-deployment-sagemaker/README.md @@ -15,7 +15,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@cdklabs/generative-ai-cdk-constructs`| ## Table of contents @@ -51,7 +51,7 @@ Here is a minimal deployable pattern definition: import { Construct } from 'constructs'; import { Stack, StackProps, Aws } from 'aws-cdk-lib'; -import { JumpStartSageMakerEndpoint, JumpStartModel, SageMakerInstanceType, HuggingFaceSageMakerEndpoint, DeepLearningContainerImage } from '@aws-cdk/generative-ai-cdk-constructs'; +import { JumpStartSageMakerEndpoint, JumpStartModel, SageMakerInstanceType, HuggingFaceSageMakerEndpoint, DeepLearningContainerImage } from '@cdklabs/generative-ai-cdk-constructs'; // Deploy a model from SageMaker Foundation Models or SageMaker JumpStart new JumpStartSageMakerEndpoint(this, 'LLAMA2', { diff --git a/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md b/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md index a5bd28b3..44253c79 100644 --- a/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md +++ b/src/patterns/gen-ai/aws-qa-appsync-opensearch/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@cdklabs/generative-ai-cdk-constructs`| ## Table of contents @@ -51,7 +51,7 @@ import { Construct } from 'constructs'; import { Stack, StackProps } from 'aws-cdk-lib'; import * as os from 'aws-cdk-lib/aws-opensearchservice'; import * as cognito from 'aws-cdk-lib/aws-cognito'; -import { QaAppsyncOpensearch, QaAppsyncOpensearchProps } from '@aws-cdk/generative-ai-cdk-constructs'; +import { QaAppsyncOpensearch, QaAppsyncOpensearchProps } from '@cdklabs/generative-ai-cdk-constructs'; // get an existing OpenSearch provisioned cluster const osDomain = os.Domain.fromDomainAttributes(this, 'osdomain', { diff --git a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md index ea6c064e..86ad7ef5 100644 --- a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md +++ b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@cdklabs/generative-ai-cdk-constructs`| ## Table of contents @@ -64,7 +64,7 @@ import { Construct } from 'constructs'; import { Stack, StackProps } from 'aws-cdk-lib'; import * as os from 'aws-cdk-lib/aws-opensearchservice'; import * as cognito from 'aws-cdk-lib/aws-cognito'; -import { RagApiGatewayOpensearch, RagApiGatewayOpensearchProps } from '@aws-cdk/generative-ai-cdk-constructs'; +import { RagApiGatewayOpensearch, RagApiGatewayOpensearchProps } from '@cdklabs/generative-ai-cdk-constructs'; // get an existing OpenSearch provisioned cluster in the same VPC as of RagAppsyncStepfnOpensearch construct // Security group for the existing opensearch cluster should allow traffic on 443. diff --git a/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md b/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md index 514c4b75..d2de5c92 100644 --- a/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md +++ b/src/patterns/gen-ai/aws-summarization-appsync-stepfn/README.md @@ -14,7 +14,7 @@ | **Language** | **Package** | |:-------------|-----------------| -|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@aws-cdk/generative-ai-cdk-constructs`| +|![Typescript Logo](https://docs.aws.amazon.com/cdk/api/latest/img/typescript32.png) Typescript|`@cdklabs/generative-ai-cdk-constructs`| ## Table of contents @@ -59,7 +59,7 @@ Create a CDK typescript project and then update the stack with below configurati import { Construct } from 'constructs'; import { Stack, StackProps } from 'aws-cdk-lib'; import * as cognito from 'aws-cdk-lib/aws-cognito'; -import { SummarizationAppsyncStepfn, SummarizationAppsyncStepfnProps } from '@aws-cdk/generative-ai-cdk-constructs'; +import { SummarizationAppsyncStepfn, SummarizationAppsyncStepfnProps } from '@cdklabs/generative-ai-cdk-constructs'; // get an existing userpool const cognitoPoolId = 'us-east-1_XXXXX'; From 4710539e02596dc15302388644ff388c1c1e41ba Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Wed, 15 Nov 2023 10:17:31 -0600 Subject: [PATCH 05/10] update token --- .projenrc.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.projenrc.ts b/.projenrc.ts index 564225ee..d4cb59e2 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -50,8 +50,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ maxNodeVersion: '20.x', // 'CURRENT' workflowNodeVersion: '20.x', // 'ACTIVE' - npmRegistryUrl: 'https://npm.pkg.github.com', - npmTokenSecret: 'GITHUB_TOKEN', + npmTokenSecret: '${{ secrets.NPM_TOKEN }}', publishToPypi: { distName: PROJECT_NAME, From fcb3207984e3cb1a41ff2dc58dc1bacc2190bb5e Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Wed, 15 Nov 2023 10:21:37 -0600 Subject: [PATCH 06/10] update npm settings --- .github/workflows/release.yml | 5 ++--- .projenrc.ts | 4 ++-- package.json | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32fef970..1dfdb509 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -85,7 +85,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - packages: write if: needs.release.outputs.latest_commit == github.sha steps: - uses: actions/setup-node@v3 @@ -110,8 +109,8 @@ jobs: - name: Release env: NPM_DIST_TAG: latest - NPM_REGISTRY: npm.pkg.github.com - NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NPM_REGISTRY: registry.npmjs.org + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} run: npx -p publib@latest publib-npm release_pypi: name: Publish to PyPI diff --git a/.projenrc.ts b/.projenrc.ts index d4cb59e2..e4b72e80 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -36,7 +36,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ cdkVersionPinning: true, defaultReleaseBranch: 'main', jsiiVersion: '~5.0.0', - name: PROJECT_NAME, + name: '@' + PUBLICATION_NAMESPACE + '/' + PROJECT_NAME, projenrcTs: true, repositoryUrl: 'https://github.com/' + GITHUB_USER + '/' + PROJECT_NAME, @@ -50,7 +50,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ maxNodeVersion: '20.x', // 'CURRENT' workflowNodeVersion: '20.x', // 'ACTIVE' - npmTokenSecret: '${{ secrets.NPM_TOKEN }}', + npmTokenSecret: 'NPM_TOKEN', publishToPypi: { distName: PROJECT_NAME, diff --git a/package.json b/package.json index 243f150f..f1cb9682 100644 --- a/package.json +++ b/package.json @@ -74,9 +74,6 @@ }, "main": "lib/index.js", "license": "Apache-2.0", - "publishConfig": { - "registry": "https://npm.pkg.github.com/" - }, "version": "0.0.0", "jest": { "testMatch": [ From 9680ec01941a3648fbe1d62eac967eda3edb31fa Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Wed, 15 Nov 2023 10:54:33 -0600 Subject: [PATCH 07/10] remove redudant package name --- .projenrc.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/.projenrc.ts b/.projenrc.ts index e4b72e80..e8c7fa49 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -41,7 +41,6 @@ const project = new awscdk.AwsCdkConstructLibrary({ repositoryUrl: 'https://github.com/' + GITHUB_USER + '/' + PROJECT_NAME, // description: undefined, /* The description is just a string that helps people understand the purpose of the package. */ - packageName: '@' + PUBLICATION_NAMESPACE + '/' + PROJECT_NAME, /* The "name" in package.json. */ keywords: ['constructs', 'aws-cdk', 'generative-ai', 'emerging-tech'], devDeps: ['eslint-plugin-header'], From ab70ca4a91bf6b2dfd012badbeeb64949d8012a6 Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Wed, 15 Nov 2023 11:38:02 -0600 Subject: [PATCH 08/10] update namespace for python package --- .projenrc.ts | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.projenrc.ts b/.projenrc.ts index e8c7fa49..70f48d09 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -52,8 +52,8 @@ const project = new awscdk.AwsCdkConstructLibrary({ npmTokenSecret: 'NPM_TOKEN', publishToPypi: { - distName: PROJECT_NAME, - module: PROJECT_NAME.replace(/-/g, '_'), // PEP 8, convert hypens + distName: PUBLICATION_NAMESPACE+'.'+PROJECT_NAME, + module: PUBLICATION_NAMESPACE+'.'+(PROJECT_NAME.replace(/-/g, '_')), // PEP 8, convert hypens twineRegistryUrl: '${{ secrets.TWINE_REGISTRY_URL }}', }, diff --git a/package.json b/package.json index f1cb9682..580ba2ba 100644 --- a/package.json +++ b/package.json @@ -121,8 +121,8 @@ "outdir": "dist", "targets": { "python": { - "distName": "generative-ai-cdk-constructs", - "module": "generative_ai_cdk_constructs" + "distName": "cdklabs.generative-ai-cdk-constructs", + "module": "cdklabs.generative_ai_cdk_constructs" } }, "tsc": { From 8efb896de3243c1ad9b9c1153078874e735f84dd Mon Sep 17 00:00:00 2001 From: Alain Krok Date: Wed, 15 Nov 2023 12:48:50 -0600 Subject: [PATCH 09/10] updaste projenrc --- .projenrc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.projenrc.ts b/.projenrc.ts index 70f48d09..f54d3746 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -53,7 +53,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ publishToPypi: { distName: PUBLICATION_NAMESPACE+'.'+PROJECT_NAME, - module: PUBLICATION_NAMESPACE+'.'+(PROJECT_NAME.replace(/-/g, '_')), // PEP 8, convert hypens + module: (PUBLICATION_NAMESPACE.replace(/-/g, '_'))+'.'+(PROJECT_NAME.replace(/-/g, '_')), // PEP 8, convert hypens twineRegistryUrl: '${{ secrets.TWINE_REGISTRY_URL }}', }, From e09618c605f6fa1819f0fef0109c571a6bdb28b4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 15 Nov 2023 18:51:03 +0000 Subject: [PATCH 10/10] chore: self mutation Signed-off-by: github-actions --- .projenrc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.projenrc.ts b/.projenrc.ts index f54d3746..7104136d 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -53,7 +53,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ publishToPypi: { distName: PUBLICATION_NAMESPACE+'.'+PROJECT_NAME, - module: (PUBLICATION_NAMESPACE.replace(/-/g, '_'))+'.'+(PROJECT_NAME.replace(/-/g, '_')), // PEP 8, convert hypens + module: (PUBLICATION_NAMESPACE.replace(/-/g, '_'))+'.'+(PROJECT_NAME.replace(/-/g, '_')), // PEP 8, convert hypens twineRegistryUrl: '${{ secrets.TWINE_REGISTRY_URL }}', },