meerschaum 2.2.2rc1__tar.gz → 2.2.2rc2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.2rc1
+Version: 2.2.2rc2
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

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

@@ -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,6 +385,7 @@ def _api_start(
                     )
                     for k, v in env_dict.items()
                 },
+                venv = 'mrsm',
                 debug = debug,
             )
         except KeyboardInterrupt:

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

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

{meerschaum-2.2.2rc1 → 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.2rc1 → meerschaum-2.2.2rc2}/meerschaum/utils/packages/__init__.py

@@ -46,6 +46,8 @@ def get_module_path(
     """
     Get a module's path without importing.
     """
+    import site
+    import pathlib
     if debug:
         from meerschaum.utils.debug import dprint
     if not _try_install_name_on_fail:
@@ -54,33 +56,52 @@ 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)
         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]
@@ -791,10 +812,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,7 +839,7 @@ 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:
@@ -853,7 +881,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,
@@ -1669,6 +1697,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
 

{meerschaum-2.2.2rc1 → meerschaum-2.2.2rc2}/meerschaum/utils/process.py

@@ -147,7 +147,6 @@ 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
-
     finally:
         if foreground:
             # we have to mask SIGTTOU because tcsetpgrp

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

@@ -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)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.2.2rc1
+Version: 2.2.2rc2
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares