meerschaum 2.1.2__py3-none-any.whl → 2.1.3.dev3__py3-none-any.whl

meerschaum/__init__.py

@@ -22,25 +22,31 @@ import atexit
 from meerschaum.utils.typing import SuccessTuple
 from meerschaum.core.Pipe import Pipe
 from meerschaum.plugins import Plugin
-from meerschaum.utils import get_pipes
 from meerschaum.utils.venv import Venv
+from meerschaum.connectors import get_connector
+from meerschaum.utils import get_pipes
 from meerschaum.utils.formatting import pprint
 from meerschaum._internal.docs import index as __doc__
-from meerschaum.connectors import get_connector
 from meerschaum.config import __version__, get_config
 from meerschaum.utils.packages import attempt_import
 from meerschaum.__main__ import _close_pools
 
 atexit.register(_close_pools)
 
-__pdoc__ = {'gui': False, 'api': False, 'core': False,}
+__pdoc__ = {'gui': False, 'api': False, 'core': False, '_internal': False}
 __all__ = (
-    "Pipe",
     "get_pipes",
     "get_connector",
+    "get_config",
+    "Pipe",
     "Plugin",
     "Venv",
     "Plugin",
     "pprint",
     "attempt_import",
+    "actions",
+    "config",
+    "connectors",
+    "plugins",
+    "utils",
 )

meerschaum/_internal/docs/index.py

