Merge branch 'dm2' into ATO-1539-add-support-for-pypred-validation-of…

…-slot-values-in-the-collect-information-flow-step
RasaHQ · Sep 18, 2023 · ddc08d0 · ddc08d0
2 parents 614acf0 + 4a71f91
commit ddc08d0
Show file tree

Hide file tree

Showing 119 changed files with 1,195 additions and 456 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -443,8 +443,7 @@ thus validating compatibility between Rasa and Rasa X/Enterprise.
 Please refer to the [Rasa Product Release and Maintenance Policy](https://rasa.com/rasa-product-release-and-maintenance-policy/) page.
 
 ## License
-Licensed under the Apache License, Version 2.0.
-Copyright 2022 Rasa Technologies GmbH. [Copy of the license](LICENSE.txt).
+Copyright 2022 Rasa Technologies GmbH.
 
 A list of the Licenses of the dependencies of the project can be found at
 the bottom of the

diff --git a/data/graph_schemas/default_config_core_predict_schema.yml b/data/graph_schemas/default_config_core_predict_schema.yml
@@ -25,7 +25,7 @@ nodes:
     needs:
         tracker: __tracker__
         flows: flows_provider
-    uses: rasa.cdu.processor.command_processor_component.CommandProcessorComponent
+    uses: rasa.dialogue_understanding.processor.command_processor_component.CommandProcessorComponent
     constructor_name: load
     fn: execute_commands
     config: { }

diff --git a/data/graph_schemas/default_config_e2e_predict_schema.yml b/data/graph_schemas/default_config_e2e_predict_schema.yml
@@ -247,7 +247,7 @@ nodes:
       needs:
           tracker: __tracker__
           flows: flows_provider
-      uses: rasa.cdu.processor.command_processor_component.CommandProcessorComponent
+      uses: rasa.dialogue_understanding.processor.command_processor_component.CommandProcessorComponent
       constructor_name: load
       fn: execute_commands
       config: { }

diff --git a/data/graph_schemas/default_config_predict_schema.yml b/data/graph_schemas/default_config_predict_schema.yml
@@ -163,7 +163,7 @@ nodes:
     needs:
         tracker: __tracker__
         flows: flows_provider
-    uses: rasa.cdu.processor.command_processor_component.CommandProcessorComponent
+    uses: rasa.dialogue_understanding.processor.command_processor_component.CommandProcessorComponent
     constructor_name: load
     fn: execute_commands
     config: { }

diff --git a/data/graph_schemas/max_hist_config_predict_schema.yml b/data/graph_schemas/max_hist_config_predict_schema.yml
@@ -25,7 +25,7 @@ nodes:
     needs:
         tracker: __tracker__
         flows: flows_provider
-    uses: rasa.cdu.processor.command_processor_component.CommandProcessorComponent
+    uses: rasa.dialogue_understanding.processor.command_processor_component.CommandProcessorComponent
     constructor_name: load
     fn: execute_commands
     config: { }

diff --git a/data/test_config/graph_config.yml b/data/test_config/graph_config.yml
@@ -356,7 +356,7 @@ predict_schema:
       needs:
           tracker: __tracker__
           flows: flows_provider
-      uses: rasa.cdu.processor.command_processor_component.CommandProcessorComponent
+      uses: rasa.dialogue_understanding.processor.command_processor_component.CommandProcessorComponent
       constructor_name: load
       fn: execute_commands
       config: { }

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,18 +9,17 @@ exclude = "((.eggs | .git | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
-version = "3.8.0a4"
+version = "3.8.0a7"
 description = "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants"
 authors = [ "Rasa Technologies GmbH <[email protected]>",]
 maintainers = [ "Tom Bocklisch <[email protected]>",]
 homepage = "https://rasa.com"
 repository = "https://github.com/rasahq/rasa"
 documentation = "https://rasa.com/docs"
-classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Topic :: Software Development :: Libraries",]
+classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Topic :: Software Development :: Libraries",]
 keywords = [ "nlp", "machine-learning", "machine-learning-library", "bot", "bots", "botkit", "rasa conversational-agents", "conversational-ai", "chatbot", "chatbot-framework", "bot-framework",]
-include = [ "LICENSE.txt", "README.md", "rasa/shared/core/training_data/visualization.html", "rasa/cli/default_config.yml", "rasa/shared/importers/*", "rasa/utils/schemas/*", "rasa/keys", "rasa/core/channels/chat.html", "rasa/cdu/classifiers/command_prompt_template.jinja2",]
+include = [ "LICENSE.txt", "README.md", "rasa/shared/core/training_data/visualization.html", "rasa/cli/default_config.yml", "rasa/shared/importers/*", "rasa/utils/schemas/*", "rasa/keys", "rasa/core/channels/chat.html", "rasa/dialogue_understanding/classifiers/command_prompt_template.jinja2",]
 readme = "README.md"
-license = "Apache-2.0"
 [[tool.poetry.source]]
 name = "internal repository mirroring psycopg binary for macos"
 url = "https://europe-west3-python.pkg.dev/rasa-releases/psycopg-binary/simple/"

diff --git a/rasa/cdu/commands/__init__.py b/rasa/cdu/commands/__init__.py
diff --git a/rasa/cdu/generator/__init__.py b/rasa/cdu/generator/__init__.py
diff --git a/rasa/cdu/stack/frames/__init__.py b/rasa/cdu/stack/frames/__init__.py
diff --git a/rasa/cli/initial_project_dm2/data/nlu.yml b/rasa/cli/initial_project_dm2/data/nlu.yml
diff --git a/rasa/cdu/__init__.py → rasa/cli/project_templates/__init__.py b/rasa/cdu/__init__.py → rasa/cli/project_templates/__init__.py
diff --git a/rasa/cdu/patterns/__init__.py → ...ect_templates/default/actions/__init__.py b/rasa/cdu/patterns/__init__.py → ...ect_templates/default/actions/__init__.py
diff --git a/rasa/cli/initial_project/actions/actions.py → ...ject_templates/default/actions/actions.py b/rasa/cli/initial_project/actions/actions.py → ...ject_templates/default/actions/actions.py
diff --git a/rasa/cli/initial_project/config.yml → .../cli/project_templates/default/config.yml b/rasa/cli/initial_project/config.yml → .../cli/project_templates/default/config.yml
diff --git a/rasa/cli/initial_project/credentials.yml → ...project_templates/default/credentials.yml b/rasa/cli/initial_project/credentials.yml → ...project_templates/default/credentials.yml
diff --git a/rasa/cli/initial_project/data/nlu.yml → ...li/project_templates/default/data/nlu.yml b/rasa/cli/initial_project/data/nlu.yml → ...li/project_templates/default/data/nlu.yml
diff --git a/rasa/cli/initial_project/data/rules.yml → .../project_templates/default/data/rules.yml b/rasa/cli/initial_project/data/rules.yml → .../project_templates/default/data/rules.yml
diff --git a/rasa/cli/initial_project/data/stories.yml → ...roject_templates/default/data/stories.yml b/rasa/cli/initial_project/data/stories.yml → ...roject_templates/default/data/stories.yml
diff --git a/rasa/cli/initial_project/domain.yml → .../cli/project_templates/default/domain.yml b/rasa/cli/initial_project/domain.yml → .../cli/project_templates/default/domain.yml
diff --git a/rasa/cli/initial_project/endpoints.yml → ...i/project_templates/default/endpoints.yml b/rasa/cli/initial_project/endpoints.yml → ...i/project_templates/default/endpoints.yml
diff --git a/...li/initial_project/tests/test_stories.yml → ..._templates/default/tests/test_stories.yml b/...li/initial_project/tests/test_stories.yml → ..._templates/default/tests/test_stories.yml
diff --git a/rasa/cdu/processor/__init__.py → ...project_templates/dm2/actions/__init__.py b/rasa/cdu/processor/__init__.py → ...project_templates/dm2/actions/__init__.py
diff --git a/...li/initial_project_dm2/actions/actions.py → .../project_templates/dm2/actions/actions.py b/...li/initial_project_dm2/actions/actions.py → .../project_templates/dm2/actions/actions.py
diff --git a/rasa/cli/initial_project_dm2/config.yml → rasa/cli/project_templates/dm2/config.yml b/rasa/cli/initial_project_dm2/config.yml → rasa/cli/project_templates/dm2/config.yml
diff --git a/rasa/cli/initial_project_dm2/credentials.yml → ...cli/project_templates/dm2/credentials.yml b/rasa/cli/initial_project_dm2/credentials.yml → ...cli/project_templates/dm2/credentials.yml
diff --git a/rasa/cli/initial_project_dm2/data/flows.yml → .../cli/project_templates/dm2/data/flows.yml b/rasa/cli/initial_project_dm2/data/flows.yml → .../cli/project_templates/dm2/data/flows.yml
diff --git a/rasa/cli/initial_project_dm2/domain.yml → rasa/cli/project_templates/dm2/domain.yml b/rasa/cli/initial_project_dm2/domain.yml → rasa/cli/project_templates/dm2/domain.yml
diff --git a/...roject_dm2/e2e_tests/complete_request.yml → ...plates/dm2/e2e_tests/complete_request.yml b/...roject_dm2/e2e_tests/complete_request.yml → ...plates/dm2/e2e_tests/complete_request.yml
diff --git a/...i/initial_project_dm2/e2e_tests/happy.yml → ...project_templates/dm2/e2e_tests/happy.yml b/...i/initial_project_dm2/e2e_tests/happy.yml → ...project_templates/dm2/e2e_tests/happy.yml
diff --git a/rasa/cli/initial_project_dm2/endpoints.yml → rasa/cli/project_templates/dm2/endpoints.yml b/rasa/cli/initial_project_dm2/endpoints.yml → rasa/cli/project_templates/dm2/endpoints.yml
diff --git a/...nitial_project_dm2/tests/test_stories.yml → ...ject_templates/dm2/tests/test_stories.yml b/...nitial_project_dm2/tests/test_stories.yml → ...ject_templates/dm2/tests/test_stories.yml
diff --git a/rasa/cli/project_templates/tutorial/actions.py b/rasa/cli/project_templates/tutorial/actions.py
@@ -0,0 +1,22 @@
+from typing import Any, Text, Dict, List
+from rasa_sdk import Action, Tracker
+from rasa_sdk.executor import CollectingDispatcher
+from rasa_sdk.events import SlotSet
+
+
+class ActionSufficientFunds(Action):
+    def name(self) -> Text:
+        return "action_sufficient_funds"
+
+    def run(
+        self,
+        dispatcher: CollectingDispatcher,
+        tracker: Tracker,
+        domain: Dict[Text, Any],
+    ) -> List[Dict[Text, Any]]:
+        # hard-coded balance for tutorial purposes. in production this
+        # would be retrieved from a database or an API
+        balance = 1000
+        transfer_amount = tracker.get_slot("amount")
+        has_sufficient_funds = transfer_amount <= balance
+        return [SlotSet("has_sufficient_funds", has_sufficient_funds)]
diff --git a/rasa/cli/project_templates/tutorial/config.yml b/rasa/cli/project_templates/tutorial/config.yml
@@ -0,0 +1,13 @@
+recipe: default.v1
+language: en
+pipeline:
+  - name: LLMCommandGenerator
+    llm:
+      model_name: gpt-4
+
+policies:
+  - name: rasa.core.policies.flow_policy.FlowPolicy
+#  - name: rasa_plus.ml.DocsearchPolicy
+#  - name: RulePolicy
+
+assistant_id: 20230405-114328-tranquil-mustard