meerschaum 3.0.0rc8__tar.gz → 3.0.1__tar.gz

{meerschaum-3.0.0rc8/meerschaum.egg-info → meerschaum-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.0rc8
+Version: 3.0.1
 Summary: Sync Time-Series Pipes with Meerschaum
 Author-email: Bennett Meares <bennett.meares@gmail.com>
 Maintainer-email: Bennett Meares <bennett.meares@gmail.com>
@@ -134,7 +134,7 @@ Requires-Dist: partd>=1.4.2; extra == "sql"
 Requires-Dist: pytz; extra == "sql"
 Requires-Dist: joblib>=1.5.1; extra == "sql"
 Requires-Dist: SQLAlchemy>=2.0.41; extra == "sql"
-Requires-Dist: GeoAlchemy2>=0.17.1; extra == "sql"
+Requires-Dist: GeoAlchemy2>=0.18.0; extra == "sql"
 Requires-Dist: databases>=0.9.0; extra == "sql"
 Requires-Dist: aiosqlite>=0.21.0; extra == "sql"
 Requires-Dist: asyncpg>=0.30.0; extra == "sql"
@@ -201,7 +201,7 @@ Requires-Dist: partd>=1.4.2; extra == "api"
 Requires-Dist: pytz; extra == "api"
 Requires-Dist: joblib>=1.5.1; extra == "api"
 Requires-Dist: SQLAlchemy>=2.0.41; extra == "api"
-Requires-Dist: GeoAlchemy2>=0.17.1; extra == "api"
+Requires-Dist: GeoAlchemy2>=0.18.0; extra == "api"
 Requires-Dist: databases>=0.9.0; extra == "api"
 Requires-Dist: aiosqlite>=0.21.0; extra == "api"
 Requires-Dist: asyncpg>=0.30.0; extra == "api"
@@ -316,7 +316,7 @@ Requires-Dist: partd>=1.4.2; extra == "full"
 Requires-Dist: pytz; extra == "full"
 Requires-Dist: joblib>=1.5.1; extra == "full"
 Requires-Dist: SQLAlchemy>=2.0.41; extra == "full"
-Requires-Dist: GeoAlchemy2>=0.17.1; extra == "full"
+Requires-Dist: GeoAlchemy2>=0.18.0; extra == "full"
 Requires-Dist: databases>=0.9.0; extra == "full"
 Requires-Dist: aiosqlite>=0.21.0; extra == "full"
 Requires-Dist: asyncpg>=0.30.0; extra == "full"

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/_internal/cli/workers.py

@@ -90,7 +90,7 @@ class ActionWorker:
         """
         Return the job associated with this worker.
         """
-        from meerschaum.config.paths import CLI_LOGS_RESOURCES_PATH, CLI_RESOURCES_PATH
+        from meerschaum.config.paths import CLI_LOGS_RESOURCES_PATH, PACKAGE_ROOT_PATH
         log_path = CLI_LOGS_RESOURCES_PATH / f'cli.{self.ix}.worker.log'
 
         return Job(
@@ -108,7 +108,7 @@ class ActionWorker:
                     'redirect_streams': True,
                     'lines_to_show': 0,
                 },
-                'cwd': CLI_RESOURCES_PATH.as_posix(),
+                'cwd': PACKAGE_ROOT_PATH.parent.as_posix(),
             },
         )
 

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/_internal/entry.py

