Merge branch 'RasaHQ:main' into main

.github/workflows/ci-docs-tests.yml

@@ -40,12 +40,12 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up Python ${{ env.DEFAULT_PYTHON_VERSION }} 🐍
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
 
     - name: Set up Node 12.x 🦙
-      uses: actions/setup-node@v3.3.0
+      uses: actions/setup-node@v3.4.1
       with:
         node-version: '12.x'
 

.github/workflows/ci-github-actions.yml

@@ -28,7 +28,7 @@ jobs:
         sudo chmod +x /usr/local/bin/gomplate
 
     - name: Set up Python ${{ env.DEFAULT_PYTHON_VERSION }} 🐍
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
 

.github/workflows/ci-model-regression-on-schedule.yml

@@ -266,7 +266,7 @@ jobs:
           .github/scripts/start_dd_agent.sh "${{ secrets.DD_API_KEY }}" "${{ env.ACCELERATOR_TYPE }}" ${{ env.NVML_INTERVAL_IN_SEC }}
 
       - name: Set up Python 3.9 🐍
-        uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+        uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
         if: steps.set_dataset_config_vars.outputs.is_dataset_exists == 'true' && steps.set_dataset_config_vars.outputs.is_config_exists == 'true'
         with:
           python-version: 3.9
@@ -499,7 +499,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.9 🐍
-        uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+        uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
         with:
           python-version: 3.9
 

.github/workflows/ci-model-regression.yml

@@ -364,7 +364,7 @@ jobs:
           .github/scripts/start_dd_agent.sh "${{ secrets.DD_API_KEY }}" "${{ env.ACCELERATOR_TYPE }}" ${{ env.NVML_INTERVAL_IN_SEC }}
 
       - name: Set up Python 3.9 🐍
-        uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+        uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
         if: steps.set_dataset_config_vars.outputs.is_dataset_exists == 'true' && steps.set_dataset_config_vars.outputs.is_config_exists == 'true'
         with:
           python-version: 3.9
@@ -609,7 +609,7 @@ jobs:
           .github/scripts/start_dd_agent.sh "${{ secrets.DD_API_KEY }}" "${{ env.ACCELERATOR_TYPE }}" ${{ env.NVML_INTERVAL_IN_SEC }}
 
       - name: Set up Python 3.9 🐍
-        uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+        uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
         if: steps.set_dataset_config_vars.outputs.is_dataset_exists == 'true' && steps.set_dataset_config_vars.outputs.is_config_exists == 'true'
         with:
           python-version: 3.9
@@ -757,7 +757,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.9 🐍
-        uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+        uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
         with:
           python-version: 3.9
 

.github/workflows/continous-integration.yml

@@ -108,7 +108,7 @@ jobs:
 
     - name: Set up Python ${{ env.DEFAULT_PYTHON_VERSION }} 🐍
       if: needs.changes.outputs.backend == 'true'
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
 
@@ -246,7 +246,7 @@ jobs:
 
     - name: Set up Python ${{ matrix.python-version }} 🐍
       if: needs.changes.outputs.backend == 'true'
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -364,7 +364,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python 3.9 🐍
-        uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+        uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
         with:
           python-version: 3.9
 
@@ -460,7 +460,7 @@ jobs:
 
     - name: Set up Python ${{ env.DEFAULT_PYTHON_VERSION }} 🐍
       if: needs.changes.outputs.backend == 'true'
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
 
@@ -795,7 +795,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up Python 3.9 🐍
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: 3.9
 

.github/workflows/documentation.yml

@@ -140,12 +140,12 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up Python 3.9 🐍
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: 3.9
 
     - name: Set up Node 12.x 🦙
-      uses: actions/setup-node@v3.3.0
+      uses: actions/setup-node@v3.4.1
       with:
         node-version: '12.x'
 
@@ -232,13 +232,13 @@ jobs:
 
     - name: Set up Python 3.9 🐍
       if: needs.changes.outputs.docs == 'true'
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: 3.9
 
     - name: Set up Node 12.x 🦙
       if: needs.changes.outputs.docs == 'true'
-      uses: actions/setup-node@v3.3.0
+      uses: actions/setup-node@v3.4.1
       with:
         node-version: '12.x'
 
@@ -325,7 +325,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up Node 12.x 🦙
-      uses: actions/setup-node@v3.3.0
+      uses: actions/setup-node@v3.4.1
       with:
         node-version: '12.x'
 

.github/workflows/rasa-install-cron-check.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: ${{ matrix.python-version }}
     - name: Try to install Rasa.

.github/workflows/security-scans.yml

@@ -24,19 +24,21 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           filters: .github/change_filters.yml
 
