chore: 'edge' -> chore_merge_back-7.3.1-to_edge

Merge edge into the working edge branch and fixup merge conflicts. This
is mostly about integrating the addition of actual versioned tip overlap
data with the new structure in edge.

Author: sfoster1

.eslintignore

@@ -32,3 +32,5 @@ hardware-testing/**
 app-testing/files
 # app testing don't format the snapshots
 app-testing/tests/__snapshots__
+opentrons-ai-server/package
+opentrons-ai-server/api/storage/index/

.eslintrc.js

@@ -49,13 +49,13 @@ module.exports = {
             importNames: [
               'useAllRunsQuery',
               'useRunQuery',
-              'useLastRunCommandKey',
+              'useAllCommandsQuery',
               'useCurrentMaintenanceRun',
               'useDeckConfigurationQuery',
               'useAllCommandsAsPreSerializedList',
             ],
             message:
-              'The HTTP hook is deprecated. Utilize the equivalent notification wrapper (useNotifyX) instead.',
+              'HTTP hook deprecated. Use the equivalent notification wrapper (useNotifyXYZ).',
           },
         ],
       },
@@ -101,10 +101,7 @@ module.exports = {
         '@typescript-eslint/no-floating-promises': 'warn',
         '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
         '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'warn',
-        '@typescript-eslint/no-unsafe-argument': 'warn',
-        '@typescript-eslint/consistent-type-imports': 'warn',
         '@typescript-eslint/consistent-indexed-object-style': 'warn',
-        '@typescript-eslint/no-confusing-void-expression': 'warn',
         '@typescript-eslint/ban-types': 'warn',
         '@typescript-eslint/non-nullable-type-assertion-style': 'warn',
         '@typescript-eslint/await-thenable': 'warn',
@@ -128,22 +125,20 @@ module.exports = {
         '**/__fixtures__/**.@(js|ts|tsx)',
         '**/fixtures/**.@(js|ts|tsx)',
         'scripts/*.@(js|ts|tsx)',
+        '**/**test.@(js|ts|tsx)',
       ],
       rules: {
         '@typescript-eslint/consistent-type-assertions': 'off',
         '@typescript-eslint/no-var-requires': 'off',
         '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/no-unsafe-argument': 'off',
         '@typescript-eslint/no-confusing-void-expression': 'warn',
         'node/handle-callback-err': 'off',
       },
     },
     {
       files: ['**/__tests__/**test.tsx'],
       extends: ['plugin:testing-library/react'],
-      rules: {
-        'testing-library/no-manual-cleanup': 'off',
-        'testing-library/prefer-screen-queries': 'warn',
-      },
     },
     {
       files: ['**/*.stories.tsx'],

.github/workflows/analyses-snapshot-test.yaml

@@ -13,14 +13,23 @@ on:
         default: 'edge'
   schedule:
     - cron:  '26 7 * * *' # 7:26 AM UTC
+  pull_request:
+    paths:
+      - 'api/**'
+      - 'shared-data/**/*'
+      - '!shared-data/js/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build-and-test:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     env:
-      TARGET: ${{ github.event.inputs.TARGET || 'edge' }}
-      TEST_SOURCE: ${{ github.event.inputs.TEST_SOURCE || 'edge' }}
+      TARGET: ${{ github.event.inputs.TARGET || github.head_ref || 'edge' }}
+      TEST_SOURCE: ${{ github.event.inputs.TEST_SOURCE || github.head_ref || 'edge' }}
 
     steps:
     - name: Checkout Repository
@@ -61,6 +70,7 @@ jobs:
       run: make snapshot-test-update
 
     - name: Create Snapshot update Request
+      id: create-pull-request
       if: failure()
       uses: peter-evans/create-pull-request@v5
       with:
@@ -70,3 +80,15 @@ jobs:
           branch: 'app-testing/${{ env.TARGET }}-from-${{ env.TEST_SOURCE}}'
           base: ${{ env.TEST_SOURCE}}
 
+    - name: Comment on PR
+      if: failure() && github.event_name == 'pull_request'
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const message = 'A PR has been opened to address analyses snapshot changes. Please review the changes here: https://github.com/${{ github.repository }}/pull/${{ steps.create-pull-request.outputs.pull-request-number }}';
+          github.rest.issues.createComment({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            issue_number: context.issue.number,
+            body: message
+          });

.github/workflows/components-test-build-deploy.yaml

@@ -7,13 +7,17 @@ on:
     paths:
       - 'Makefile'
       - 'components/**'
-      - 'app/**/*.stories.@(js|jsx|ts|tsx)'
+      - 'app/**/*.stories.*'
+      - 'app/src/atoms/**/*'
+      - 'app/src/molecules/**/*'
       - 'package.json'
       - '.github/workflows/components-test-build-deploy.yaml'
   push:
     paths:
       - 'components/**'
-      - 'app/**/*.stories.@(js|jsx|ts|tsx)'
+      - 'app/**/*.stories.*'
+      - 'app/src/atoms/**/*'
+      - 'app/src/molecules/**/*'
       - 'package.json'
       - '.github/workflows/components-test-build-deploy.yaml'
     branches:
@@ -114,15 +118,18 @@ jobs:
     steps:
       - id: determine-build-type
         run: |
-          echo "Determining build type for event ${{github.event_type}} and ref ${{github.ref}}"
-          if [ "${{ format('{0}', github.ref == 'refs/heads/edge') }}" = "true" ] ; then
-            echo "storybook s3 builds for edge"
+          echo "Determining build type for event ${{github.event_name}} and ref ${{github.ref}}"
+          if [ "${{ format('{0}', github.event_name == 'pull_request') }}" = "true" ] ; then
+            echo "No builds for pull requests"
+            echo 'type=none' >> $GITHUB_OUTPUT
+          elif [ "${{ format('{0}', startsWith(github.ref, 'refs/heads/')) }}" = "true" ] ; then
+            echo "storybook s3 builds for branch ${{ github.ref_name }}"
             echo 'type=storybook' >> $GITHUB_OUTPUT
           elif [ "${{ format('{0}', startsWith(github.ref, 'refs/tags/components')) }}" = "true" ] ; then
             echo "publish builds for components tags"
             echo 'type=publish' >> $GITHUB_OUTPUT
           else
-            echo "No build for ref ${{github.ref}} and event ${{github.event_type}}"
+            echo "No build for ref ${{github.ref}} and event ${{github.event_name}}"
             echo 'type=none' >> $GITHUB_OUTPUT
           fi
 
@@ -162,6 +169,10 @@ jobs:
           AWS_DEFAULT_REGION: us-east-2
         run: |
           aws s3 sync ./dist s3://opentrons-components/${{ env.OT_BRANCH}} --acl public-read
+      - name: 'Set generated URL'
+        run: |
+          echo 'Created component storybook for [${{ env.OT_BRANCH }}](https://s3-us-west-2.amazonaws.com/opentrons-components/${{ env.OT_BRANCH }}/index.html?path=/)' >> $GITHUB_STEP_SUMMARY
+          echo 'Created component storybook for https://s3-us-west-2.amazonaws.com/opentrons-components/${{ env.OT_BRANCH }}/index.html?path=/'
 
   publish-components:
     name: 'publish components package to npm'
@@ -190,9 +201,9 @@ jobs:
           npm config set cache ./.npm-cache
           yarn config set cache-folder ./.yarn-cache
           make setup-js
-      - name: 'build typescript'
-        run: make build-ts
-      - name: 'build library'
+      - name: 'build typescript types'
+        run: make -C components build-ts
+      - name: 'build js bundle'
         run: |
           make -C components lib
       # replace package.json stub version number with version from tag

.github/workflows/hardware-testing.yaml

@@ -9,6 +9,9 @@ on:
     paths:
       - 'Makefile'
       - 'hardware-testing/**'
+      - 'api/**'
+      - 'shared-data/**'
+      - 'hardware/**'
       - '.github/workflows/hardware-testing.yaml'
       - '.github/actions/python/**'
     branches:

.github/workflows/js-check.yaml

@@ -75,12 +75,12 @@ jobs:
           make setup-js
         # Use the if to run all the lint checks even of some fail
         shell: bash
-      - name: 'lint js'
-        if: always() && steps.setup-js.outcome == 'success'
-        run: make lint-js
       - name: 'typechecks'
         if: always() && steps.setup-js.outcome == 'success'
         run: make check-js
+      - name: 'lint js'
+        if: always() && steps.setup-js.outcome == 'success'
+        run: make lint-js
       - name: 'circular deps'
         if: always() && steps.setup-js.outcome == 'success'
         run: make circular-dependencies-js

.github/workflows/opentrons-ai-client-staging-continuous-deploy.yaml

@@ -0,0 +1,64 @@
+name: 'OpentronsAI client edge continuous deployment to staging'
+
+on:
+  push:
+    branches:
+      - edge
+    paths:
+      - 'opentrons-ai-client/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.run_id }}
+  cancel-in-progress: true
+
+env:
+  CI: true
+
+jobs:
+  js-unit-test:
+    runs-on: 'ubuntu-22.04'
+    permissions:
+      id-token: write
+      contents: read
+    name: 'OpentronsAI client edge continuous deployment to staging'
+    timeout-minutes: 10
+    steps:
+      - uses: 'actions/checkout@v3'
+      - uses: 'actions/setup-node@v3'
+        with:
+          node-version: '18.19.0'
+      - name: 'install udev'
+        run: |
+          # WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update && sudo apt-get install libudev-dev
+      - name: 'set complex environment variables'
+        id: 'set-vars'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { buildComplexEnvVars } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
+            buildComplexEnvVars(core, context)
+      - name: 'cache yarn cache'
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ github.workspace }}/.npm-cache/_prebuild
+            ${{ github.workspace }}/.yarn-cache
+          key: js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+      - name: 'setup-js'
+        run: |
+          npm config set cache ${{ github.workspace }}/.npm-cache
+          yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
+          make setup-js
+      - name: 'build'
+        run: |
+          make -C opentrons-ai-client build-staging
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.STAGING_AI_ROLE_ARN }}
+          aws-region: ${{ secrets.STAGING_AI_REGION }}
+      - name: 'deploy to staging'
+        run: |
+          make -C opentrons-ai-client staging-deploy

