solace-agent-mesh 1.0.1__tar.gz → 1.0.2__tar.gz

solace_agent_mesh-1.0.2/.github/workflows/ci.yaml

@@ -0,0 +1,171 @@
+name: CI
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - main
+
+permissions:
+  repository-projects: read
+  contents: write
+  id-token: write
+  packages: write
+  checks: write
+  pull-requests: write
+
+jobs:
+  ci:
+    uses: SolaceDev/solace-public-workflows/.github/workflows/hatch_ci.yml@main
+    with:
+      min-python-version: "3.10"
+      max-python-version: "3.13"
+      whitesource_project_name: "solace-agent-mesh"
+      whitesource_product_name: "solaceai"
+      whitesource_config_file: "wss-unified-agent.config"
+      npm_package_path: client/webui/frontend
+      node_version: 20
+      npm_lock_file: package-lock.json
+
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+      SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
+      WHITESOURCE_API_KEY: ${{ secrets.WHITESOURCE_API_KEY }}
+      MANIFEST_AWS_ACCESS_KEY_ID: ${{ secrets.MANIFEST_READ_ONLY_AWS_ACCESS_KEY_ID }}
+      MANIFEST_AWS_SECRET_ACCESS_KEY: ${{ secrets.MANIFEST_READ_ONLY_AWS_SECRET_ACCESS_KEY }}
+      MANIFEST_AWS_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  docker-build:
+    name: Build Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Get Commit Hash
+        id: get_commit_hash
+        run: |
+          echo "commit_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "short_sha=${GITHUB_SHA:0:10}" >> $GITHUB_OUTPUT
+
+      - name: Get Version from hatch
+        id: get_version
+        run: |
+          python3 -m pip install hatch
+          echo "version=$(hatch version)" >> $GITHUB_OUTPUT
+          echo "Found version: $(hatch version)"
+
+      - name: Determine Release Tag
+        id: release_tag
+        run: |
+          # Sanitize ref_name for Docker tag compatibility (replace / with -)
+          sanitized_ref="${{ github.ref_name }}"
+          sanitized_ref="${sanitized_ref//\//-}"
+          echo "release_tag=${sanitized_ref}" >> $GITHUB_OUTPUT
+          echo "Using sanitized branch name as release tag: ${sanitized_ref} (from ${{ github.ref_name }})"
+
+      - name: Set Build Params
+        id: set_build_params
+        run: |
+          if [[ "${{ github.event_name  == 'push' }}" == "true" ]]; then
+            export DOCKER_PUSH=true
+            export UPDATE_MANIFEST=true
+          else
+            export DOCKER_PUSH=false
+            export UPDATE_MANIFEST=false
+          fi
+          echo "DOCKER_PUSH=$DOCKER_PUSH" >> $GITHUB_ENV
+          echo "UPDATE_MANIFEST=$UPDATE_MANIFEST" >> $GITHUB_ENV
+
+      - name: Setup Qemu
+        uses: docker/setup-qemu-action@v3.6.0
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3.10.0
+
+      - name: Configure AWS credentials
+        if: fromJSON(env.DOCKER_PUSH)
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.SAM_AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.SAM_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+
+      - name: Login to Amazon ECR
+        if: fromJSON(env.DOCKER_PUSH)
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Tag Images
+        id: tag_images
+        shell: bash
+        run: |
+          version="${{ steps.get_version.outputs.version }}"
+          release_tag="${{ steps.release_tag.outputs.release_tag }}"
+          short_sha="${{ steps.get_commit_hash.outputs.short_sha }}"
+
+          # Determine image name based on event and branch
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == "${{ github.event.repository.default_branch }}" ]]; then
+            # Push to default branch - use ECR registry
+            image_name="${{ secrets.SAM_AWS_ECR_REGISTRY }}/solace-agent-mesh"
+            echo "Using ECR registry for default branch push"
+          else
+            # PR or other branch - use GitHub repo name
+            image_name="${{ github.repository }}"
+            echo "Using GitHub repository name for PR/branch build"
+          fi
+
+          # Create tags array
+          tags="${image_name}:${version}"
+          tags="${tags},${image_name}:${version}-${short_sha}"
+          tags="${tags},${image_name}:${release_tag}"
+          tags="${tags},${image_name}:${release_tag}-${short_sha}"
+
+          echo "tags=${tags}" >> $GITHUB_OUTPUT
+          echo "Created tags: ${tags}"
+
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v6.16.0
+        with:
+          context: .
+          file: Dockerfile
+          tags: ${{ steps.tag_images.outputs.tags }}
+          push: ${{ fromJSON(env.DOCKER_PUSH)}}
+          cache-from: type=gha
+          cache-to: type=gha
+
+      - name: Update Release Manifest
+        if: fromJSON(env.UPDATE_MANIFEST)
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.SAM_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.SAM_AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+        run: |
+          # Set release manifest variables
+          export release_version="${{ steps.get_version.outputs.version }}-${{ steps.get_commit_hash.outputs.short_sha }}"
+          export version="${{ steps.get_version.outputs.version }}"
+          export image_tag="${{ steps.get_version.outputs.version }}-${{ steps.get_commit_hash.outputs.short_sha }}"
+          export chart_version="n/a"
+          export sha="${{ steps.get_commit_hash.outputs.commit_hash }}"
+          export squad="ai"
+          export repository="solace-agent-mesh"
+          export release_tag="${{ steps.release_tag.outputs.release_tag }}"
+
+          # Update DynamoDB manifest
+          aws dynamodb update-item \
+              --table-name solace-cloud-manifest \
+              --key "{\"squad\":{\"S\":\"${squad}\"},\"repository\": {\"S\": \"${repository}\"} }"\
+              --update-expression "SET dev = :r" \
+              --expression-attribute-values \
+              """{\":r\":
+                      {\"M\":
+                          {
+                            \"version\":{\"S\":\"${version}\"},
+                            \"image_tag\":{\"S\":\"${image_tag}\"},
+                            \"chart_version\": {\"S\": \"${chart_version}\"},
+                            \"sha\": {\"S\": \"${sha}\"},
+                            \"release_version\": {\"S\": \"${release_version}\"}
+                          }
+                      }
+              }"""

