draft refactoring

awslabs · Jul 26, 2024 · 65484ef · 65484ef
1 parent e8caa72
commit 65484ef
Show file tree

Hide file tree

Showing 20 changed files with 43 additions and 57 deletions.
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -3,21 +3,26 @@
 
 name: Publish to NPM
 
-on: 
-  workflow_dispatch
+on:
+  workflow_dispatch:
 
 jobs:
   build-and-publish:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: typescript
     steps:
       - uses: actions/checkout@6ccd57f4c5d15bdc2fef309bd9fb6cc9db2ef1c6
       - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
         with:
           node-version: 20
           registry-url: https://registry.npmjs.org/
+      - run: cp ../LICENSE .
+      - run: cp ../README.md .
       - run: npm install
       - run: npm run build
       - run: npm pack
       - run: npm publish --access=public
         env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
diff --git a/.github/workflows/run-lint.yml b/.github/workflows/run-lint.yml
@@ -28,18 +28,3 @@ jobs:
         run: npm install
       - name: Run linting
         run: npm run lint
-      # - name: Spell check
-      #   uses: streetsidesoftware/cspell-action@4dc9d4bdf3974ed26d6f2e973c1e168edff47d80
-      #   with:
-      #     files: '**/*.{md,ts}'
-      #     strict: true
-      #     check_dot_files: true
-      #     incremental_files_only: false
-      #     config: 'cspell.config.yml'
-      # - name: Run ShellCheck
-      #   uses: ludeeus/action-shellcheck@cd81f4475ab741e097ec0fe73b692f3e49d66b8c
-      #   with:
-      #     scandir: '.'
-      #     ignore_paths: >-
-      #       node_modules
-      #       .husky
diff --git a/.github/workflows/run-security-checks.yml b/.github/workflows/run-security-checks.yml
@@ -1,5 +1,4 @@
 name: Run security checks on the project
-
 on:
   workflow_call:
   workflow_dispatch:
@@ -10,23 +9,37 @@ permissions:
 jobs:
   scan:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: typescript
     steps:
       # Checkout and setup.
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           fetch-depth: 0
+
       - name: Install dependencies
         run: npm install
 
       # NPM audit.
       - name: Run audit
         run: npm audit
-
+        continue-on-error: true
+
       # GitLeaks.
       - name: Run Gitleaks
         uses: gitleaks/gitleaks-action@4df650038e2eb9f7329218df929c2780866e61a3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE }}
-
+
+      # Output results
+      - name: Output npm audit results
+        run: npm audit --json > npm_audit_results.json
+
+      - name: Upload npm audit results
+        uses: actions/upload-artifact@v3
+        with:
+          name: npm-audit-results
+          path: typescript/npm_audit_results.json
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,5 +1,4 @@
 name: Run tests on the project
-
 on:
   push:
     branches:
@@ -8,14 +7,14 @@ on:
     types:
       - opened
       - edited
-
-
 permissions:
   contents: read
-
 jobs:
   lint:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: typescript
     steps:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -27,19 +26,4 @@ jobs:
       - name: Install dependencies
         run: npm install
       - name: Run tests
-        run: npm run coverage
-      # - name: Spell check
-      #   uses: streetsidesoftware/cspell-action@4dc9d4bdf3974ed26d6f2e973c1e168edff47d80
-      #   with:
-      #     files: '**/*.{md,ts}'
-      #     strict: true
-      #     check_dot_files: true
-      #     incremental_files_only: false
-      #     config: 'cspell.config.yml'
-      # - name: Run ShellCheck
-      #   uses: ludeeus/action-shellcheck@cd81f4475ab741e097ec0fe73b692f3e49d66b8c
-      #   with:
-      #     scandir: '.'
-      #     ignore_paths: >-
-      #       node_modules
-      #       .husky
+        run: npm run coverage
diff --git a/.gitignore b/.gitignore
@@ -1,29 +1,26 @@
 
-!jest.config.js
-*.d.ts
-node_modules
-.package-lock.json
+!typescript/jest.config.js
+typescript/*.d.ts
+typescript/node_modules
+typescript/.package-lock.json
 
-# CDK asset staging directory
-.cdk.staging
-cdk.out
+examples/chat-demo-app/cdk.out
 
-lib/**/*.js
-bin/*.js
+examples/chat-demo-app/lib/**/*.js
+examples/chat-demo-app/bin/*.js
 
-!lambda/url_rewrite/*.js 
-resources/ui/public/aws-exports.json
-resources/ui/dist
+!examples/lambda/url_rewrite/*.js 
+examples/resources/ui/public/aws-exports.json
+examples/resources/ui/dist
 
 
 .DS_Store
 
-**/dist/**/*
+typescript/dist/**/*
 
-*.tgz
+typescript/*.tgz
 *aws-exports.json
 !download.js
 
 examples/local-demo/.env
-
-coverage/**/*
+typescript/coverage/**/*
diff --git a/docs/src/env.d.ts b/docs/src/env.d.ts
@@ -0,0 +1,2 @@
+/// <reference path="../.astro/types.d.ts" />
+/// <reference types="astro/client" />
diff --git a/.eslintrc.js → typescript/.eslintrc.js b/.eslintrc.js → typescript/.eslintrc.js
diff --git a/.npmignore → typescript/.npmignore b/.npmignore → typescript/.npmignore
diff --git a/package-lock.json → typescript/package-lock.json b/package-lock.json → typescript/package-lock.json
diff --git a/package.json → typescript/package.json b/package.json → typescript/package.json
diff --git a/tests/Orchestrator.test.ts → typescript/tests/Orchestrator.test.ts b/tests/Orchestrator.test.ts → typescript/tests/Orchestrator.test.ts
diff --git a/tests/agents/Agents.test.ts → typescript/tests/agents/Agents.test.ts b/tests/agents/Agents.test.ts → typescript/tests/agents/Agents.test.ts
diff --git a/...s/classifiers/AnthropicClassifier.test.ts → ...s/classifiers/AnthropicClassifier.test.ts b/...s/classifiers/AnthropicClassifier.test.ts → ...s/classifiers/AnthropicClassifier.test.ts
diff --git a/tests/classifiers/BedrockClassifier.test.ts → ...sts/classifiers/BedrockClassifier.test.ts b/tests/classifiers/BedrockClassifier.test.ts → ...sts/classifiers/BedrockClassifier.test.ts
diff --git a/tests/classifiers/Classifier.test.ts → ...ript/tests/classifiers/Classifier.test.ts b/tests/classifiers/Classifier.test.ts → ...ript/tests/classifiers/Classifier.test.ts
diff --git a/tests/mock/mockAgent.ts → typescript/tests/mock/mockAgent.ts b/tests/mock/mockAgent.ts → typescript/tests/mock/mockAgent.ts
diff --git a/tests/retrievers/Retriever.test.ts → ...script/tests/retrievers/Retriever.test.ts b/tests/retrievers/Retriever.test.ts → ...script/tests/retrievers/Retriever.test.ts
diff --git a/tests/storage/ChatStorage.test.ts → typescript/tests/storage/ChatStorage.test.ts b/tests/storage/ChatStorage.test.ts → typescript/tests/storage/ChatStorage.test.ts
diff --git a/tests/utils/Utils.test.ts → typescript/tests/utils/Utils.test.ts b/tests/utils/Utils.test.ts → typescript/tests/utils/Utils.test.ts
diff --git a/tsconfig.json → typescript/tsconfig.json b/tsconfig.json → typescript/tsconfig.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/// <reference path="../.astro/types.d.ts" />
		/// <reference types="astro/client" />