meerschaum 2.2.1__tar.gz → 2.2.2rc2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.1
+Version: 2.2.2rc2
 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.2rc2}/meerschaum/_internal/shell/Shell.py

@@ -203,6 +203,29 @@ def _check_complete_keys(line: str) -> Optional[List[str]]:
     return None
 
 
+def get_shell_intro(with_color: bool = True) -> str:
+    """
+    Return the introduction message string.
+    """
+    from meerschaum.utils.formatting import CHARSET, ANSI, colored
+    intro = get_config('shell', CHARSET, 'intro', patch=patch)
+    intro += '\n' + ''.join(
+        [' '
+            for i in range(
+                string_width(intro) - len('v' + version)
+            )
+        ]
+    ) + 'v' + version
+
+    if not with_color or not ANSI:
+        return intro
+
+    return colored(
+        intro,
+        **get_config('shell', 'ansi', 'intro', 'rich')
+    )
+
+
 class Shell(cmd.Cmd):
     def __init__(
             self,
@@ -277,25 +300,20 @@ class Shell(cmd.Cmd):
         except Exception as e:
             pass
 
-
     def load_config(self, instance: Optional[str] = None):
         """
         Set attributes from the shell configuration.
         """
         from meerschaum.utils.misc import remove_ansi
-        from meerschaum.utils.formatting import CHARSET, ANSI, UNICODE, colored
+        from meerschaum.utils.formatting import CHARSET, ANSI, colored
         
         if shell_attrs.get('intro', None) != '':
-            self.intro = get_config('shell', CHARSET, 'intro', patch=patch)
-            self.intro += '\n' + ''.join(
-                [' '
-                    for i in range(
-                        string_width(self.intro) - len('v' + version)
-                    )
-                ]
-            ) + 'v' + version
-        else:
-            self.intro = ""
+            self.intro = (
+                get_shell_intro(with_color=False)
+                if shell_attrs.get('intro', None) != ''
+                else ""
+            )
+
         shell_attrs['intro'] = self.intro
         shell_attrs['_prompt'] = get_config('shell', CHARSET, 'prompt', patch=patch)
         self.prompt = shell_attrs['_prompt']
@@ -822,7 +840,7 @@ def input_with_sigint(_input, session, shell: Optional[Shell] = None):
     """
     Replace built-in `input()` with prompt_toolkit.prompt.
     """
-    from meerschaum.utils.formatting import CHARSET, ANSI, UNICODE, colored
+    from meerschaum.utils.formatting import CHARSET, ANSI, colored
     from meerschaum.connectors import is_connected, connectors
     from meerschaum.utils.misc import remove_ansi
     from meerschaum.config import get_config

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/meerschaum/_internal/term/__init__.py

@@ -16,7 +16,7 @@ from meerschaum._internal.term.TermPageHandler import TermPageHandler
 from meerschaum.config._paths import API_TEMPLATES_PATH, API_STATIC_PATH
 
 tornado, tornado_ioloop, terminado = attempt_import(
-    'tornado', 'tornado.ioloop', 'terminado', lazy=False, venv=None,
+    'tornado', 'tornado.ioloop', 'terminado', lazy=False,
 )
 
 def get_webterm_app_and_manager() -> Tuple[

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/meerschaum/_internal/term/tools.py

@@ -17,7 +17,7 @@ def is_webterm_running(host: str, port: int, protocol: str = 'http') -> int:
     requests = attempt_import('requests')
     url = f'{protocol}://{host}:{port}'
     try:
-        r = requests.get(url)
+        r = requests.get(url, timeout=3)
     except Exception as e:
         return False
     if not r:

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/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'
@@ -306,15 +306,50 @@ def _api_start(
 
     def _run_uvicorn():
         try:
-            uvicorn.run(
-                **filter_keywords(
-                    uvicorn.run,
-                    **{
-                        k: v
-                        for k, v in uvicorn_config.items()
-                        if k not in custom_keys
-                    }
-                )
+            uvicorn_flags = [
+                '--host', host,
+                '--port', str(port),
+                (
+                    '--proxy-headers'
+                    if uvicorn_config.get('proxy_headers')
+                    else '--no-proxy-headers'
+                ),
+                (
+                    '--use-colors'
+                    if uvicorn_config.get('use_colors')
+                    else '--no-use-colors'
+                ),
+                '--env-file', uvicorn_config['env_file'],
+            ]
+            if uvicorn_reload := uvicorn_config.get('reload'):
+                uvicorn_flags.append('--reload')
+            if (
+                uvicorn_reload
+                and (reload_dirs := uvicorn_config.get('reload_dirs'))
+            ):
+                if not isinstance(reload_dirs, list):
+                    reload_dirs = [reload_dirs]
+                for reload_dir in reload_dirs:
+                    uvicorn_flags += ['--reload-dir', reload_dir]
+            if (
+                uvicorn_reload
+                and (reload_excludes := uvicorn_config.get('reload_excludes'))
+            ):
+                if not isinstance(reload_excludes, list):
+                    reload_excludes = [reload_excludes]
+                for reload_exclude in reload_excludes:
+                    uvicorn_flags += ['--reload-exclude', reload_exclude]
+            if (uvicorn_workers := uvicorn_config.get('workers')) is not None:
+                uvicorn_flags += ['--workers', str(uvicorn_workers)]
+
+            uvicorn_args = uvicorn_flags + ['meerschaum.api:app']
+            proc = run_python_package(
+                'uvicorn',
+                uvicorn_args,
+                venv = 'mrsm',
+                as_proc = True,
+                foreground = True,
+                debug = debug,
             )
         except KeyboardInterrupt:
             pass
@@ -350,7 +385,7 @@ def _api_start(
                     )
                     for k, v in env_dict.items()
                 },
-                venv = None,
+                venv = 'mrsm',
                 debug = debug,
             )
         except KeyboardInterrupt:

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/meerschaum/actions/python.py

@@ -10,36 +10,37 @@ from meerschaum.utils.typing import SuccessTuple, Any, List, Optional
 
 def python(
         action: Optional[List[str]] = None,
+        venv: Optional[str] = 'mrsm',
+        sub_args: Optional[List[str]] = None,
         debug: bool = False,
         **kw: Any
     ) -> SuccessTuple:
     """
-    Launch a Python interpreter with Meerschaum imported. Commands are optional.
-    Note that quotes must be escaped and commands must be separated by semicolons
+    Launch a virtual environment's Python interpreter with Meerschaum imported.
+    You may pass flags to the Python binary by surrounding each flag with `[]`.
     
     Usage:
         `python {commands}`
     
-    Example:
-        `python print(\\'Hello, World!\\'); pipes = mrsm.get_pipes()`
-    
-        ```
-        Hello, World!
-
-        >>> import meerschaum as mrsm
-        >>> print('Hello, World!')
-        >>> pipes = mrsm.get_pipes()
-        ```
+    Examples:
+        mrsm python
+        mrsm python --venv noaa
+        mrsm python [-i] [-c 'print("hi")']
     """
-    import sys, subprocess
+    import sys, subprocess, os
     from meerschaum.utils.debug import dprint
     from meerschaum.utils.warnings import warn, error
     from meerschaum.utils.process import run_process
+    from meerschaum.utils.venv import venv_executable
     from meerschaum.config import __version__ as _version
+    from meerschaum.config.paths import VIRTENV_RESOURCES_PATH
 
     if action is None:
         action = []
 
+    if venv == 'None':
+        venv = None
+
     joined_actions = ['import meerschaum as mrsm']
     line = ""
     for i, a in enumerate(action):
@@ -51,7 +52,6 @@ def python(
             line = ""
 
     ### ensure meerschaum is imported
-    #  joined_actions = ['import meerschaum as mrsm;'] + joined_actions
     if debug:
         dprint(joined_actions)
 
@@ -75,8 +75,24 @@ def python(
 
     if debug:
         dprint(f"command:\n{command}")
+
+    env_dict = os.environ.copy()
+    venv_path = (VIRTENV_RESOURCES_PATH / venv) if venv is not None else None
+    if venv_path is not None:
+        env_dict.update({'VIRTUAL_ENV': venv_path.as_posix()})
+
+    args_to_run = (
+        [venv_executable(venv), '-i', '-c', command]
+        if not sub_args
+        else [venv_executable(venv)] + sub_args
+    )
+
     try:
-        return_code = run_process([sys.executable, '-i', '-c', command], foreground=True)
+        return_code = run_process(
+            args_to_run,
+            foreground = True,
+            env = env_dict,
+        )
     except KeyboardInterrupt:
         return_code = 1
     return return_code == 0, (

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/meerschaum/actions/start.py

@@ -333,8 +333,7 @@ def _start_gui(
     from meerschaum.connectors.parse import parse_instance_keys
     from meerschaum._internal.term.tools import is_webterm_running
     import platform
-    webview = attempt_import('webview')
-    requests = attempt_import('requests')
+    webview, requests = attempt_import('webview', 'requests')
     import json
     import time
 
@@ -365,7 +364,7 @@ def _start_gui(
     base_url = 'http://' + api_kw['host'] + ':' + str(api_kw['port'])
 
     process = venv_exec(
-        start_tornado_code, as_proc=True, venv=None, debug=debug, capture_output=(not debug)
+        start_tornado_code, as_proc=True, debug=debug, capture_output=(not debug)
     )
     timeout = 10
     start = time.perf_counter()
@@ -446,7 +445,6 @@ def _start_webterm(
                 + "    Include `-f` to start another server on a new port\n"
                 + "    or specify a different port with `-p`."
             )
-
     if not nopretty:
         info(f"Starting the webterm at http://{host}:{port} ...\n    Press CTRL+C to quit.")
     tornado_app.listen(port, host)

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/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.2rc2}/meerschaum/api/__init__.py

@@ -31,6 +31,7 @@ CHECK_UPDATE = os.environ.get(STATIC_CONFIG['environment']['runtime'], None) !=
 
 endpoints = STATIC_CONFIG['api']['endpoints']
 
+uv = attempt_import('uv', lazy=False, check_update=CHECK_UPDATE)
 (
     fastapi,
     aiofiles,

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/meerschaum/api/dash/components.py

@@ -12,7 +12,7 @@ from meerschaum.utils.packages import attempt_import, import_dcc, import_html
 from meerschaum.utils.typing import SuccessTuple, List
 from meerschaum.config.static import STATIC_CONFIG
 from meerschaum.utils.misc import remove_ansi
-from meerschaum.actions import get_shell
+from meerschaum._internal.shell.Shell import get_shell_intro
 from meerschaum.api import endpoints, CHECK_UPDATE
 from meerschaum.connectors import instance_types
 from meerschaum.utils.misc import get_connector_labels
@@ -69,7 +69,10 @@ bottom_buttons_content = dbc.Card(
         ])
     )
 )
-console_div = html.Div(id='console-div', children=[html.Pre(get_shell().intro, id='console-pre')])
+console_div = html.Div(
+    id = 'console-div',
+    children = [html.Pre(get_shell_intro(), id='console-pre')],
+)
 
 location = dcc.Location(id='location', refresh=False)
 

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/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.2rc2}/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.2rc2}/meerschaum/config/_version.py

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

meerschaum-2.2.2rc2/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.2rc2}/meerschaum/config/static/__init__.py

@@ -110,7 +110,7 @@ STATIC_CONFIG: Dict[str, Any] = {
                 'pbkdf2_sha256',
             ],
             'default': 'pbkdf2_sha256',
-            'pbkdf2_sha256__default_rounds': 3_000_000,
+            'pbkdf2_sha256__default_rounds': 1_000_000,
         },
         'min_username_length': 1,
         'max_username_length': 26,

{meerschaum-2.2.1 → meerschaum-2.2.2rc2}/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):