Skip to content

Commit

Permalink
Merge pull request #12486 from RasaHQ/merge-3.4.x-main-e206ba8
Browse files Browse the repository at this point in the history
Merge 3.4.x into main
  • Loading branch information
ancalita authored Jun 13, 2023
2 parents 12012d9 + e3186e2 commit 97072e8
Show file tree
Hide file tree
Showing 8 changed files with 111 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
shell: bash

- name: Install poetry 🦄
uses: Gr1N/setup-poetry@15821dc8a61bc630db542ae4baf6a7c19a994844
uses: Gr1N/setup-poetry@15821dc8a61bc630db542ae4baf6a7c19a994844 # v8
with:
poetry-version: ${{ env.POETRY_VERSION }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ jobs:

- name: Install poetry 🦄
if: needs.changes.outputs.docs == 'true'
uses: Gr1N/setup-poetry@15821dc8a61bc630db542ae4baf6a7c19a994844
uses: Gr1N/setup-poetry@15821dc8a61bc630db542ae4baf6a7c19a994844 # v8
with:
poetry-version: ${{ env.POETRY_VERSION }}

Expand Down
66 changes: 64 additions & 2 deletions CHANGELOG.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
<!-- TOWNCRIER -->

## [3.5.11] - 2023-06-08
Rasa 3.5.11 (2023-06-08)

Rasa 3.5.11 (2023-06-08)
### Bugfixes
- [#12467](https://github.com/rasahq/rasa/issues/12467): Fix running custom form validation to update required slots at form activation when prefilled slots consist only of slots
that are not requested by the form.
Expand Down Expand Up @@ -184,6 +184,68 @@ Rasa 3.5.0 (2023-03-21)
- [#11924](https://github.com/rasahq/rasa/issues/11924), [#11926](https://github.com/rasahq/rasa/issues/11926), [#12006](https://github.com/rasahq/rasa/issues/12006), [#12022](https://github.com/rasahq/rasa/issues/12022), [#12092](https://github.com/rasahq/rasa/issues/12092), [#12135](https://github.com/rasahq/rasa/issues/12135), [#12137](https://github.com/rasahq/rasa/issues/12137), [#12140](https://github.com/rasahq/rasa/issues/12140), [#12154](https://github.com/rasahq/rasa/issues/12154)


## [3.4.14] - 2023-06-08

Rasa 3.4.14 (2023-06-08)
### Bugfixes
- [#12467](https://github.com/rasahq/rasa/issues/12467): Fix running custom form validation to update required slots at form activation when prefilled slots consist only of slots
that are not requested by the form.


## [3.4.13] - 2023-05-19

Rasa 3.4.13 (2023-05-19)

No significant changes.


## [3.4.12] - 2023-05-12

Rasa 3.4.12 (2023-05-12)
### Bugfixes
- [#12361](https://github.com/rasahq/rasa/issues/12361): Explicitly handled `BufferError exception - Local: Queue full` in Kafka producer.


## [3.4.11] - 2023-05-09

Rasa 3.4.11 (2023-05-09)
### Bugfixes
- [#12325](https://github.com/rasahq/rasa/issues/12325): Fix parsing of RabbitMQ URL provided in `endpoints.yml` file to include vhost path and query parameters.
Re-allows inclusion of credentials in the URL as a regression fix (this was supported in 2.x).
- [#12364](https://github.com/rasahq/rasa/issues/12364): `SlotSet` events will be emitted when the value set by the custom action is the same as the existing value of the slot. This was fixed for `AugmentedMemoizationPolicy` to work properly with truncated trackers.

To restore the previous behaviour, the custom action can return a SlotSet only if the slot value has changed. For example,

```
class CustomAction(Action):
def name(self) -> Text:
return "custom_action"

def run(self, dispatcher: CollectingDispatcher,
tracker: Tracker,
domain: Dict[Text, Any]) -> List[Dict[Text, Any]]:
# current value of the slot
slot_value = tracker.get_slot('my_slot')

# value of the entity
# this is parsed from the user utterance
entity_value = next(tracker.get_latest_entity_values("entity_name"), None)

if slot_value != entity_value:
return[SlotSet("my_slot", entity_value)]
```

### Miscellaneous internal changes
- [#12267](https://github.com/rasahq/rasa/issues/12267)


## [3.4.10] - 2023-04-17

Rasa 3.4.10 (2023-04-17)
### Miscellaneous internal changes
- [#12255](https://github.com/rasahq/rasa/issues/12255)


## [3.4.9] - 2023-04-05
### Miscellaneous internal changes
- [#12234](https://github.com/rasahq/rasa/issues/12234)
Expand Down
1 change: 0 additions & 1 deletion changelog/12255.misc.md

This file was deleted.

40 changes: 35 additions & 5 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,13 @@ python = "~=3.7.0"
version = ">=1.19.2,<1.25.0"
python = ">=3.8,<3.11"

# Pinning numpy version for windows because of the issue mentioned below:
#https://github.com/scipy/scipy/blob/c58b608c83d30800aceee6a4dab5c3464cb1de7d/pyproject.toml#L38-L41
[[tool.poetry.dependencies.numpy]]
version = "1.22.3"
markers = "sys_platform =='Windows' and platform_python_implementation != 'PyPy'"
python = "3.10"

[[tool.poetry.dependencies.scipy]]
version = ">=1.4.1,<1.7.3"
python = "~=3.7.0"
Expand Down
2 changes: 2 additions & 0 deletions rasa/core/actions/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@ class ActionListen(Action):
"""

def name(self) -> Text:
"""Returns action listen name."""
return ACTION_LISTEN_NAME

async def run(
Expand Down Expand Up @@ -837,6 +838,7 @@ class ActionExecutionRejection(RasaException):
"""

def __init__(self, action_name: Text, message: Optional[Text] = None) -> None:
"""Create a new ActionExecutionRejection exception."""
self.action_name = action_name
self.message = message or "Custom action '{}' rejected to run".format(
action_name
Expand Down
3 changes: 1 addition & 2 deletions rasa/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,8 @@ def modify_default_recipe_graph_predict_nodes(


@hookspec # type: ignore[misc]
def get_version_info() -> Tuple[Text, Text]:
def get_version_info() -> Tuple[Text, Text]: # type: ignore[empty-body]
"""Hook specification for getting plugin version info."""
return "", ""


@hookspec # type: ignore[misc]
Expand Down

0 comments on commit 97072e8

Please sign in to comment.