Skip to content

Commit

Permalink
Merge branch 'main' into merge-2.8.x-main-829558f
Browse files Browse the repository at this point in the history
  • Loading branch information
wochinge committed Sep 23, 2021
2 parents 829558f + 2bb76e1 commit a3009ec
Show file tree
Hide file tree
Showing 513 changed files with 40,490 additions and 21,507 deletions.
46 changes: 0 additions & 46 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

71 changes: 71 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Bug Report
description: Create a report to help us improve
labels: ["area:rasa-oss :ferris_wheel:","type:bug :bug:"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: version-rasa
attributes:
label: Rasa Open Source version
description: What's the rasa open source version you used (`rasa --version`)
validations:
required: true
- type: input
id: version-rasa-sdk
attributes:
label: Rasa SDK version
description: What's the rasa SDK version you used (if relevant)
- type: input
id: version-rasa-x
attributes:
label: Rasa X version
description: What's the Rasa X version you used (if relevant)
- type: dropdown
id: version-python
attributes:
label: Python version
options:
- 3.6
- 3.7
- 3.8
- 3.9
- 3.10
- Other
validations:
required: true
- type: dropdown
id: version-os
attributes:
label: What operating system are you using?
multiple: true
options:
- Linux
- OSX
- Windows
- Cloud (AWS / GCP / AZURE)
- Self hosted Cloud (openshift)
- Other
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
validations:
required: true
- type: textarea
id: command
attributes:
label: Command / Request
description: Command or request that led to the error. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output including errors and stacktraces. This will be automatically formatted into code, so no need for backticks.
render: shell
32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Feature request
description: Suggest an idea on how to improve Rasa
labels: ["area:rasa-oss :ferris_wheel:","type:enhancement :sparkles:"]
body:
- type: textarea
id: current-state
attributes:
label: What problem are you trying to solve?
description: Short overview of the current situation. Why is this feature needed? Please link any relevant [forum](https://forum.rasa.com) threads here.
validations:
required: true
- type: textarea
id: suggestion
attributes:
label: What's your suggested solution?
description: What would a possible solution look like? Describe, without going too low into technical details, what changes need to happen during implementation of this feature.
- type: textarea
id: examples
attributes:
label: Examples (if relevant)
description: List examples and/or link to relevant references.
- type: textarea
id: blockers
attributes:
label: Is anything blocking this from being implemented? (if relevant)
description: Is this feature blocked by anything or anyone? Or might there be any potential blockers on the way?
- type: textarea
id: definition-of-done
attributes:
label: Definition of Done
description: What needs to be there to consider this feature as done?
5 changes: 3 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ updates:
time: '13:00'
pull-request-branch-name:
separator: "-"
open-pull-requests-limit: 10
# currently disabled because we cannot update the docs theme and its dependencies
open-pull-requests-limit: 0
reviewers:
- RasaHQ/enable-squad
- "m-vdb"
labels:
- type:dependencies

Expand Down
8 changes: 7 additions & 1 deletion .github/scripts/mr_generate_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ def read_results(file):
with open(file) as json_file:
data = json.load(json_file)

keys = ["accuracy", "weighted avg", "macro avg", "micro avg", "conversation_accuracy"]
keys = [
"accuracy",
"weighted avg",
"macro avg",
"micro avg",
"conversation_accuracy",
]
result = {key: data[key] for key in keys if key in data}

return result
Expand Down
8 changes: 7 additions & 1 deletion .github/scripts/mr_publish_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,13 @@ def read_results(file):
with open(file) as json_file:
data = json.load(json_file)

keys = ["accuracy", "weighted avg", "macro avg", "micro avg", "conversation_accuracy"]
keys = [
"accuracy",
"weighted avg",
"macro avg",
"micro avg",
"conversation_accuracy",
]
result = {key: data[key] for key in keys if key in data}

return result
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/automatic-pr-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@ jobs:
# branch protection rules it will be merged automatically
mergepal:
runs-on: ubuntu-latest
if: github.repository == 'RasaHQ/rasa'

steps:
- uses: actions/checkout@v2
- uses: rasahq/update-pr-branch@601ac3dadf708b14e7f0252d98230538235f99d9
if: github.repository == 'RasaHQ/rasa'
with:
token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}
# required parameter by original action -
# check is already done through protected branches so not needed for us
required_approval_count: 0
# update branch despite failing check runs
require_passed_checks: false
2 changes: 1 addition & 1 deletion .github/workflows/automatic-release-to-main-merger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:

- name: Open pull request ☄️
if: always()
uses: repo-sync/pull-request@d80b305e358ef8131f270608735c72e2c913f2af
uses: repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3
with:
# using this token to make sure it triggers other actions
github_token: ${{ secrets.RASABOT_GITHUB_TOKEN }}
Expand Down
26 changes: 0 additions & 26 deletions .github/workflows/cancel-stale-workflows.yml

This file was deleted.

8 changes: 6 additions & 2 deletions .github/workflows/ci-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
pull_request:
types: [opened, synchronize, labeled]

concurrency:
group: ci-docs-tests-${{ github.ref }} # branch or tag name
cancel-in-progress: true

env:
DEFAULT_PYTHON_VERSION: '3.7'

Expand Down Expand Up @@ -41,7 +45,7 @@ jobs:
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}

