taskflow 5.0.0__py3-none-any.whl → 5.1.1__py3-none-any.whl

taskflow/jobs/backends/impl_zookeeper.py

@@ -28,6 +28,7 @@ from kazoo.protocol import states as k_states
 from kazoo.recipe import watchers
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
+from oslo_utils import strutils
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 
@@ -829,7 +830,8 @@ class ZookeeperJobBoard(base.NotifyingJobBoard):
             excp.raise_with_cause(excp.JobFailure,
                                   "Failed to connect to zookeeper")
         try:
-            if self._conf.get('check_compatible', True):
+            if strutils.bool_from_string(
+                    self._conf.get('check_compatible'), default=True):
                 kazoo_utils.check_compatible(self._client, self.MIN_ZK_VERSION)
             if self._worker is None and self._emit_notifications:
                 self._worker = futurist.ThreadPoolExecutor(max_workers=1)

taskflow/persistence/backends/impl_zookeeper.py

@@ -20,6 +20,7 @@ import contextlib
 from kazoo import exceptions as k_exc
 from kazoo.protocol import paths
 from oslo_serialization import jsonutils
+from oslo_utils import strutils
 
 from taskflow import exceptions as exc
 from taskflow.persistence import path_based
@@ -161,7 +162,8 @@ class ZkConnection(path_based.PathBasedConnection):
     def validate(self):
         with self._exc_wrapper():
             try:
