Merge branch 'main' into ATO-2564-Change-missing-domain-log-level-in-…

…rasa-sdk-from-ERROR-to-DEBUG

proto/action_webhook.proto

@@ -11,7 +11,7 @@ service ActionService {
 message ActionsRequest {}
 
 message ActionsResponse {
-    map<string, string> actions = 1;
+    repeated google.protobuf.Struct actions = 1;
 }
 
 message Tracker {

pyproject.toml

@@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .mypy_cache | .pytest_cache | build | dist ))"
 
 [tool.poetry]
 name = "rasa-sdk"
-version = "3.9.0rc1"
+version = "3.9.0rc2"
 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]>",]

rasa_sdk/grpc_py/action_webhook_pb2.pyi

@@ -12,16 +12,9 @@ class ActionsRequest(_message.Message):
 
 class ActionsResponse(_message.Message):
     __slots__ = ["actions"]
-    class ActionsEntry(_message.Message):
-        __slots__ = ["key", "value"]
-        KEY_FIELD_NUMBER: _ClassVar[int]
-        VALUE_FIELD_NUMBER: _ClassVar[int]
-        key: str
-        value: str
-        def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
     ACTIONS_FIELD_NUMBER: _ClassVar[int]
-    actions: _containers.ScalarMap[str, str]
-    def __init__(self, actions: _Optional[_Mapping[str, str]] = ...) -> None: ...
+    actions: _containers.RepeatedCompositeFieldContainer[_struct_pb2.Struct]
+    def __init__(self, actions: _Optional[_Iterable[_Union[_struct_pb2.Struct, _Mapping]]] = ...) -> None: ...
 
 class Tracker(_message.Message):
     __slots__ = ["sender_id", "slots", "latest_message", "events", "paused", "followup_action", "active_loop", "latest_action_name", "stack"]

rasa_sdk/grpc_server.py

@@ -94,7 +94,11 @@ def __init__(
         self.auto_reload = auto_reload
         self.executor = executor
 
-    async def Actions(self, request: ActionsRequest, context) -> ActionsResponse:
+    async def Actions(
+        self,
+        request: ActionsRequest,
+        context: grpc.aio.ServicerContext,
+    ) -> ActionsResponse:
         """Handle RPC request for the actions.
 
         Args:
@@ -107,9 +111,14 @@ async def Actions(self, request: ActionsRequest, context) -> ActionsResponse:
         if self.auto_reload:
             self.executor.reload()
 
-        actions = self.executor.list_actions()
+        actions = [action.model_dump() for action in self.executor.list_actions()]
         response = ActionsResponse()
-        return ParseDict(actions, response)
+        return ParseDict(
+            {
+                "actions": actions,
+            },
+            response,
+        )
 
     async def Webhook(
         self,

rasa_sdk/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.9.0rc1"
+__version__ = "3.9.0rc2"

tests/conftest.py

@@ -4,6 +4,7 @@
 
 import pytest
 
+import rasa_sdk
 from rasa_sdk import Action, FormValidationAction, Tracker, ValidationAction
 from rasa_sdk.events import SlotSet
 from rasa_sdk.executor import CollectingDispatcher
@@ -13,6 +14,7 @@
 
 
 def get_stack():
+    """Return a dialogue stack."""
     dialogue_stack = [
         {
             "frame_id": "CP6JP9GQ",
@@ -147,3 +149,15 @@ def name(self):
 class SubclassTestActionB(SubclassTestActionA):
     def name(self):
         return "subclass_test_action_b"
+
+
+@pytest.fixture
+def current_rasa_version() -> str:
+    """Return current Rasa version."""
+    return rasa_sdk.__version__
+
+
+@pytest.fixture
+def previous_rasa_version() -> str:
+    """Return previous Rasa version."""
+    return "1.0.0"