meerschaum 2.2.2rc4__py3-none-any.whl → 2.2.3__py3-none-any.whl

meerschaum/_internal/term/__init__.py

@@ -32,7 +32,7 @@ def get_webterm_app_and_manager() -> Tuple[
     A tuple of the Tornado web application and term manager.
     """
     commands = [
-        venv_executable('mrsm'),
+        venv_executable(None),
         '-c',
         "import os; _ = os.environ.pop('COLUMNS', None); _ = os.environ.pop('LINES', None); "
         "from meerschaum._internal.entry import get_shell; "

meerschaum/actions/api.py

@@ -156,7 +156,6 @@ def _api_start(
     from meerschaum.config.static import STATIC_CONFIG, SERVER_ID
     from meerschaum.connectors.parse import parse_instance_keys
     from meerschaum.utils.pool import get_pool
-    from meerschaum.utils.venv import get_module_venv
     import shutil
     from copy import deepcopy
 
@@ -170,10 +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',
-        lazy = False,
-        check_update = False,
-        venv = 'mrsm',
+        'uvicorn', 'gunicorn', venv=None, lazy=False, check_update=False,
     )
 
     uvicorn_config_path = API_UVICORN_RESOURCES_PATH / SERVER_ID / 'config.json'
@@ -309,51 +305,19 @@ def _api_start(
     ### remove custom keys before calling uvicorn
 
     def _run_uvicorn():
-        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']
-        run_python_package(
-            'uvicorn',
-            uvicorn_args,
-            venv = get_module_venv(uvicorn),
-            as_proc = False,
-            foreground = True,
-            debug = debug,
-        )
+        try:
+            uvicorn.run(
+                **filter_keywords(
+                    uvicorn.run,
+                    **{
+                        k: v
+                        for k, v in uvicorn_config.items()
+                        if k not in custom_keys
+                    }
+                )
+            )
+        except KeyboardInterrupt:
+            pass
 
     def _run_gunicorn():
         gunicorn_args = [
@@ -374,21 +338,23 @@ def _api_start(
             ]
         if debug:
             gunicorn_args += ['--log-level=debug', '--enable-stdio-inheritance', '--reload']
-
-        run_python_package(
-            'gunicorn',
-            gunicorn_args,
-            env = {
-                k: (
-                    json.dumps(v)
-                    if isinstance(v, (dict, list))
-                    else v
-                )
-                for k, v in env_dict.items()
-            },
-            venv = get_module_venv(gunicorn),
-            debug = debug,
-        )
+        try:
+            run_python_package(
+                'gunicorn',
+                gunicorn_args,
+                env = {
+                    k: (
+                        json.dumps(v)
+                        if isinstance(v, (dict, list))
+                        else v
+                    )
+                    for k, v in env_dict.items()
+                },
+                venv = None,
+                debug = debug,
+            )
+        except KeyboardInterrupt:
+            pass
 
 
     _run_uvicorn() if not production else _run_gunicorn()

meerschaum/config/_version.py

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

meerschaum/utils/packages/__init__.py

@@ -841,7 +841,7 @@ def pip_install(
     except (ImportError, FileNotFoundError):
         uv_bin = None
         have_uv_pip = False
-    if have_pip and not have_uv_pip and _install_uv_pip:
+    if have_pip and not have_uv_pip and _install_uv_pip and not is_android():
         if not pip_install(
             'uv',
             venv = None,
@@ -860,7 +860,6 @@ def pip_install(
         venv_contains_package('uv', venv=None, debug=debug)
         and uv_bin is not None
         and venv is not None
-        and not is_android()
     )
 
     import sys

{meerschaum-2.2.2rc4.dist-info → meerschaum-2.2.3.dist-info}/METADATA

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

{meerschaum-2.2.2rc4.dist-info → meerschaum-2.2.3.dist-info}/RECORD

@@ -18,10 +18,10 @@ meerschaum/_internal/shell/ValidAutoSuggest.py,sha256=bARjOWMidz0dvMelLUe6yRPto5
 meerschaum/_internal/shell/__init__.py,sha256=vXQoQPEVlYiUYai1b5AwQAlTnja6A2cSABnqXhzlS7I,281
 meerschaum/_internal/shell/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/_internal/term/TermPageHandler.py,sha256=Rt5S47Pr_3HLJc8xIXpZUczYE_Dw2qT8qwf1jZFtUHQ,520
-meerschaum/_internal/term/__init__.py,sha256=c4Je3376Tj7Me2qldCxg_Xs2mGN-Mu1YAMIaAG6vK6w,1642
+meerschaum/_internal/term/__init__.py,sha256=LqTySBfHYnOtHGYCWfovcxV4FnZdON2BPYp0UbgI1QI,1640
 meerschaum/_internal/term/tools.py,sha256=dXVAimKD-Yv2fg2WOTr0YGBY7XDKjQqw-RizcS65YVI,727
 meerschaum/actions/__init__.py,sha256=7CNoKEqkqqafqMcChspJX9cR9OdgEWk9ggj0000Jl98,11360
-meerschaum/actions/api.py,sha256=7OTGfcu7CmOqplYJBdk3vCIFMPE_8QkEGRS_B-Ow9V0,14031
+meerschaum/actions/api.py,sha256=mWhv4bn3Ap17_Gqf2Cx9bAsHKG-Zhy072pBbNzHLEJc,12756
 meerschaum/actions/bootstrap.py,sha256=JnIyJ4odw6cA4e0Cw7J8THkLavMcj68nRyGsQDAT8nc,13396
 meerschaum/actions/clear.py,sha256=OoFZE0bK5m8s3GLNZcixuVT0DMj1izXVxGCATcmUGbI,4851
 meerschaum/actions/copy.py,sha256=8g3ANXfVdvuyaoXcZjgTg3BxHTOhHGrzVDOOsTBrpSU,6213
@@ -136,7 +136,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=s74cmJl8NrhM_Y1cB_P41_JDUYXV0g4WXnKFZWMtnrY,3551
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=gYnJG3bYcMuCYNVqci0er5eTN3nIjLXAyhoRFZIGnRI,74
+meerschaum/config/_version.py,sha256=gP1cQDqMS3FhQGvMzz2yo7hBI_-e9-bZoGXa-wFMNBI,71
 meerschaum/config/paths.py,sha256=Z7vaOunaEJbVFXiSSz4IthhNOQDI-dhtpi5TpSyrcXg,206
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=c_WdTSejVdj8lqSE_pK5MhIBkHoftiZWDuEuB9dmk2I,9007
@@ -225,16 +225,16 @@ meerschaum/utils/formatting/_jobs.py,sha256=s1lVcdMkzNj5Bqw-GsUhcguUFtahi5nQ-kg1
 meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZvAQAqef4A,19492
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
 meerschaum/utils/formatting/_shell.py,sha256=ox75O7VHDAiwzSvdMSJZhXLadvAqYJVeihU6WeZ2Ogc,3677
-meerschaum/utils/packages/__init__.py,sha256=Lg_RavlKui150iDmqFy900coiWB4zx4KTXErq-kqs48,62636
+meerschaum/utils/packages/__init__.py,sha256=6zRX0g8Kh-wHjvkbiMf_kLKM2BlR5FJUCA3JStX9YeU,62628
 meerschaum/utils/packages/_packages.py,sha256=kWoo1KWvpQgR3rY_rpHzvGIh14BBFH92Erw5UtW7yX0,7918
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=4vFAu85lQ5GYEVhc6e_KhFmrks4t_Ma6ysmtraccYbs,24187
-meerschaum-2.2.2rc4.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.2.2rc4.dist-info/METADATA,sha256=Lca_cfI6M5ToHKZKKRjh7TXCnnnnFZovIy2JFY7N-UE,23988
-meerschaum-2.2.2rc4.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.2.2rc4.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-meerschaum-2.2.2rc4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.2.2rc4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.2.2rc4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.2.2rc4.dist-info/RECORD,,
+meerschaum-2.2.3.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.2.3.dist-info/METADATA,sha256=-k8RV4yb88KjD8OtoCcYcCcR08FzI6iw9ELFC0CpOYk,23985
+meerschaum-2.2.3.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.2.3.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+meerschaum-2.2.3.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.2.3.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.2.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.2.3.dist-info/RECORD,,