fix merge conflicts

RasaHQ · Oct 16, 2023 · 34bb04d · 34bb04d
2 parents a6edc9c + 463c703
commit 34bb04d
Show file tree

Hide file tree

Showing 201 changed files with 4,014 additions and 1,180 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -8,3 +8,4 @@ rasa/tests
 rasa/scripts
 data/
 examples/
+docker-data/*
diff --git a/.github/scripts/download_pretrained.py b/.github/scripts/download_pretrained.py
@@ -52,7 +52,7 @@ def get_model_name_and_weights_from_config(
             if model_name not in model_class_dict:
                 raise KeyError(
                     f"'{model_name}' not a valid model name. Choose from "
-                    f"{str(list(model_class_dict.keys()))} or create"
+                    f"{list(model_class_dict.keys())!s} or create"
                     f"a new class inheriting from this class to support your model."
                 )
 

diff --git a/.github/tests/test_download_pretrained.py b/.github/tests/test_download_pretrained.py
@@ -23,7 +23,9 @@ def test_download_pretrained_lmf_exists_with_model_name():
     config = yaml.load(CONFIG_FPATH)
 
     steps = config.get("pipeline", [])
-    step = list(filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps))[0]
+    step = list(  # noqa: RUF015
+        filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps)
+    )[0]
     step["model_name"] = "roberta"
     step["cache_dir"] = "/this/dir"
 
@@ -41,7 +43,9 @@ def test_download_pretrained_unknown_model_name():
     config = yaml.load(CONFIG_FPATH)
 
     steps = config.get("pipeline", [])
-    step = list(filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps))[0]
+    step = list(  # noqa: RUF015
+        filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps)
+    )[0]
     step["model_name"] = "unknown"
 
     with tempfile.NamedTemporaryFile("w+") as fp:
@@ -56,7 +60,9 @@ def test_download_pretrained_multiple_model_names():
     config = yaml.load(CONFIG_FPATH)
 
     steps = config.get("pipeline", [])
-    step = list(filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps))[0]
+    step = list(  # noqa: RUF015
+        filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps)
+    )[0]
     step_new = deepcopy(step)
     step_new["model_name"] = "roberta"
     steps.append(step_new)
@@ -74,7 +80,9 @@ def test_download_pretrained_with_model_name_and_nondefault_weight():
     config = yaml.load(CONFIG_FPATH)
 
     steps = config.get("pipeline", [])
-    step = list(filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps))[0]
+    step = list(  # noqa: RUF015
+        filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps)
+    )[0]
     step["model_name"] = "bert"
     step["model_weights"] = "bert-base-uncased"
 
@@ -91,7 +99,9 @@ def test_download_pretrained_lmf_doesnt_exists():
     config = yaml.load(CONFIG_FPATH)
 
     steps = config.get("pipeline", [])
-    step = list(filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps))[0]
+    step = list(  # noqa: RUF015
+        filter(lambda x: x["name"] == download_pretrained.COMP_NAME, steps)
+    )[0]
     steps.remove(step)
 
     with tempfile.NamedTemporaryFile("w+") as fp:

diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml
@@ -352,9 +352,15 @@ jobs:
           (Get-ItemProperty "HKLM:System\CurrentControlSet\Control\FileSystem").LongPathsEnabled
           Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -value 0
 
-      - name: Install ddtrace
-        if: needs.changes.outputs.backend == 'true'
-        run: poetry run pip install -U ddtrace
+      - name: Install ddtrace on Linux
+        if: needs.changes.outputs.backend == 'true' && matrix.os == 'ubuntu-22.04'
+        run: poetry run pip install -U 'ddtrace<2.0.0'
+
+      - name: Install ddtrace on Windows
+        if: needs.changes.outputs.backend == 'true' && matrix.os == 'windows-2019'
+        run: |
+          .\.venv\Scripts\activate
+          py -m pip install -U 'ddtrace<2.0.0'
 
       - name: Test Code 🔍 (multi-process)
         if: needs.changes.outputs.backend == 'true'
@@ -492,9 +498,15 @@ jobs:
           (Get-ItemProperty "HKLM:System\CurrentControlSet\Control\FileSystem").LongPathsEnabled
           Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -value 0
 
-      - name: Install ddtrace
-        if: needs.changes.outputs.backend == 'true'
-        run: poetry run pip install -U ddtrace
+      - name: Install ddtrace on Linux
+        if: needs.changes.outputs.backend == 'true' && matrix.os == 'ubuntu-22.04'
+        run: poetry run pip install -U 'ddtrace<2.0.0'
+
+      - name: Install ddtrace on Windows
+        if: needs.changes.outputs.backend == 'true' && matrix.os == 'windows-2019'
+        run: |
+          .\.venv\Scripts\activate
+          py -m pip install -U 'ddtrace<2.0.0'
 
       - name: Test Code 🔍 (multi-process)
         if: needs.changes.outputs.backend == 'true'
@@ -519,8 +531,8 @@ jobs:
           path: |
             ${{ github.workspace }}/${{ matrix.test }}-coverage
 
-  prepare_coverage_reports:
-    name: Prepare coverage reports
+  prepare_coverage_reports_analyse_with_sonarcloud:
+    name: Prepare coverage reports and Analyse coverage with Sonarcloud
     if: github.ref_type != 'tag'
     runs-on: ubuntu-22.04
     # Always upload results even if tests failed
@@ -561,21 +573,6 @@ jobs:
           coverage combine "${final_dir}/"*
           coverage xml
 
-  sonarcloud:
-    name: SonarCloud Scan
-    if: github.ref_type != 'tag'
-    runs-on: ubuntu-22.04
-    needs:
-      - prepare_coverage_reports
-
-    steps:
-      - name: Checkout git repository 🕝
-        if: needs.changes.outputs.backend == 'true'
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-        with:
-          # Disabling shallow clone is recommended for improving relevancy of coverage reporting
-          fetch-depth: 0
-
       - name: Analyse code with SonarCloud
         uses: sonarsource/sonarcloud-github-action@5875562561d22a34be0c657405578705a169af6c
         env:
@@ -586,7 +583,7 @@ jobs:
             -Dsonar.organization=rasahq
             -Dsonar.projectKey=RasaHQ_rasa
             -Dsonar.sources=.
-            -Dsonar.python.coverage.reportPaths=tests_coverage/coverage.xml
+            -Dsonar.python.coverage.reportPaths=${{ github.workspace }}/tests_coverage
             -Dsonar.host.url=https://sonarcloud.io
             -Dsonar.verbose=true
 
@@ -1055,8 +1052,11 @@ jobs:
         run: |
           sudo swapoff -a
           sudo rm -f /swapfile
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
           sudo apt clean
-          docker image prune -a
+          docker image prune -a -f
+          docker volume prune -f
+          docker container prune -f
           df -h
 
       - name: Read Poetry Version 🔢
@@ -1084,6 +1084,9 @@ jobs:
         run: |
           docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }}
 
+      - name: Check how much space is left after Docker build
+        run: df -h
+
       - name: Push image with main tag 📦
         if: needs.changes.outputs.docker == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'RasaHQ/rasa'
         run: |

diff --git a/.typo-ci.yml b/.typo-ci.yml
@@ -62,27 +62,43 @@ excluded_files:
 
 # # Any typos we should ignore?
 excluded_words:
+  - CDD
+  - Comerica
+  - ConveRTFeaturizer
+  - ConveRTTokenizer
+  - HookimplMarker
+  - Juste
+  - NLG
+  - README
+  - Tanja
+  - Vova
   - analytics
+  - anonymization
+  - anonymized
   - asyncio
+  - backends
   - bot
   - bot's
   - cdd
-  - CDD
   - cmdline
+  - conftest
   - conveRT
-  - ConveRTFeaturizer
-  - ConveRTTokenizer
+  - crf
+  - crfentityextractor
   - crfsuite
+  - crypto
   - custom-nlg-service
+  - customizable
   - daksh
+  - dataset
   - db's
-  - deque
-  - docusaurus
-  - non-latin
   - deduplicate
   - deduplication
+  - deque
+  - docusaurus
   - donath
-  - matplotlib
+  - dslim
+  - entitysynonymmapper
   - extractor
   - fbmessenger
   - featurization
@@ -95,13 +111,17 @@ excluded_words:
   - forni
   - gzip
   - gzipped
+  - hallo
   - hftransformersnlp
+  - hookimpl
   - initializer
   - instaclient
-  - jwt
-  - jwt's
+  - ish
+  - jieba
   - jupyter
   - jupyterhub
+  - jwt
+  - jwt's
   - karpathy
   - keras
   - knowledgebase
@@ -110,101 +130,82 @@ excluded_words:
   - llm
   - luis
   - matmul
+  - matplotlib
   - mattermost
   - memoization
+  - memoizationpolicy
   - miniconda
   - mitie
-  - mitiefeaturizer
   - mitie's
+  - mitiefeaturizer
   - mitienlp
-  - dataset
   - mongod
   - mrkdown
   - mrkdwn
   - myio
   - mymodelname
   - myuser
-  - numpy
   - networkx
+  - ngram
+  - nlg
   - nlu
   - nlu's
+  - non-latin
+  - numpy
   - perceptron
+  - pii-management
   - pika
   - pika's
-  - jieba
+  - pluggy
+  - pre
   - pretrained
   - prototyper
+  - prototyper
   - pycodestyle
   - pykwalify
   - pymessenger
   - pyobject
   - python-engineio
-  - pre
-  - customizable
   - quickstart
   - rasa
   - rasa's
   - readthedocs
+  - regexes
+  - regexfeaturizer
   - regularizer
   - repo
   - rst
+  - ruamel
+  - rustc
+  - rustup
+  - rustup-init
   - sanic
   - sanitization
   - scipy
   - sklearn
   - socketio
+  - spaCy
+  - spaCy's
   - spacy
   - spacyfeaturizer
   - spacynlp
-  - ish
-  - spaCy
-  - spaCy's
-  - README
-  - crf
-  - backends
-  - whitespaced
-  - ngram
   - subsampled
   - testagent
+  - thisismysecret
+  - tokenization
   - tokenize
   - tokenized
-  - tokenization
   - tokenizer
   - tokenizers
   - tokenizing
   - typoci
   - unfeaturized
   - unschedule
-  - wsgi
-  - ruamel
-  - prototyper
-  - hallo
-  - crypto
-  - regexes
+  - venv
   - walkthroughs
   - webexteams
-  - venv
-  - regexfeaturizer
-  - crfentityextractor
-  - Comerica
-  - entitysynonymmapper
-  - memoizationpolicy
-  - NLG
-  - nlg
-  - Juste
-  - Tanja
-  - Vova
-  - rustup
-  - rustup-init
-  - rustc
-  - conftest
+  - whitespaced
   - winpty
-  - pii-management
-  - anonymization
-  - anonymized
-  - dslim
-  - pluggy
-  - HookimplMarker
-  - hookimpl
+  - wsgi
 
 spellcheck_filenames: false
diff --git a/3.7.0b1/main_plain/.config/rasa/global.yml b/3.7.0b1/main_plain/.config/rasa/global.yml
diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
@@ -16,6 +16,16 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [3.6.9] - 2023-09-15
+
+Rasa 3.6.9 (2023-09-15)                        
+### Improvements
+- [#12778](https://github.com/rasahq/rasa/issues/12778): Added additional method `fingerprint_addon` to the `GraphComponent` interface to allow inclusion of external data into the fingerprint calculation of a component
+
+### Bugfixes
+- [#12790](https://github.com/rasahq/rasa/issues/12790): Fixed `KeyError` which resulted when `domain_responses` doesn't exist as a keyword argument while using a custom action dispatcher with nlg server.
+
+
 ## [3.6.8] - 2023-08-30
 
 Rasa 3.6.8 (2023-08-30)                         

diff --git a/README.md b/README.md
@@ -338,7 +338,7 @@ While this table represents our target release frequency, we reserve the right t
 Our End of Life policy defines how long a given release is considered supported, as well as how long a release is
 considered to be still in active development or maintenance.
 
-The maintentance duration and end of life for every release are shown on our website as part of the [Product Release and Maintenance Policy](https://rasa.com/rasa-product-release-and-maintenance-policy/).
+The maintenance duration and end of life for every release are shown on our website as part of the [Product Release and Maintenance Policy](https://rasa.com/rasa-product-release-and-maintenance-policy/).
 
 ### Cutting a Major / Minor release
 #### A week before release day