meerschaum 2.2.4__tar.gz → 2.2.5__tar.gz

{meerschaum-2.2.4/meerschaum.egg-info → meerschaum-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.4
+Version: 2.2.5
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -54,6 +54,7 @@ Requires-Dist: python-dateutil>=2.7.5; extra == "core"
 Requires-Dist: requests>=2.23.0; extra == "core"
 Requires-Dist: binaryornot>=0.4.4; extra == "core"
 Requires-Dist: pyvim>=3.0.2; extra == "core"
+Requires-Dist: ptpython>=3.0.27; extra == "core"
 Requires-Dist: aiofiles>=0.6.0; extra == "core"
 Requires-Dist: packaging>=21.3.0; extra == "core"
 Requires-Dist: prompt-toolkit>=3.0.39; extra == "core"
@@ -83,7 +84,6 @@ Requires-Dist: mycli>=1.23.2; extra == "cli"
 Requires-Dist: litecli>=1.5.0; extra == "cli"
 Requires-Dist: mssql-cli>=1.0.0; extra == "cli"
 Requires-Dist: gadwall>=0.2.0; extra == "cli"
-Requires-Dist: ptpython>=3.0.27; extra == "cli"
 Provides-Extra: stack
 Requires-Dist: docker-compose>=1.29.2; extra == "stack"
 Provides-Extra: build
@@ -148,6 +148,7 @@ Requires-Dist: python-dateutil>=2.7.5; extra == "sql"
 Requires-Dist: requests>=2.23.0; extra == "sql"
 Requires-Dist: binaryornot>=0.4.4; extra == "sql"
 Requires-Dist: pyvim>=3.0.2; extra == "sql"
+Requires-Dist: ptpython>=3.0.27; extra == "sql"
 Requires-Dist: aiofiles>=0.6.0; extra == "sql"
 Requires-Dist: packaging>=21.3.0; extra == "sql"
 Requires-Dist: prompt-toolkit>=3.0.39; extra == "sql"
@@ -206,6 +207,7 @@ Requires-Dist: python-dateutil>=2.7.5; extra == "api"
 Requires-Dist: requests>=2.23.0; extra == "api"
 Requires-Dist: binaryornot>=0.4.4; extra == "api"
 Requires-Dist: pyvim>=3.0.2; extra == "api"
+Requires-Dist: ptpython>=3.0.27; extra == "api"
 Requires-Dist: aiofiles>=0.6.0; extra == "api"
 Requires-Dist: packaging>=21.3.0; extra == "api"
 Requires-Dist: prompt-toolkit>=3.0.39; extra == "api"
@@ -254,6 +256,7 @@ Requires-Dist: python-dateutil>=2.7.5; extra == "full"
 Requires-Dist: requests>=2.23.0; extra == "full"
 Requires-Dist: binaryornot>=0.4.4; extra == "full"
 Requires-Dist: pyvim>=3.0.2; extra == "full"
+Requires-Dist: ptpython>=3.0.27; extra == "full"
 Requires-Dist: aiofiles>=0.6.0; extra == "full"
 Requires-Dist: packaging>=21.3.0; extra == "full"
 Requires-Dist: prompt-toolkit>=3.0.39; extra == "full"

{meerschaum-2.2.4 → meerschaum-2.2.5}/meerschaum/__init__.py

@@ -23,7 +23,7 @@ from meerschaum.utils.typing import SuccessTuple
 from meerschaum.core.Pipe import Pipe
 from meerschaum.plugins import Plugin
 from meerschaum.utils.venv import Venv
-from meerschaum.connectors import get_connector
+from meerschaum.connectors import get_connector, Connector, make_connector
 from meerschaum.utils import get_pipes
 from meerschaum.utils.formatting import pprint
 from meerschaum._internal.docs import index as __doc__
@@ -49,4 +49,7 @@ __all__ = (
     "connectors",
     "plugins",
     "utils",
+    "SuccessTuple",
+    "Connector",
+    "make_connector",
 )

{meerschaum-2.2.4 → meerschaum-2.2.5}/meerschaum/_internal/arguments/_parse_arguments.py

@@ -80,8 +80,9 @@ def parse_arguments(sysargs: List[str]) -> Dict[str, Any]:
 
     ### rebuild sysargs without sub_arguments
     filtered_sysargs = [
-        word for i, word in enumerate(sysargs)
-            if i not in sub_arg_indices
+        word
+        for i, word in enumerate(sysargs)
+        if i not in sub_arg_indices
     ]
 
     try:
@@ -99,7 +100,6 @@ def parse_arguments(sysargs: List[str]) -> Dict[str, Any]:
         except Exception as _e:
             args_dict['text'] = ' '.join(sysargs)
         args_dict[STATIC_CONFIG['system']['arguments']['failure_key']] = e
-        unknown = []
 
     false_flags = [arg for arg, val in args_dict.items() if val is False]
     for arg in false_flags:
@@ -126,17 +126,26 @@ def parse_arguments(sysargs: List[str]) -> Dict[str, Any]:
 
     ### remove None (but not False) args
     none_args = []
+    none_args_keep = []
     for a, v in args_dict.items():
         if v is None:
             none_args.append(a)
+        elif v == 'None':
+            none_args_keep.append(a)
     for a in none_args:
         del args_dict[a]
+    for a in none_args_keep:
+        args_dict[a] = None
 
     ### location_key '[None]' or 'None' -> None
     if 'location_keys' in args_dict:
         args_dict['location_keys'] = [
-            None if lk in ('[None]', 'None')
-            else lk for lk in args_dict['location_keys'] 
+            (
+                None
+                if lk in ('[None]', 'None')
+                else lk
+            )
+            for lk in args_dict['location_keys']
         ]
 
     return parse_synonyms(args_dict)
@@ -145,7 +154,7 @@ def parse_arguments(sysargs: List[str]) -> Dict[str, Any]:
 def parse_line(line: str) -> Dict[str, Any]:
     """
     Parse a line of text into standard Meerschaum arguments.
-    
+
     Parameters
     ----------
     line: str
@@ -165,12 +174,12 @@ def parse_line(line: str) -> Dict[str, Any]:
     try:
         return parse_arguments(shlex.split(line))
     except Exception as e:
-        return {'action': [], 'text': line,}
+        return {'action': [], 'text': line}
 
 
 def parse_synonyms(
-        args_dict: Dict[str, Any]
-    ) -> Dict[str, Any]:
+    args_dict: Dict[str, Any]
+) -> Dict[str, Any]:
     """Check for synonyms (e.g. `async` = `True` -> `unblock` = `True`)"""
     if args_dict.get('async', None):
         args_dict['unblock'] = True
@@ -194,8 +203,8 @@ def parse_synonyms(
 
 
 def parse_dict_to_sysargs(
-        args_dict : Dict[str, Any]
-    ) -> List[str]:
+    args_dict: Dict[str, Any]
+) -> List[str]:
     """Revert an arguments dictionary back to a command line list."""
     from meerschaum._internal.arguments._parser import get_arguments_triggers
     sysargs = []
@@ -230,9 +239,9 @@ def parse_dict_to_sysargs(
 
 
 def remove_leading_action(
-        action: List[str],
-        _actions: Optional[Dict[str, Callable[[Any], SuccessTuple]]] = None,
-    ) -> List[str]:
+    action: List[str],
+    _actions: Optional[Dict[str, Callable[[Any], SuccessTuple]]] = None,
+) -> List[str]:
     """
     Remove the leading strings in the `action` list.
 

{meerschaum-2.2.4 → meerschaum-2.2.5}/meerschaum/_internal/arguments/_parser.py

@@ -37,12 +37,15 @@ class ArgumentParser(argparse.ArgumentParser):
         return result
 
 
-def parse_datetime(dt_str: str) -> datetime:
+def parse_datetime(dt_str: str) -> Union[datetime, int, str]:
     """Parse a string into a datetime."""
     from meerschaum.utils.misc import is_int
     if is_int(dt_str):
         return int(dt_str)
 
+    if dt_str in ('None', '[None]'):
+        return 'None'
+
     from meerschaum.utils.packages import attempt_import
     dateutil_parser = attempt_import('dateutil.parser')
 
@@ -155,7 +158,6 @@ groups['actions'].add_argument(
     '-d', '--daemon', action='store_true',
     help = "Run an action as a background daemon."
 )
-
 groups['actions'].add_argument(
     '--rm', action='store_true', help="Delete a job once it has finished executing."
 )