-  gitleaks:
-    name: Detecting hardcoded secrets
+  trufflehog:
+    name: Detect Secrets
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-      with:
-        # Fetch all history for all tags and branches
-        fetch-depth: '0'
-
-    - name: Gitleaks - detecting hardcoded secrets
-      uses: zricethezav/gitleaks-action@518e4898c0cd1cc5d9aab6627a2eabd46e81d8da # v1.6.0
-      with:
-        config-path: .gitleaks.toml
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: TruffleHog Secrets Scan
+        uses: trufflesecurity/trufflehog@0752503872c81fb8820085d38d5cd7e7cff8a5af
+        continue-on-error: true
+        with:
+          path: ./
+          base: ${{ github.event.repository.default_branch }}
+          head: ${{ github.head_ref }}
 
   bandit:
     name: Detect python security issues
@@ -50,7 +52,7 @@ jobs:
 
     - name: Set up Python 3.9 🐍
       if: needs.changes.outputs.backend == 'true'
-      uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+      uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
       with:
         python-version: 3.9
 

CHANGELOG.mdx

@@ -16,6 +16,24 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [3.2.4] - 2022-07-21                         
+### Bugfixes
+- [#11061](https://github.com/rasahq/rasa/issues/11061): Added session_config key as valid domain key during domain loading from directory containing a separate domain file with session configuration.
+- [#11362](https://github.com/rasahq/rasa/issues/11362): Run default action `action_extract_slots` after a custom action returns a `UserUttered` event to fill any applicable slots.
+- [#11368](https://github.com/rasahq/rasa/issues/11368): Handle the case when an `EndpointConfig` object is given as parameter to the `AwaitableTrackerStore.create()` method.
+
+
+## [3.2.3] - 2022-07-18                         
+### Bugfixes
+- [#11305](https://github.com/rasahq/rasa/issues/11305): - Fixed error in creating response when slack sends retry messages. Assigning `None` to `response.text` caused `TypeError: Bad body type. Expected str, got NoneType`.
+  - Fixed Slack triggering timeout after 3 seconds if the action execution is too slow. Running `on_new_message` as an asyncio background task instead of a blocking await fixes this by immediately returning a response with code 200.
+- [#11326](https://github.com/rasahq/rasa/issues/11326): Revert change in #10295 that removed running the form validation action on activation of the form before the loop is active.
+- [#11333](https://github.com/rasahq/rasa/issues/11333): `SlotSet` events will be emitted when the value set by the current user turn is the same as the existing value.
+
+  Previously, `ActionExtractSlots` would not emit any `SlotSet` events if the new value was the same as the existing
+  one. This caused the augmented memoization policy to lose these slot values when truncating the tracker.
+
+
 ## [3.2.2] - 2022-07-05                         
 ### Improved Documentation
 - [#11207](https://github.com/rasahq/rasa/issues/11207): Update documentation for customizable classes such as tracker stores, event brokers and lock stores.
@@ -65,14 +83,6 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 - [#11088](https://github.com/rasahq/rasa/issues/11088), [#11123](https://github.com/rasahq/rasa/issues/11123), [#9093](https://github.com/rasahq/rasa/issues/9093), [#9099](https://github.com/rasahq/rasa/issues/9099)
 
 
-## [3.1.3] - 2022-06-17
-### Bugfixes
-- [#11129](https://github.com/rasahq/rasa/issues/11129): The azure botframework channel now validates the incoming JSON Web Tokens (including signature).
-
-  Previously, JWTs were not validated at all.
-- [#11197](https://github.com/rasahq/rasa/issues/11197): Backports fix for failed check in `rasa data validate` that verifies forms in rules or stories are consistent with the domain when the rule or story contains a default action as `active_loop` step.
-
-
 ## [3.1.2] - 2022-06-08                         
 ### Miscellaneous internal changes
 - [#11156](https://github.com/rasahq/rasa/issues/11156), [#11173](https://github.com/rasahq/rasa/issues/11173)

CODEOWNERS

@@ -1,23 +1,23 @@
 /docs/docs/prototype-an-assistant.mdx @RasaHQ/atom-squad
 /.github/workflows/ @RasaHQ/infrastructure-squad
 /rasa/ @RasaHQ/atom-squad
-/rasa/core/featurizers/ @RasaHQ/research
-/rasa/core/policies/ @RasaHQ/research
+/rasa/core/featurizers/ @RasaHQ/core-ai-squad
+/rasa/core/policies/ @RasaHQ/core-ai-squad
 /rasa/core/policies/ensemble.py @RasaHQ/atom-squad
 /rasa/core/policies/policy.py @RasaHQ/atom-squad
 /rasa/core/policies/registry.py @RasaHQ/atom-squad
 /rasa/core/policies/__init__.py @RasaHQ/atom-squad
-/rasa/nlu/classifiers/ @RasaHQ/research
-/rasa/nlu/extractors/crf_entity_extractor.py @RasaHQ/research
-/rasa/nlu/extractors/extractor.py @RasaHQ/research
-/rasa/nlu/featurizers/ @RasaHQ/research
-/rasa/nlu/selectors/ @RasaHQ/research
-/rasa/nlu/tokenizers/ @RasaHQ/research
-/rasa/nlu/utils/ @RasaHQ/research
-/rasa/nlu/test.py @RasaHQ/research
-/rasa/shared/nlu/training_data/features.py @RasaHQ/research
-/rasa/shared/nlu/training_data/message.py @RasaHQ/research
-/rasa/shared/nlu/training_data/util.py @RasaHQ/atom-squad @RasaHQ/research
-/rasa/utils/plotting.py @RasaHQ/research
-/rasa/utils/train_utils.py @RasaHQ/research
-/rasa/utils/tensorflow/ @RasaHQ/research
+/rasa/nlu/classifiers/ @RasaHQ/core-ai-squad
+/rasa/nlu/extractors/crf_entity_extractor.py @RasaHQ/core-ai-squad
+/rasa/nlu/extractors/extractor.py @RasaHQ/core-ai-squad
+/rasa/nlu/featurizers/ @RasaHQ/core-ai-squad
+/rasa/nlu/selectors/ @RasaHQ/core-ai-squad
+/rasa/nlu/tokenizers/ @RasaHQ/core-ai-squad
+/rasa/nlu/utils/ @RasaHQ/core-ai-squad
+/rasa/nlu/test.py @RasaHQ/core-ai-squad
+/rasa/shared/nlu/training_data/features.py @RasaHQ/core-ai-squad
+/rasa/shared/nlu/training_data/message.py @RasaHQ/core-ai-squad
+/rasa/shared/nlu/training_data/util.py @RasaHQ/atom-squad @RasaHQ/core-ai-squad
+/rasa/utils/plotting.py @RasaHQ/core-ai-squad
+/rasa/utils/train_utils.py @RasaHQ/core-ai-squad
+/rasa/utils/tensorflow/ @RasaHQ/core-ai-squad

changelog/11342.doc.md

@@ -0,0 +1 @@
+Add a new section in the `LockStore` docs and migration guide to inform about `ConcurrentRedisLockStore` new implementation.

changelog/11390.bugfix.md

@@ -0,0 +1,2 @@
+Fixes regression in which slot mappings were prioritized according to reverse order as they were listed in the domain, instead of in order from first to last, as was implicitly expected in `2.x`.
+Clarifies this implicit priority order in the docs.

data/test_action_extract_slots_11333/config.yml

@@ -0,0 +1,46 @@
+# The config recipe.
+# https://rasa.com/docs/rasa/model-configuration/
+recipe: default.v1
+
+# Configuration for Rasa NLU.
+# https://rasa.com/docs/rasa/nlu/components/
+language: en
+
+pipeline:
+# No configuration for the NLU pipeline was provided. The following default pipeline was used to train your model.
+# If you'd like to customize it, uncomment and adjust the pipeline.
+# See https://rasa.com/docs/rasa/tuning-your-model for more information.
+  - name: WhitespaceTokenizer
+  - name: RegexFeaturizer
+  - name: LexicalSyntacticFeaturizer
+  - name: CountVectorsFeaturizer
+  - name: CountVectorsFeaturizer
+    analyzer: char_wb
+    min_ngram: 1
+    max_ngram: 4
+  - name: DIETClassifier
+    epochs: 100
+    constrain_similarities: true
+  - name: EntitySynonymMapper
+  # - name: ResponseSelector
+  #   epochs: 100
+  #   constrain_similarities: true
+  # - name: FallbackClassifier
+  #   threshold: 0.3
+  #   ambiguity_threshold: 0.1
+
+# Configuration for Rasa Core.
+# https://rasa.com/docs/rasa/core/policies/
+policies:
+# No configuration for policies was provided. The following default policies were used to train your model.
+# If you'd like to customize them, uncomment and adjust the policies.
+# See https://rasa.com/docs/rasa/policies for more information.
+  - name: AugmentedMemoizationPolicy
+  - name: RulePolicy
+  # - name: UnexpecTEDIntentPolicy
+  #   max_history: 5
+  #   epochs: 100
+  # - name: TEDPolicy
+  #   max_history: 5
+  #   epochs: 100
+  #   constrain_similarities: true