meerschaum 3.0.4__tar.gz → 3.0.5__tar.gz

{meerschaum-3.0.4/meerschaum.egg-info → meerschaum-3.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.4
+Version: 3.0.5
 Summary: Sync Time-Series Pipes with Meerschaum
 Author-email: Bennett Meares <bennett.meares@gmail.com>
 Maintainer-email: Bennett Meares <bennett.meares@gmail.com>

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "3.0.4"
+__version__ = "3.0.5"

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/connectors/__init__.py

@@ -69,6 +69,7 @@ def get_connector(
     label: str = None,
     refresh: bool = False,
     debug: bool = False,
+    _load_plugins: bool = True,
     **kw: Any
 ) -> Connector:
     """
@@ -122,11 +123,12 @@ def get_connector(
     if isinstance(type, str) and not label and ':' in type:
         type, label = type.split(':', maxsplit=1)
 
-    with _locks['_loaded_plugin_connectors']:
-        if not _loaded_plugin_connectors:
-            load_plugin_connectors()
-            _load_builtin_custom_connectors()
-            _loaded_plugin_connectors = True
+    if _load_plugins:
+        with _locks['_loaded_plugin_connectors']:
+            if not _loaded_plugin_connectors:
+                load_plugin_connectors()
+                _load_builtin_custom_connectors()
+                _loaded_plugin_connectors = True
 
     if type is None and label is None:
         default_instance_keys = get_config('meerschaum', 'instance', patch=True)
@@ -337,12 +339,16 @@ def load_plugin_connectors():
     for plugin in get_plugins():
         if plugin is None:
             continue
+
         with open(plugin.__file__, encoding='utf-8') as f:
             text = f.read()
+
         if 'make_connector' in text or 'Connector' in text:
             to_import.append(plugin.name)
+
     if not to_import:
         return
+
     import_plugins(*to_import)
 
 
@@ -354,7 +360,7 @@ def unload_plugin_connectors(
     Unload custom connectors added by plugins.
     """
     from meerschaum.plugins import get_plugins_names
-    global custom_types, _known_custom_types, types, plugins_types, connectors
+    global custom_types, _known_custom_types, types, plugins_types, connectors, _loaded_plugin_connectors
 
     plugin_names = plugin_names or get_plugins_names()
 
@@ -368,6 +374,7 @@ def unload_plugin_connectors(
 
     custom_types.clear()
     custom_types.update(_known_custom_types)
+    _loaded_plugin_connectors = False
 
 
 def get_connector_plugin(

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/connectors/parse.py

@@ -119,11 +119,11 @@ def parse_repo_keys(keys: Optional[str] = None, **kw):
     if not keys.startswith('api:'):
         raise ValueError("Only APIConnectors may be treated as repositories.")
 
-    return parse_connector_keys(keys, **kw)
+    return parse_connector_keys(keys, _load_plugins=kw.pop('_load_plugins', False), **kw)
 
 
 def parse_executor_keys(keys: Optional[str] = None, **kw):
-    """Parse the executor keys into an APIConnector or string."""
+    """Parse the executor keys into an APIConnector, SystemdConnector, or string."""
     from meerschaum.jobs import get_executor_keys_from_context
     if keys is None:
         keys = get_executor_keys_from_context()

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/connectors/sql/_cli.py

@@ -43,6 +43,10 @@ def cli(
     """
     from meerschaum.utils.warnings import dprint
     from meerschaum.utils.venv import venv_exec
+
+    ### Initialize the engine so that dependencies are resolved.
+    _ = self.engine
+
     env = copy.deepcopy(dict(os.environ))
     env_key = f"MRSM_SQL_{self.label.upper()}"
     env_val = json.dumps(self.meta)

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/core/Plugin/_Plugin.py

@@ -776,7 +776,13 @@ class Plugin:
         return [_d for _d in _deps if not _d.startswith('plugin:')]
 
 
-    def activate_venv(self, dependencies: bool=True, debug: bool=False, **kw) -> bool:
+    def activate_venv(
+        self,
+        dependencies: bool = True,
+        init_if_not_exists: bool = True,
+        debug: bool = False,
+        **kw
+    ) -> bool:
         """
         Activate the virtual environments for the plugin and its dependencies.
 
@@ -796,7 +802,7 @@ class Plugin:
 
         if dependencies:
             for plugin in self.get_required_plugins(debug=debug):
-                plugin.activate_venv(debug=debug, **kw)
+                plugin.activate_venv(debug=debug, init_if_not_exists=init_if_not_exists, **kw)
 
         vtp = venv_target_path(self.name, debug=debug, allow_nonexistent=True)
         venv_meerschaum_path = vtp / 'meerschaum'
@@ -812,7 +818,7 @@ class Plugin:
         if not success:
             warn(f"Unable to create symlink {venv_meerschaum_path} to {PACKAGE_ROOT_PATH}:\n{msg}")
 
-        return activate_venv(self.name, debug=debug, **kw)
+        return activate_venv(self.name, init_if_not_exists=init_if_not_exists, debug=debug, **kw)
 
 
     def deactivate_venv(self, dependencies: bool=True, debug: bool = False, **kw) -> bool:

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/plugins/__init__.py

@@ -573,7 +573,7 @@ def import_plugins(
             for plugin_name in flatten_list(plugins_to_import):
                 plugin = Plugin(plugin_name)
                 try:
-                    with Venv(plugin):
+                    with Venv(plugin, init_if_not_exists=False):
                         imported_plugins.append(
                             importlib.import_module(
                                 f'{PLUGINS_RESOURCES_PATH.stem}.{plugin_name}'
@@ -798,7 +798,8 @@ def unload_plugins(
     _loaded_plugins = False
     _synced_symlinks = False
 
-    plugins = plugins or get_plugins_names()
+    all_plugins = get_plugins_names()
+    plugins = plugins or all_plugins
     if debug:
         dprint(f"Unloading plugins: {plugins}")
 
@@ -808,12 +809,26 @@ def unload_plugins(
     module_prefix = f"{PLUGINS_RESOURCES_PATH.stem}."
     loaded_modules = [mod_name for mod_name in sys.modules if mod_name.startswith(module_prefix)]
 
-    _ = sys.modules.pop(PLUGINS_RESOURCES_PATH.stem, None)
+    root_plugins_mod = (
+        sys.modules.get(PLUGINS_RESOURCES_PATH.stem, None)
+        if sorted(plugins) != sorted(all_plugins)
+        else sys.modules.pop(PLUGINS_RESOURCES_PATH, None)
+    )
+
     for plugin_name in plugins:
         for mod_name in loaded_modules:
-            if mod_name[len(PLUGINS_RESOURCES_PATH.stem):].startswith(plugin_name):
+            if (
+                mod_name[len(PLUGINS_RESOURCES_PATH.stem):].startswith(plugin_name + '.')
+                or mod_name[len(PLUGINS_RESOURCES_PATH.stem):] == plugin_name
+            ):
                 _ = sys.modules.pop(mod_name, None)
 
+        if root_plugins_mod is not None and plugin_name in root_plugins_mod.__dict__:
+            try:
+                delattr(root_plugins_mod, plugin_name)
+            except Exception:
+                pass
+
         ### Unload sync hooks.
         _ = _pre_sync_hooks.pop(plugin_name, None)
         _ = _post_sync_hooks.pop(plugin_name, None)
@@ -896,7 +911,9 @@ def get_plugins(*to_load, try_import: bool = True) -> Union[Tuple[Plugin], Plugi
                 (
                     name if (PLUGINS_RESOURCES_PATH / name).is_dir()
                     else name[:-3]
-                ) for name in os.listdir(PLUGINS_RESOURCES_PATH) if name != '__init__.py'
+                )
+                for name in os.listdir(PLUGINS_RESOURCES_PATH)
+                if name != '__init__.py'
             ]
         )
     ]

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/utils/packages/__init__.py

@@ -192,8 +192,7 @@ def manually_import_module(
     _previously_imported = import_name in sys.modules
     if _previously_imported and use_sys_modules:
         return sys.modules[import_name]
-    if debug:
-        from meerschaum.utils.debug import dprint
+
     from meerschaum.utils.warnings import warn as warn_function
     import warnings
     root_name = import_name.split('.')[0] if split else import_name
@@ -202,6 +201,7 @@ def manually_import_module(
     root_path = get_module_path(root_name, venv=venv)
     if root_path is None:
         return None
+
     mod_path = root_path
     if mod_path.is_dir():
         for _dir in import_name.split('.')[:-1]:
@@ -215,15 +215,17 @@ def manually_import_module(
                         mod_path / import_name.split('.')[-1] / '__init__.py'
                     )
                 )
-            except Exception as e:
+            except Exception:
                 mod_path = None
 
     spec = (
-        importlib.util.find_spec(import_name) if mod_path is None or not mod_path.exists()
+        importlib.util.find_spec(import_name)
+        if mod_path is None or not mod_path.exists()
         else importlib.util.spec_from_file_location(import_name, str(mod_path))
     )
     root_spec = (
-        importlib.util.find_spec(root_name) if not root_path.exists()
+        importlib.util.find_spec(root_name)
+        if not root_path.exists()
         else importlib.util.spec_from_file_location(root_name, str(root_path))
     )
 
@@ -277,7 +279,7 @@ def manually_import_module(
     if spec is None:
         try:
             mod = _import_module(import_name)
-        except Exception as e:
+        except Exception:
             mod = None
         return mod
 
@@ -290,7 +292,7 @@ def manually_import_module(
             with warnings.catch_warnings():
                 warnings.filterwarnings('ignore', 'The NumPy')
                 spec.loader.exec_module(mod)
-        except Exception as e:
+        except Exception:
             pass
         mod = _import_module(import_name)
         if old_sys_mod is not None:
@@ -1412,7 +1414,7 @@ def attempt_import(
                 warn_function(
                     (f"\n\nMissing package '{name}' from virtual environment '{venv}'; "
                      + "some features will not work correctly."
-                     + f"\n\nSet install=True when calling attempt_import.\n"),
+                     + "\n\nSet install=True when calling attempt_import.\n"),
                     ImportWarning,
                     stacklevel = 3,
                     color = False,

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/utils/venv/_Venv.py

@@ -11,7 +11,8 @@ from __future__ import annotations
 import copy
 import pathlib
 from meerschaum.utils.typing import Union
-from meerschaum.utils.threading import RLock
+
+import meerschaum as mrsm
 
 
 class Venv:
@@ -35,7 +36,8 @@ class Venv:
 
     def __init__(
         self,
-        venv: Union[str, 'meerschaum.core.Plugin', None] = 'mrsm',
+        venv: Union[str, 'mrsm.core.Plugin', None] = 'mrsm',
+        init_if_not_exists: bool = True,
         debug: bool = False,
     ) -> None:
         from meerschaum.utils.venv import activate_venv, deactivate_venv, active_venvs
@@ -52,6 +54,7 @@ class Venv:
             self._deactivate = deactivate_venv
             self._kwargs = {'venv': venv}
         self._debug = debug
+        self._init_if_not_exists = init_if_not_exists
         ### In case someone calls `deactivate()` before `activate()`.
         self._kwargs['previously_active_venvs'] = copy.deepcopy(active_venvs)
 
@@ -65,11 +68,20 @@ class Venv:
         from meerschaum.utils.venv import active_venvs, init_venv
         self._kwargs['previously_active_venvs'] = copy.deepcopy(active_venvs)
         try:
-            return self._activate(debug=(debug or self._debug), **self._kwargs)
+            return self._activate(
+                debug=(debug or self._debug),
+                init_if_not_exists=self._init_if_not_exists,
+                **self._kwargs
+            )
         except OSError as e:
-            if not init_venv(self._venv, force=True):
-                raise e
-        return self._activate(debug=(debug or self._debug), **self._kwargs)
+            if self._init_if_not_exists:
+                if not init_venv(self._venv, force=True):
+                    raise e
+        return self._activate(
+            debug=(debug or self._debug),
+            init_if_not_exists=self._init_if_not_exists,
+            **self._kwargs
+        )
 
 
     def deactivate(self, debug: bool = False) -> bool:

{meerschaum-3.0.4 → meerschaum-3.0.5}/meerschaum/utils/venv/__init__.py

@@ -39,6 +39,7 @@ def activate_venv(
     venv: Optional[str] = 'mrsm',
     color: bool = True,
     force: bool = False,
+    init_if_not_exists: bool = True,
     debug: bool = False,
     **kw
 ) -> bool:
@@ -53,6 +54,9 @@ def activate_venv(
     color: bool, default True
         If `True`, include color in debug text.
 
+    init_if_not_exists: bool, default True
+        If `True`, create the virtual environment if it does not exist.
+
     force: bool, default False
         If `True`, do not exit early even if the venv is currently active.
 
@@ -68,10 +72,12 @@ def activate_venv(
     if active_venvs_order and active_venvs_order[0] == venv:
         if not force:
             return True
+
     import sys
     import os
-    if venv is not None:
+    if venv is not None and init_if_not_exists:
         init_venv(venv=venv, debug=debug)
+
     with LOCKS['active_venvs']:
         if thread_id not in threads_active_venvs:
             threads_active_venvs[thread_id] = {}
@@ -82,10 +88,14 @@ def activate_venv(
             threads_active_venvs[thread_id][venv] += 1
 
         target_path = venv_target_path(venv, debug=debug, allow_nonexistent=True)
-        if not target_path.exists():
+        if not target_path.exists() and venv is not None and init_if_not_exists:
             init_venv(venv=venv, force=True, debug=debug)
+
         if not target_path.exists():
+            if init_if_not_exists:
+                return False
             raise EnvironmentError(f"Could not activate virtual environment '{venv}'.")
+
         target = target_path.as_posix()
 
         if venv in active_venvs_order:
@@ -97,6 +107,7 @@ def activate_venv(
                 active_venvs_order.remove(venv)
             except Exception:
                 pass
+
         if venv is not None:
             sys.path.insert(0, target)
         else:

{meerschaum-3.0.4 → meerschaum-3.0.5/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.4
+Version: 3.0.5
 Summary: Sync Time-Series Pipes with Meerschaum
 Author-email: Bennett Meares <bennett.meares@gmail.com>
 Maintainer-email: Bennett Meares <bennett.meares@gmail.com>