Merge branch 'chore_release-pd-8.5.0' into chore_mergeback-8.5.0-to-pd-branch

Author: smb2268

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

@@ -210,6 +210,7 @@ jobs:
           VERSION_STRING=$(echo ${{ github.ref }} | sed 's/refs\/tags\/components@//')
           json -I -f ./components/package.json -e "this.version=\"$VERSION_STRING\""
           json -I -f ./components/package.json -e "this.dependencies['@opentrons/shared-data']=\"$VERSION_STRING\""
+          json -I -f ./components/package.json -e "delete this.dependencies['@opentrons/step-generation']"
       - uses: 'actions/setup-node@v4'
         with:
           node-version: '22.11.0'

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

@@ -6,6 +6,7 @@ on:
       - edge
     paths:
       - 'opentrons-ai-client/**'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.run_id }}

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

@@ -6,6 +6,7 @@ on:
       - edge
     paths:
       - 'opentrons-ai-server/**'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.run_id }}

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

@@ -83,8 +83,12 @@ jobs:
       - uses: ./.github/actions/js/setup
       - name: 'build PD'
         env:
+          NODE_OPTIONS: '--max-old-space-size=5120'
           OT_PD_MIXPANEL_ID: ${{ secrets.OT_PD_MIXPANEL_ID }}
           OT_PD_MIXPANEL_DEV_ID: ${{ secrets.OT_PD_MIXPANEL_DEV_ID }}
+          # ToDo(kk:04/23/2025) need to setup sentry org account and project
+          # OT_PD_SENTRY_DSN: ${{ secrets.OT_PD_SENTRY_DNS }}
+          # OT_PD_SENTRY_DEV_DSN: ${{ secrets.OT_PD_SENTRY_DEV_DSN }}
         run: |
           make -C protocol-designer NODE_ENV=development
       - name: 'upload github artifact'
@@ -93,6 +97,23 @@ jobs:
           name: 'pd-artifact'
           path: protocol-designer/dist
 
+  # ToDo(kk:04/23/2025) need to setup sentry org account and project
+  # upload-sourcemaps-pd:
+  #   timeout-minutes: 10
+  #   name: 'upload protocol designer source maps'
+  #   needs: ['build-pd']
+  #   runs-on: 'ubuntu-24.04'
+  #   if: github.event_name != 'pull_request'
+
+  #   uses: getsentry/action-release@v3
+  #   env:
+  #     SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+  #     SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+  #     SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+  #   with:
+  #     name: pd-artifact
+  #     sourcemaps: ./dist
+
   deploy-pd:
     timeout-minutes: 10
     name: 'deploy protocol designer'

.prettierrc.js

@@ -12,4 +12,26 @@ module.exports = {
   jsxBracketSameLine: false, // default
   arrowParens: 'avoid', // default
   endOfLine: 'lf',
+  plugins: ['@ianvs/prettier-plugin-sort-imports'],
+  importOrder: [
+    '^(react)(.*)$',
+    '<THIRD_PARTY_MODULES>',
+    '',
+    '^@opentrons/(.*)$',
+    '',
+    '^/(.*)/(?!assets)(.*)$',
+    '',
+    '^[./](?!.*\\.(png|jpg|jpeg|gif|svg|webm|mp4)$)',
+    '',
+    '<TYPES>',
+    '<TYPES>^(react)(.*)$',
+    '<TYPES><THIRD_PARTY_MODULES>',
+    '<TYPES>^@opentrons/(.*)$',
+    '<TYPES>^/(.*)/(?!assets)(.*)$',
+    '<TYPES>^[./]',
+    '',
+    '.*/assets/.*',
+    '.*\\.(png|jpg|jpeg|gif|svg|webm|mp4)$',
+  ],
+  importOrderParserPlugins: ['typescript', 'jsx', 'decorators-legacy'],
 }

.storybook/main.ts

