meerschaum 2.7.5__py3-none-any.whl → 2.7.7__py3-none-any.whl

meerschaum/jobs/_Job.py

@@ -313,6 +313,7 @@ class Job:
         if not cleanup_success:
             return cleanup_success, cleanup_msg
 
+        _ = self.daemon._properties.pop('result', None)
         return cleanup_success, f"Deleted {self}."
 
     def is_running(self) -> bool:

meerschaum/plugins/__init__.py

@@ -126,8 +126,8 @@ def pre_sync_hook(
 
 
 def post_sync_hook(
-        function: Callable[[Any], Any],
-    ) -> Callable[[Any], Any]:
+    function: Callable[[Any], Any],
+) -> Callable[[Any], Any]:
     """
     Register a function as a sync hook to be executed upon completion of a sync.
     
@@ -143,10 +143,14 @@ def post_sync_hook(
     Examples
     --------
     >>> from meerschaum.plugins import post_sync_hook
+    >>> from meerschaum.utils.misc import interval_str
+    >>> from datetime import timedelta
     >>>
     >>> @post_sync_hook
     ... def log_sync(pipe, success_tuple, duration=None, **kwargs):
-    ...     print(f"It took {round(duration, 2)} seconds to sync {pipe}.")
+    ...     duration_delta = timedelta(seconds=duration)
+    ...     duration_text = interval_str(duration_delta)
+    ...     print(f"It took {duration_text} to sync {pipe}.")
     >>>
     """
     with _locks['_post_sync_hooks']:

meerschaum/utils/daemon/Daemon.py

@@ -1017,7 +1017,8 @@ class Daemon:
 
     def read_pickle(self) -> Daemon:
         """Read a Daemon's pickle file and return the `Daemon`."""
-        import pickle, traceback
+        import pickle
+        import traceback
         if not self.pickle_path.exists():
             error(f"Pickle file does not exist for daemon '{self.daemon_id}'.")
 
@@ -1053,6 +1054,9 @@ class Daemon:
         if self._properties is None:
             self._properties = {}
 