-                if self._conf.get('check_compatible', True):
+                if strutils.bool_from_string(
+                        self._conf.get('check_compatible'), default=True):
                     k_utils.check_compatible(self._client, MIN_ZK_VERSION)
             except exc.IncompatibleVersion:
                 exc.raise_with_cause(exc.StorageFailure, "Backend storage is"

taskflow/tests/unit/jobs/test_zk_job.py

@@ -293,3 +293,47 @@ class ZakeJobboardTest(test.TestCase, ZookeeperBoardTestMixin):
             self.assertRaises(excp.NotImplementedError,
                               self.board.register_entity,
                               entity_instance_2)
+
+    def test_connect_check_compatible(self):
+        # Valid version
+        client = fake_client.FakeClient()
+        board = impl_zookeeper.ZookeeperJobBoard(
+            'test-board', {'check_compatible': True},
+            client=client)
+        self.addCleanup(board.close)
+        self.addCleanup(self.close_client, client)
+
+        with base.connect_close(board):
+            pass
+
+        # Invalid version, no check
+        client = fake_client.FakeClient(server_version=(3, 2, 0))
+        board = impl_zookeeper.ZookeeperJobBoard(
+            'test-board', {'check_compatible': False},
+            client=client)
+        self.addCleanup(board.close)
+        self.addCleanup(self.close_client, client)
+
+        with base.connect_close(board):
+            pass
+
+        # Invalid version, check_compatible=True
+        client = fake_client.FakeClient(server_version=(3, 2, 0))
+        board = impl_zookeeper.ZookeeperJobBoard(
+            'test-board', {'check_compatible': True},
+            client=client)
+        self.addCleanup(board.close)
+        self.addCleanup(self.close_client, client)
+
+        self.assertRaises(excp.IncompatibleVersion, board.connect)
+
+        # Invalid version, check_compatible='False'
+        client = fake_client.FakeClient(server_version=(3, 2, 0))
+        board = impl_zookeeper.ZookeeperJobBoard(
+            'test-board', {'check_compatible': 'False'},
+            client=client)
+        self.addCleanup(board.close)
+        self.addCleanup(self.close_client, client)
+
+        with base.connect_close(board):
+            pass

taskflow/tests/unit/test_utils_iter_utils.py

@@ -140,14 +140,21 @@ class IterUtilsTest(test.TestCase):
         self.assertRaises(ValueError, iter_utils.while_is_not, 2, 'a')
 
     def test_while_is_not(self):
-        it = iter(string.ascii_lowercase)
-        self.assertEqual(['a'],
-                         list(iter_utils.while_is_not(it, 'a')))
-        it = iter(string.ascii_lowercase)
-        self.assertEqual(['a', 'b'],
-                         list(iter_utils.while_is_not(it, 'b')))
-        self.assertEqual(list(string.ascii_lowercase[2:]),
-                         list(iter_utils.while_is_not(it, 'zzz')))
-        it = iter(string.ascii_lowercase)
-        self.assertEqual(list(string.ascii_lowercase),
-                         list(iter_utils.while_is_not(it, '')))
+        class Dummy(object):
+            def __init__(self, char):
+                self.char = char
+        dummy_list = [Dummy(a)
+                      for a in string.ascii_lowercase]
+
+        it = iter(dummy_list)
+        self.assertEqual([dummy_list[0]],
+                         list(iter_utils.while_is_not(it, dummy_list[0])))
+        it = iter(dummy_list)
+        self.assertEqual(dummy_list[0:2],
+                         list(iter_utils.while_is_not(it, dummy_list[1])))
+        self.assertEqual(dummy_list[2:],
+                         list(iter_utils.while_is_not(it, Dummy('zzz'))))
+
+        it = iter(dummy_list)
+        self.assertEqual(dummy_list,
+                         list(iter_utils.while_is_not(it, Dummy(''))))

taskflow/tests/unit/test_utils_kazoo_utils.py

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright (C) Red Hat
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from unittest import mock
+
+from taskflow import test
+from taskflow.utils import kazoo_utils
+
+
+class MakeClientTest(test.TestCase):
+
+    @mock.patch("kazoo.client.KazooClient")
+    def test_make_client_config(self, mock_kazoo_client):
+        conf = {}
+        expected = {
+            'hosts': 'localhost:2181',
+            'logger': mock.ANY,
+            'read_only': False,
+            'randomize_hosts': False,
+            'keyfile': None,
+            'keyfile_password': None,
+            'certfile': None,
+            'use_ssl': False,
+            'verify_certs': True
+        }
+
+        kazoo_utils.make_client(conf)
+
+        mock_kazoo_client.assert_called_once_with(**expected)
+
+        mock_kazoo_client.reset_mock()
+
+        # With boolean passed as strings
+        conf = {
+            'use_ssl': 'True',
+            'verify_certs': 'False'
+        }
+        expected = {
+            'hosts': 'localhost:2181',
+            'logger': mock.ANY,
+            'read_only': False,
+            'randomize_hosts': False,
+            'keyfile': None,
+            'keyfile_password': None,
+            'certfile': None,
+            'use_ssl': True,
+            'verify_certs': False
+        }
+
+        kazoo_utils.make_client(conf)
+
+        mock_kazoo_client.assert_called_once_with(**expected)
+
+        mock_kazoo_client.reset_mock()

taskflow/utils/kazoo_utils.py

@@ -17,6 +17,7 @@
 from kazoo import client
 from kazoo import exceptions as k_exc
 from oslo_utils import reflection
+from oslo_utils import strutils
 
 from taskflow import exceptions as exc
 from taskflow import logging
@@ -24,6 +25,15 @@ from taskflow import logging
 
 LOG = logging.getLogger(__name__)
 
+CONF_TRANSFERS = (
+    ('read_only', strutils.bool_from_string, False),
+    ('randomize_hosts', strutils.bool_from_string, False),
+    ('keyfile', None, None),
+    ('keyfile_password', None, None),
+    ('certfile', None, None),
+    ('use_ssl', strutils.bool_from_string, False),
+    ('verify_certs', strutils.bool_from_string, True))
+
 
 def _parse_hosts(hosts):
     if isinstance(hosts, str):
@@ -193,16 +203,19 @@ def make_client(conf):
     """
     # See: https://kazoo.readthedocs.io/en/latest/api/client.html
     client_kwargs = {
-        'read_only': bool(conf.get('read_only')),
-        'randomize_hosts': bool(conf.get('randomize_hosts')),
         'logger': LOG,
-        'keyfile': conf.get('keyfile', None),
-        'keyfile_password': conf.get('keyfile_password', None),
-        'certfile': conf.get('certfile', None),
-        'use_ssl': conf.get('use_ssl', False),
-        'verify_certs': conf.get('verify_certs', True),
-
     }
+
+    for key, value_type_converter, default in CONF_TRANSFERS:
+        if key in conf:
+            if value_type_converter is not None:
+                client_kwargs[key] = value_type_converter(conf[key],
+                                                          default=default)
+            else:
+                client_kwargs[key] = conf[key]
+        else:
+            client_kwargs[key] = default
+
     # See: https://kazoo.readthedocs.io/en/latest/api/retry.html
     if 'command_retry' in conf:
         client_kwargs['command_retry'] = conf['command_retry']

taskflow/utils/schema_utils.py

@@ -17,12 +17,6 @@
 import jsonschema
 from jsonschema import exceptions as schema_exc
 
-# Special jsonschema validation types/adjustments.
-_SCHEMA_TYPES = {
-    # See: https://github.com/Julian/jsonschema/issues/148
-    'array': (list, tuple),
-}
-
 
 # Expose these types so that people don't have to import the same exceptions.
 ValidationError = schema_exc.ValidationError
@@ -31,4 +25,11 @@ SchemaError = schema_exc.SchemaError
 
 def schema_validate(data, schema):
     """Validates given data using provided json schema."""
-    jsonschema.validate(data, schema, types=_SCHEMA_TYPES)
+    Validator = jsonschema.validators.validator_for(schema)
+    # Special jsonschema validation types/adjustments.
+    # See: https://github.com/Julian/jsonschema/issues/148
+    type_checker = Validator.TYPE_CHECKER.redefine(
+        "array", lambda checker, data: isinstance(data, (list, tuple)))
+    TupleAllowingValidator = jsonschema.validators.extend(
+        Validator, type_checker=type_checker)
+    TupleAllowingValidator(schema).validate(data)

{taskflow-5.0.0.dist-info → taskflow-5.1.1.dist-info}/AUTHORS

@@ -97,6 +97,7 @@ liuwei <liuw147@chinaunicom.cn>
 luke.li <lilu7189@fiberhome.com>
 maaoyu <maaoyu@inspur.com>
 melissaml <ma.lei@99cloud.net>
+niuke <niuke19970315@163.com>
 qinchunhua <qin.chunhua@zte.com.cn>
 rahulram <rahurama@cisco.com>
 skudriashev <skudriashev@griddynamics.com>

{taskflow-5.0.0.dist-info → taskflow-5.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskflow
-Version: 5.0.0
+Version: 5.1.1
 Summary: Taskflow structured state management library.
 Home-page: https://docs.openstack.org/taskflow/latest/
 Author: OpenStack

{taskflow-5.0.0.dist-info → taskflow-5.1.1.dist-info}/RECORD

@@ -106,7 +106,7 @@ taskflow/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/jobs/base.py,sha256=ncIAaBBHIdQ71kvKfOVvoq2noFjrNnmOwVT9YNFh5Yg,22043
 taskflow/jobs/backends/__init__.py,sha256=ILlqq_U0FPM77nPQgx_OexjHxUvC5Tl4RXkX-IznSfw,2902
 taskflow/jobs/backends/impl_redis.py,sha256=ANcQODjj_f_biMWas1p0sgwUXfa9X32mrL1OSeHR4J4,43520
-taskflow/jobs/backends/impl_zookeeper.py,sha256=BmAQ2LtzafvgoMvN1uSR9whEsKeMv0T15ffpEwKyj1c,37555
+taskflow/jobs/backends/impl_zookeeper.py,sha256=yMwhmyXRknhOpJiV2gHQQnHv885JAOWss-LGOM6SoQQ,37643
 taskflow/listeners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/listeners/base.py,sha256=vhbh4CcTW9iulQCG-A5G0iJDp7-j1m1XALYRewOanik,7391
 taskflow/listeners/capturing.py,sha256=14wrkVMrlmPm5jTnTTFM0RFv4PuKMIaIEPmYA4Ki4TA,4329
@@ -126,7 +126,7 @@ taskflow/persistence/backends/__init__.py,sha256=z5k5CZNjtbKvj2uxqNrdPmREDUGlTMr
 taskflow/persistence/backends/impl_dir.py,sha256=t8YQe4llF4ghguTh45BBEzRvvtpCllaAbuFZhOY_4os,6085
 taskflow/persistence/backends/impl_memory.py,sha256=PHKHqeV_KkkwCpT42J2j22o8gfdjAKt3recCP6k5TUw,13390
 taskflow/persistence/backends/impl_sqlalchemy.py,sha256=eHPgb217qQRpJhp3VtGgpUufeTHCimDgcMSo2lKvUb0,25408
-taskflow/persistence/backends/impl_zookeeper.py,sha256=sV6nunPEY_plZFbRdVUZRVu_y7awCtMxwhMvx7aV1o4,6096
+taskflow/persistence/backends/impl_zookeeper.py,sha256=PaJmf-xDk7udmYzrMxRM-ARrd1HfAucqQjYIljmpixM,6188
 taskflow/persistence/backends/sqlalchemy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/persistence/backends/sqlalchemy/migration.py,sha256=YS4UPcygmYV1lRTogPUuyMM39DupIZ1LwuD23yoaEno,1140
 taskflow/persistence/backends/sqlalchemy/tables.py,sha256=CUHMWfVIK9bim-APx4QSmFuru1FyJIrOFl7hT51dQcs,4819
@@ -174,7 +174,8 @@ taskflow/tests/unit/test_types.py,sha256=uecv0lBqPAfAdTDXYMoM8Pi-P9JROR-aA_xkK0t
 taskflow/tests/unit/test_utils.py,sha256=WnTW4hVhq16O0I88K1oMEv1X8x1DMMaK8H_wT2q9W8E,11029
 taskflow/tests/unit/test_utils_async_utils.py,sha256=BkVaxbRO3XX2ueAy6kSplq4D1SVos8DOaf9V1mueEf4,981
 taskflow/tests/unit/test_utils_binary.py,sha256=OdF2BIeUCIP4hXi6QsYv8IqZtDpmqCZySlv5nLZ6UOk,3168
-taskflow/tests/unit/test_utils_iter_utils.py,sha256=0CoXh3IHFki7Pz6Ynby0kqvSasVCR8zQlK-wo_7Tj3I,5551
+taskflow/tests/unit/test_utils_iter_utils.py,sha256=jzUJzUtfL1EPRoQLoUzZ0chlkuTKoqQKHjz7F-LaZ3Y,5716
+taskflow/tests/unit/test_utils_kazoo_utils.py,sha256=lYV5ust99XF-ExaPaZ6_laPSJDewT6cTrBWw9X13nGw,1963
 taskflow/tests/unit/test_utils_threading_utils.py,sha256=JxWTMFQwjUXmsEBKl6c207VPpZn3Wh_lY3MYH-iEFUA,5503
 taskflow/tests/unit/action_engine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/tests/unit/action_engine/test_builder.py,sha256=tuL4LoPpnvqnGBE9qAoVXVHLzARGwhhOu4q1cSnvZ68,12866
@@ -186,7 +187,7 @@ taskflow/tests/unit/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 taskflow/tests/unit/jobs/base.py,sha256=wYv5ziDeVdYn2nhuMSfYTWU39Xxpv8lRKvJbGsB79lM,8447
 taskflow/tests/unit/jobs/test_entrypoint.py,sha256=t2m5zeYhjb2pmPxBgGO_0AMWR0dabWxglDBODzLE0fY,2220
 taskflow/tests/unit/jobs/test_redis_job.py,sha256=GSYGoBS7c9Sd5cJlBmx3B6vUKQR4yXkUlOHdzhNNGqs,5174
-taskflow/tests/unit/jobs/test_zk_job.py,sha256=F0Fe7dbtSoKNQA-pO7dIHTL6uicCei18iJL_1AqVxJo,12225
+taskflow/tests/unit/jobs/test_zk_job.py,sha256=K9FU38I-w_pybn81pK4ULffJdssxPLzc4W-brRRgIX8,13797
 taskflow/tests/unit/patterns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/tests/unit/patterns/test_graph_flow.py,sha256=ywPavkeuES91IphE2mqGpHbUk9w_DZJMNra_RKuVWAU,12464
 taskflow/tests/unit/patterns/test_linear_flow.py,sha256=VMSU1lPq4pgkmKHeM70ZJglG1T-MylrNX6NuPGKBeX4,5145
@@ -223,18 +224,18 @@ taskflow/utils/async_utils.py,sha256=aoRp7cY8cm5jSsOy3RyV5Fjr27U2J_V6ldMYVWTPJJ4
 taskflow/utils/banner.py,sha256=_44ZM33gye8orjUN4B_VdQe8ksEPAK3WI6pfrMMiEiE,3635
 taskflow/utils/eventlet_utils.py,sha256=-0Tpw9x8UmQYXbyCbh751k1D5gPYVQv2zqCRis3vcmE,1149
 taskflow/utils/iter_utils.py,sha256=RAMpEe7pYsXXoObke0Jh2ePpfdX7cTDxhTgHua2v37M,4674
-taskflow/utils/kazoo_utils.py,sha256=kqBvM43I9iRbroeAr42dh84fGR3d0kT5gnWxuXAtHmU,9521
+taskflow/utils/kazoo_utils.py,sha256=fCHMC-a5ayJqzBVjdTiy1WqBE6hSmRwxx7GkF-jd6Nw,9915
 taskflow/utils/kombu_utils.py,sha256=tgAN6c7kSggbT0rMn3rVzkKm9e1CmW90Jpb5279G2zg,2528
 taskflow/utils/misc.py,sha256=yHfRx6P0TqADiL-f-m5H74ugG2U7p5ktYkMK9DVGdWA,18504
 taskflow/utils/persistence_utils.py,sha256=GWceOcxdfsf-MtrdR74xmC2khClF8im6DpZmR2UpYuU,3899
 taskflow/utils/redis_utils.py,sha256=G3QinnXJFcNWKIDhw_nwVO6QtZxzjA9w57DJs8N2qC4,4369
-taskflow/utils/schema_utils.py,sha256=pQxt31sz-l--ufIbsBpql58mu0iktZXAjyCxwxR231I,1199
+taskflow/utils/schema_utils.py,sha256=Zf6eL0NK0_TVFD_Sc1yEZYswFz9K0tet1Dmj48F8uMA,1434
 taskflow/utils/threading_utils.py,sha256=eiaNUK127DOBr_zfj3-j4Oi5a2dsD7VunVeTYN6NjPo,5849
-taskflow-5.0.0.dist-info/AUTHORS,sha256=P7_HgYtGEK4P6xFFhjB9HZU39_TO4lod2rqPTjEQeFU,4345
-taskflow-5.0.0.dist-info/LICENSE,sha256=0t4vVm0tDgtQn7DqH6Nmn0kGSrHeIcV0U8qzdQojTo8,10143
-taskflow-5.0.0.dist-info/METADATA,sha256=AV8kWvvR84LY4uywfeaJJZNrhXzlgQaWrKM_1ai_R4E,5036
-taskflow-5.0.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-taskflow-5.0.0.dist-info/entry_points.txt,sha256=MGjjnng_YpSJs9BMAJBC2hJnljMV0pNllXl_5VoHJV0,1183
-taskflow-5.0.0.dist-info/pbr.json,sha256=Cluc2FMozs5sx5RsthVlLQG6aesudF0VJLu9zv2lGsc,47
-taskflow-5.0.0.dist-info/top_level.txt,sha256=PsdN41vwysesDlqHCSVVXH4mkTMdMiZFW_yHEAXiZE4,9
-taskflow-5.0.0.dist-info/RECORD,,
+taskflow-5.1.1.dist-info/AUTHORS,sha256=YKkAn3T15aBNUg0A7QgHXZ3c5EkcZCVus2pVqydp520,4375
+taskflow-5.1.1.dist-info/LICENSE,sha256=0t4vVm0tDgtQn7DqH6Nmn0kGSrHeIcV0U8qzdQojTo8,10143
+taskflow-5.1.1.dist-info/METADATA,sha256=687s8OImJPu_hi-kUABc3BUBIzZHeq50QVEcZntkhl0,5036
+taskflow-5.1.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+taskflow-5.1.1.dist-info/entry_points.txt,sha256=MGjjnng_YpSJs9BMAJBC2hJnljMV0pNllXl_5VoHJV0,1183
+taskflow-5.1.1.dist-info/pbr.json,sha256=8WxZ922I9fo3mk5RLexixZioeQ97VUZU4Edc4Wm-B9c,47
+taskflow-5.1.1.dist-info/top_level.txt,sha256=PsdN41vwysesDlqHCSVVXH4mkTMdMiZFW_yHEAXiZE4,9
+taskflow-5.1.1.dist-info/RECORD,,

taskflow-5.1.1.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "78aa34f4", "is_release": true}

taskflow-5.0.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "6dfc1801", "is_release": true}