solace_agent_mesh-1.0.2/.github/workflows/cleanup_ws.yaml

@@ -0,0 +1,14 @@
+name: Cleanup WhiteSource Project
+
+on:
+  pull_request:
+    types: [closed]
+
+permissions:
+  contents: read
+
+jobs:
+  cleanup-whitesource:
+    uses: SolaceDev/solace-public-workflows/.github/workflows/cleanup_ws.yml@main
+    secrets:
+      ws_api_key: ${{ secrets.WHITESOURCE_API_KEY }}

solace_agent_mesh-1.0.2/.github/workflows/push-docker.yml

@@ -0,0 +1,161 @@
+name: Push Docker Image (Manual Dispatch)
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref-to-checkout:
+        description: "The ref to checkout"
+        required: true
+        type: string
+        default: "main"
+      version:
+        description: "The version tag for the Docker image (e.g., 1.0.0). If not provided, it will attempt to use the latest git tag."
+        required: false
+        type: string
+        default: ""
+
+      destination:
+        description: "The destination to push the Docker image to"
+        required: false
+        type: choice
+        default: "ECR"
+        options:
+          - ECR
+          - DockerHub
+      push_latest:
+        description: 'Whether to also tag and push as "latest"'
+        required: false
+        type: boolean
+        default: false
+      update_manifest:
+        description: "Whether to update the image manifest"
+        required: false
+        type: boolean
+        default: false
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          ref: ${{ github.event.inputs.ref-to-checkout }}
+
+      - name: Get Commit Hash
+        id: get_commit_hash
+        run: |
+          echo "commit_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "short_sha=${GITHUB_SHA:0:10}" >> $GITHUB_OUTPUT
+
+      - name: Get Version from hatch
+        id: get_version
+        run: |
+          python3 -m pip install hatch
+          echo "version=$(hatch version)" >> $GITHUB_OUTPUT
+          echo "Found version: $(hatch version)"
+
+      - name: Push to DockerHub
+        if: github.event.inputs.destination == 'DockerHub'
+        uses: ./.github/actions/push-docker
+        with:
+          version_tag: ${{ steps.get_version.outputs.version }}
+          push_latest: ${{ github.event.inputs.push_latest }}
+          docker_username: ${{ secrets.DOCKER_USERNAME }}
+          docker_password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Setup Qemu
+        if: github.event.inputs.destination == 'ECR'
+        uses: docker/setup-qemu-action@v3.6.0
+
+      - name: Setup Docker Buildx
+        if: github.event.inputs.destination == 'ECR'
+        uses: docker/setup-buildx-action@v3.10.0
+
+      - name: Configure AWS credentials
+        if: github.event.inputs.destination == 'ECR'
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.SAM_AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.SAM_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+
+      - name: Login to Amazon ECR
+        if: github.event.inputs.destination == 'ECR'
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Create ECR Tags
+        if: github.event.inputs.destination == 'ECR'
+        id: ecr_tags
+        shell: bash
+        run: |
+          registry="${{ github.event.inputs.destination == 'ECR' && secrets.SAM_AWS_ECR_REGISTRY || 'solace' }}"
+          version="${{ steps.get_version.outputs.version }}"
+          short_sha="${{ steps.get_commit_hash.outputs.short_sha }}"
+          ref_name="${{ github.event.inputs.ref-to-checkout }}"
+
+          # Create tags array
+          tags="${registry}/solace-agent-mesh:${version}"
+          tags="${tags},${registry}/solace-agent-mesh:${version}-${short_sha}"
+          tags="${tags},${registry}/solace-agent-mesh:${ref_name}"
+          tags="${tags},${registry}/solace-agent-mesh:${ref_name}-${short_sha}"
+
+          if [[ "${{ github.event.inputs.push_latest }}" == "true" ]]; then
+            tags="${tags},${registry}/solace-agent-mesh:latest"
+          fi
+
+          echo "tags=${tags}" >> $GITHUB_OUTPUT
+          echo "Created ECR tags: ${tags}"
+
+      - name: Build and Push to ECR
+        if: github.event.inputs.destination == 'ECR'
+        uses: docker/build-push-action@v6.16.0
+        with:
+          context: .
+          file: Dockerfile
+          tags: ${{ steps.ecr_tags.outputs.tags }}
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha
+
+      - name: Update Release Manifest
+        if: github.event.inputs.destination == 'ECR' && github.event.inputs.update_manifest == 'true'
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.SAM_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.SAM_AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+        run: |
+          # Set release manifest variables
+          export release_version="${{ steps.get_version.outputs.version }}-${{ steps.get_commit_hash.outputs.short_sha }}"
+          export version="${{ steps.get_version.outputs.version }}"
+          export image_tag="${{ steps.get_version.outputs.version }}-${{ steps.get_commit_hash.outputs.short_sha }}"
+          export chart_version="n/a"
+          export sha="${{ steps.get_commit_hash.outputs.commit_hash }}"
+          export squad="ai"
+          export repository="solace-agent-mesh"
+          export release_tag="${{ github.event.inputs.ref-to-checkout }}"
+
+          # Update DynamoDB manifest
+          aws dynamodb update-item \
+              --table-name solace-cloud-manifest \
+              --key "{\"squad\":{\"S\":\"${squad}\"},\"repository\": {\"S\": \"${repository}\"} }"\
+              --update-expression "SET dev = :r" \
+              --expression-attribute-values \
+              """{\":r\":
+                      {\"M\":
+                          {
+                            \"version\":{\"S\":\"${version}\"},
+                            \"image_tag\":{\"S\":\"${image_tag}\"},
+                            \"chart_version\": {\"S\": \"${chart_version}\"},
+                            \"sha\": {\"S\": \"${sha}\"},
+                            \"release_version\": {\"S\": \"${release_version}\"}
+                          }
+                      }
+              }"""

