From 460a501a5031986193a48fcbeba9b7d9c98ab61e Mon Sep 17 00:00:00 2001 From: ricwo Date: Tue, 10 Sep 2019 12:29:15 +0200 Subject: [PATCH 1/5] order SQL events --- CHANGELOG.rst | 11 ++++++++++- rasa/core/tracker_store.py | 4 +++- rasa/version.py | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f606b689fb5d..e3373019fb97 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. This project adheres to `Semantic Versioning`_ starting with version 1.0. -[Unreleased 1.2.8] - `master`_ +[Unreleased 1.2.9] - `master`_ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Added @@ -23,6 +23,15 @@ Fixed ----- +[1.2.8] - 2019-09-10 +^^^^^^^^^^^^^^^^^^^^ + +Fixed +----- +- SQL tracker events are retrieved ordered by timestamps. This fixes interactive + learning events being shown in the wrong order. + + [1.2.7] - 2019-09-02 ^^^^^^^^^^^^^^^^^^^^ diff --git a/rasa/core/tracker_store.py b/rasa/core/tracker_store.py index 508341ef1f11..fa222a7fc6b5 100644 --- a/rasa/core/tracker_store.py +++ b/rasa/core/tracker_store.py @@ -451,7 +451,9 @@ def retrieve(self, sender_id: Text) -> Optional[DialogueStateTracker]: """Create a tracker from all previously stored events.""" query = self.session.query(self.SQLEvent) - result = query.filter_by(sender_id=sender_id).all() + result = ( + query.filter_by(sender_id=sender_id).order_by(self.SQLEvent.timestamp).all() + ) events = [json.loads(event.data) for event in result] if self.domain and len(events) > 0: diff --git a/rasa/version.py b/rasa/version.py index 7f647d06f6e3..5cc179e20f3a 100644 --- a/rasa/version.py +++ b/rasa/version.py @@ -1 +1 @@ -__version__ = "1.2.7" +__version__ = "1.2.8" From 38c9a4cec033c6b74ed75e00b50a68bee628525f Mon Sep 17 00:00:00 2001 From: Tom Bocklisch Date: Wed, 11 Sep 2019 21:27:23 +0200 Subject: [PATCH 2/5] style improvements --- rasa/nlu/classifiers/embedding_intent_classifier.py | 8 ++++---- rasa/nlu/featurizers/regex_featurizer.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rasa/nlu/classifiers/embedding_intent_classifier.py b/rasa/nlu/classifiers/embedding_intent_classifier.py index a613321cb6ba..28cd817ea3ab 100644 --- a/rasa/nlu/classifiers/embedding_intent_classifier.py +++ b/rasa/nlu/classifiers/embedding_intent_classifier.py @@ -667,11 +667,11 @@ def persist(self, file_name: Text, model_dir: Text) -> Dict[Text, Any]: saver = tf.train.Saver() saver.save(self.session, checkpoint) - with io.open( + with open( os.path.join(model_dir, file_name + "_inv_intent_dict.pkl"), "wb" ) as f: pickle.dump(self.inv_intent_dict, f) - with io.open( + with open( os.path.join(model_dir, file_name + "_encoded_all_intents.pkl"), "wb" ) as f: pickle.dump(self.encoded_all_intents, f) @@ -706,11 +706,11 @@ def load( word_embed = tf.get_collection("word_embed")[0] intent_embed = tf.get_collection("intent_embed")[0] - with io.open( + with open( os.path.join(model_dir, file_name + "_inv_intent_dict.pkl"), "rb" ) as f: inv_intent_dict = pickle.load(f) - with io.open( + with open( os.path.join(model_dir, file_name + "_encoded_all_intents.pkl"), "rb" ) as f: encoded_all_intents = pickle.load(f) diff --git a/rasa/nlu/featurizers/regex_featurizer.py b/rasa/nlu/featurizers/regex_featurizer.py index e68a31fe0029..6efb58b5a7ec 100644 --- a/rasa/nlu/featurizers/regex_featurizer.py +++ b/rasa/nlu/featurizers/regex_featurizer.py @@ -102,7 +102,7 @@ def _generate_lookup_regex(self, lookup_table): else: try: - f = io.open(lookup_elements, "r", encoding="utf-8") + f = open(lookup_elements, "r", encoding="utf-8") except IOError: raise ValueError( "Could not load lookup table {}" From bbd627f76f3594731720b30b1e21fab4b8989807 Mon Sep 17 00:00:00 2001 From: akelad Date: Thu, 12 Sep 2019 21:15:38 +0200 Subject: [PATCH 3/5] correctly pass ssl flags to x --- rasa/cli/x.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rasa/cli/x.py b/rasa/cli/x.py index b15ce4d34dcc..84948e7861b9 100644 --- a/rasa/cli/x.py +++ b/rasa/cli/x.py @@ -80,6 +80,9 @@ def _rasa_service( enable_api=True, jwt_secret=args.jwt_secret, jwt_method=args.jwt_method, + ssl_certificate=args.ssl_certificate, + ssl_keyfile=args.ssl_keyfile, + ssl_password=args.ssl_password, ) From 05c8392305b9aa558ff02af26c66a0483e9edce1 Mon Sep 17 00:00:00 2001 From: akelad Date: Tue, 17 Sep 2019 15:16:39 -0700 Subject: [PATCH 4/5] prepare next release --- CHANGELOG.rst | 9 ++++++++- rasa/version.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e3373019fb97..d82312425db1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. This project adheres to `Semantic Versioning`_ starting with version 1.0. -[Unreleased 1.2.9] - `master`_ +[Unreleased 1.2.10] - `master`_ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Added @@ -22,6 +22,13 @@ Removed Fixed ----- +[1.2.9] - 2019-09-17 +^^^^^^^^^^^^^^^^^^^^ + +Fixed +----- +- Correctly pass SSL flag values to x CLI command + [1.2.8] - 2019-09-10 ^^^^^^^^^^^^^^^^^^^^ diff --git a/rasa/version.py b/rasa/version.py index 5cc179e20f3a..b87fc0c7ea80 100644 --- a/rasa/version.py +++ b/rasa/version.py @@ -1 +1 @@ -__version__ = "1.2.8" +__version__ = "1.2.9" From bf67911ccc83226c1902362a3ac2da1fa61be50e Mon Sep 17 00:00:00 2001 From: akelad Date: Tue, 17 Sep 2019 15:50:08 -0700 Subject: [PATCH 5/5] fix changelog underline --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d82312425db1..8ce94cf93f5a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,7 +8,7 @@ This project adheres to `Semantic Versioning`_ starting with version 1.0. [Unreleased 1.2.10] - `master`_ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Added -----