Changed "(:/!)" to "(:!!)"

Author: AbelCheng

README.rst

@@ -422,36 +422,36 @@ Sample User Apps/Modules/Scripts
                     {
                         "(://)": "http://service1",
                         "(...)": {"svc1-arg1": "arg1 of service1 payload ..." },
-                        "(:/!)": 600
+                        "(:!!)": 600
                     },
                     {
                         "(://)": "http://service2",
                         "(.|.)": {"svc2-arg1": "arg1 of service2 payload ..." },
-                        "(:/!)": 600
+                        "(:!!)": 600
                     },
                     {
                         "[###]": [
                             {
                                 "(://)": "http://service3",
                                 "(...)": {"svc3-arg1": "arg1 of service3 payload ..." },
-                                "(:/!)": 1800
+                                "(:!!)": 1800
                             },
                             {
                                 "(://)": "http://service4",
                                 "(...)": {"svc4-arg1": "arg1 of service4 payload ..." },
-                                "(:/!)": 1800
+                                "(:!!)": 1800
                             },
                             {
                                 "(://)": "http://service5",
                                 "(...)": {"svc5-arg1": "arg1 of service5 payload ..." },
-                                "(:/!)": 1800
+                                "(:!!)": 1800
                             }
                         ]
                     },
                     {
                         "(://)": "http://service6",
                         "(...)": {"svc6-arg1": "arg1 of service6 payload ..." },
-                        "(:/!)": 600
+                        "(:!!)": 600
                     }
                 ]
             }
@@ -472,7 +472,7 @@ Sample User Apps/Modules/Scripts
                 {
                     "(://)": "http://service1",
                     "(...)": {"svc1-arg1": "arg1 of service1 payload ..." },
-                    "(:/!)": timeout seconds
+                    "(:!!)": timeout seconds
                 }
 
             Or
@@ -482,13 +482,13 @@ Sample User Apps/Modules/Scripts
                 {
                     "(://)": "http://service2",
                     "(.|.)": {"svc2-arg1": "arg1 of service2 payload ..." },
-                    "(:/!)": timeout seconds
+                    "(:!!)": timeout seconds
                 }
 
             +   "``(://)``" - *Key : Value* - "URL of the service call"
             +   "``(...)``" - *Key : Value* - {A dictionary of arguments (payload) for the service call}
             +   "``(.|.)``" - *Key : Value* - {Merge the results of the previous service as pipeline arguments into this dictionary of arguments}
-            +   "``(:/!)``" - *Key : Value* - timeout seconds (optional) *How many seconds to wait for the REST service to respond before giving up*
+            +   "``(:!!)``" - *Key : Value* - timeout seconds (optional) *How many seconds to wait for the REST service to respond before giving up*
 
             Each service is an executable/callable unit, let's have a convention to use a rounded rectangle as its graphical symbol.
 

Sample/UserApps/ServicesGrouping/rest_grouping.py

@@ -22,7 +22,7 @@
 _reserved_key_rest_url : str = "(://)"
 _reserved_key_payload : str = "(...)"
 _reserved_key_payload_with_pipe : str = "(.|.)"
-_reserved_key_timeout : str = "(:/!)"
+_reserved_key_timeout : str = "(:!!)"
 
 
 def _task_func(url:str, data:dict=None, timeout:float=None):
@@ -54,6 +54,15 @@ def create_base_container(self) -> TaskContainer:
         return TaskContainer(_task_func, _pipeargs_merge_fn, self.thread_pool)
 
 
+    @staticmethod
+    def _get_timeout(task_node:Dict[str, Any])->float:
+        timeout = task_node.get(_reserved_key_timeout)
+        if isinstance(timeout, (int, float)) and timeout > 0:
+            return timeout
+        else:
+            return None
+
+
     def extract_single_task(self, task_node:Dict[str, Any]) -> Tuple[tuple, Dict[str, Any], bool]:
         url = task_node.get(_reserved_key_rest_url)
         if url:
@@ -69,8 +78,7 @@ def extract_single_task(self, task_node:Dict[str, Any]) -> Tuple[tuple, Dict[str
             else:
                 with_pipe = False
 
-            timeout = task_node.get(_reserved_key_timeout)
-
+            timeout = self._get_timeout(task_node)
             return ((), {'url': url, 'data': data, 'timeout': timeout}, with_pipe)
         else:
             return None
@@ -86,7 +94,7 @@ def extract_parallel_group(self, task_node:Dict[str, Any]) -> List[Dict[str, Any
 
     def load(self, task_tree:Dict[str, Any]) -> TaskContainer:
         container = super().load(task_tree)
-        container.timeout = task_tree.get(_reserved_key_timeout)
+        container.timeout = self._get_timeout(task_tree)
         return container
 
 

Utilities.PyPI/dbdatareader.py

@@ -5,15 +5,22 @@
 ----
 
 **dbDataReader** is a simple data reader for reading .NET ``System.Data.IDataReader``-like forward-only streams.
+
 The returned data model depends on the type of data container passed in.
 
-4 built-in container classes 
-- ``ListOfList``, ``DictOfList``, ``ListOfDict`` and ``SqlTvp`` are shipped with this package.
-Please refer to the MDX reader example in 
-https://github.com/DataBooster/PyWebApi/blob/master/Sample/UserApps/MdxReader/adomd_client.py
-for quick details.
+4 built-in container classes:
+
+-   ``ListOfList``
+-   ``DictOfList``
+-   ``ListOfDict``
+-   ``SqlTvp``
+
+are shipped with this package.
 
-|
+Please refer to the `MDX Reader <https://github.com/DataBooster/PyWebApi/blob/master/Sample/UserApps/MdxReader/adomd_client.py>`__ 
+example and its `product documentation <https://github.com/DataBooster/PyWebApi#mdx-reader>`__ for quick details.
+
+----
 
 | Homepage and documentation: https://github.com/DataBooster/PyWebApi
 | Copyright (c) 2020 Abel Cheng
@@ -383,4 +390,4 @@ def read_all_results(self, result_set_class, *args, **kwargs) -> list:
 
 
 
-__version__ = "0.1a7"
+__version__ = "0.1a8"