{solace_agent_mesh-1.0.1 → solace_agent_mesh-1.0.2}/.github/workflows/release.yml

@@ -19,12 +19,14 @@ permissions:
 
 jobs:
   release:
-    uses: SolaceDev/solace-public-workflows/.github/workflows/hatch_release_pypi.yml@ws-block
+    uses: SolaceDev/solace-public-workflows/.github/workflows/hatch_release_pypi.yml@main
     with:
       ENVIRONMENT: pypi
       version: ${{ github.event.inputs.version }}
       whitesource_project_name: "solace-agent-mesh"
       whitesource_product_name: "solaceai"
+      prisma_check: true
+      sonarqube_hotspot_check: true
       npm_package_path: client/webui/frontend
       node_version: 20
       npm_lock_file: package-lock.json
@@ -33,9 +35,17 @@ jobs:
     secrets:
       COMMIT_KEY: ${{ secrets.COMMIT_KEY }}
       PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+      PRISMA_DOCKER_IMAGE_TO_CHECK: ${{ secrets.DOCKER_IMAGE_TO_CHECK }}
+      PRISMA_ACCESS_KEY: ${{ secrets.PRISMA_ACCESS_KEY_ID }}
+      PRISMA_ACCESS_KEY_SECRET: ${{ secrets.PRISMA_SECRET_ACCESS_KEY }}
+      SONARQUBE_PROJECT_KEY: ${{ secrets.SONARQUBE_PROJECT_KEY }}
+      SONARQUBE_PROJECT_MAIN_BRANCH: "main"
+      SONARQUBE_QUERY_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+      SONARQUBE_HOTSPOTS_API_URL: ${{ secrets.SONARQUBE_HOTSPOTS_API_URL }}
       WHITESOURCE_API_KEY: ${{ secrets.WHITESOURCE_API_KEY }}