- name: Set up Node 12.x 🦙
uses: actions/setup-node@v2.2.0
uses: actions/setup-node@v2.3.0
with:
node-version: '12.x'

Expand All @@ -51,7 +55,7 @@ jobs:
shell: bash

- name: Install poetry 🦄
uses: Gr1N/setup-poetry@v4
uses: Gr1N/setup-poetry@v7
with:
poetry-version: ${{ env.POETRY_VERSION }}

Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/ci-model-regression-on-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ jobs:
shell: bash

- name: Install poetry 🦄
uses: Gr1N/setup-poetry@v4
uses: Gr1N/setup-poetry@v7
if: steps.set_dataset_config_vars.outputs.is_dataset_exists == 'true' && steps.set_dataset_config_vars.outputs.is_config_exists == 'true'
with:
poetry-version: ${{ env.POETRY_VERSION }}
Expand Down Expand Up @@ -357,7 +357,8 @@ jobs:
if: failure() && steps.issue-exists.outputs.result == 'false'
uses: actions/github-script@a3e7071a34d7e1f219a8a4de9a5e0a34d1ee1293 # v4
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
# do not use GITHUB_TOKEN here because it wouldn't trigger subsequent workflows
github-token: ${{ secrets.RASABOT_GITHUB_TOKEN }}
script: |
var issue = await github.issues.create({
owner: context.repo.owner,
Expand All @@ -370,7 +371,7 @@ jobs:
- name: Notify Slack of Failure 😱
if: failure() && steps.issue-exists.outputs.result == 'false'
uses: 8398a7/action-slack@f3635935f58910a6d6951b73efe9037c960c8c04 # v3
uses: 8398a7/action-slack@047b09b154480ed39076984b64f324fff010d703 # v3
with:
status: custom
fields: workflow,job,commit,repo,ref,author,took
Expand Down Expand Up @@ -458,6 +459,7 @@ jobs:
OUTPUT="${OUTPUT//$'\n'/'%0A'}"
OUTPUT="${OUTPUT//$'\r'/'%0D'}"
OUTPUT="$(echo $OUTPUT | sed 's|`|\\`|g')"
echo "::set-output name=report_description::${OUTPUT}"
IS_DROPPED=false
Expand Down Expand Up @@ -509,19 +511,24 @@ jobs:
# do not use GITHUB_TOKEN here because it wouldn't trigger subsequent workflows
github-token: ${{ secrets.RASABOT_GITHUB_TOKEN }}
script: |
// Prepare issue body
let issue_body = '*This PR is automatically created by the Scheduled Model Regression Test workflow. Checkout the Github Action Run [here](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).* <br> --- <br> **Description of Problem:** <br> Some test performance scores **decreased**. Please look at the following table for more details. <br>'
issue_body += `${{ steps.performance.outputs.report_description }}`
// Open issue
var issue = await github.issues.create({
owner: context.repo.owner,
repo: context.repo.repo,
title: '${{ env.GITHUB_ISSUE_TITLE }}',
labels: ${{ env.GITHUB_ISSUE_LABELS }},
body: '"*This PR is automatically created by the Scheduled Model Regression Test workflow. Checkout the Github Action Run [here](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).* <br> --- <br> **Description of Problem:** <br> Some test performance scores **decreased**. Please look at the following table for more details. <br> ${{ steps.performance.outputs.report_description }}"'
body: issue_body
})
return issue.data.number
- name: Notify Slack when Performance Drops 💬
if: steps.performance.outputs.is_dropped == 'true' && steps.issue-exists.outputs.result == 'false'
uses: 8398a7/action-slack@f3635935f58910a6d6951b73efe9037c960c8c04 #v3
uses: 8398a7/action-slack@047b09b154480ed39076984b64f324fff010d703 #v3
with:
status: custom
fields: workflow,job,commit,repo,ref,author,took
Expand Down
Loading

0 comments on commit a3009ec

Please sign in to comment.