meerschaum 2.2.1__tar.gz → 2.2.2rc1__tar.gz

{meerschaum-2.2.1/meerschaum.egg-info → meerschaum-2.2.2rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.1
+Version: 2.2.2rc1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -65,6 +65,7 @@ Requires-Dist: watchfiles>=0.21.0; extra == "core"
 Requires-Dist: dill>=0.3.3; extra == "core"
 Requires-Dist: virtualenv>=20.1.0; extra == "core"
 Requires-Dist: APScheduler>=4.0.0a5; extra == "core"
+Requires-Dist: uv>=0.2.11; extra == "core"
 Provides-Extra: drivers
 Requires-Dist: cryptography>=38.0.1; extra == "drivers"
 Requires-Dist: psycopg[binary]>=3.1.18; extra == "drivers"
@@ -157,6 +158,7 @@ Requires-Dist: watchfiles>=0.21.0; extra == "sql"
 Requires-Dist: dill>=0.3.3; extra == "sql"
 Requires-Dist: virtualenv>=20.1.0; extra == "sql"
 Requires-Dist: APScheduler>=4.0.0a5; extra == "sql"
+Requires-Dist: uv>=0.2.11; extra == "sql"
 Provides-Extra: dash
 Requires-Dist: Flask-Compress>=1.10.1; extra == "dash"
 Requires-Dist: dash>=2.6.2; extra == "dash"
@@ -214,6 +216,7 @@ Requires-Dist: watchfiles>=0.21.0; extra == "api"
 Requires-Dist: dill>=0.3.3; extra == "api"
 Requires-Dist: virtualenv>=20.1.0; extra == "api"
 Requires-Dist: APScheduler>=4.0.0a5; extra == "api"
+Requires-Dist: uv>=0.2.11; extra == "api"
 Requires-Dist: pprintpp>=0.4.0; extra == "api"
 Requires-Dist: asciitree>=0.3.3; extra == "api"
 Requires-Dist: typing-extensions>=4.7.1; extra == "api"
@@ -261,6 +264,7 @@ Requires-Dist: watchfiles>=0.21.0; extra == "full"
 Requires-Dist: dill>=0.3.3; extra == "full"
 Requires-Dist: virtualenv>=20.1.0; extra == "full"
 Requires-Dist: APScheduler>=4.0.0a5; extra == "full"
+Requires-Dist: uv>=0.2.11; extra == "full"
 Requires-Dist: cryptography>=38.0.1; extra == "full"
 Requires-Dist: psycopg[binary]>=3.1.18; extra == "full"
 Requires-Dist: PyMySQL>=0.9.0; extra == "full"

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/actions/api.py

@@ -169,7 +169,7 @@ def _api_start(
     ### `check_update` must be False, because otherwise Uvicorn's hidden imports will break things.
     dotenv = attempt_import('dotenv', lazy=False)
     uvicorn, gunicorn = attempt_import(
-        'uvicorn', 'gunicorn', venv=None, lazy=False, check_update=False,
+        'uvicorn', 'gunicorn', lazy=False, check_update=False,
     )
 
     uvicorn_config_path = API_UVICORN_RESOURCES_PATH / SERVER_ID / 'config.json'
@@ -350,7 +350,6 @@ def _api_start(
                     )
                     for k, v in env_dict.items()
                 },
-                venv = None,
                 debug = debug,
             )
         except KeyboardInterrupt:

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/actions/upgrade.py

