Merge branch 'main' into delete-documents-feature

azaylamba · Jun 10, 2024 · a6a2917 · a6a2917
2 parents ea642ac + 3b4bd7e
commit a6a2917
Show file tree

Hide file tree

Showing 12 changed files with 1,520 additions and 373 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "20"
       - name: Backend
         run: |
           npm install
@@ -19,4 +19,4 @@ jobs:
         working-directory: ./lib/user-interface/react-app
         run: |
           npm install
-          npm run build
+          npm run build
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           cache: npm
       - name: Setup Pages
         uses: actions/configure-pages@v3

diff --git a/bin/config.ts b/bin/config.ts
@@ -11,6 +11,7 @@ export function getConfig(): SystemConfig {
     /* vpc: {
        vpcId: "vpc-00000000000000000",
        createVpcEndpoints: true,
+       vpcDefaultSecurityGroup: "sg-00000000000"
     },*/
     privateWebsite: false,
     certificate : "",

diff --git a/lib/model-interfaces/idefics/index.ts b/lib/model-interfaces/idefics/index.ts
@@ -38,10 +38,13 @@ export class IdeficsInterface extends Construct {
     // Create a private API to serve images and other files from S3
     // in order to avoid using signed URLs and run out of input tokens
     // with the idefics model
+    const defaultSecurityGroup = (props.config.vpc?.vpcId && props.config.vpc.vpcDefaultSecurityGroup) ?
+        props.config.vpc.vpcDefaultSecurityGroup : props.shared.vpc.vpcDefaultSecurityGroup
+
     const vpcDefaultSecurityGroup = ec2.SecurityGroup.fromSecurityGroupId(
-      this,
-      "VPCDefaultSecurityGroup",
-      props.shared.vpc.vpcDefaultSecurityGroup
+        this,
+        'VPCDefaultSecurityGroup',
+        defaultSecurityGroup
     );
 
     const vpcEndpoint = props.shared.vpc.addInterfaceEndpoint(

diff --git a/lib/shared/file-import-batch-job/requirements.txt b/lib/shared/file-import-batch-job/requirements.txt
@@ -4,14 +4,14 @@ numpy==1.26.0
 cfnresponse==1.1.2
 aws_requests_auth==0.4.3
 requests-aws4auth==1.2.3
-langchain==0.1.5
-opensearch-py==2.4.2
+langchain==0.1.11
+opensearch-py==2.3.1
 psycopg2-binary==2.9.7
 pgvector==0.2.2
-pydantic==2.3.0
+pydantic==2.4.0
 urllib3<2
 openai==0.28.0
 beautifulsoup4==4.12.2
-requests==2.31.0
+requests==2.32.2
 attrs==23.1.0
 feedparser==6.0.10
diff --git a/lib/shared/layers/common/requirements.txt b/lib/shared/layers/common/requirements.txt
@@ -9,11 +9,11 @@ langchain-community==0.0.36
 opensearch-py==2.4.2
 psycopg2-binary==2.9.7
 pgvector==0.2.2
-pydantic==2.3.0
+pydantic==2.4.0
 urllib3<2
 openai==0.28.1
 beautifulsoup4==4.12.2
-requests==2.31.0
+requests==2.32.0
 attrs==23.1.0
 feedparser==6.0.10
 defusedxml==0.7.1
diff --git a/lib/shared/types.ts b/lib/shared/types.ts
@@ -74,6 +74,7 @@ export interface SystemConfig {
   vpc?: {
     vpcId?: string;
     createVpcEndpoints?: boolean;
+    vpcDefaultSecurityGroup?: string;
   };
   certificate?: string;
   domain?: string;

diff --git a/lib/shared/web-crawler-batch-job/requirements.txt b/lib/shared/web-crawler-batch-job/requirements.txt
@@ -4,11 +4,11 @@ numpy==1.26.0
 cfnresponse==1.1.2
 aws_requests_auth==0.4.3
 requests-aws4auth==1.2.3
-langchain==0.1.5
+langchain==0.1.11
 opensearch-py==2.3.1
 psycopg2-binary==2.9.7
 pgvector==0.2.2
-pydantic==2.3.0
+pydantic==2.4.0
 urllib3<2
 openai==0.28.0
 beautifulsoup4==4.12.2