@@ -62,6 +62,7 @@ def entry(
     A `SuccessTuple` indicating success.
     """
     start = time.perf_counter()
+    from meerschaum.config.environment import get_daemon_env_vars
     sysargs_list = shlex.split(sysargs) if isinstance(sysargs, str) else sysargs
     if (
         not _use_cli_daemon
@@ -69,6 +70,7 @@ def entry(
         or '--no-daemon' in sysargs_list
         or '--daemon' in sysargs_list
         or '-d' in sysargs_list
+        or get_daemon_env_vars()
         or not mrsm.get_config('system', 'experimental', 'cli_daemon')
     ):
         success, msg = entry_without_daemon(sysargs, _patch_args=_patch_args)

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/_internal/term/__init__.py

@@ -40,23 +40,16 @@ def get_webterm_app_and_manager(
     -------
     A tuple of the Tornado web application and term manager.
     """
-    from meerschaum.config.environment import get_env_vars
-    from meerschaum._internal.static import STATIC_CONFIG
+    from meerschaum.config.environment import get_env_vars, get_daemon_env_vars
     if env_path is None:
         from meerschaum.config.paths import WEBTERM_INTERNAL_RESOURCES_PATH
         env_path = WEBTERM_INTERNAL_RESOURCES_PATH / (str(port) + '.json')
 
-    env_vars = get_env_vars()
+    daemon_env_vars = get_daemon_env_vars()
     env_dict = {
-        env_var: os.environ[env_var]
-        for env_var in env_vars
-        if env_var not in (
-            STATIC_CONFIG['environment']['systemd_log_path'],
-            STATIC_CONFIG['environment']['systemd_result_path'],
-            STATIC_CONFIG['environment']['systemd_delete_job'],
-            STATIC_CONFIG['environment']['systemd_stdin_path'],
-            STATIC_CONFIG['environment']['daemon_id'],
-        )
+        env_var: env_val
+        for env_var, env_val in get_env_vars().items()
+        if env_var not in daemon_env_vars
     }
     with open(env_path, 'w+', encoding='utf-8') as f:
         json.dump(env_dict, f)

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/actions/api.py

@@ -173,7 +173,7 @@ def _api_start(
         ROOT_DIR_PATH,
     )
     from meerschaum.config._patch import apply_patch_to_config
-    from meerschaum.config.environment import get_env_vars
+    from meerschaum.config.environment import get_env_vars, get_daemon_env_vars
     from meerschaum._internal.static import STATIC_CONFIG, SERVER_ID
     from meerschaum.connectors.parse import parse_instance_keys
     from meerschaum.utils.pool import get_pool
@@ -335,11 +335,17 @@ def _api_start(
             )
         ),
         'HOSTNAME': os.environ.get('HOSTNAME', 'api'),
+        'XDG_RUNTIME_DIR': os.environ.get('XDG_RUNTIME_DIR', ''),
+        'DBUS_SESSION_BUS_ADDRESS': os.environ.get('DBUS_SESSION_BUS_ADDRESS', ''),
     })