@@ -3,7 +3,7 @@
 # vim:fenc=utf-8
 
 """
-<img src="https://meerschaum.io/assets/banner_1920x320.png" alt="Meerschaum banner"/>
+<img src="https://meerschaum.io/assets/banner_1920x320.png" alt="Meerschaum banner" style="width: 100%;"/>
 
 | PyPI | GitHub | Info | Stats |
 |---|---|---|---|
@@ -28,17 +28,6 @@ Data engineering often gets in analysts' way, and when work needs to get done, e
 
 Rather than copy / pasting your ETL scripts, simply build pipes with Meerschaum! [Meerschaum gives you the tools to design your data streams how you like](https://towardsdatascience.com/easy-time-series-etl-for-data-scientists-with-meerschaum-5aade339b398) ― and don't worry — you can always incorporate Meerschaum into your existing systems!
 
-#### Want to Learn More?
-
-You can find a wealth of information at [meerschaum.io](https://meerschaum.io)!
-
-Additionally, below are several articles published about Meerschaum:
-
-- Interview featured in [*Console 100 - The Open Source Newsletter*](https://console.substack.com/p/console-100)
-- [*A Data Scientist's Guide to Fetching COVID-19 Data in 2022*](https://towardsdatascience.com/a-data-scientists-guide-to-fetching-covid-19-data-in-2022-d952b4697) (Towards Data Science)
-- [*Time-Series ETL with Meerschaum*](https://towardsdatascience.com/easy-time-series-etl-for-data-scientists-with-meerschaum-5aade339b398) (Towards Data Science)
-- [*How I automatically extract my M1 Finance transactions*](https://bmeares.medium.com/how-i-automatically-extract-my-m1-finance-transactions-b43cef857bc7)
-
 ## Features
 
 - 📊 **Built for Data Scientists and Analysts**  
@@ -58,8 +47,8 @@ Additionally, below are several articles published about Meerschaum:
     - Manage your database connections with [Meerschaum connectors](https://meerschaum.io/reference/connectors/)
     - Utility commands with sensible syntax let you control many pipes with grace.
 - 💼 **Portable from the Start**  
-    - The environment variable `$MRSM_ROOT_DIR` lets you emulate multiple installations and group together your [instances](https://meerschaum.io/reference/connectors/#instances-and-repositories).
-    - No dependencies required; anything needed will be installed into a virtual environment.
+    - The environment variables `$MRSM_ROOT_DIR`, `$MRSM_PLUGINS_DIR`, and `$MRSM_VENVS_DIR` let you emulate multiple installations and group together your [instances](https://meerschaum.io/reference/connectors/#instances-and-repositories).
+    - No dependencies required; anything needed will be installed into virtual environments.
     - [Specify required packages for your plugins](https://meerschaum.io/reference/plugins/writing-plugins/), and users will get those packages in a virtual environment.
 
 ## Installation
@@ -81,28 +70,29 @@ Please visit [meerschaum.io](https://meerschaum.io) for setup, usage, and troubl
 ```python
 >>> import meerschaum as mrsm
 >>> pipe = mrsm.Pipe("plugin:noaa", "weather")
->>> df = pipe.get_data(begin='2022-02-02')
->>> df[['timestamp', 'station', 'temperature (wmoUnit:degC)']]
-               timestamp station  temperature (wmoUnit:degC)
-0    2022-03-29 09:54:00    KCEU                         8.3
-1    2022-03-29 09:52:00    KATL                        10.6
-2    2022-03-29 09:52:00    KCLT                         7.2
-3    2022-03-29 08:54:00    KCEU                         8.3
-4    2022-03-29 08:52:00    KATL                        11.1
-...                  ...     ...                         ...
-1626 2022-02-02 01:52:00    KATL                        10.0
-1627 2022-02-02 01:52:00    KCLT                         7.8
-1628 2022-02-02 00:54:00    KCEU                         8.3
-1629 2022-02-02 00:52:00    KATL                        10.0
-1630 2022-02-02 00:52:00    KCLT                         8.3
-
-[1631 rows x 3 columns]
+>>> cols_to_select = ['timestamp', 'station', 'temperature (degC)']
+>>> df = pipe.get_data(cols_to_select, begin='2023-11-15', end='2023-11-20')
+>>> df
+              timestamp station  temperature (degC)
+0   2023-11-15 00:52:00    KATL                16.1
+1   2023-11-15 00:52:00    KCLT                11.7
+2   2023-11-15 00:53:00    KGMU                15.0
+3   2023-11-15 00:54:00    KCEU                13.9
+4   2023-11-15 01:52:00    KATL                15.6
+..                  ...     ...                 ...
+535 2023-11-19 22:54:00    KCEU                15.6
+536 2023-11-19 23:52:00    KATL                16.7
+537 2023-11-19 23:52:00    KCLT                13.9
+538 2023-11-19 23:53:00    KGMU                15.6
+539 2023-11-19 23:54:00    KCEU                15.0
+
+[540 rows x 3 columns]
 >>>
 ```
 
 ## Plugins
 
-Here is the [list of community plugins](https://meerschaum.io/reference/plugins/list-of-plugins/) and the [public plugins repository](https://api.mrsm.io/dash/plugins).
+Check out the [Awesome Meerschaum list](https://github.com/bmeares/awesome-meerschaum) for a list of community plugins as well as the [public plugins repository](https://api.mrsm.io/dash/plugins).
 
 For details on installing, using, and writing plugins, check out the [plugins documentation](https://meerschaum.io/reference/plugins/types-of-plugins) at [meerschaum.io](https://meerschaum.io).
 
@@ -123,12 +113,17 @@ def register(pipe, **kw):
     }
 
 def fetch(pipe, **kw):
-    import datetime, random
-    return {
-        'dt': [datetime.datetime.utcnow()],
-        'id': [1],
-        'val': [random.randint(0, 100)],
-    }
+    import random
+    from datetime import datetime
+    docs = [
+        {
+            'dt': datetime.now(),
+            'id': i,
+            'val': random.ranint(0, 200),
+        }
+        for i in range(random.randint(0, 100))
+    ]
+    return docs
 ```
 
 ## Support Meerschaum's Development

meerschaum/_internal/entry.py

@@ -118,6 +118,7 @@ def entry_with_args(
     return result
 
 
+_shells = []
 _shell = None
 def get_shell(
         sysargs: Optional[List[str]] = None,
@@ -141,4 +142,6 @@ def get_shell(
             _shell = shell_pkg.Shell(actions, sysargs=sysargs)
         elif reload:
             _shell.__init__()
+
+        _shells.append(_shell)
     return _shell

meerschaum/_internal/shell/Shell.py

@@ -64,6 +64,10 @@ reserved_completers = {
     'instance', 'repo'
 }
 
+### To handle dynamic reloading, store shell attributes externally.
+### This is because the shell object address gets lost upon reloads.
+shell_attrs = {}
+
 def _insert_shell_actions(
         _shell: Optional['Shell'] = None,
         actions: Optional[Dict[str, Callable[[Any], SuccessTuple]]] = None,
@@ -229,7 +233,7 @@ class Shell(cmd.Cmd):
             pass
 
         from meerschaum.config._paths import SHELL_HISTORY_PATH
-        self.session = prompt_toolkit_shortcuts.PromptSession(
+        shell_attrs['session'] = prompt_toolkit_shortcuts.PromptSession(
             history = prompt_toolkit_history.FileHistory(str(SHELL_HISTORY_PATH)),
             auto_suggest = ValidAutoSuggest(),
             completer = ShellCompleter(),
@@ -260,15 +264,15 @@ class Shell(cmd.Cmd):
                 pass
 
         ### NOTE: custom actions must be added to the self._actions dictionary
-        self._actions = actions
-        self._sysargs = sysargs
-        self._actions['instance'] = self.do_instance
-        self._actions['repo'] = self.do_repo
-        self._actions['debug'] = self.do_debug
-        self._update_bottom_toolbar = True
-        self._old_bottom_toolbar = ''
-        self.debug = False
-        self._reload = True
+        shell_attrs['_actions'] = actions
+        shell_attrs['_sysargs'] = sysargs
+        shell_attrs['_actions']['instance'] = self.do_instance
+        shell_attrs['_actions']['repo'] = self.do_repo
+        shell_attrs['_actions']['debug'] = self.do_debug
+        shell_attrs['_update_bottom_toolbar'] = True
+        shell_attrs['_old_bottom_toolbar'] = ''
+        shell_attrs['debug'] = False
+        shell_attrs['_reload'] = True
         self.load_config()
         self.hidden_commands = []
         ### update hidden commands list (cmd2 only)
@@ -286,7 +290,7 @@ class Shell(cmd.Cmd):
         from meerschaum.utils.misc import remove_ansi
         from meerschaum.utils.formatting import CHARSET, ANSI, UNICODE, colored
         
-        if self.__dict__.get('intro', None) != '':
+        if shell_attrs.get('intro', None) != '':
             self.intro = get_config('shell', CHARSET, 'intro', patch=patch)
             self.intro += '\n' + ''.join(
                 [' '
@@ -297,25 +301,30 @@ class Shell(cmd.Cmd):
             ) + 'v' + version
         else:
             self.intro = ""
-        self._prompt = get_config('shell', CHARSET, 'prompt', patch=patch)
-        self.prompt = self._prompt
-        self.ruler = get_config('shell', CHARSET, 'ruler', patch=patch)
-        self.close_message = get_config('shell', CHARSET, 'close_message', patch=patch)
-        self.doc_header = get_config('shell', CHARSET, 'doc_header', patch=patch)
-        self.undoc_header = get_config('shell', CHARSET, 'undoc_header', patch=patch)
+        shell_attrs['intro'] = self.intro
+        shell_attrs['_prompt'] = get_config('shell', CHARSET, 'prompt', patch=patch)
+        self.prompt = shell_attrs['_prompt']
+        shell_attrs['ruler'] = get_config('shell', CHARSET, 'ruler', patch=patch)
+        self.ruler = shell_attrs['ruler']
+        shell_attrs['close_message'] = get_config('shell', CHARSET, 'close_message', patch=patch)
+        self.close_message = shell_attrs['close_message']
+        shell_attrs['doc_header'] = get_config('shell', CHARSET, 'doc_header', patch=patch)
+        self.doc_header = shell_attrs['doc_header']
+        shell_attrs['undoc_header'] = get_config('shell', CHARSET, 'undoc_header', patch=patch)
+        self.undoc_header = shell_attrs['undoc_header']
 
         if instance is None and self.__dict__.get('instance_keys', None) is None:
             ### create default instance and repository connectors
-            self.instance_keys = remove_ansi(get_config('meerschaum', 'instance', patch=patch))
-            ### self.instance is a stylized version of self.instance_keys
-            self.instance = str(self.instance_keys)
+            shell_attrs['instance_keys'] = remove_ansi(get_config('meerschaum', 'instance', patch=patch))
+            ### instance is a stylized version of instance_keys
+            shell_attrs['instance'] = str(shell_attrs['instance_keys'])
         else:
-            self.instance = instance
-            self.instance_keys = remove_ansi(str(instance))
-        if self.__dict__.get('repo_keys', None) is None:
-            self.repo_keys = get_config('meerschaum', 'default_repository', patch=patch)
+            shell_attrs['instance'] = instance
+            shell_attrs['instance_keys'] = remove_ansi(str(instance))
+        if shell_attrs.get('repo_keys', None) is None:
+            shell_attrs['repo_keys'] = get_config('meerschaum', 'default_repository', patch=patch)
         ### this will be updated later in update_prompt ONLY IF {username} is in the prompt
-        self.username = ''
+        shell_attrs['username'] = ''
 
         if ANSI:
             def apply_colors(attr, key):
@@ -325,48 +334,54 @@ class Shell(cmd.Cmd):
                 )
 
             for attr_key in get_config('shell', 'ansi'):
-                if attr_key not in self.__dict__:
+                if attr_key not in shell_attrs:
                     continue
-                self.__dict__[attr_key] = apply_colors(self.__dict__[attr_key], attr_key)
+                shell_attrs[attr_key] = apply_colors(shell_attrs[attr_key], attr_key)
+                self.__dict__[attr_key] = shell_attrs[attr_key]
 
         ### refresh actions
         _insert_shell_actions(_shell=self, keep_self=True)
 
         ### replace {instance} in prompt with stylized instance string
         self.update_prompt()
-        self._dict_backup = {k:v for k, v in self.__dict__.copy().items() if k != '_dict_backup'}
 
     def insert_actions(self):
         from meerschaum.actions import actions
 
     def update_prompt(self, instance: Optional[str] = None, username: Optional[str] = None):
         from meerschaum.utils.formatting import ANSI, colored
-        cmd.__builtins__['input'] = input_with_sigint(_old_input, self.session, shell=self)
-        prompt = self._prompt
+        from meerschaum._internal.entry import _shell, get_shell
+
+        cmd.__builtins__['input'] = input_with_sigint(
+            _old_input,
+            shell_attrs['session'],
+            shell = self,
+        )
+        prompt = shell_attrs['_prompt']
         mask = prompt
-        self._update_bottom_toolbar = True
+        shell_attrs['_update_bottom_toolbar'] = True
 
-        if '{instance}' in self._prompt:
+        if '{instance}' in shell_attrs['_prompt']:
             if instance is None:
-                instance = self.instance_keys
-            self.instance = instance
+                instance = shell_attrs['instance_keys']
+            shell_attrs['instance'] = instance
             if ANSI:
-                self.instance = colored(
-                    self.instance, **get_config(
+                shell_attrs['instance'] = colored(
+                    shell_attrs['instance'], **get_config(
                         'shell', 'ansi', 'instance', 'rich'
                     )
                 )
-            prompt = prompt.replace('{instance}', self.instance)
+            prompt = prompt.replace('{instance}', shell_attrs['instance'])
             mask = mask.replace('{instance}', ''.join(['\0' for c in '{instance}']))
 
-        if '{username}' in self._prompt:
+        if '{username}' in shell_attrs['_prompt']:
             if username is None:
                 from meerschaum.utils.misc import remove_ansi
                 from meerschaum.connectors.parse import parse_instance_keys
                 from meerschaum.connectors.sql import SQLConnector
                 try:
                     conn_attrs = parse_instance_keys(
-                        remove_ansi(self.instance_keys), construct=False
+                        remove_ansi(shell_attrs['instance_keys']), construct=False
                     )
                     if 'username' not in conn_attrs:
                         if 'uri' in conn_attrs:
@@ -379,14 +394,14 @@ class Shell(cmd.Cmd):
                     username = str(e)
                 if username is None:
                    username = '(no username)'
-            self.username = (
+            shell_attrs['username'] = (
                 username if not ANSI else
                 colored(username, **get_config('shell', 'ansi', 'username', 'rich'))
             )
-            prompt = prompt.replace('{username}', self.username)
+            prompt = prompt.replace('{username}', shell_attrs['username'])
             mask = mask.replace('{username}', ''.join(['\0' for c in '{username}']))
 
-        remainder_prompt = list(self._prompt)
+        remainder_prompt = list(shell_attrs['_prompt'])
         for i, c in enumerate(mask):
             if c != '\0':
                 _c = c
@@ -394,10 +409,11 @@ class Shell(cmd.Cmd):
                     _c = colored(_c, **get_config('shell', 'ansi', 'prompt', 'rich'))
                 remainder_prompt[i] = _c
         self.prompt = ''.join(remainder_prompt).replace(
-            '{username}', self.username
+            '{username}', shell_attrs['username']
         ).replace(
-            '{instance}', self.instance
+            '{instance}', shell_attrs['instance']
         )
+        shell_attrs['prompt'] = self.prompt
         ### flush stdout
         print("", end="", flush=True)
 
@@ -412,6 +428,9 @@ class Shell(cmd.Cmd):
         ### Preserve the working directory.
         old_cwd = os.getcwd()
 
+        from meerschaum._internal.entry import _shell, get_shell
+        self = get_shell(sysargs=shell_attrs['_sysargs'], debug=shell_attrs.get('debug', False))
+
         ### make a backup of line for later
         original_line = deepcopy(line)
 
@@ -427,7 +446,7 @@ class Shell(cmd.Cmd):
         ### if the user specifies, clear the screen before executing any commands
         if _clear_screen:
             from meerschaum.utils.formatting._shell import clear_screen
-            clear_screen(debug=self.debug)
+            clear_screen(debug=shell_attrs['debug'])
 
         ### return blank commands (spaces break argparse)
         if original_line is None or len(str(line).strip()) == 0:
@@ -456,11 +475,10 @@ class Shell(cmd.Cmd):
         args['shell'] = True
         args['line'] = line
 
-
         ### if debug is not set on the command line,
         ### default to shell setting
         if not args.get('debug', False):
-            args['debug'] = self.debug
+            args['debug'] = shell_attrs['debug']
 
         ### Make sure an action was provided.
         if not args.get('action', None):
@@ -479,17 +497,19 @@ class Shell(cmd.Cmd):
         from meerschaum.actions import get_main_action_name
         main_action_name = get_main_action_name(args['action'])
         if main_action_name is None:
-            if not hasattr(self, 'do_'+args['action'][0]):
+            if not hasattr(self, 'do_' + args['action'][0]):
                 args['action'].insert(0, 'sh')
                 main_action_name = 'sh'
+            else:
+                main_action_name = args['action'][0]
 
         ### if no instance is provided, use current shell default,
         ### but not for the 'api' command (to avoid recursion)
         if 'mrsm_instance' not in args and main_action_name != 'api':
-            args['mrsm_instance'] = str(self.instance_keys)
+            args['mrsm_instance'] = str(shell_attrs['instance_keys'])
 
         if 'repository' not in args and main_action_name != 'api':
-            args['repository'] = str(self.repo_keys)
+            args['repository'] = str(shell_attrs['repo_keys'])
 
         ### parse out empty strings
         if args['action'][0].strip("\"'") == '':
@@ -501,21 +521,25 @@ class Shell(cmd.Cmd):
             args['action'] = ['start', 'jobs'] + args['action']
             main_action_name = 'start'
 
-        positional_only = (main_action_name not in self._actions)
+        positional_only = (main_action_name not in shell_attrs['_actions'])
         if positional_only:
             return original_line
 
         from meerschaum._internal.entry import entry_with_args
 
         try:
-            success_tuple = entry_with_args(_actions=self._actions, **args)
+            success_tuple = entry_with_args(_actions=shell_attrs['_actions'], **args)
+            #  success_tuple = entry_with_args(**args)
         except Exception as e:
             success_tuple = False, str(e)
 
         from meerschaum.utils.formatting import print_tuple
         if isinstance(success_tuple, tuple):
             print_tuple(
-                success_tuple, skip_common=(not self.debug), upper_padding=1, lower_padding=0,
+                success_tuple,
+                skip_common = (not shell_attrs['debug']),
+                upper_padding = 1,
+                lower_padding = 0,
             )
 
         ### Restore the old working directory.
@@ -525,9 +549,9 @@ class Shell(cmd.Cmd):
         return ""
 
     def postcmd(self, stop : bool = False, line : str = ""):
-        _reload = self._reload
+        _reload = shell_attrs['_reload']
         if _reload:
-            self.load_config(self.instance)
+            self.load_config(shell_attrs['instance'])
         if stop:
             return True
 
@@ -555,15 +579,15 @@ class Shell(cmd.Cmd):
         except (IndexError, AttributeError):
             state = ''
         if state == '':
-            self.debug = not self.debug
+            shell_attrs['debug'] = not shell_attrs['debug']
         elif state.lower() in on_commands:
-            self.debug = True
+            shell_attrs['debug'] = True
         elif state.lower() in off_commands:
-            self.debug = False
+            shell_attrs['debug'] = False
         else:
             info(f"Unknown state '{state}'. Ignoring...")
 
-        info(f"Debug mode is {'on' if self.debug else 'off'}.")
+        info(f"Debug mode is {'on' if shell_attrs['debug'] else 'off'}.")
 
     def do_instance(
             self,
@@ -619,7 +643,7 @@ class Shell(cmd.Cmd):
         else:
             conn_keys = instance_keys
 
-        self.instance_keys = conn_keys
+        shell_attrs['instance_keys'] = conn_keys
 
         self.update_prompt(instance=conn_keys)
         info(f"Default instance for the current shell: {conn_keys}")
@@ -683,7 +707,7 @@ class Shell(cmd.Cmd):
         if conn is None or not conn:
             conn = get_connector('api', debug=debug)
 
-        self.repo_keys = str(conn)
+        shell_attrs['repo_keys'] = str(conn)
 
         info(f"Default repository for the current shell: {conn}")
         return True, "Success"
@@ -712,9 +736,9 @@ class Shell(cmd.Cmd):
         args = parse_line(line)
         if len(args['action']) == 0:
             del args['action']
-            self._actions['show'](['actions'], **args)
+            shell_attrs['_actions']['show'](['actions'], **args)
             return ""
-        if args['action'][0] not in self._actions:
+        if args['action'][0] not in shell_attrs['_actions']:
             try:
                 print(textwrap.dedent(getattr(self, f"do_{args['action'][0]}").__doc__))
             except Exception as e:
@@ -780,17 +804,21 @@ class Shell(cmd.Cmd):
         Patch builtin cmdloop with my own input (defined below).
         """
         import signal, os