@@ -140,7 +140,7 @@ def _upgrade_packages(
     if venv is NoVenv:
         venv = 'mrsm'
     if len(action) == 0:
-        group = 'full'
+        group = 'api'
     else:
         group = action[0]
 

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/config/_default.py

@@ -110,6 +110,7 @@ default_system_config = {
         'space': False,
         'join_fetch': False,
         'inplace_sync': True,
+        'uv_pip': True,
     },
 }
 default_pipes_config = {

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/config/_paths.py

@@ -82,24 +82,24 @@ for _plugin_path in _plugins_paths_to_remove:
 
 ENVIRONMENT_VENVS_DIR = STATIC_CONFIG['environment']['venvs']
 if ENVIRONMENT_VENVS_DIR in os.environ:
-    VENVS_DIR_PATH = Path(os.environ[ENVIRONMENT_VENVS_DIR]).resolve()
-    if not VENVS_DIR_PATH.exists():
+    _VENVS_DIR_PATH = Path(os.environ[ENVIRONMENT_VENVS_DIR]).resolve()
+    if not _VENVS_DIR_PATH.exists():
         try:
-            VENVS_DIR_PATH.mkdir(parents=True, exist_ok=True)
+            _VENVS_DIR_PATH.mkdir(parents=True, exist_ok=True)
         except Exception as e:
             print(
                 f"Invalid path set for environment variable '{ENVIRONMENT_VENVS_DIR}':\n"
-                + f"{VENVS_DIR_PATH}"
+                + f"{_VENVS_DIR_PATH}"
             )
-            VENVS_DIR_PATH = (_ROOT_DIR_PATH / 'venvs').resolve()
-            print(f"Will use the following path for venvs instead:\n{VENVS_DIR_PATH}")
+            _VENVS_DIR_PATH = (_ROOT_DIR_PATH / 'venvs').resolve()
+            print(f"Will use the following path for venvs instead:\n{_VENVS_DIR_PATH}")
 else:
-    VENVS_DIR_PATH = _ROOT_DIR_PATH / 'venvs'
+    _VENVS_DIR_PATH = _ROOT_DIR_PATH / 'venvs'
 
 paths = {
-    'PACKAGE_ROOT_PATH'              : str(Path(__file__).parent.parent.resolve()),
-    'ROOT_DIR_PATH'                  : str(_ROOT_DIR_PATH),
-    'VIRTENV_RESOURCES_PATH'         : str(VENVS_DIR_PATH),
+    'PACKAGE_ROOT_PATH'              : Path(__file__).parent.parent.resolve().as_posix(),
+    'ROOT_DIR_PATH'                  : _ROOT_DIR_PATH.as_posix(),
+    'VIRTENV_RESOURCES_PATH'         : _VENVS_DIR_PATH.as_posix(),
     'CONFIG_DIR_PATH'                : ('{ROOT_DIR_PATH}', 'config'),
     'DEFAULT_CONFIG_DIR_PATH'        : ('{ROOT_DIR_PATH}', 'default_config'),
     'PATCH_DIR_PATH'                 : ('{ROOT_DIR_PATH}', 'patch_config'),
@@ -186,7 +186,6 @@ def __getattr__(name: str) -> Path:
     if name.endswith('RESOURCES_PATH') or name == 'CONFIG_DIR_PATH':
         path.mkdir(parents=True, exist_ok=True)
     elif 'FILENAME' in name:
-        path = str(path)
+        path = path.as_posix()
 
     return path
-

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.2.1"
+__version__ = "2.2.2rc1"

meerschaum-2.2.2rc1/meerschaum/config/paths.py

@@ -0,0 +1,10 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+
+"""
+External API for importing Meerschaum paths.
+"""
+
+from meerschaum.config._paths import __getattr__, paths
+__all__ = tuple(paths.keys())

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/core/Pipe/_sync.py

@@ -215,9 +215,8 @@ def sync(
 
             ### Activate and invoke `sync(pipe)` for plugin connectors with `sync` methods.
             try:
-                if p.connector.type == 'plugin' and p.connector.sync is not None:
-                    connector_plugin = Plugin(p.connector.label)
-                    with Venv(connector_plugin, debug=debug):
+                if getattr(p.connector, 'sync', None) is not None:
+                    with Venv(get_connector_plugin(p.connector), debug=debug):
                         return_tuple = p.connector.sync(p, debug=debug, **kw)
                     p._exists = None
                     if not isinstance(return_tuple, tuple):

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/utils/packages/__init__.py

@@ -466,12 +466,13 @@ def _get_package_metadata(import_name: str, venv: Optional[str]) -> Dict[str, st
     import re
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
     install_name = _import_to_install_name(import_name)
-    _args = ['show', install_name]
+    _args = ['pip', 'show', install_name]
     if venv is not None:
         cache_dir_path = VIRTENV_RESOURCES_PATH / venv / 'cache'
-        _args += ['--cache-dir', str(cache_dir_path)]
+        _args += ['--cache-dir', cache_dir_path.as_posix()]
+
     proc = run_python_package(
-        'pip', _args,
+        'uv', _args,
         capture_output=True, as_proc=True, venv=venv, universal_newlines=True,
     )
     outs, errs = proc.communicate()
@@ -721,6 +722,7 @@ def pip_install(
         check_pypi: bool = True,
         check_wheel: bool = True,
         _uninstall: bool = False,
+        _install_uv_pip: bool = True,
         color: bool = True,
         silent: bool = False,
         debug: bool = False,
@@ -776,6 +778,7 @@ def pip_install(
 
     """
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
+    from meerschaum.config import get_config
     from meerschaum.utils.warnings import warn
     if args is None:
         args = ['--upgrade'] if not _uninstall else []
@@ -787,9 +790,31 @@ def pip_install(
         have_wheel = venv_contains_package('wheel', venv=venv, debug=debug)
 
     _args = list(args)
-    have_pip = venv_contains_package('pip', venv=venv, debug=debug)
+    have_pip = venv_contains_package('pip', venv=None, debug=debug)
+    try:
+        import uv
+        have_uv_pip = True
+    except ImportError:
+        have_uv_pip = False
+    if have_pip and not have_uv_pip and _install_uv_pip:
+        if not pip_install(
+            'uv',
+            venv = None,
+            debug = debug,
+            _install_uv_pip = False,
+            check_update = False,
+            check_pypi = False,
+            check_wheel = False,
+        ):
+            warn(
+                f"Failed to install `uv` for virtual environment '{venv}'.",
+                color = False,
+            )
+
+    use_uv_pip = venv_contains_package('uv', venv=None, debug=debug)
+
     import sys
-    if not have_pip:
+    if not have_pip and not use_uv_pip:
         if not get_pip(venv=venv, debug=debug):
             import sys
             minor = sys.version_info.minor
@@ -806,13 +831,18 @@ def pip_install(
     
     with Venv(venv, debug=debug):
         if venv is not None:
-            if '--ignore-installed' not in args and '-I' not in _args and not _uninstall:
+            if (
+                '--ignore-installed' not in args
+                and '-I' not in _args
+                and not _uninstall
+                and not use_uv_pip
+            ):
                 _args += ['--ignore-installed']
             if '--cache-dir' not in args and not _uninstall:
                 cache_dir_path = VIRTENV_RESOURCES_PATH / venv / 'cache'
                 _args += ['--cache-dir', str(cache_dir_path)]
 
-        if 'pip' not in ' '.join(_args):
+        if 'pip' not in ' '.join(_args) and not use_uv_pip:
             if check_update and not _uninstall:
                 pip = attempt_import('pip', venv=venv, install=False, debug=debug, lazy=False)
                 if need_update(pip, check_pypi=check_pypi, debug=debug):
@@ -820,13 +850,16 @@ def pip_install(
         
         _args = (['install'] if not _uninstall else ['uninstall']) + _args
 
-        if check_wheel and not _uninstall:
+        if check_wheel and not _uninstall and not use_uv_pip:
             if not have_wheel:
                 if not pip_install(
                     'setuptools', 'wheel',
                     venv = venv,
-                    check_update = False, check_pypi = False,
-                    check_wheel = False, debug = debug,
+                    check_update = False,
+                    check_pypi = False,
+                    check_wheel = False,
+                    debug = debug,
+                    _install_uv_pip = False,
                 ):
                     warn(
                         (
@@ -838,21 +871,21 @@ def pip_install(
 
         if requirements_file_path is not None:
             _args.append('-r')
-            _args.append(str(pathlib.Path(requirements_file_path).resolve()))
+            _args.append(pathlib.Path(requirements_file_path).resolve().as_posix())
 
         if not ANSI and '--no-color' not in _args:
             _args.append('--no-color')
 
-        if '--no-input' not in _args:
+        if '--no-input' not in _args and not use_uv_pip:
             _args.append('--no-input')
 
-        if _uninstall and '-y' not in _args:
+        if _uninstall and '-y' not in _args and not use_uv_pip:
             _args.append('-y')
 
-        if '--no-warn-conflicts' not in _args and not _uninstall:
+        if '--no-warn-conflicts' not in _args and not _uninstall and not use_uv_pip:
             _args.append('--no-warn-conflicts')
 
-        if '--disable-pip-version-check' not in _args:
+        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:
@@ -863,12 +896,16 @@ def pip_install(
                 and '-t' not in _args
                 and not inside_venv()
                 and not _uninstall
+                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:
-                pass
+                if use_uv_pip:
+                    _args.append('--verbose')
         else:
             if '-q' not in _args or '-qq' not in _args or '-qqq' not in _args:
                 pass
@@ -883,7 +920,7 @@ def pip_install(
         if not silent:
             print(msg)
 
-        if not _uninstall:
+        if _uninstall:
             for install_name in _packages:
                 _install_no_version = get_install_no_version(install_name)
                 if _install_no_version in ('pip', 'wheel'):
@@ -896,10 +933,15 @@ def pip_install(
                         f"Failed to clean up package '{_install_no_version}'.",
                     )
 
+        if use_uv_pip:
+            _args.insert(0, 'pip')
+            if not _uninstall:
+                _args.append('--prerelease=allow')
+
         rc = run_python_package(
-            'pip',
+            ('pip' if not use_uv_pip else 'uv'),
             _args + _packages,
-            venv = venv,
+            venv = None,
             env = _get_pip_os_env(),
             debug = debug,
         )
@@ -1031,6 +1073,10 @@ def run_python_package(
     if cwd is not None:
         os.chdir(cwd)
     executable = venv_executable(venv=venv)
+    venv_path = (VIRTENV_RESOURCES_PATH / venv) if venv is not None else None
+    env_dict = kw.get('env', os.environ).copy()
+    if venv_path is not None:
+        env_dict.update({'VIRTUAL_ENV': venv_path.as_posix()})
     command = [executable, '-m', str(package_name)] + [str(a) for a in args]
     import traceback
     if debug:
@@ -1055,7 +1101,7 @@ def run_python_package(
             command,
             stdout = stdout,
             stderr = stderr,
-            env = kw.get('env', os.environ),
+            env = env_dict,
         )
         to_return = proc if as_proc else proc.wait()
     except KeyboardInterrupt:

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/utils/packages/_packages.py

@@ -53,6 +53,7 @@ packages: Dict[str, Dict[str, str]] = {
         'dill'                       : 'dill>=0.3.3',
         'virtualenv'                 : 'virtualenv>=20.1.0',
         'apscheduler'                : 'APScheduler>=4.0.0a5',
+        'uv'                         : 'uv>=0.2.11',
     },
     'drivers': {
         'cryptography'               : 'cryptography>=38.0.1',

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/utils/schedule.py

@@ -8,7 +8,7 @@ Schedule processes and threads.
 
 from __future__ import annotations
 import sys
-from datetime import datetime, timezone, timedelta, timedelta
+from datetime import datetime, timezone, timedelta
 import meerschaum as mrsm
 from meerschaum.utils.typing import Callable, Any, Optional, List, Dict
 

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum/utils/venv/__init__.py

@@ -361,6 +361,8 @@ def init_venv(
             verified_venvs.add(venv)
         return True
 
+    import io
+    from contextlib import redirect_stdout, redirect_stderr
     import sys, platform, os, pathlib, shutil
     from meerschaum.config.static import STATIC_CONFIG
     from meerschaum.config._paths import VIRTENV_RESOURCES_PATH
@@ -381,25 +383,34 @@ def init_venv(
             verified_venvs.add(venv)
         return True
 
-    from meerschaum.utils.packages import run_python_package, attempt_import
+    from meerschaum.utils.packages import run_python_package, attempt_import, _get_pip_os_env
     global tried_virtualenv
     try:
         import venv as _venv
+        uv = attempt_import('uv', venv=None, debug=debug)
         virtualenv = None
     except ImportError:
         _venv = None
+        uv = None
         virtualenv = None
-    
 
     _venv_success = False
-    if _venv is not None:
-        import io
-        from contextlib import redirect_stdout
+
+    if uv is not None:
+        _venv_success = run_python_package(
+            'uv',
+            ['venv', venv_path.as_posix(), '-q'],
+            venv = None,
+            env = _get_pip_os_env(),
+            debug = debug,
+        ) == 0
+
+    if _venv is not None and not _venv_success:
         f = io.StringIO()
         with redirect_stdout(f):
             _venv_success = run_python_package(
                 'venv',
-                [str(venv_path)] + (
+                [venv_path.as_posix()] + (
                     ['--symlinks'] if platform.system() != 'Windows' else []
                 ),
                 venv=None, debug=debug
@@ -438,7 +449,7 @@ def init_venv(
                 except Exception as e:
                     import traceback
                     traceback.print_exc()
-            virtualenv.cli_run([str(venv_path)])
+            virtualenv.cli_run([venv_path.as_posix()])
             if dist_packages_path.exists():
                 vtp.mkdir(exist_ok=True, parents=True)
                 for file_path in dist_packages_path.glob('*'):
@@ -614,7 +625,7 @@ def venv_target_path(
                     return site_path
 
                 ### Allow for dist-level paths (running as root).
-                for possible_dist in reversed(site.getsitepackages()):
+                for possible_dist in site.getsitepackages():
                     dist_path = pathlib.Path(possible_dist)
                     if not dist_path.exists():
                         continue

{meerschaum-2.2.1 → meerschaum-2.2.2rc1/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.1
+Version: 2.2.2rc1
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -65,6 +65,7 @@ Requires-Dist: watchfiles>=0.21.0; extra == "core"
 Requires-Dist: dill>=0.3.3; extra == "core"
 Requires-Dist: virtualenv>=20.1.0; extra == "core"
 Requires-Dist: APScheduler>=4.0.0a5; extra == "core"
+Requires-Dist: uv>=0.2.11; extra == "core"
 Provides-Extra: drivers
 Requires-Dist: cryptography>=38.0.1; extra == "drivers"
 Requires-Dist: psycopg[binary]>=3.1.18; extra == "drivers"
@@ -157,6 +158,7 @@ Requires-Dist: watchfiles>=0.21.0; extra == "sql"
 Requires-Dist: dill>=0.3.3; extra == "sql"
 Requires-Dist: virtualenv>=20.1.0; extra == "sql"
 Requires-Dist: APScheduler>=4.0.0a5; extra == "sql"
+Requires-Dist: uv>=0.2.11; extra == "sql"
 Provides-Extra: dash
 Requires-Dist: Flask-Compress>=1.10.1; extra == "dash"
 Requires-Dist: dash>=2.6.2; extra == "dash"
@@ -214,6 +216,7 @@ Requires-Dist: watchfiles>=0.21.0; extra == "api"
 Requires-Dist: dill>=0.3.3; extra == "api"
 Requires-Dist: virtualenv>=20.1.0; extra == "api"
 Requires-Dist: APScheduler>=4.0.0a5; extra == "api"
+Requires-Dist: uv>=0.2.11; extra == "api"
 Requires-Dist: pprintpp>=0.4.0; extra == "api"
 Requires-Dist: asciitree>=0.3.3; extra == "api"
 Requires-Dist: typing-extensions>=4.7.1; extra == "api"
@@ -261,6 +264,7 @@ Requires-Dist: watchfiles>=0.21.0; extra == "full"
 Requires-Dist: dill>=0.3.3; extra == "full"
 Requires-Dist: virtualenv>=20.1.0; extra == "full"
 Requires-Dist: APScheduler>=4.0.0a5; extra == "full"
+Requires-Dist: uv>=0.2.11; extra == "full"
 Requires-Dist: cryptography>=38.0.1; extra == "full"
 Requires-Dist: psycopg[binary]>=3.1.18; extra == "full"
 Requires-Dist: PyMySQL>=0.9.0; extra == "full"

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum.egg-info/SOURCES.txt

@@ -147,6 +147,7 @@ meerschaum/config/_read_config.py
 meerschaum/config/_shell.py
 meerschaum/config/_sync.py
 meerschaum/config/_version.py
+meerschaum/config/paths.py
 meerschaum/config/resources/__init__.py
 meerschaum/config/stack/__init__.py
 meerschaum/config/stack/grafana/__init__.py

{meerschaum-2.2.1 → meerschaum-2.2.2rc1}/meerschaum.egg-info/requires.txt

@@ -47,6 +47,7 @@ watchfiles>=0.21.0
 dill>=0.3.3
 virtualenv>=20.1.0
 APScheduler>=4.0.0a5
+uv>=0.2.11
 pprintpp>=0.4.0
 asciitree>=0.3.3
 typing-extensions>=4.7.1
@@ -98,6 +99,7 @@ watchfiles>=0.21.0
 dill>=0.3.3
 virtualenv>=20.1.0
 APScheduler>=4.0.0a5
+uv>=0.2.11
 
 [dash]
 Flask-Compress>=1.10.1
@@ -191,6 +193,7 @@ watchfiles>=0.21.0
 dill>=0.3.3
 virtualenv>=20.1.0
 APScheduler>=4.0.0a5
+uv>=0.2.11
 cryptography>=38.0.1
 psycopg[binary]>=3.1.18
 PyMySQL>=0.9.0
@@ -279,6 +282,7 @@ watchfiles>=0.21.0
 dill>=0.3.3
 virtualenv>=20.1.0
 APScheduler>=4.0.0a5
+uv>=0.2.11
 
 [stack]
 docker-compose>=1.29.2