Merge remote-tracking branch 'upstream/main' into cf-2

Author: kmeng01

.github/dependabot.yml

@@ -1,11 +1,20 @@
 version: 2
 updates:
-- package-ecosystem: pip
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "13:00"
-  groups:
-    python-packages:
-      patterns:
-        - "*"
+  - package-ecosystem: pip
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "13:00"
+    groups:
+      python-packages:
+        patterns:
+          - "*"
+    ignore:
+      - dependency-name: "quarto-cli"
+        versions: [">=1.6.0"]
+      - dependency-name: "ruff"
+        versions: [">=0.9.5"]
+      - dependency-name: "textual"
+        versions: [">=2.0.0"]
+      - dependency-name: "fsspec"
+        versions: [">=2024.12.0"]

.github/workflows/build.yml

@@ -51,6 +51,18 @@ jobs:
         run: |
           mypy .
 
+  pre-commit:
+    runs-on: ubuntu-latest
+    env:
+      SKIP: "ruff"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: pip
+      - uses: pre-commit/[email protected]
+
   test:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/docker.yml

@@ -0,0 +1,76 @@
+name: Build and Push Image to Docker Hub
+
+on:
+  workflow_dispatch:
+    inputs:
+      image:
+        description: Image to build
+        required: true
+        type: choice
+        options:
+          - inspect-computer-tool
+          - inspect-web-browser-tool
+          - inspect-tool-support
+      tag:
+        description: Tag to assign to the image
+        required: true
+        type: string
+        default: latest
+      platforms:
+        description: Target platforms (comma-separated list)
+        required: true
+        type: string
+        default: linux/amd64,linux/arm64
+      push:
+        description: Push the image to Docker Hub
+        required: true
+        type: boolean
+        default: true
+      org:
+        description: Docker Hub organization
+        required: true
+        type: string
+        default: aisiuk
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    environment: docker
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Set build context path and image name
+        run: |
+          if [[ "${{ github.event.inputs.image }}" == "inspect-computer-tool" ]]; then
+            echo "BUILD_CONTEXT=src/inspect_ai/tool/_tools/_computer/_resources" >> $GITHUB_ENV
+          elif [[ "${{ github.event.inputs.image }}" == "inspect-web-browser-tool" ]]; then
+            echo "BUILD_CONTEXT=src/inspect_ai/tool/_tools/_web_browser/_resources" >> $GITHUB_ENV
+          elif [[ "${{ github.event.inputs.image }}" == "inspect-tool-support" ]]; then
+            echo "BUILD_CONTEXT=src/inspect_tool_support" >> $GITHUB_ENV
+          else
+            echo "Invalid image name '${{ github.event.inputs.image }}'"
+            exit 1
+          fi
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: arm64,amd64
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+      - name: Build and (optionally) push multi-arch image
+        uses: docker/build-push-action@v4
+        with:
+          context: ${{ env.BUILD_CONTEXT }}
+          push: ${{ github.event.inputs.push }}
+          platforms: ${{ github.event.inputs.platforms }}
+          tags: ${{ github.event.inputs.org }}/${{ github.event.inputs.image }}:${{ github.event.inputs.tag }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.pre-commit-config.yaml

@@ -1,11 +1,8 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-# This should be the _latest_ version of python supported by us
-default_language_version:
-  python: python3.11
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.3
+    rev: v0.9.6
     hooks:
       # Run the linter.
       - id: ruff
@@ -17,8 +14,9 @@ repos:
     hooks:
       - id: check-added-large-files
       - id: check-json
+        # The following are JSONC files.
+        exclude: '(^\.vscode/|^tools/vscode/|jsconfig\.json$|tsconfig\.json$)'
       - id: check-yaml
       - id: debug-statements
       - id: detect-private-key
-      - id: end-of-file-fixer
       - id: requirements-txt-fixer

.pylintrc

@@ -0,0 +1,9 @@
+[MASTER]
+; R - Refactorings
+; C - Convention
+; W - Warning
+; E - Error
+enable=E
+; We are starting conservatively disabling non-errors and a handful of currently noisy E's
+disable=R,W,C,E0401,E1101,E0611,E1128,E0606
+score=no

.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python Debugger: Module",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "inspect_ai",
+      "args": "${input:argsPrompt}",
+      "cwd": "${workspaceFolder}/src"
+    }
+  ],
+  "inputs": [
+    {
+      "id": "argsPrompt",
+      "type": "promptString",
+      "description": "Enter arguments for the module",
+      "default": ""
+    }
+  ]
+}