-        cmd.__builtins__['input'] = input_with_sigint(_old_input, self.session, shell=self)
+        cmd.__builtins__['input'] = input_with_sigint(
+            _old_input,
+            shell_attrs['session'],
+            shell = self,
+        )
 
         ### if the user specifies, clear the screen before initializing the shell
         if _clear_screen:
             from meerschaum.utils.formatting._shell import clear_screen
-            clear_screen(debug=self.debug)
+            clear_screen(debug=shell_attrs['debug'])
 
         ### if sysargs are provided, skip printing the intro and execute instead
-        if self._sysargs:
-            self.intro = ""
-            self.precmd(' '.join(self._sysargs))
+        if shell_attrs['_sysargs']:
+            shell_attrs['intro'] = ""
+            self.precmd(' '.join(shell_attrs['_sysargs']))
 
     def postloop(self):
         print('\n' + self.close_message)
@@ -816,24 +844,24 @@ def input_with_sigint(_input, session, shell: Optional[Shell] = None):
         nonlocal last_connected
         if not get_config('shell', 'bottom_toolbar', 'enabled'):
             return None
-        if not shell._update_bottom_toolbar and platform.system() == 'Windows':
-            return shell._old_bottom_toolbar
+        if not shell_attrs['_update_bottom_toolbar'] and platform.system() == 'Windows':
+            return shell_attrs['_old_bottom_toolbar']
         size = os.get_terminal_size()
         num_cols, num_lines = size.columns, size.lines
 
         instance_colored = (
             colored(
-                shell.instance_keys, 'on ' + get_config(
+                shell_attrs['instance_keys'], 'on ' + get_config(
                     'shell', 'ansi', 'instance', 'rich', 'style'
                 )
-            ) if ANSI else colored(shell.instance_keys, 'on white')
+            ) if ANSI else colored(shell_attrs['instance_keys'], 'on white')
         )
         repo_colored = (
-            colored(shell.repo_keys, 'on ' + get_config('shell', 'ansi', 'repo', 'rich', 'style'))
-            if ANSI else colored(shell.repo_keys, 'on white')
+            colored(shell_attrs['repo_keys'], 'on ' + get_config('shell', 'ansi', 'repo', 'rich', 'style'))
+            if ANSI else colored(shell_attrs['repo_keys'], 'on white')
         )
         try:
-            typ, label = shell.instance_keys.split(':')
+            typ, label = shell_attrs['instance_keys'].split(':')
             connected = typ in connectors and label in connectors[typ]
         except Exception as e:
             connected = False
@@ -859,9 +887,9 @@ def input_with_sigint(_input, session, shell: Optional[Shell] = None):
         )
         buffer = (' ' * buffer_size) if buffer_size > 0 else '\n '
         text = left + buffer + right
-        shell._old_bottom_toolbar = prompt_toolkit_formatted_text.ANSI(text)
-        shell._update_bottom_toolbar = False
-        return shell._old_bottom_toolbar
+        shell_attrs['_old_bottom_toolbar'] = prompt_toolkit_formatted_text.ANSI(text)
+        shell_attrs['_update_bottom_toolbar'] = False
+        return shell_attrs['_old_bottom_toolbar']
 
     def _patched_prompt(*args):
         _args = []

meerschaum/_internal/shell/ShellCompleter.py

@@ -24,7 +24,9 @@ class ShellCompleter(Completer):
         """
         Bridge the built-in cmd completer with the `prompt_toolkit` completer system.
         """
-        shell_actions = [a[3:] for a in dir(get_shell()) if a.startswith('do_')]
+        from meerschaum._internal.shell.Shell import shell_attrs
+        shell = get_shell()
+        shell_actions = [a[3:] for a in dir(shell) if a.startswith('do_')]
         yielded = []
         ensure_readline()
         parts = document.text.split('-')
