Merge pull request #216 from oconpa/feat/typesnpackages

feat: Layer Types and Additional Packages

Author: dineshSajwan

.eslintrc.json

@@ -10,6 +10,7 @@
  *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
  *  and limitations under the License.
  */
+import { ProjenStruct, Struct } from '@mrgrain/jsii-struct-builder';
 import { JsonPatch, awscdk } from 'projen';
 import { NpmAccess } from 'projen/lib/javascript';
 import {
@@ -51,6 +52,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
     'eslint-plugin-header',
     'husky',
     'pinst',
+    '@mrgrain/jsii-struct-builder',
   ],
   deps: ['cdk-nag'],
 
@@ -157,6 +159,20 @@ project.eslint?.addRules({
   'header/header': [2, 'header.js'],
 });
 
+project.eslint?.addIgnorePattern('LangchainProps.ts');
+project.eslint?.addIgnorePattern('AdapterProps.ts');
+
+// Shared interfaces extending pre-existing CDK interfaces
+new ProjenStruct(project, { name: 'LangchainProps', filePath: 'src/patterns/gen-ai/aws-langchain-common-layer/LangchainProps.ts' })
+  .mixin(Struct.fromFqn('aws-cdk-lib.aws_lambda.LayerVersionProps'))
+  .withoutDeprecated()
+  .omit('code', 'compatibleRuntimes', 'compatibleArchitectures');
+
+new ProjenStruct(project, { name: 'AdapterProps', filePath: 'src/patterns/gen-ai/aws-langchain-common-layer/AdapterProps.ts' })
+  .mixin(Struct.fromFqn('aws-cdk-lib.aws_lambda.LayerVersionProps'))
+  .withoutDeprecated()
+  .omit('code');
+
 const packageJson = project.tryFindObjectFile('package.json');
 packageJson?.patch(JsonPatch.add('/scripts/prepare', 'husky install')); // yarn 1
 packageJson?.patch(JsonPatch.add('/scripts/postinstall', 'husky install')); // yarn 2

.gitattributes

@@ -15,13 +15,14 @@ import * as cdk from 'aws-cdk-lib';
 import * as lambda from 'aws-cdk-lib/aws-lambda';
 import * as s3assets from 'aws-cdk-lib/aws-s3-assets';
 import { Construct } from 'constructs';
+import { LangchainProps } from '../../patterns/gen-ai/aws-langchain-common-layer/LangchainProps';
 
-export interface LayerProps {
+export interface LayerProps extends LangchainProps {
   runtime: lambda.Runtime;
   architecture: lambda.Architecture;
   path: string;
-  description: string;
   autoUpgrade?: boolean;
+  additionalPackages?: string[];
   local?: 'python' | 'python3';
 }
 
@@ -31,9 +32,12 @@ export class Layer extends Construct {
   constructor(scope: Construct, id: string, props: LayerProps) {
     super(scope, id);
 
-    const { runtime, architecture, path, description, autoUpgrade, local } = props;
+    const { runtime, architecture, path, additionalPackages, autoUpgrade, local } = props;
 
     const args = local ? [] : ['-t /asset-output/python'];
+    if (additionalPackages) {
+      args.push(...additionalPackages);
+    }
     if (autoUpgrade) {
       args.push('--upgrade');
     }
@@ -70,8 +74,7 @@ export class Layer extends Construct {
       code: lambda.Code.fromBucket(layerAsset.bucket, layerAsset.s3ObjectKey),
       compatibleRuntimes: [runtime],
       compatibleArchitectures: [architecture],
-      removalPolicy: cdk.RemovalPolicy.DESTROY,
-      description: description,
+      ...props,
     });
 
     this.layer = layer;

.gitignore

@@ -13,6 +13,9 @@
 export * from './patterns/gen-ai/aws-rag-appsync-stepfn-opensearch';
 export * from './patterns/gen-ai/aws-summarization-appsync-stepfn';
 export * from './patterns/gen-ai/aws-langchain-common-layer';
+export * from './patterns/gen-ai/aws-langchain-common-layer/LangchainProps';
+export * from './patterns/gen-ai/aws-langchain-common-layer/AdapterProps';
 export * from './patterns/gen-ai/aws-qa-appsync-opensearch';
 export * from './patterns/gen-ai/aws-model-deployment-sagemaker';
+
 export { version } from './common/helpers/utils';