.github/workflows/opentrons-ai-production-deploy.yaml

@@ -0,0 +1,105 @@
+name: 'OpentronsAI production deployment'
+
+on:
+  push:
+    tags:
+      - 'ai-client@*'
+      - 'ai-server@*'
+
+env:
+  CI: true
+
+jobs:
+  deploy-client:
+    if: startsWith(github.ref, 'refs/tags/ai-client@')
+    # if there is a deployment (this workflow) in progress for the ai-client@ tag, cancel it
+    concurrency:
+      group: ${{ github.workflow }}-ai-client@
+      cancel-in-progress: true
+    runs-on: 'ubuntu-22.04'
+    permissions:
+      id-token: write
+      contents: read
+    name: 'OpentronsAI client prod deploy'
+    timeout-minutes: 10
+    steps:
+      - uses: 'actions/checkout@v3'
+      - uses: 'actions/setup-node@v3'
+        with:
+          node-version: '18.19.0'
+      - name: 'install udev'
+        run: |
+          # WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update && sudo apt-get install libudev-dev
+      - name: 'set complex environment variables'
+        id: 'set-vars'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { buildComplexEnvVars } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
+            buildComplexEnvVars(core, context)
+      - name: 'cache yarn cache'
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ github.workspace }}/.npm-cache/_prebuild
+            ${{ github.workspace }}/.yarn-cache
+          key: js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+      - name: 'setup-js'
+        run: |
+          npm config set cache ${{ github.workspace }}/.npm-cache
+          yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
+          make setup-js
+      - name: 'build'
+        run: |
+          make -C opentrons-ai-client build-production
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.PROD_AI_ROLE_ARN }}
+          aws-region: ${{ secrets.PROD_AI_REGION }}
+      - name: 'deploy client to prod'
+        run: |
+          make -C opentrons-ai-client prod-deploy
+
+  deploy-server:
+    if: startsWith(github.ref, 'refs/tags/ai-server@')
+    # if there is a deployment (this workflow) in progress for the ai-server@ tag, cancel it
+    concurrency:
+      group: ${{ github.workflow }}-ai-server@
+      cancel-in-progress: true
+    runs-on: 'ubuntu-latest'
+    permissions:
+      id-token: write
+      contents: read
+    name: 'OpentronsAI server prod deploy'
+    timeout-minutes: 10
+    steps:
+      - name: Extract Version
+        id: extract_version
+        run: |
+          TAG_REF=${{ github.ref }}
+          SERVER_VERSION=${TAG_REF#refs/tags/ai-server@}
+          echo "SERVER_VERSION=$SERVER_VERSION" >> "$GITHUB_OUTPUT"
+      - name: Checkout opentrons repo
+        uses: 'actions/checkout@v4'
+      - name: Setup Python
+        uses: 'actions/setup-python@v5'
+        with:
+          python-version: '3.12'
+          cache: 'pipenv'
+          cache-dependency-path: opentrons-ai-server/Pipfile.lock
+      - name: Setup
+        id: install
+        working-directory: ./opentrons-ai-server
+        run: make setup
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.PROD_AI_ROLE_ARN }}
+          aws-region: ${{ secrets.PROD_AI_REGION }}
+      - name: 'deploy api to prod'
+        working-directory: ./opentrons-ai-server
+        run: |
+          make deploy ENV=prod TAG=${{ steps.extract_version.outputs.SERVER_VERSION }}