-    for env_var in get_env_vars():
-        if env_var in env_dict:
-            continue
-        env_dict[env_var] = os.environ[env_var]
+
+    daemon_env_vars = get_daemon_env_vars()
+    env_vars = {
+        env_var: env_val
+        for env_var, env_val in get_env_vars().items()
+        if env_var not in daemon_env_vars and env_var not in env_dict
+    }
+    env_dict.update(env_vars)
 
     env_dict[MRSM_CONFIG] = apply_patch_to_config(
         env_dict.get(MRSM_CONFIG, {}),

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/actions/start.py

@@ -94,6 +94,7 @@ def _start_jobs(
     sysargs: Optional[List[str]] = None,
     executor_keys: Optional[str] = None,
     rm: bool = False,
+    line: Optional[str] = None,
     debug: bool = False,
     **kw
 ) -> SuccessTuple:
@@ -125,6 +126,7 @@ def _start_jobs(
           - `start job --name happy_seal`
                 Start the job 'happy_seal' but via the `--name` flag.
     """
+    import shlex
     from meerschaum.utils.warnings import warn, info
     from meerschaum.utils.daemon._names import get_new_daemon_name
     from meerschaum.jobs import (
@@ -215,7 +217,29 @@ def _start_jobs(
 
     def _run_new_job(name: Optional[str] = None):
         name = name or get_new_daemon_name()
-        job = Job(name, sysargs, executor_keys=executor_keys, delete_after_completion=rm)
+        if len(sysargs or []) >= 2 and sysargs[0] == 'start' and sysargs[1].startswith('job'):
+            return (False, "Create a new job with `-d` / `--daemon`."), name
+
+        job_sysargs = (
+            shlex.join([a for a in sysargs if a not in ('-d', '--daemon')])
+            if not line
+            else line
+        )
+        job = Job(name, job_sysargs, executor_keys=executor_keys, delete_after_completion=rm)
+
+        if not job.exists():
+            try:
+                confirm = yes_no(
+                    f"Create new job '{name}'?\n    {job_sysargs}\n",
+                    default='y',
+                    yes=kw.get('yes', False),
+                    noask=kw.get('noask', False),
+                )
+            except Exception:
+                confirm = True
+            if not confirm:
+                return (False, "Nothing changed."), name
+
         return job.start(debug=debug), name
 
     def _run_existing_job(name: str):
@@ -288,6 +312,7 @@ def _start_jobs(
             if new_job
             else _run_existing_job(_name)
         )
+
         if not kw.get('nopretty', False):
             print_tuple(success_tuple)
 
@@ -303,7 +328,10 @@ def _start_jobs(
         + ("Failed to start job" + ("s" if len(_failures) != 1 else '')
             + f" {items_str(_failures)}." if _failures else '')
     )
-    _install_healthcheck_job()
+    if not msg:
+        msg = "Nothing changed."
+    else:
+        _install_healthcheck_job()
     return len(_failures) == 0, msg
 
 

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/api/dash/callbacks/custom.py

@@ -7,7 +7,6 @@ Import custom callbacks created by plugins.
 """
 
 import traceback
-from typing import Any, Dict
 
 from meerschaum.api.dash import dash_app
 from meerschaum.plugins import _dash_plugins, _plugin_endpoints_to_pages
@@ -47,6 +46,8 @@ def add_plugin_pages(debug: bool = False):
                 else:
                     page_layout = [pages_navbar, page_layout]
             _pages[_page_dict['page_key']] = _endpoint
+            if not _endpoint.lstrip('/').startswith('dash'):
+                _endpoint = '/dash/' + _endpoint.lstrip('/')
             _paths[_endpoint] = page_layout
             if _page_dict['login_required']:
                 _required_login.add(_endpoint)

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/api/dash/callbacks/dashboard.py

@@ -99,16 +99,15 @@ omit_actions = {
 
 ### Map endpoints to page layouts.
 _paths = {
-    'login'   : pages.login.layout,
-    ''        : pages.dashboard.layout,
-    'pipes'   : pages.pipes.layout,
-    'plugins' : pages.plugins.layout,
-    'tokens'  : pages.tokens.layout,
-    'register': pages.register.layout,
-    'pipes'   : pages.pipes.layout,
-    'jobs'    : pages.jobs.layout,
+    '/dash/login'   : pages.login.layout,
+    '/dash'         : pages.dashboard.layout,
+    '/dash/plugins' : pages.plugins.layout,
+    '/dash/tokens'  : pages.tokens.layout,
+    '/dash/register': pages.register.layout,
+    '/dash/pipes'   : pages.pipes.layout,
+    '/dash/jobs'    : pages.jobs.layout,
 }
-_required_login = {'', 'tokens', 'jobs', 'pipes'}
+_required_login = {'', '/dash', '/dash/', '/dash/tokens', '/dash/jobs', '/dash/pipes'}
 _pages = {
     'Web Console': '/dash/',
     'Pipes': '/dash/pipes',
@@ -145,7 +144,6 @@ def update_page_layout_div(
     -------
     A tuple of the page layout and new session store data.
     """
-    dash_endpoint = endpoints['dash']
     try:
         session_id = session_store_data.get('session-id', None)
     except AttributeError:
@@ -162,18 +160,9 @@ def update_page_layout_div(
     else:
         session_store_to_return = dash.no_update
 
-    base_path = (
-        pathname.rstrip('/') + '/'
-    ).replace(
-        (dash_endpoint + '/'),
-        ''
-    ).rstrip('/').split('/')[0]
-
+    base_path = '/'.join(pathname.split('/')[:2])
     complete_path = (
         pathname.rstrip('/') + '/'
-    ).replace(
-        dash_endpoint + '/',
-        ''
     ).rstrip('/')
 
     if complete_path in _paths:
@@ -181,14 +170,14 @@ def update_page_layout_div(
     elif base_path in _paths:
         path_str = base_path
     else:
-        path_str = ''
+        path_str = '/dash'
 
     path = (
         path_str
         if no_auth or path_str not in _required_login else (
             path_str
             if is_session_active(session_id)
-            else 'login'
+            else '/dash/login'
         )
     )
     layout = _paths.get(path, pages.error.layout)

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/config/_default.py

@@ -129,12 +129,14 @@ default_system_config = {
             'edit',
             'start daemon',
             'start job',
+            'stop job',
+            'delete job',
             'stop daemon',
             'show daemon',
             'restart daemon',
             'reload',
             'start worker',
-            'start job',
+            'show log',
             'python',
             'login',
             'executor',

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "3.0.0rc8"
+__version__ = "3.0.1"

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/config/environment.py

@@ -162,13 +162,37 @@ def apply_connector_uri(env_var: str, env: Optional[Dict[str, Any]] = None) -> N
     )
 
 
-def get_env_vars(env: Optional[Dict[str, Any]] = None) -> List[str]:
+def get_env_vars(env: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
     """
     Return all environment variables which begin with `'MRSM_'`.
     """
     prefix = STATIC_CONFIG['environment']['prefix']
     env = env if env is not None else os.environ
-    return sorted([env_var for env_var in env if env_var.startswith(prefix)])
+    return {
+        env_var: env_val
+        for env_var, env_val in env.items()
+        if env_var.startswith(prefix)
+    }
+
+
+def get_daemon_env_vars(env: Optional[Dict[str, Any]] = None) -> Dict[str, str]:
+    """
+    Return the daemon-specific environment vars in the current environment.
+    """
+    env = env if env is not None else os.environ
+
+    daemon_env_var_names = (
+        STATIC_CONFIG['environment']['systemd_log_path'],
+        STATIC_CONFIG['environment']['systemd_result_path'],
+        STATIC_CONFIG['environment']['systemd_delete_job'],
+        STATIC_CONFIG['environment']['systemd_stdin_path'],
+        STATIC_CONFIG['environment']['daemon_id'],
+    )
+    return {
+        env_var: env.get(env_var, '')
+        for env_var in daemon_env_var_names
+        if env_var in env
+    }
 
 
 @contextlib.contextmanager

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/connectors/sql/_create_engine.py

@@ -23,9 +23,9 @@ install_flavor_drivers = {
     'mysql': ['pymysql'],
     'mariadb': ['pymysql'],
     'timescaledb': ['psycopg'],
-    'timescaledb-ha': ['psycopg', 'geoalchemy'],
+    'timescaledb-ha': ['psycopg', 'geoalchemy2'],
     'postgresql': ['psycopg'],
-    'postgis': ['psycopg', 'geoalchemy'],
+    'postgis': ['psycopg', 'geoalchemy2'],
     'citus': ['psycopg'],
     'cockroachdb': ['psycopg', 'sqlalchemy_cockroachdb', 'sqlalchemy_cockroachdb.psycopg'],
     'mssql': ['pyodbc'],

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/connectors/sql/_pipes.py

@@ -280,22 +280,19 @@ def fetch_pipes_keys(
 
     ors, nands = [], []
     if self.flavor in json_flavors:
+        tags_jsonb = pipes_tbl.c['parameters'].cast(JSONB).op('->')('tags').cast(JSONB)
         for _in_tags, _ex_tags in in_ex_tag_groups:
             if _in_tags:
                 ors.append(
                     sqlalchemy.and_(
-                        pipes_tbl.c['parameters']['tags'].cast(
-                            JSONB
-                        ).contains(_in_tags)
+                        tags_jsonb.contains(_in_tags)
                     )
                 )
             for xt in _ex_tags:
                 nands.append(
                     sqlalchemy.not_(
                         sqlalchemy.and_(
-                            pipes_tbl.c['parameters']['tags'].cast(
-                                JSONB
-                            ).contains([xt])
+                            tags_jsonb.contains([xt])
                         )
                     )
                 )

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/plugins/__init__.py

@@ -234,6 +234,8 @@ def web_page(
             page_str = _func.__name__
 
         page_str = page_str.lstrip('/').rstrip('/').strip()
+        if not page_str.startswith('dash'):
+            page_str = f'/dash/{page_str}'
         page_key = (
             ' '.join(
                 [

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/utils/packages/__init__.py

@@ -652,7 +652,9 @@ def need_update(
     if required_version:
         semver_path = get_module_path('semver', debug=debug)
         if semver_path is None:
-            pip_install(_import_to_install_name('semver'), debug=debug)
+            no_venv_semver_path = get_module_path('semver', venv=None, debug=debug)
+            if no_venv_semver_path is None:
+                pip_install(_import_to_install_name('semver'), debug=debug)
         semver = attempt_import('semver', check_update=False, lazy=False, debug=debug)
     if check_pypi:
         ### Check PyPI for updates

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum/utils/packages/_packages.py

@@ -146,7 +146,7 @@ packages['sql'] = {
     'pytz'                           : 'pytz',
     'joblib'                         : 'joblib>=1.5.1',
     'sqlalchemy'                     : 'SQLAlchemy>=2.0.41',
-    'geoalchemy'                     : 'GeoAlchemy2>=0.17.1',
+    'geoalchemy2'                    : 'GeoAlchemy2>=0.18.0',
     'databases'                      : 'databases>=0.9.0',
     'aiosqlite'                      : 'aiosqlite>=0.21.0',
     'asyncpg'                        : 'asyncpg>=0.30.0',

{meerschaum-3.0.0rc8 → meerschaum-3.0.1/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 3.0.0rc8
+Version: 3.0.1
 Summary: Sync Time-Series Pipes with Meerschaum
 Author-email: Bennett Meares <bennett.meares@gmail.com>
 Maintainer-email: Bennett Meares <bennett.meares@gmail.com>
@@ -134,7 +134,7 @@ Requires-Dist: partd>=1.4.2; extra == "sql"
 Requires-Dist: pytz; extra == "sql"
 Requires-Dist: joblib>=1.5.1; extra == "sql"
 Requires-Dist: SQLAlchemy>=2.0.41; extra == "sql"
-Requires-Dist: GeoAlchemy2>=0.17.1; extra == "sql"
+Requires-Dist: GeoAlchemy2>=0.18.0; extra == "sql"
 Requires-Dist: databases>=0.9.0; extra == "sql"
 Requires-Dist: aiosqlite>=0.21.0; extra == "sql"
 Requires-Dist: asyncpg>=0.30.0; extra == "sql"
@@ -201,7 +201,7 @@ Requires-Dist: partd>=1.4.2; extra == "api"
 Requires-Dist: pytz; extra == "api"
 Requires-Dist: joblib>=1.5.1; extra == "api"
 Requires-Dist: SQLAlchemy>=2.0.41; extra == "api"
-Requires-Dist: GeoAlchemy2>=0.17.1; extra == "api"
+Requires-Dist: GeoAlchemy2>=0.18.0; extra == "api"
 Requires-Dist: databases>=0.9.0; extra == "api"
 Requires-Dist: aiosqlite>=0.21.0; extra == "api"
 Requires-Dist: asyncpg>=0.30.0; extra == "api"
@@ -316,7 +316,7 @@ Requires-Dist: partd>=1.4.2; extra == "full"
 Requires-Dist: pytz; extra == "full"
 Requires-Dist: joblib>=1.5.1; extra == "full"
 Requires-Dist: SQLAlchemy>=2.0.41; extra == "full"
-Requires-Dist: GeoAlchemy2>=0.17.1; extra == "full"
+Requires-Dist: GeoAlchemy2>=0.18.0; extra == "full"
 Requires-Dist: databases>=0.9.0; extra == "full"
 Requires-Dist: aiosqlite>=0.21.0; extra == "full"
 Requires-Dist: asyncpg>=0.30.0; extra == "full"

{meerschaum-3.0.0rc8 → meerschaum-3.0.1}/meerschaum.egg-info/requires.txt

@@ -19,7 +19,7 @@ partd>=1.4.2
 pytz
 joblib>=1.5.1
 SQLAlchemy>=2.0.41
-GeoAlchemy2>=0.17.1
+GeoAlchemy2>=0.18.0
 databases>=0.9.0
 aiosqlite>=0.21.0
 asyncpg>=0.30.0
@@ -234,7 +234,7 @@ partd>=1.4.2
 pytz
 joblib>=1.5.1
 SQLAlchemy>=2.0.41
-GeoAlchemy2>=0.17.1
+GeoAlchemy2>=0.18.0
 databases>=0.9.0
 aiosqlite>=0.21.0
 asyncpg>=0.30.0
@@ -288,7 +288,7 @@ partd>=1.4.2
 pytz
 joblib>=1.5.1
 SQLAlchemy>=2.0.41
-GeoAlchemy2>=0.17.1
+GeoAlchemy2>=0.18.0
 databases>=0.9.0
 aiosqlite>=0.21.0
 asyncpg>=0.30.0