merged dm2

RasaHQ · Sep 18, 2023 · bf843e3 · bf843e3
2 parents 2b48529 + 4a71f91
commit bf843e3
Show file tree

Hide file tree

Showing 78 changed files with 224 additions and 401 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.0a6"
+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/core/actions/action.py b/rasa/core/actions/action.py
@@ -97,9 +97,9 @@
 def default_actions(action_endpoint: Optional[EndpointConfig] = None) -> List["Action"]:
     """List default actions."""
     from rasa.core.actions.two_stage_fallback import TwoStageFallbackAction
-    from rasa.cdu.patterns.correction import ActionCorrectFlowSlot
-    from rasa.cdu.patterns.cancel import ActionCancelFlow
-    from rasa.cdu.patterns.clarify import ActionClarifyFlows
+    from rasa.dialogue_understanding.patterns.correction import ActionCorrectFlowSlot
+    from rasa.dialogue_understanding.patterns.cancel import ActionCancelFlow
+    from rasa.dialogue_understanding.patterns.clarify import ActionClarifyFlows
 
     return [
         ActionListen(),

diff --git a/rasa/core/actions/flow_trigger_action.py b/rasa/core/actions/flow_trigger_action.py
@@ -1,8 +1,8 @@
 from typing import Any, Dict, Optional, Text, List
 
 import structlog
-from rasa.cdu.stack.dialogue_stack import DialogueStack
-from rasa.cdu.stack.frames.flow_stack_frame import (
+from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
+from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
     FlowStackFrameType,
     UserFlowStackFrame,
 )

diff --git a/rasa/core/nlg/response.py b/rasa/core/nlg/response.py
@@ -1,6 +1,6 @@
 import copy
 import logging
-from rasa.cdu.stack.dialogue_stack import DialogueStack
+from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.core.constants import DEFAULT_TEMPLATE_ENGINE, TEMPLATE_ENGINE_CONFIG_KEY
 
 from rasa.shared.core.trackers import DialogueStateTracker