meerschaum 2.2.2rc1__py3-none-any.whl → 2.2.2rc3__py3-none-any.whl

meerschaum/utils/packages/__init__.py

@@ -46,6 +46,7 @@ def get_module_path(
     """
     Get a module's path without importing.
     """
+    import site
     if debug:
         from meerschaum.utils.debug import dprint
     if not _try_install_name_on_fail:
@@ -54,33 +55,58 @@ def get_module_path(
         import_name_lower = install_name_lower
     else:
         import_name_lower = import_name.lower().replace('-', '_')
+
     vtp = venv_target_path(venv, allow_nonexistent=True, debug=debug)
     if not vtp.exists():
         if debug:
-            dprint(f"Venv '{venv}' does not exist, cannot import '{import_name}'.", color=False)
+            dprint(
+                (
+                    "Venv '{venv}' does not exist, cannot import "
+                    + f"'{import_name}'."
+                ),
+                color = False,
+            )
         return None
+
+    venv_target_candidate_paths = [vtp]
+    if venv is None:
+        site_user_packages_dirs = [pathlib.Path(site.getusersitepackages())]
+        site_packages_dirs = [pathlib.Path(path) for path in site.getsitepackages()]
+
+        paths_to_add = [
+            path
+            for path in site_user_packages_dirs + site_packages_dirs
+            if path not in venv_target_candidate_paths
+        ]
+        venv_target_candidate_paths += paths_to_add
+
     candidates = []
-    for file_name in os.listdir(vtp):
-        file_name_lower = file_name.lower().replace('-', '_')
-        if not file_name_lower.startswith(import_name_lower):
-            continue
-        if file_name.endswith('dist_info'):
+    for venv_target_candidate in venv_target_candidate_paths:
+        try:
+            file_names = os.listdir(venv_target_candidate)
+        except FileNotFoundError:
             continue
-        file_path = vtp / file_name
+        for file_name in file_names:
+            file_name_lower = file_name.lower().replace('-', '_')
+            if not file_name_lower.startswith(import_name_lower):
+                continue
+            if file_name.endswith('dist_info'):
+                continue
+            file_path = venv_target_candidate / file_name
 
-        ### Most likely: Is a directory with __init__.py
-        if file_name_lower == import_name_lower and file_path.is_dir():
-            init_path = file_path / '__init__.py'
-            if init_path.exists():
-                candidates.append(init_path)
+            ### Most likely: Is a directory with __init__.py
+            if file_name_lower == import_name_lower and file_path.is_dir():
+                init_path = file_path / '__init__.py'
+                if init_path.exists():
+                    candidates.append(init_path)
 
-        ### May be a standalone .py file.
-        elif file_name_lower == import_name_lower + '.py':
-            candidates.append(file_path)
+            ### May be a standalone .py file.
+            elif file_name_lower == import_name_lower + '.py':
+                candidates.append(file_path)
 
-        ### Compiled wheels (e.g. pyodbc)
-        elif file_name_lower.startswith(import_name_lower + '.'):
-            candidates.append(file_path)
+            ### Compiled wheels (e.g. pyodbc)
+            elif file_name_lower.startswith(import_name_lower + '.'):
+                candidates.append(file_path)
 
     if len(candidates) == 1:
         return candidates[0]
@@ -681,12 +707,22 @@ def need_update(
     return False
 
 
-def get_pip(venv: Optional[str] = 'mrsm', debug: bool=False) -> bool:
+def get_pip(
+        venv: Optional[str] = 'mrsm',
+        color: bool = True,
+        debug: bool = False,
+    ) -> bool:
     """
     Download and run the get-pip.py script.
 
     Parameters
     ----------
+    venv: Optional[str], default 'mrsm'
+        The virtual environment into which to install `pip`.
+
+    color: bool, default True
+        If `True`, force color output.
+
     debug: bool, default False
         Verbosity toggle.
 
@@ -709,7 +745,7 @@ def get_pip(venv: Optional[str] = 'mrsm', debug: bool=False) -> bool:
     if venv is not None:
         init_venv(venv=venv, debug=debug)
     cmd_list = [venv_executable(venv=venv), dest.as_posix()] 
-    return subprocess.call(cmd_list, env=_get_pip_os_env()) == 0
+    return subprocess.call(cmd_list, env=_get_pip_os_env(color=color)) == 0
 
 
 def pip_install(
@@ -722,6 +758,7 @@ def pip_install(
         check_pypi: bool = True,
         check_wheel: bool = True,
         _uninstall: bool = False,
+        _from_completely_uninstall: bool = False,
         _install_uv_pip: bool = True,
         color: bool = True,
         silent: bool = False,
@@ -791,10 +828,17 @@ def pip_install(
 
     _args = list(args)
     have_pip = venv_contains_package('pip', venv=None, debug=debug)
+    try:
+        import pip
+        have_pip = True
+    except ImportError:
+        have_pip = False
     try:
         import uv
+        uv_bin = uv.find_uv_bin()
         have_uv_pip = True
-    except ImportError:
+    except (ImportError, FileNotFoundError):
+        uv_bin = None
         have_uv_pip = False
     if have_pip and not have_uv_pip and _install_uv_pip:
         if not pip_install(
@@ -811,11 +855,11 @@ def pip_install(
                 color = False,
             )
 
-    use_uv_pip = venv_contains_package('uv', venv=None, debug=debug)
+    use_uv_pip = venv_contains_package('uv', venv=None, debug=debug) and uv_bin is not None
 
     import sys
     if not have_pip and not use_uv_pip:
-        if not get_pip(venv=venv, debug=debug):
+        if not get_pip(venv=venv, color=color, debug=debug):
             import sys
             minor = sys.version_info.minor
             print(
@@ -853,7 +897,7 @@ def pip_install(
         if check_wheel and not _uninstall and not use_uv_pip:
             if not have_wheel:
                 if not pip_install(
-                    'setuptools', 'wheel',
+                    'setuptools', 'wheel', 'uv',
                     venv = venv,
                     check_update = False,
                     check_pypi = False,
@@ -863,7 +907,7 @@ def pip_install(
                 ):
                     warn(
                         (
-                            "Failed to install `setuptools` and `wheel` for virtual "
+                            "Failed to install `setuptools`, `wheel`, and `uv` for virtual "
                             + f"environment '{venv}'."
                         ),
                         color = False,
@@ -888,7 +932,7 @@ def pip_install(
         if '--disable-pip-version-check' not in _args and not use_uv_pip:
             _args.append('--disable-pip-version-check')
 
-        if '--target' not in _args and '-t' not in _args and not _uninstall:
+        if '--target' not in _args and '-t' not in _args and not (not use_uv_pip and _uninstall):
             if venv is not None:
                 _args += ['--target', venv_target_path(venv, debug=debug)]
         elif (
@@ -899,8 +943,6 @@ def pip_install(
                 and not use_uv_pip
         ):
             _args += ['--user']
-        if '--break-system-packages' not in _args and not _uninstall:
-            _args.append('--break-system-packages')
 
         if debug:
             if '-v' not in _args or '-vv' not in _args or '-vvv' not in _args:
@@ -920,10 +962,10 @@ def pip_install(
         if not silent:
             print(msg)
 
-        if _uninstall:
+        if _uninstall and not _from_completely_uninstall and not use_uv_pip:
             for install_name in _packages:
                 _install_no_version = get_install_no_version(install_name)
-                if _install_no_version in ('pip', 'wheel'):
+                if _install_no_version in ('pip', 'wheel', 'uv'):
                     continue
                 if not completely_uninstall_package(
                     _install_no_version,
@@ -933,16 +975,17 @@ def pip_install(
                         f"Failed to clean up package '{_install_no_version}'.",
                     )
 
+        ### NOTE: Only append the `--prerelease=allow` flag if we explicitly depend on a prerelease.
         if use_uv_pip:
             _args.insert(0, 'pip')
-            if not _uninstall:
+            if not _uninstall and get_prerelease_dependencies(_packages):
                 _args.append('--prerelease=allow')
 
         rc = run_python_package(
             ('pip' if not use_uv_pip else 'uv'),
             _args + _packages,
             venv = None,
-            env = _get_pip_os_env(),
+            env = _get_pip_os_env(color=color),
             debug = debug,
         )
         if debug:
@@ -960,6 +1003,33 @@ def pip_install(
     return success
 
 
+def get_prerelease_dependencies(_packages: Optional[List[str]] = None):
+    """
+    Return a list of explicitly prerelease dependencies from a list of packages.
+    """
+    if _packages is None:
+        _packages = list(all_packages.keys())
+    prelrease_strings = ['dev', 'rc', 'a']
+    prerelease_packages = []
+    for install_name in _packages:
+        _install_no_version = get_install_no_version(install_name)
+        import_name = _install_to_import_name(install_name)
+        install_with_version = _import_to_install_name(import_name)
+        version_only = (
+            install_with_version.lower().replace(_install_no_version.lower(), '')
+            .split(']')[-1]
+        )
+
+        is_prerelease = False
+        for prelrease_string in prelrease_strings:
+            if prelrease_string in version_only:
+                is_prerelease = True
+
+        if is_prerelease:
+            prerelease_packages.append(install_name)
+    return prerelease_packages
+
+
 def completely_uninstall_package(
         install_name: str,
         venv: str = 'mrsm',
@@ -986,7 +1056,7 @@ def completely_uninstall_package(
             continue
         installed_versions.append(file_name)
 
-    max_attempts = len(installed_versions) + 1
+    max_attempts = len(installed_versions)
     while attempts < max_attempts:
         if not venv_contains_package(
             _install_to_import_name(_install_no_version),
@@ -995,8 +1065,10 @@ def completely_uninstall_package(
             return True
         if not pip_uninstall(
             _install_no_version,
-            venv=venv,
-            silent=(not debug), debug=debug
+            venv = venv,
+            silent = (not debug),
+            _from_completely_uninstall = True,
+            debug = debug,
         ):
             return False
         attempts += 1
@@ -1121,9 +1193,10 @@ def attempt_import(
         check_update: bool = False,
         check_pypi: bool = False,
         check_is_installed: bool = True,
+        allow_outside_venv: bool = True,
         color: bool = True,
         debug: bool = False
-    ) -> Union[Any, Tuple[Any]]:
+    ) -> Any:
     """
     Raise a warning if packages are not installed; otherwise import and return modules.
     If `lazy` is `True`, return lazy-imported modules.
@@ -1166,6 +1239,15 @@ def attempt_import(
     check_is_installed: bool, default True
         If `True`, check if the package is contained in the virtual environment.
 
+    allow_outside_venv: bool, default True
+        If `True`, search outside of the specified virtual environment
+        if the package cannot be found.
+        Setting to `False` will reinstall the package into a virtual environment, even if it
+        is installed outside.
+
+    color: bool, default True
+        If `False`, do not print ANSI colors.
+
     Returns
     -------
     The specified modules. If they're not available and `install` is `True`, it will first
@@ -1247,6 +1329,7 @@ def attempt_import(
                             name,
                             venv = venv,
                             split = split,
+                            allow_outside_venv = allow_outside_venv,
                             debug = debug,
                         )
                         _is_installed_first_check[name] = package_is_installed
@@ -1392,7 +1475,9 @@ def import_rich(
         'pygments', lazy=False,
     )
     rich = attempt_import(
-        'rich', lazy=lazy, **kw)
+        'rich', lazy=lazy,
+        **kw
+    )
     return rich
 
 
@@ -1626,10 +1711,26 @@ def is_installed(
         import_name: str,
         venv: Optional[str] = 'mrsm',
         split: bool = True,
+        allow_outside_venv: bool = True,
         debug: bool = False,
     ) -> bool:
     """
     Check whether a package is installed.
+
+    Parameters
+    ----------
+    import_name: str
+        The import name of the module.
+
+    venv: Optional[str], default 'mrsm'
+        The venv in which to search for the module.
+
+    split: bool, default True
+        If `True`, split on periods to determine the root module name.
+
+    allow_outside_venv: bool, default True
+        If `True`, search outside of the specified virtual environment
+        if the package cannot be found.
     """
     if debug:
         from meerschaum.utils.debug import dprint
@@ -1640,7 +1741,11 @@ def is_installed(
             spec_path = pathlib.Path(
                 get_module_path(root_name, venv=venv, debug=debug)
                 or
-                importlib.util.find_spec(root_name).origin
+                (
+                    importlib.util.find_spec(root_name).origin 
+                    if venv is not None and allow_outside_venv
+                    else None
+                )
             )
         except (ModuleNotFoundError, ValueError, AttributeError, TypeError) as e:
             spec_path = None
@@ -1669,6 +1774,8 @@ def venv_contains_package(
     """
     Search the contents of a virtual environment for a package.
     """
+    import site
+    import pathlib
     root_name = import_name.split('.')[0] if split else import_name
     return get_module_path(root_name, venv=venv, debug=debug) is not None
 
@@ -1732,7 +1839,7 @@ def _monkey_patch_get_distribution(_dist: str, _version: str) -> None:
     pkg_resources.get_distribution = _get_distribution
 
 
-def _get_pip_os_env():
+def _get_pip_os_env(color: bool = True):
     """
     Return the environment variables context in which `pip` should be run.
     See PEP 668 for why we are overriding the environment.
@@ -1741,5 +1848,6 @@ def _get_pip_os_env():
     pip_os_env = os.environ.copy()
     pip_os_env.update({
         'PIP_BREAK_SYSTEM_PACKAGES': 'true',
+        ('FORCE_COLOR' if color else 'NO_COLOR'): '1',
     })
     return pip_os_env

meerschaum/utils/packages/_packages.py

@@ -119,7 +119,7 @@ packages: Dict[str, Dict[str, str]] = {
     },
 }
 packages['sql'] = {
-    'numpy'                          : 'numpy>=1.18.5',
+    'numpy'                          : 'numpy<2.0.0',
     'pandas'                         : 'pandas[parquet]>=2.0.1',
     'pyarrow'                        : 'pyarrow>=16.1.0',
     'dask'                           : 'dask[dataframe]>=2024.5.1',

meerschaum/utils/process.py

@@ -9,10 +9,16 @@ See `meerschaum.utils.pool` for multiprocessing and
 """
 
 from __future__ import annotations
-import os, signal, subprocess, sys, platform
+import os, signal, subprocess, sys, platform, traceback
 from meerschaum.utils.typing import Union, Optional, Any, Callable, Dict, Tuple
 from meerschaum.config.static import STATIC_CONFIG
 
+_child_processes = []
+def signal_handler(sig, frame):
+    for child in _child_processes:
+        child.send_signal(sig)
+        child.wait()
+
 def run_process(
         *args,
         foreground: bool = False,
@@ -73,6 +79,7 @@ def run_process(
         sys.stdout.write(line.decode('utf-8'))
         sys.stdout.flush()
 
+  
     if capture_output or line_callback is not None:
         kw['stdout'] = subprocess.PIPE
         kw['stderr'] = subprocess.STDOUT
@@ -123,6 +130,7 @@ def run_process(
 
     try:
         child = subprocess.Popen(*args, **kw)
+        _child_processes.append(child)
 
         # we can't set the process group id from the parent since the child
         # will already have exec'd. and we can't SIGSTOP it before exec,
@@ -147,7 +155,9 @@ def run_process(
             store_proc_dict[store_proc_key] = child
         _ret = poll_process(child, line_callback) if line_callback is not None else child.wait()
         ret = _ret if not as_proc else child
-
+    except KeyboardInterrupt:
+        child.send_signal(signal.SIGINT)
+        ret = child.wait() if not as_proc else child
     finally:
         if foreground:
             # we have to mask SIGTTOU because tcsetpgrp

meerschaum/utils/venv/__init__.py

@@ -15,7 +15,7 @@ __all__ = sorted([
     'activate_venv', 'deactivate_venv', 'init_venv',
     'inside_venv', 'is_venv_active', 'venv_exec',
     'venv_executable', 'venv_exists', 'venv_target_path',
-    'Venv', 'get_venvs', 'verify_venv',
+    'Venv', 'get_venvs', 'verify_venv', 'get_module_venv',
 ])
 __pdoc__ = {'Venv': True}
 
@@ -79,7 +79,7 @@ def activate_venv(
         else:
             threads_active_venvs[thread_id][venv] += 1
 
-        target = str(venv_target_path(venv, debug=debug))
+        target = venv_target_path(venv, debug=debug).as_posix()
         if venv in active_venvs_order:
             sys.path.remove(target)
             try:
@@ -171,7 +171,7 @@ def deactivate_venv(
     if sys.path is None:
         return False
 
-    target = str(venv_target_path(venv, allow_nonexistent=force, debug=debug))
+    target = venv_target_path(venv, allow_nonexistent=force, debug=debug).as_posix()
     with LOCKS['sys.path']:
         if target in sys.path:
             sys.path.remove(target)
@@ -709,4 +709,28 @@ def get_venvs() -> List[str]:
     return venvs
 
 
+def get_module_venv(module) -> Union[str, None]:
+    """
+    Return the virtual environment where an imported module is installed.
+
+    Parameters
+    ----------
+    module: ModuleType
+        The imported module to inspect.
+
+    Returns
+    -------
+    The name of a venv or `None`.
+    """
+    import pathlib
+    from meerschaum.config.paths import VIRTENV_RESOURCES_PATH
+    module_path = pathlib.Path(module.__file__).resolve()
+    try:
+        rel_path = module_path.relative_to(VIRTENV_RESOURCES_PATH)
+    except ValueError:
+        return None
+
+    return rel_path.as_posix().split('/', maxsplit=1)[0]
+
+
 from meerschaum.utils.venv._Venv import Venv

{meerschaum-2.2.2rc1.dist-info → meerschaum-2.2.2rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.2rc1
+Version: 2.2.2rc3
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -40,7 +40,7 @@ Requires-Dist: fastapi >=0.111.0 ; extra == 'api'
 Requires-Dist: fastapi-login >=1.7.2 ; extra == 'api'
 Requires-Dist: python-multipart >=0.0.9 ; extra == 'api'
 Requires-Dist: httpx >=0.24.1 ; extra == 'api'
-Requires-Dist: numpy >=1.18.5 ; extra == 'api'
+Requires-Dist: numpy <2.0.0 ; extra == 'api'
 Requires-Dist: pandas[parquet] >=2.0.1 ; extra == 'api'
 Requires-Dist: pyarrow >=16.1.0 ; extra == 'api'
 Requires-Dist: dask[dataframe] >=2024.5.1 ; extra == 'api'
@@ -225,7 +225,7 @@ Requires-Dist: duckdb-engine >=0.13.0 ; extra == 'full'
 Requires-Dist: toga >=0.3.0-dev29 ; extra == 'full'
 Requires-Dist: pywebview >=3.6.3 ; extra == 'full'
 Requires-Dist: pycparser >=2.21.0 ; extra == 'full'
-Requires-Dist: numpy >=1.18.5 ; extra == 'full'
+Requires-Dist: numpy <2.0.0 ; extra == 'full'
 Requires-Dist: pandas[parquet] >=2.0.1 ; extra == 'full'
 Requires-Dist: pyarrow >=16.1.0 ; extra == 'full'
 Requires-Dist: dask[dataframe] >=2024.5.1 ; extra == 'full'
@@ -259,7 +259,7 @@ Provides-Extra: minimal
 Provides-Extra: required
 Provides-Extra: setup
 Provides-Extra: sql
-Requires-Dist: numpy >=1.18.5 ; extra == 'sql'
+Requires-Dist: numpy <2.0.0 ; extra == 'sql'
 Requires-Dist: pandas[parquet] >=2.0.1 ; extra == 'sql'
 Requires-Dist: pyarrow >=16.1.0 ; extra == 'sql'
 Requires-Dist: dask[dataframe] >=2024.5.1 ; extra == 'sql'