-      MANIFEST_AWS_ACCESS_KEY_ID: ${{ secrets.MANIFEST_AWS_ACCESS_KEY_ID }}
-      MANIFEST_AWS_SECRET_ACCESS_KEY: ${{ secrets.MANIFEST_AWS_SECRET_ACCESS_KEY }}
+      MANIFEST_AWS_ACCESS_KEY_ID: ${{ secrets.SAM_AWS_ACCESS_KEY_ID }}
+      MANIFEST_AWS_SECRET_ACCESS_KEY: ${{ secrets.SAM_AWS_SECRET_ACCESS_KEY }}
+      MANIFEST_AWS_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
 
   build_and_push_docker:
     name: Build and Push Docker Image
@@ -45,24 +55,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-          fetch-tags: true
+          ref: ${{ needs.release.outputs.commit_hash }}
 
-      - name: Get Latest Tag
-        id: get_latest_tag
-        run: |
-          latest_tag=$(git describe --tags --abbrev=0)
-          if [[ -z "${latest_tag}" ]]; then
-            echo "No git tags found. The semver_release_pypi job might have failed to create a tag."
-            exit 1
-          fi
-          echo "latest_tag=${latest_tag}" >> $GITHUB_OUTPUT
-          echo "Using latest tag for Docker image: ${latest_tag}"
-
-      - name: Push Docker Image using Composite Action
+      - name: Build and Push Docker Image to DockerHub
         uses: ./.github/actions/push-docker
         with:
-          version_tag: ${{ steps.get_latest_tag.outputs.latest_tag }}
-          push_latest: true # Or false, depending on your preference for release tags
+          version_tag: ${{ needs.release.outputs.new_version }}
+          push_latest: true
           docker_username: ${{ secrets.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}

{solace_agent_mesh-1.0.1 → solace_agent_mesh-1.0.2}/.vscode/launch.json

@@ -174,5 +174,19 @@
             },
             "subProcess": true
         },
+        {
+            "name": "Python: Pytest (specific test)",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "pytest",
+            "args": [
+                "tests/integration/scenarios_declarative/test_declarative_runner.py::test_declarative_scenario[embeds/late/test_ac_template_missing_template_file]"
+            ],
+            "justMyCode": false,
+            "console": "integratedTerminal",
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}"
+            }
+        },
     ]
-}
+}

{solace_agent_mesh-1.0.1 → solace_agent_mesh-1.0.2}/Dockerfile

@@ -44,4 +44,4 @@ LABEL org.opencontainers.image.source=https://github.com/SolaceLabs/solace-agent
 EXPOSE 3000 5002 5003 8000 8088
 
 # CLI entry point
-ENTRYPOINT ["solace-agent-mesh"]
+ENTRYPOINT ["solace-agent-mesh"]

{solace_agent_mesh-1.0.1 → solace_agent_mesh-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solace-agent-mesh
-Version: 1.0.1
+Version: 1.0.2
 Summary: Solace Agent Mesh is an open-source framework for building event-driven, multi-agent AI systems where specialized agents collaborate on complex tasks.
 Project-URL: Homepage, https://github.com/SolaceLabs/solace-agent-mesh
 Project-URL: Repository, https://github.com/SolaceLabs/solace-agent-mesh
@@ -247,7 +247,7 @@ Requires-Dist: python-jwt>=3.3
 Requires-Dist: python-multipart>=0.0.7
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rouge~=1.0.1
-Requires-Dist: solace-ai-connector~=1.1.7
+Requires-Dist: solace-ai-connector~=1.1.8
 Requires-Dist: sse-starlette>=1.6
 Requires-Dist: toml~=0.10.2
 Requires-Dist: uvicorn[standard]>=0.20