From aafb3d61cf8a5d662302277f9365ae771413afbb Mon Sep 17 00:00:00 2001 From: Alexey Snigir Date: Thu, 31 Oct 2024 12:55:08 +0100 Subject: [PATCH] fix reporting --- .../workflows/test-integration-vizro-ai.yml | 44 ------------------- .github/workflows/test-score-vizro-ai.yml | 4 +- 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/.github/workflows/test-integration-vizro-ai.yml b/.github/workflows/test-integration-vizro-ai.yml index d6d4379f9..f2a6ed5ab 100644 --- a/.github/workflows/test-integration-vizro-ai.yml +++ b/.github/workflows/test-integration-vizro-ai.yml @@ -154,47 +154,3 @@ jobs: env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK - - - name: Report artifacts - uses: actions/upload-artifact@v4 - if: always() - with: - name: Report-${{ matrix.config.python-version }}-${{ matrix.config.label }} - path: | - /home/runner/work/vizro/vizro/vizro-ai/tests/integration/reports/report*.csv - - test-integration-vizro-ai-report: - needs: test-integration-vizro-ai - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Download All Artifacts - uses: actions/download-artifact@v4 - - - name: Set current date as env variable - id: date - run: | - echo "::set-output name=date::$(date +'%Y-%m-%dT%H-%M-%S')" - echo "TIME_NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV - - - name: Create one csv report - run: | - cd /home/runner/work/vizro/vizro/ - head -n 1 Report-3.11-/report_model_gpt-4o-mini_pypi.csv > report-aggregated-${{ steps.date.outputs.date }}.csv && tail -n+2 -q */*.csv >> report-aggregated-${{ steps.date.outputs.date }}.csv - gawk -F, -i inplace 'FNR>1 {$1="${{ steps.date.outputs.date }}"} {print}' OFS=, report-aggregated-${{ steps.date.outputs.date }}.csv - - - name: Report artifacts - uses: actions/upload-artifact@v4 - if: always() - with: - name: Report-aggregated-${{ steps.date.outputs.date }} - path: | - /home/runner/work/vizro/vizro/report-aggregated-${{ steps.date.outputs.date }}.csv - - - name: Upload reports to artifactory - run: | - cd /home/runner/work/vizro/vizro/ - curl -fL https://getcli.jfrog.io | sh - ./jfrog config add vizro --artifactory-url ${{ secrets.ARTIFACTORY_URL}} --user ${{ secrets.ARTIFACTORY_USER}} --apikey ${{ secrets.ARTIFACTORY_PASS}} --interactive=false - ./jfrog rt u --flat=false "report-aggregated-${{ steps.date.outputs.date }}.csv" vizx-generic-local/vizro-ai-reports/ diff --git a/.github/workflows/test-score-vizro-ai.yml b/.github/workflows/test-score-vizro-ai.yml index 3d6607aae..8ed46380b 100644 --- a/.github/workflows/test-score-vizro-ai.yml +++ b/.github/workflows/test-score-vizro-ai.yml @@ -100,7 +100,7 @@ jobs: OPENAI_API_BASE: ${{ secrets.OPENAI_API_BASE }} VIZRO_TYPE: pypi BRANCH: ${{ github.head_ref }} - PYTHON_VERSION: ${{ matrix.python-version }} + PYTHON_VERSION: ${{ matrix.config.python-version }} - name: Run vizro-ai score tests with local vizro run: | @@ -111,7 +111,7 @@ jobs: OPENAI_API_BASE: ${{ secrets.OPENAI_API_BASE }} VIZRO_TYPE: local BRANCH: ${{ github.head_ref }} - PYTHON_VERSION: ${{ matrix.python-version }} + PYTHON_VERSION: ${{ matrix.config.python-version }} - name: Send custom JSON data to Slack id: slack