@@ -4,6 +4,10 @@ module.exports = {
     '../app/**/*.stories.@(js|jsx|ts|tsx)',
     '../protocol-designer/**/*.stories.@(js|jsx|ts|tsx)',
     '../opentrons-ai-client/**/*.stories.@(js|jsx|ts|tsx)',
+    '../components/**/*.mdx',
+    '../app/**/*.mdx',
+    '../protocol-designer/**/*.mdx',
+    '../opentrons-ai-client/**/*.mdx',
   ],
 
   addons: [

.storybook/preview.tsx

@@ -1,4 +1,5 @@
 import { I18nextProvider } from 'react-i18next'
+
 import { GlobalStyle } from '../app/src/atoms/GlobalStyle'
 import { i18n } from '../app/src/i18n'
 
@@ -46,10 +47,19 @@ export const customViewports = {
     name: 'Protocol Designer Base',
     type: 'desktop',
     styles: {
-      width: '14402px',
+      width: '1440px',
       height: '1024px',
     },
   },
+  protocolDesignerSmallHeight: {
+    // The small height for Protocol Designer. This might be the base size for web
+    name: 'Protocol Designer Small Height',
+    type: 'desktop',
+    styles: {
+      width: '1440px',
+      height: '664px',
+    },
+  },
 }
 
 export const parameters = {

__mocks__/electron-store.js

@@ -1,5 +1,6 @@
 // mock electron-store
 'use strict'
+
 import { vi } from 'vitest'
 
 // will by default mock the config dir. if you need other behaavior you can

__mocks__/electron-updater.js

@@ -1,6 +1,8 @@
 // mock electron-updater
 'use strict'
+
 import { vi } from 'vitest'
+
 const EventEmitter = require('events')
 const autoUpdater = new EventEmitter()
 

abr-testing/abr_testing/automation/slack.py

@@ -0,0 +1,156 @@
+"""Slack Functions for Robot Communication."""
+from slack_sdk import WebClient
+from slack_sdk.web.slack_response import SlackResponse
+import configparser
+import os
+from typing import Optional, List, cast
+from opentrons.protocols.parameters.types import ParameterChoice
+
+
+class Slack:
+    """Slack Tool."""
+
+    def __init__(
+        self,
+        configuration: configparser.ConfigParser,
+        channel_name: str,
+        user_name: str,
+    ) -> None:
+        """Connects to slack channel."""
+        slack_token = configuration["DEFAULT"]["slack_token"]
+        self.client = WebClient(token=slack_token)
+        self.channel = channel_name
+        self.user_name = user_name
+        # If user is a robot, then the icon will be the opentron logo
+        if user_name.startswith("DVT") or user_name.startswith("PVT"):
+            self.icon_emoji = ":robot_face:"
+        else:
+            self.icon_emoji = ":gear:"
+            print("Using computer icon for non-robot user.")
+
+    def get_users_in_channel(self, channel_id: str) -> List[ParameterChoice]:
+        """Get all active, human users in a specific Slack channel."""
+        all_member_ids: List[str] = []
+        channel_cursor: Optional[str] = None
+
+        while True:
+            response_members: SlackResponse = self.client.conversations_members(
+                channel=channel_id, cursor=channel_cursor
+            )
+            if not cast(dict, response_members).get("ok", False):
+                raise Exception("Failed to get channel members from Slack API.")
+
+            all_member_ids.extend(
+                cast(list, cast(dict, response_members).get("members", []))
+            )
+            channel_cursor = cast(
+                Optional[str],
+                cast(dict, response_members)
+                .get("response_metadata", {})
+                .get("next_cursor"),
+            )
+            if not channel_cursor:
+                break
+
+        user_list: List[ParameterChoice] = []
+        user_cursor: Optional[str] = None
+
+        while True:
+            response: SlackResponse = self.client.users_list(cursor=user_cursor)
+            if not cast(dict, response).get("ok", False):
+                raise Exception("Failed to get users from Slack API.")
+
+            users: List[dict] = cast(list, cast(dict, response).get("members", []))
+            for user in users:
+                user_id = user.get("id")
+                profile = user.get("profile", {})
+                if (
+                    user_id in all_member_ids
+                    and not user.get("deleted", False)
+                    and not user.get("is_bot", False)
+                ):
+                    first_name = profile.get("first_name", "").strip()
+                    last_name = profile.get("last_name", "").strip()
+                    display_name = (
+                        profile.get("real_name", "Unknown User")
+                        if not first_name and not last_name
+                        else f"{first_name} {last_name}".strip()
+                    )
+                    user_list.append(
+                        ParameterChoice(display_name=display_name, value=user_id)
+                    )
+            user_cursor = cast(
+                Optional[str],
+                cast(dict, response).get("response_metadata", {}).get("next_cursor"),
+            )
+            if not user_cursor:
+                break
+
+        return user_list
+
+    def send_slack_message(
+        self,
+        message: str,
+        image_path: Optional[str] = None,
+        user_id: Optional[str] = None,
+    ) -> None:
+        """Send slack message with or without image."""
+        tagged_user = f"<@{user_id}> " if user_id and user_id.lower() != "none" else ""
+        message = tagged_user + " " + message
+        if image_path:
+            response = self.client.files_upload(
+                channels=self.channel,
+                file=image_path,
+                title=os.path.basename(image_path).split(".")[0],
+            )
+            response.validate()
+            file_permalink = response["file"]["permalink"]
+            self.client.chat_postMessage(
+                channel=self.channel,
+                blocks=[
+                    {
+                        "type": "image",
+                        "image_url": file_permalink,
+                    }
+                ],
+                text=message,
+                username=self.user_name,
+                icon_emoji=self.icon_emoji,
+            )
+        else:
+            self.client.chat_postMessage(
+                channel=self.channel,
+                text=message,
+                username=self.user_name,
+                icon_emoji=self.icon_emoji,
+            )
+
+    def send_run_completed_message(
+        self, protocol_name: str, user_id: Optional[str] = None
+    ) -> None:
+        """Send run completed message."""
+        tagged_user = f"<@{user_id}> " if user_id and user_id.lower() != "none" else ""
+        message = f"{tagged_user} {protocol_name} has completed successfully."
+        self.send_slack_message(message)
+
+    def send_run_started_message(
+        self, protocol_name: str, user_id: Optional[str] = None
+    ) -> None:
+        """Send run started message."""
+        tagged_user = f"<@{user_id}> " if user_id and user_id.lower() != "none" else ""
+        message = f"{tagged_user} Protocol: {protocol_name} has started."
+        self.send_slack_message(message)
+
+    def send_error_message(
+        self,
+        protocol_name: str,
+        error_str: str,
+        image_path: Optional[str] = None,
+        user_id: Optional[str] = None,
+    ) -> None:
+        """Send error message to Slack, optionally tagging a user."""
+        tagged_user = f"<@{user_id}> " if user_id and user_id.lower() != "none" else ""
+        message = f"{tagged_user} Protocol: {protocol_name} ended in error: {error_str}"
+
+        self.icon_emoji = ":alert:"
+        self.send_slack_message(message, image_path)