+        if self._properties.get('result', None) is None:
+            _ = self._properties.pop('result', None)
+
         if _file_properties is not None:
             self._properties = apply_patch_to_config(
                 _file_properties,

meerschaum/utils/daemon/__init__.py

@@ -37,7 +37,7 @@ def daemon_entry(sysargs: Optional[List[str]] = None) -> SuccessTuple:
     filtered_sysargs = [arg for arg in sysargs if arg not in ('-d', '--daemon')]
     try:
         label = shlex.join(filtered_sysargs) if sysargs else None
-    except Exception as e:
+    except Exception:
         label = ' '.join(filtered_sysargs) if sysargs else None
 
     name = _args.get('name', None)
@@ -45,7 +45,7 @@ def daemon_entry(sysargs: Optional[List[str]] = None) -> SuccessTuple:
     if name:
         try:
             daemon = Daemon(daemon_id=name)
-        except Exception as e:
+        except Exception:
             daemon = None
 
     if daemon is not None:

meerschaum/utils/dtypes/sql.py

@@ -536,7 +536,7 @@ def get_db_type_from_pd_type(
     from meerschaum.utils.packages import attempt_import
     from meerschaum.utils.dtypes import are_dtypes_equal, MRSM_ALIAS_DTYPES
     from meerschaum.utils.misc import parse_arguments_str
-    sqlalchemy_types = attempt_import('sqlalchemy.types')
+    sqlalchemy_types = attempt_import('sqlalchemy.types', lazy=False)
 
     types_registry = (
         PD_TO_DB_DTYPES_FLAVORS
@@ -559,7 +559,7 @@ def get_db_type_from_pd_type(
         found_db_type = True
 
     if not found_db_type:
-        warn(f"Unknown Pandas data type '{pd_type}'. Falling back to 'TEXT'.")
+        warn(f"Unknown Pandas data type '{pd_type}'. Falling back to 'TEXT'.", stacklevel=3)
         return (
             'TEXT'
             if not as_sqlalchemy

meerschaum/utils/misc.py

@@ -90,20 +90,21 @@ def add_method_to_class(
 
 
 def generate_password(length: int = 12) -> str:
-    """Generate a secure password of given length.
+    """
+    Generate a secure password of given length.
 
     Parameters
     ----------
-    length : int, default 12
+    length: int, default 12
         The length of the password.
 
     Returns
     -------
     A random password string.
-
     """
-    import secrets, string
-    return ''.join((secrets.choice(string.ascii_letters) for i in range(length)))
+    import secrets
+    import string
+    return ''.join((secrets.choice(string.ascii_letters + string.digits) for i in range(length)))
 
 def is_int(s : str) -> bool:
     """
@@ -121,7 +122,7 @@ def is_int(s : str) -> bool:
     """
     try:
         float(s)
-    except Exception as e:
+    except Exception:
         return False
     
     return float(s).is_integer()

meerschaum/utils/packages/__init__.py

@@ -337,14 +337,14 @@ def get_install_no_version(install_name: str) -> str:
 
 import_versions = {}
 def determine_version(
-        path: pathlib.Path,
-        import_name: Optional[str] = None,
-        venv: Optional[str] = 'mrsm',
-        search_for_metadata: bool = True,
-        split: bool = True,
-        warn: bool = False,
-        debug: bool = False,
-    ) -> Union[str, None]:
+    path: pathlib.Path,
+    import_name: Optional[str] = None,
+    venv: Optional[str] = 'mrsm',
+    search_for_metadata: bool = True,
+    split: bool = True,
+    warn: bool = False,
+    debug: bool = False,
+) -> Union[str, None]:
     """
     Determine a module's `__version__` string from its filepath.
     
@@ -381,11 +381,8 @@ def determine_version(
     with _locks['import_versions']:
         if venv not in import_versions:
             import_versions[venv] = {}
-    import importlib.metadata
-    import re, os
+    import os
     old_cwd = os.getcwd()
-    if debug:
-        from meerschaum.utils.debug import dprint
     from meerschaum.utils.warnings import warn as warn_function
     if import_name is None:
         import_name = path.parent.stem if path.stem == '__init__' else path.stem
@@ -395,7 +392,10 @@ def determine_version(
     _version = None
     module_parent_dir = (
         path.parent.parent if path.stem == '__init__' else path.parent
-    ) if path is not None else venv_target_path(venv, debug=debug)
+    ) if path is not None else venv_target_path(venv, allow_nonexistent=True, debug=debug)
+
+    if not module_parent_dir.exists():
+        return None
 
     installed_dir_name = _import_to_dir_name(import_name)
     clean_installed_dir_name = installed_dir_name.lower().replace('-', '_')
@@ -403,7 +403,11 @@ def determine_version(
     ### First, check if a dist-info directory exists.
     _found_versions = []
     if search_for_metadata:
-        for filename in os.listdir(module_parent_dir):
+        try:
+            filenames = os.listdir(module_parent_dir)
+        except FileNotFoundError:
+            filenames = []
+        for filename in filenames:
             if not filename.endswith('.dist-info'):
                 continue
             filename_lower = filename.lower()
@@ -430,7 +434,7 @@ def determine_version(
         try:
             os.chdir(module_parent_dir)
             _version = importlib_metadata.metadata(import_name)['Version']
-        except Exception as e:
+        except Exception:
             _version = None
         finally:
             os.chdir(old_cwd)
@@ -698,7 +702,7 @@ def need_update(
             (not semver.Version.parse(version).match(required_version))
             if required_version else False
         )
-    except AttributeError as e:
+    except AttributeError:
         pip_install(_import_to_install_name('semver'), venv='mrsm', debug=debug)
         semver = manually_import_module('semver', venv='mrsm', debug=debug)
         return (
@@ -724,10 +728,10 @@ def need_update(
 
 
 def get_pip(
-        venv: Optional[str] = 'mrsm',
-        color: bool = True,
-        debug: bool = False,
-    ) -> bool:
+    venv: Optional[str] = 'mrsm',
+    color: bool = True,
+    debug: bool = False,
+) -> bool:
     """
     Download and run the get-pip.py script.
 
@@ -747,7 +751,8 @@ def get_pip(
     A bool indicating success.
 
     """
-    import sys, subprocess
+    import sys
+    import subprocess
     from meerschaum.utils.misc import wget
     from meerschaum.config._paths import CACHE_RESOURCES_PATH
     from meerschaum.config.static import STATIC_CONFIG
@@ -755,7 +760,7 @@ def get_pip(
     dest = CACHE_RESOURCES_PATH / 'get-pip.py'
     try:
         wget(url, dest, color=False, debug=debug)
-    except Exception as e:
+    except Exception:
         print(f"Failed to fetch pip from '{url}'. Please install pip and restart Meerschaum.") 
         sys.exit(1)
     if venv is not None:
@@ -776,6 +781,7 @@ def pip_install(
     _uninstall: bool = False,
     _from_completely_uninstall: bool = False,
     _install_uv_pip: bool = True,
+    _use_uv_pip: bool = True,
     color: bool = True,
     silent: bool = False,
     debug: bool = False,
@@ -835,10 +841,7 @@ def pip_install(
     from meerschaum.utils.warnings import warn
     if args is None:
         args = ['--upgrade'] if not _uninstall else []
-    if color:
-        ANSI, UNICODE = True, True
-    else:
-        ANSI, UNICODE = False, False
+    ANSI = True if color else False
     if check_wheel:
         have_wheel = venv_contains_package('wheel', venv=venv, debug=debug)
 
@@ -877,7 +880,8 @@ def pip_install(
             )
 
     use_uv_pip = (
-        venv_contains_package('uv', venv=None, debug=debug)
+        _use_uv_pip
+        and venv_contains_package('uv', venv=None, debug=debug)
         and uv_bin is not None
         and venv is not None
         and is_uv_enabled()

meerschaum/utils/packages/_packages.py

@@ -136,7 +136,7 @@ packages['sql'] = {
     'numpy'                          : 'numpy>=1.18.5',
     'pandas'                         : 'pandas[parquet]>=2.0.1',
     'pyarrow'                        : 'pyarrow>=16.1.0',
-    'dask'                           : 'dask[complete]>=2024.5.1',
+    'dask'                           : 'dask[complete]>=2024.12.1',
     'partd'                          : 'partd>=1.4.2',
     'pytz'                           : 'pytz',
     'joblib'                         : 'joblib>=0.17.0',

meerschaum/utils/prompt.py

@@ -7,7 +7,9 @@ Functions for interacting with the user.
 """
 
 from __future__ import annotations
+
 import os
+import meerschaum as mrsm
 from meerschaum.utils.typing import Any, Union, Optional, Tuple, List
 
 
@@ -63,9 +65,8 @@ def prompt(
 
     """
     from meerschaum.utils.packages import attempt_import
-    from meerschaum.utils.formatting import colored, ANSI, CHARSET, highlight_pipes, fill_ansi
+    from meerschaum.utils.formatting import ANSI, CHARSET, highlight_pipes, fill_ansi
     from meerschaum.config import get_config
-    from meerschaum.config.static import _static_config
     from meerschaum.utils.misc import filter_keywords
     from meerschaum.utils.daemon import running_in_daemon
     noask = check_noask(noask)
@@ -175,8 +176,6 @@ def yes_no(
     ```
     """
     from meerschaum.utils.warnings import error, warn
-    from meerschaum.utils.formatting import ANSI, UNICODE
-    from meerschaum.utils.packages import attempt_import
 
     default = options[0] if yes else default
     noask = yes or check_noask(noask)
@@ -195,7 +194,7 @@ def yes_no(
             success = False
         
         if not success:
-            error(f"Error getting response. Aborting...", stack=False)
+            error("Error getting response. Aborting...", stack=False)
         if answer == "":
             answer = default
 
@@ -205,19 +204,20 @@ def yes_no(
     
     return answer.lower() == options[0].lower()
 
+
 def choose(
-        question: str,
-        choices: List[Union[str, Tuple[str, str]]],
-        default: Union[str, List[str], None] = None,
-        numeric: bool = True,
-        multiple: bool = False,
-        as_indices: bool = False,
-        delimiter: str = ',',
-        icon: bool = True,
-        warn: bool = True,
-        noask: bool = False,
-        **kw
-    ) -> Union[str, Tuple[str], None]:
+    question: str,
+    choices: List[Union[str, Tuple[str, str]]],
+    default: Union[str, List[str], None] = None,
+    numeric: bool = True,
+    multiple: bool = False,
+    as_indices: bool = False,
+    delimiter: str = ',',
+    icon: bool = True,
+    warn: bool = True,
+    noask: bool = False,
+    **kw
+) -> Union[str, Tuple[str], None]:
     """
     Present a list of options and return the user's choice.
 
@@ -418,8 +418,8 @@ def choose(
         valid = (len(answers) > 1 or not (len(answers) == 1 and answers[0] is None))
         for a in answers:
             if (
-                not a in {_original for _new, _original in altered_choices.items()}
-                and not a in _choices
+                a not in {_original for _new, _original in altered_choices.items()}
+                and a not in _choices
                 and a != default
                 and not noask
             ):
@@ -428,21 +428,22 @@ def choose(
         if valid:
             break
         if warn:
-            _warn(f"Please pick a valid choice.", stack=False)
+            _warn("Please pick a valid choice.", stack=False)
 
     if not multiple:
         if not numeric:
             return answer
         try:
             _answer = choices[int(answer) - 1]
-            if as_indices and isinstance(choice, tuple):
+            if as_indices and isinstance(_answer, tuple):
                 return _answer[0]
             return _answer
-        except Exception as e:
+        except Exception:
             _warn(f"Could not cast answer '{answer}' to an integer.", stacklevel=3)
 
     if not numeric:
         return answers
+
     _answers = []
     for a in answers:
         try:
@@ -451,17 +452,17 @@ def choose(
             if isinstance(_answer_to_return, tuple) and as_indices:
                 _answer_to_return = _answer_to_return[0]
             _answers.append(_answer_to_return)
-        except Exception as e:
+        except Exception:
             _warn(f"Could not cast answer '{a}' to an integer.", stacklevel=3)
     return _answers
 
 
 def get_password(
-        username: Optional[str] = None,
-        minimum_length: Optional[int] = None,
-        confirm: bool = True,
-        **kw: Any
-    ) -> str:
+    username: Optional[str] = None,
+    minimum_length: Optional[int] = None,
+    confirm: bool = True,
+    **kw: Any
+) -> str:
     """
     Prompt the user for a password.
 
@@ -493,15 +494,15 @@ def get_password(
     from meerschaum.utils.warnings import warn
     while True:
         password = prompt(
-            f"Password" + (f" for user '{username}':" if username is not None else ":"),
-            is_password = True,
+            "Password" + (f" for user '{username}':" if username is not None else ":"),
+            is_password=True,
             **kw
         )
         if minimum_length is not None and len(password) < minimum_length:
             warn(
                 "Password is too short. " +
                 f"Please enter a password that is at least {minimum_length} characters.",
-                stack = False
+                stack=False
             )
             continue
 
@@ -509,12 +510,12 @@ def get_password(
             return password
 
         _password = prompt(
-            f"Confirm password" + (f" for user '{username}':" if username is not None else ":"),
-            is_password = True,
+            "Confirm password" + (f" for user '{username}':" if username is not None else ":"),
+            is_password=True,
             **kw
         )
         if password != _password:
-            warn(f"Passwords do not match! Please try again.", stack=False)
+            warn("Passwords do not match! Please try again.", stack=False)
             continue
         else:
             return password
@@ -550,13 +551,13 @@ def get_email(username: Optional[str] = None, allow_omit: bool = True, **kw: Any
     from meerschaum.utils.misc import is_valid_email
     while True:
         email = prompt(
-            f"Email" + (f" for user '{username}'" if username is not None else "") +
+            "Email" + (f" for user '{username}'" if username is not None else "") +
             (" (empty to omit):" if allow_omit else ": "),
             **kw
         )
         if (allow_omit and email == '') or is_valid_email(email):
             return email
-        warn(f"Invalid email! Please try again.", stack=False)
+        warn("Invalid email! Please try again.", stack=False)
 
 
 def check_noask(noask: bool = False) -> bool:
@@ -571,3 +572,20 @@ def check_noask(noask: bool = False) -> bool:
         os.environ.get(NOASK, 'false').lower()
         in ('1', 'true')
     )
+
+
+def get_connectors_completer(*types: str):
+    """
+    Return a prompt-toolkit Completer object to pass into `prompt()`.
+    """
+    from meerschaum.utils.misc import get_connector_labels
+    prompt_toolkit_completion = mrsm.attempt_import('prompt_toolkit.completion', lazy=False)
+    Completer = prompt_toolkit_completion.Completer
+    Completion = prompt_toolkit_completion.Completion
+
+    class ConnectorCompleter(Completer):
+        def get_completions(self, document, complete_event):
+            for label in get_connector_labels(*types):
+                yield Completion(label, start_position=(-1 * len(document.text)))
+
+    return ConnectorCompleter()