@@ -32,7 +34,6 @@ class ShellCompleter(Completer):
         part_0_subbed_spaces = parts[0].replace(' ', '_')
         parsed_text = part_0_subbed_spaces + '-'.join(parts[1:])
 
-        shell = get_shell()
 
         ### Index is the rank order (0 is closest match).
         ### Break when no results are returned.
@@ -50,11 +51,14 @@ class ShellCompleter(Completer):
             yielded.append(poss)
 
         args = parse_line(document.text)
-        action_function = get_action(args['action'], _actions=shell._actions)
+        action_function = get_action(args['action'], _actions=shell_attrs.get('_actions', None))
         if action_function is None:
             return
 
-        main_action_name = get_main_action_name(args['action'], _actions=shell._actions)
+        main_action_name = get_main_action_name(
+            args['action'],
+            _actions = shell_attrs.get('_actions', None)
+        )
 
         ### If we haven't yet hit space, don't suggest subactions.
         if not parsed_text.replace(

meerschaum/actions/__init__.py

@@ -291,7 +291,6 @@ __all__ = ['actions', 'get_subactions', 'get_action', 'get_main_action_name', 'g
 ### functions that do not begin with '_' from all submodules.
 from inspect import getmembers, isfunction
 actions = {}
-"This docstring will be replaced in __pdoc__ at the end of this file."
 
 for module in modules:
     ### A couple important things happening here:
@@ -324,6 +323,8 @@ original_actions = actions.copy()
 from meerschaum._internal.entry import entry, get_shell
 import meerschaum.plugins
 make_action = meerschaum.plugins.make_action
+pre_sync_hook = meerschaum.plugins.pre_sync_hook
+post_sync_hook = meerschaum.plugins.post_sync_hook
 
 ### Instruct pdoc to skip the `meerschaum.actions.plugins` subdirectory.
 __pdoc__ = {

meerschaum/actions/reload.py

@@ -17,8 +17,5 @@ def reload(
     """
     Reload the running Meerschaum instance.
     """
-    from meerschaum.utils.packages import reload_package
-    from meerschaum.plugins import reload_plugins
-    reload_package('meerschaum')
-    reload_plugins(debug=debug)
-    return True, "Success"
+    from meerschaum.utils.packages import reload_meerschaum
+    return reload_meerschaum(debug=debug)