meerschaum 3.0.1__py3-none-any.whl → 3.0.2__py3-none-any.whl

meerschaum/_internal/cli/entry.py

@@ -140,6 +140,7 @@ def entry_with_daemon(
         'patch_args': _patch_args,
         'env': env,
         'config': config,
+        'cwd': os.getcwd(),
     })
 
     accepted = False

meerschaum/_internal/cli/workers.py

@@ -319,6 +319,9 @@ class ActionWorker:
             action_id = input_data.get('action_id', None)
             patch_args = input_data.get('patch_args', None)
             env = input_data.get('env', {})
+            old_cwd = os.getcwd()
+            cwd = input_data.get('cwd', os.getcwd())
+            os.chdir(cwd)
             config = input_data.get('config', {})
             self.write_output_data({
                 'state': 'accepted',
@@ -335,6 +338,8 @@ class ActionWorker:
                     )
                     print(STOP_TOKEN, flush=True, end='\n')
 
+            os.chdir(old_cwd)
+
             self.write_output_data({
                 'state': 'completed',
                 'session_id': session_id,

meerschaum/actions/install.py

@@ -74,14 +74,10 @@ def _install_plugins(
         - install plugins noaa --repo mrsm  (mrsm is the default instance)
         - install plugins noaa --repo mycustominstance
     """
-    from meerschaum.utils.debug import dprint
     from meerschaum.utils.warnings import info
-    from meerschaum.plugins import reload_plugins
     from meerschaum.connectors.parse import parse_repo_keys
-    import meerschaum.actions
+    from meerschaum.actions import actions
     from meerschaum.utils.formatting import print_tuple
-    from meerschaum.core import Plugin
-    from meerschaum.connectors.api import APIConnector
 
     if not action:
         return False, "No plugins to install."
@@ -98,8 +94,7 @@ def _install_plugins(
         )
         print_tuple((success, msg))
 
-    reload_plugins(debug=debug)
-    return True, "Success"
+    return actions['reload'](debug=debug)
 
 
 def _complete_install_plugins(
@@ -132,8 +127,9 @@ def _complete_install_plugins(
     from meerschaum.connectors.parse import parse_repo_keys
     try:
         repo_connector = parse_repo_keys(repository)
-    except Exception as e:
+    except Exception:
         return []
+
     results = repo_connector.get_plugins(search_term=search_term)
     if len(results) == 1 and results[0] == search_term:
         return []
@@ -156,10 +152,11 @@ def _install_packages(
         `install packages pandas numpy`
     """
     if not action:
-        return False, f"No packages to install."
-    from meerschaum.utils.warnings import info
+        return False, "No packages to install."
+
     from meerschaum.utils.packages import pip_install
     from meerschaum.utils.misc import items_str
+    from meerschaum.actions import actions
     if venv is NoVenv:
         venv = 'mrsm'
 
@@ -169,11 +166,16 @@ def _install_packages(
         venv = venv,
         debug = debug,
     ):
+        reload_success, reload_msg = actions['reload'](debug=debug)
+        if not reload_success:
+            return reload_success, reload_msg
+
         return True, (
             "Successfully installed package" + ("s" if len(action) != 1 else '')
             + f" {items_str(action)}"
             + f" into the virtual environment '{venv}'."
         )
+
     return False, (
         "Failed to install package" + ("s" if len(action) != 1 else '') + f" {items_str(action)}."
     )
@@ -201,6 +203,7 @@ def _install_required(
     from meerschaum.utils.warnings import warn, info
     from meerschaum.connectors.parse import parse_repo_keys
     from meerschaum.plugins import get_plugins_names
+    from meerschaum.actions import actions
     repo_connector = parse_repo_keys(repository)
 
     plugins_names = action or get_plugins_names()
@@ -221,6 +224,10 @@ def _install_required(
         else:
             success_count += 1
 
+    reload_success, reload_msg = actions['reload'](debug=debug)
+    if not reload_success:
+        return reload_success, reload_msg
+
     success = fail_count == 0
     msg = (
         f"Installed packages for {success_count + fail_count} plugins\n    "
@@ -234,15 +241,6 @@ def _complete_install_required(*args, **kw) -> List[str]:
     return _complete_uninstall_plugins(*args, **kw)
 
 
-def _install_systemd(
-    action: Optional[List[str]] = None,
-    **kwargs: Any
-) -> SuccessTuple:
-    """
-    Install the Meerschaum job monitor as a systemd service.
-    """
-    import sys
-
 
 ### NOTE: This must be the final statement of the module.
 ###       Any subactions added below these lines will not

meerschaum/actions/upgrade.py

@@ -51,19 +51,16 @@ def _upgrade_meerschaum(
         - `upgrade meerschaum full`
 
     """
-    import subprocess
-    import json
     from meerschaum.utils.debug import dprint
     from meerschaum.utils.warnings import info
     from meerschaum.actions import actions
     from meerschaum.utils.prompt import yes_no
-    from meerschaum.utils.packages import pip_install, attempt_import
+    from meerschaum.utils.packages import pip_install
     from meerschaum.utils.misc import is_docker_available
 
     if action is None:
         action = []
 
-    is_stack_running = False
     try:
         success, msg = actions['stack'](
             ['ps', '-q'], _capture_output=True, debug=debug
@@ -71,7 +68,7 @@ def _upgrade_meerschaum(
         if msg.endswith('\n'):
             msg = msg[:-1]
         containers = msg.split('\n')
-    except Exception as e:
+    except Exception:
         containers = []
 
     if containers:
@@ -103,7 +100,7 @@ def _upgrade_meerschaum(
     if is_docker_available():
         actions['stack'](['pull'], debug=debug)
 
-    return True, "Success"
+    return actions['reload'](debug=debug)
 
 
 class NoVenv:
@@ -128,10 +125,10 @@ def _upgrade_packages(
         upgrade packages full
     """
     from meerschaum.utils.packages import packages, pip_install, get_prerelease_dependencies
-    from meerschaum.utils.warnings import info, warn
+    from meerschaum.utils.warnings import warn
     from meerschaum.utils.prompt import yes_no
     from meerschaum.utils.formatting import make_header, pprint
-    from meerschaum.utils.misc import print_options
+    from meerschaum.actions import actions
     if action is None:
         action = []
     if venv is NoVenv:
@@ -164,7 +161,7 @@ def _upgrade_packages(
         if (install_name not in prereleases_to_install) or group == '_internal'
     ]
 
-    success, msg = False, f"Nothing installed."
+    success, msg = False, "Nothing installed."
     if force or yes_no(question, noask=noask, yes=yes):
         success = pip_install(*to_install, debug=debug)
         if success and prereleases_to_install:
@@ -173,6 +170,14 @@ def _upgrade_packages(
             f"Successfully installed {len(packages[group])} packages." if success
             else f"Failed to install packages in dependency group '{group}'."
         )
+
+    if not success:
+        return success, msg
+
+    reload_success, reload_msg = actions['reload'](debug=debug)
+    if not reload_success:
+        return reload_success, reload_msg
+
     return success, msg
 
 
@@ -205,11 +210,20 @@ def _upgrade_plugins(
     to_install = get_plugins_names() if len(action) == 0 else action
     if len(to_install) == 0:
         return False, "No plugins to upgrade."
+
     print_options(to_install, header="Plugins to Upgrade:")
     if force or yes_no(f"Upgrade {len(to_install)} plugins?", yes=yes, noask=noask):
-        return actions['install'](
-            action=['plugins'] + to_install, debug=debug, force=force, noask=noask, yes=yes, **kw
+        install_success, install_msg = actions['install'](
+            action=['plugins'] + to_install,
+            debug=debug,
+            force=force,
+            noask=noask,
+            yes=yes,
+            **kw
         )
+
+        return install_success, install_msg
+
     return False, "No plugins upgraded."
 
 ### NOTE: This must be the final statement of the module.

meerschaum/config/_default.py

@@ -134,6 +134,8 @@ default_system_config = {
             'stop daemon',
             'show daemon',
             'restart daemon',
+            'install',
+            'upgrade',
             'reload',
             'start worker',
             'show log',

meerschaum/config/_read_config.py

@@ -185,7 +185,6 @@ def read_config(
                         import traceback
                         traceback.print_exc()
                         _config_key = {}
-                substitute = False
                 _single_key_config = (
                     search_and_substitute_config({key: _config_key}) if substitute
                     else {key: _config_key}

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "3.0.1"
+__version__ = "3.0.2"

meerschaum/plugins/__init__.py

@@ -326,23 +326,22 @@ def sync_plugins_symlinks(debug: bool = False, warn: bool = True) -> None:
     """
     Update the plugins' internal symlinks. 
     """
+    from meerschaum.utils.warnings import error, warn as _warn, dprint
     global _synced_symlinks
     with _locks['_synced_symlinks']:
         if _synced_symlinks:
+            if debug:
+                dprint("Skip syncing symlinks...")
             return
 
     import os
     import pathlib
     import time
     from collections import defaultdict
-    import importlib.util
     from meerschaum.utils.misc import flatten_list, make_symlink, is_symlink
-    from meerschaum.utils.warnings import error, warn as _warn
     from meerschaum._internal.static import STATIC_CONFIG
-    from meerschaum.utils.venv import Venv, activate_venv, deactivate_venv, is_venv_active
     from meerschaum.config._paths import (
         PLUGINS_RESOURCES_PATH,
-        PLUGINS_ARCHIVES_RESOURCES_PATH,
         PLUGINS_INIT_PATH,
         PLUGINS_DIR_PATHS,
         PLUGINS_INTERNAL_LOCK_PATH,
@@ -700,7 +699,11 @@ def load_plugins(
     Import Meerschaum plugins and update the actions dictionary.
     """
     global _loaded_plugins
+    from meerschaum.utils.warnings import dprint
+
     if skip_if_loaded and _loaded_plugins:
+        if debug:
+            dprint("Skip loading plugins...")
         return
 
     from inspect import isfunction, getmembers
@@ -714,6 +717,7 @@ def load_plugins(
         recursive = True,
         modules_venvs = True
     )
+
     ### I'm appending here to keep from redefining the modules list.
     new_modules = (
         [
@@ -784,7 +788,7 @@ def unload_plugins(
     """
     Unload the specified plugins from memory.
     """
-    global _loaded_plugins
+    global _loaded_plugins, _synced_symlinks
     import sys
     from meerschaum.config.paths import PLUGINS_RESOURCES_PATH, PLUGINS_INJECTED_RESOURCES_PATH
     from meerschaum.connectors import unload_plugin_connectors
@@ -792,6 +796,7 @@ def unload_plugins(
         from meerschaum.utils.warnings import dprint
 
     _loaded_plugins = False
+    _synced_symlinks = False
 
     plugins = plugins or get_plugins_names()
     if debug:
@@ -803,6 +808,7 @@ 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)
     for plugin_name in plugins:
         for mod_name in loaded_modules:
             if mod_name[len(PLUGINS_RESOURCES_PATH.stem):].startswith(plugin_name):

{meerschaum-3.0.1.dist-info → meerschaum-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.1
+Version: 3.0.2
 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.1.dist-info → meerschaum-3.0.2.dist-info}/RECORD

@@ -8,8 +8,8 @@ meerschaum/_internal/arguments/_parse_arguments.py,sha256=B7eXnz2fGrDb_lWy2wagWV
 meerschaum/_internal/arguments/_parser.py,sha256=v4dlR5ElJFmKGiw35UGCiDI1XiH8-ma8PJwoV3O--c4,18082
 meerschaum/_internal/cli/__init__.py,sha256=ZZ_N_24WUg7fA6opMtSkS3OdtA6zgAe1rLMnS4-W1Zs,114
 meerschaum/_internal/cli/daemons.py,sha256=-qx5y9YSyGzeDrBIRjuSaeHgmSNmSqrRiyOjXduNaBc,2586
-meerschaum/_internal/cli/entry.py,sha256=gxXX4hma_2xH0TSXacamFbOhbOYI0vGqV0QKqIQalBo,6786
-meerschaum/_internal/cli/workers.py,sha256=_HQCxa54_VPfw34BE754UfidoSzievN8eQlixSqrbNI,12920
+meerschaum/_internal/cli/entry.py,sha256=O00pR369q7NYrSYrmESRsy6iaLsSEOmrultMZ5SVIpY,6814
+meerschaum/_internal/cli/workers.py,sha256=D5peGIQ1kR5ZkNHj1bdu0-Oc0avFGf553JFCbpzkg3I,13064
 meerschaum/_internal/docs/__init__.py,sha256=ZQYHWo6n0kfLLkyG36YXqTYvv2Pc7it5HZHMylT6cBA,126
 meerschaum/_internal/docs/index.py,sha256=_ghUsrgjc2eo2c-CwvqY4gT2rgyXVONuT0oScyWkIz8,27401
 meerschaum/_internal/shell/Shell.py,sha256=-iF7EYZQcNS3GNvaUgo-T8tuIeQKUjlMoZeBI6GclI0,44491
@@ -32,7 +32,7 @@ meerschaum/actions/delete.py,sha256=9NhWrClsdsiJ6ih-Yxyi6gZ05MMI9ykTSnL6dpPC1Z0,
 meerschaum/actions/drop.py,sha256=xNgHWFPyvs4lm923BCRwYJULUqGYMbcVnRPb25Y-lzs,4433
 meerschaum/actions/edit.py,sha256=JTvXMkL_9v46mI6P0FhHXhgg9vQjIdz1ebXc2Ei2Dws,20471
 meerschaum/actions/index.py,sha256=byhcGi7P1S0TTcJPBxq3jGKmBF_gZ8t77oqtg0kGSdI,1826
-meerschaum/actions/install.py,sha256=P_M2dnn3sVC2mAn5hwvu4VHWkoh4r9TBUzNcU_Kukpc,7437
+meerschaum/actions/install.py,sha256=6KNeLOPwdc_IFuzw6iQJAH52ZO6rPNx7PAiH_dspNR0,7367
 meerschaum/actions/login.py,sha256=DHYVIwrr6RpkrcW4NpGlURq2-ABL9-pXp2J-SXef10Y,4173
 meerschaum/actions/os.py,sha256=dtoppoBhLzW3rLNF0SFovEfNxA4WJWt_9WrOGlS5KbA,2251
 meerschaum/actions/pause.py,sha256=WI4dQFfjQ6ObWKUzwQ5FrtYPDyEcnxWwval8cSIzzJw,4221
@@ -50,7 +50,7 @@ meerschaum/actions/stop.py,sha256=GN1t7SpRzLpMKWyJmRkKdOEVov0TMaknJ3gKjAUZQkE,57
 meerschaum/actions/sync.py,sha256=jB3w_t4_Uj788jDJ4FGPCHS5EqU08b5gPcReAlGan74,17818
 meerschaum/actions/tag.py,sha256=JhWSq7X4wPrgt9tTft6qWOfs5nv-djGnqze4UQ8DPVA,3053
 meerschaum/actions/uninstall.py,sha256=tBXhdXggSieGEQe4EPGxpgMK0MZTJCweNvAJ9-59El0,5776
-meerschaum/actions/upgrade.py,sha256=AjuC93Te-I_GWwIfuNkFJ2q1zVHDQ2Oco34S4JgK2iA,6485
+meerschaum/actions/upgrade.py,sha256=-N7S0ewA__azTg4Q-Woj0Ehv2SN-Siarr4_HGPlJREk,6711
 meerschaum/actions/verify.py,sha256=yKNqh2T38t3yxqErr2o8i-nNG4ZZuyQUkaImATRdl5M,4676
 meerschaum/api/__init__.py,sha256=r9h44c-l8Qx7QNoNWdvDe6ovJPbZC34PzqWnT-Odi3E,11214
 meerschaum/api/_chain.py,sha256=h8-WXUGXX6AqzdALfsBC5uv0FkAcLdHJXCGzqzuq89k,875
@@ -144,17 +144,17 @@ meerschaum/api/routes/_webterm.py,sha256=TviHMz0_pLnby7dZW76y3mt-40Cq3VGFItSVcBi
 meerschaum/api/tables/__init__.py,sha256=e2aNC0CdlWICTUMx1i9RauF8Pm426J0RZJbsJWv4SWo,482
 meerschaum/config/__init__.py,sha256=IZLzkI7jBycfmHSR6R_WG3eBe0Uv53c-CI_QqNf4lnw,12966
 meerschaum/config/_dash.py,sha256=BJHl4xMrQB-YHUEU7ldEW8q_nOPoIRSOqLrfGElc6Dw,187
-meerschaum/config/_default.py,sha256=HdwExsy1X3B37aq7AnXImits8vA3qLkG1Xi70TlM5Tk,8076
+meerschaum/config/_default.py,sha256=V3aV0KeZrFg2rKfZtc-lHhqVWfKgLhxu9_EZFL6H0QU,8122
 meerschaum/config/_edit.py,sha256=WCdt7BSspPytH-NiPS1kpCZxXDDG7VbOu0H1AnMtwlw,9177
 meerschaum/config/_formatting.py,sha256=SXUU0QFAlO_eIZjyodXQGSrjg-mVkL2qXuQwxqqdJps,6746
 meerschaum/config/_jobs.py,sha256=gS_4mMGdmVP7WB4V5Sz8kYP0HmhWcMY2jSWGR7jX6cw,1279
 meerschaum/config/_patch.py,sha256=qCv1LqZSDUI8mbaxcoKfmR-XI4Dmtz3Kzgsv1XFDhUo,1569
 meerschaum/config/_paths.py,sha256=QAJrcBQ05RJFZmPufezr_Grb1Wwr9y69pKFude0DJoE,13450
 meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6wLs,1220
-meerschaum/config/_read_config.py,sha256=IsTVrk8xQXf0nxIjb_ASyecgjkktVqjDt_wJvVGP98Y,16266
+meerschaum/config/_read_config.py,sha256=Y4O-eozH94FsucqLWXb5hS57RLPMHsLUQe7a24doi0o,16231
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=nN5bLCHU8sFDdlPi7pQXuRVFcX457rZjOiALTvqRS_E,4332
-meerschaum/config/_version.py,sha256=GuCnsG09o5kT64ABqDd5ExeZsoe_yQEqta0q2cAVEVc,71
+meerschaum/config/_version.py,sha256=yLMxZ0Wd2WlFk-MKJq82SsxiEbYoRPN98PxoXFoWg78,71
 meerschaum/config/environment.py,sha256=hTyjPLrGp3R4sytg_Jqv4TnCVI1WdmbX2YoRBCWSNt8,8277
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/static.py,sha256=92fSGxoHFDOK9GEsN8NVbAEh9W7-eZ1BS6thyEqcjeI,359
@@ -242,7 +242,7 @@ meerschaum/models/__init__.py,sha256=9OCElgSTRzgqAIpi_FSUzTAVJtUwOIi71BGFsqkn6PU
 meerschaum/models/pipes.py,sha256=vGSGm5UuyfwfPDqM9iq-PjFeiGrWYW52bJAKNZ4pcHs,7839
 meerschaum/models/tokens.py,sha256=57cFisjhx47EFbJLfsp8iHX8-qZiRY8ztFWahylWOJQ,1067
 meerschaum/models/users.py,sha256=E1ambl2g6f2tdnLkwAquyqjvflrb2AMiVhI9nXXHYR0,683
-meerschaum/plugins/__init__.py,sha256=qKWqbmk4Wi4Dhmrpw-r9wIOnaMfeQ7wvog1--GsQGBE,34956
+meerschaum/plugins/__init__.py,sha256=3ButbAcVQVdOlgai7kEvid7TYMNdDW-zqRbEL0Ka2C8,35100
 meerschaum/plugins/bootstrap.py,sha256=sSvdh2g78AYwTTNMTdHw62Nj2v95pmbd77HFznuErUE,27728
 meerschaum/utils/__init__.py,sha256=QrK1K9hIbPCRCM5k2nZGFqGnrqhA0Eh-iSmCU7FG6Cs,612
 meerschaum/utils/_get_pipes.py,sha256=TbV77VjQ9qqCLOy06-hlnfQI_hS6PTcXkbO7aQ2csdM,13275
@@ -279,11 +279,11 @@ meerschaum/utils/packages/_packages.py,sha256=KWVfxsm-6ZdffpskIjHPki6wSQvf0LK9MW
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=dF-FqP7Boq-g-anj2Ps-UkTOL2qJtxY3bdz0HWF2zT8,3726
 meerschaum/utils/venv/__init__.py,sha256=_mabNYZwj5_XQCsdo8sED4HY-1q5s-3em6Bml7bc4BE,27301
-meerschaum-3.0.1.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-3.0.1.dist-info/licenses/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-3.0.1.dist-info/METADATA,sha256=gSbablebJKlk5CU0LEaXIWsygmSZpr0_-aSwmRiWKyQ,25325
-meerschaum-3.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meerschaum-3.0.1.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-3.0.1.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-3.0.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-3.0.1.dist-info/RECORD,,
+meerschaum-3.0.2.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-3.0.2.dist-info/licenses/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-3.0.2.dist-info/METADATA,sha256=ZWCAgShvSeO_E6fEygHYgprOKBgnxVpo1c4AWwUDLbc,25325
+meerschaum-3.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meerschaum-3.0.2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-3.0.2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-3.0.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-3.0.2.dist-info/RECORD,,