meerschaum 2.2.5.dev3__py3-none-any.whl → 2.2.7__py3-none-any.whl

meerschaum/core/Pipe/_fetch.py

@@ -8,11 +8,14 @@ Functions for fetching new data into the Pipe
 
 from __future__ import annotations
 from datetime import timedelta, datetime
+
 import meerschaum as mrsm
-from meerschaum.utils.typing import Optional, Any, Union, SuccessTuple, Iterator
+from meerschaum.utils.typing import Optional, Any, Union, SuccessTuple, Iterator, TYPE_CHECKING
 from meerschaum.config import get_config
 from meerschaum.utils.warnings import warn
-from meerschaum.utils.misc import filter_keywords
+
+if TYPE_CHECKING:
+    pd = mrsm.attempt_import('pandas')
 
 def fetch(
         self,
@@ -55,6 +58,7 @@ def fetch(
 
     from meerschaum.connectors import custom_types, get_connector_plugin
     from meerschaum.utils.debug import dprint, _checkpoint
+    from meerschaum.utils.misc import filter_arguments
 
     _chunk_hook = kw.pop('chunk_hook', None)
     kw['workers'] = self.get_num_workers(kw.get('workers', None))
@@ -72,24 +76,22 @@ def fetch(
                 chunk_message = '\n' + chunk_label + '\n' + chunk_message
             return chunk_success, chunk_message
 
-
     with mrsm.Venv(get_connector_plugin(self.connector)):
-        df = self.connector.fetch(
+        _args, _kwargs = filter_arguments(
+            self.connector.fetch,
             self,
-            **filter_keywords(
-                self.connector.fetch,
-                begin=_determine_begin(
-                    self,
-                    begin,
-                    check_existing=check_existing,
-                    debug=debug,
-                ),
-                end=end,
-                chunk_hook=_chunk_hook,
+            begin=_determine_begin(
+                self,
+                begin,
+                check_existing=check_existing,
                 debug=debug,
-                **kw
-            )
+            ),
+            end=end,
+            chunk_hook=_chunk_hook,
+            debug=debug,
+            **kw
         )
+        df = self.connector.fetch(*_args, **_kwargs)
     return df
 
 

meerschaum/core/Pipe/_sync.py

@@ -14,7 +14,9 @@ import threading
 import multiprocessing
 import functools
 from datetime import datetime, timedelta
+from typing import TYPE_CHECKING
 
+import meerschaum as mrsm
 from meerschaum.utils.typing import (
     Union,
     Optional,
@@ -26,13 +28,16 @@ from meerschaum.utils.typing import (
     List,
     Iterable,
     Generator,
-    Iterator,
 )
 from meerschaum.utils.warnings import warn, error
 
+if TYPE_CHECKING:
+    pd = mrsm.attempt_import('pandas')
+
 class InferFetch:
     MRSM_INFER_FETCH: bool = True
 
+
 def sync(
     self,
     df: Union[
@@ -125,7 +130,7 @@ def sync(
     from meerschaum.utils.formatting import get_console
     from meerschaum.utils.venv import Venv
     from meerschaum.connectors import get_connector_plugin
-    from meerschaum.utils.misc import df_is_chunk_generator, filter_keywords
+    from meerschaum.utils.misc import df_is_chunk_generator, filter_keywords, filter_arguments
     from meerschaum.utils.pool import get_pool
     from meerschaum.config import get_config
 
@@ -189,6 +194,9 @@ def sync(
         if hasattr(df, 'MRSM_INFER_FETCH'):
             try:
                 if p.connector is None:
+                    if ':' not in p.connector_keys:
+                        return True, f"{p} does not support fetching; nothing to do."
+
                     msg = f"{p} does not have a valid connector."
                     if p.connector_keys.startswith('plugin:'):
                         msg += f"\n    Perhaps {p.connector_keys} has a syntax error?"
@@ -210,28 +218,28 @@ def sync(
             ):
                 with Venv(get_connector_plugin(self.instance_connector)):
                     p._exists = None
-                    return self.instance_connector.sync_pipe_inplace(
+                    _args, _kwargs = filter_arguments(
+                        p.instance_connector.sync_pipe_inplace,
                         p,
-                        **filter_keywords(
-                            p.instance_connector.sync_pipe_inplace,
-                            debug=debug,
-                            **kw
-                        )
+                        debug=debug,
+                        **kw
+                    )
+                    return self.instance_connector.sync_pipe_inplace(
+                        *_args,
+                        **_kwargs
                     )
-
 
             ### Activate and invoke `sync(pipe)` for plugin connectors with `sync` methods.
             try:
                 if getattr(p.connector, 'sync', None) is not None:
                     with Venv(get_connector_plugin(p.connector), debug=debug):
-                        return_tuple = p.connector.sync(
+                        _args, _kwargs = filter_arguments(
+                            p.connector.sync,
                             p,
-                            **filter_keywords(
-                                p.connector.sync,
-                                debug=debug,
-                                **kw
-                            )
+                            debug=debug,
+                            **kw
                         )
+                        return_tuple = p.connector.sync(*_args, **_kwargs)
                     p._exists = None
                     if not isinstance(return_tuple, tuple):
                         return_tuple = (

meerschaum/plugins/_Plugin.py

@@ -654,17 +654,18 @@ class Plugin:
             import ast, re
             ### NOTE: This technically would break 
             ### if `required` was the very first line of the file.
-            req_start_match = re.search(r'\nrequired(\s?)=', text)
+            req_start_match = re.search(r'required(:\s*)?.*=', text)
             if not req_start_match:
                 return []
             req_start = req_start_match.start()
+            equals_sign = req_start + text[req_start:].find('=')
 
             ### Dependencies may have brackets within the strings, so push back the index.
-            first_opening_brace = req_start + 1 + text[req_start:].find('[')
+            first_opening_brace = equals_sign + 1 + text[equals_sign:].find('[')
             if first_opening_brace == -1:
                 return []
 
-            next_closing_brace = req_start + 1 + text[req_start:].find(']')
+            next_closing_brace = equals_sign + 1 + text[equals_sign:].find(']')
             if next_closing_brace == -1:
                 return []
 
@@ -681,12 +682,11 @@ class Plugin:
 
             req_end = end_ix + 1
             req_text = (
-                text[req_start:req_end]
-                .lstrip()
-                .replace('required', '', 1)
+                text[(first_opening_brace-1):req_end]
                 .lstrip()
                 .replace('=', '', 1)
                 .lstrip()
+                .rstrip()
             )
             try:
                 required = ast.literal_eval(req_text)

meerschaum/plugins/__init__.py

@@ -27,7 +27,7 @@ _locks = {
     'PLUGINS_INTERNAL_LOCK_PATH': RLock(),
 }
 __all__ = (
-    "Plugin", "make_action", "api_plugin", "import_plugins",
+    "Plugin", "make_action", "api_plugin", "dash_plugin", "import_plugins",
     "reload_plugins", "get_plugins", "get_data_plugins", "add_plugin_argument",
     "pre_sync_hook", "post_sync_hook",
 )