meerschaum 2.7.9__py3-none-any.whl → 2.8.0__py3-none-any.whl

meerschaum/_internal/arguments/_parser.py

@@ -302,14 +302,17 @@ groups['sync'].add_argument(
     help="Run the action asynchronously, if possible. Alias for --unblock",
 )
 groups['sync'].add_argument(
-    '--begin', type=parse_datetime, help="Specify a begin datetime for syncing or displaying data."
+    '--begin', type=parse_datetime, help="The begin datetime when syncing, fetching data."
 )
 groups['sync'].add_argument(
-    '--end', type=parse_datetime, help="Specify an end datetime for syncing or displaying data."
+    '--end', type=parse_datetime, help="The end datetime when syncing, fetching data."
 )
 groups['sync'].add_argument(
-    '--chunksize', type=int, help=(
-        "Specify the database chunksize. Defaults to 100,000."
+    '--chunksize', type=int, help="How many rows per chunk. Defaults to 100,000."
+)
+groups['sync'].add_argument(
+    '--batchsize', type=int, help=(
+        "How many chunks to process in parallel. Defaults to number of CPUs."
     ),
 )
 groups['sync'].add_argument(
@@ -355,9 +358,18 @@ groups['sync'].add_argument(
         "This improves performance when all rows are expected to already be of the correct type."
     ),
 )
+groups['sync'].add_argument(
+    '--skip-chunks-with-greater-rowcounts', action='store_true',
+    help="When verifying, skip chunks with rowcounts greater than the remote's."
+)
+groups['sync'].add_argument(
+    '--check-rowcounts-only', action='store_true', help=(
+        "Only compare row-counts when verifying pipes."
+    ),
+)
 groups['sync'].add_argument(
     '--cache', action='store_true',
-    help = (
+    help=(
         "When syncing or viewing a pipe's data, sync to a local database for later analysis."
     )
 )

meerschaum/_internal/term/TermPageHandler.py

@@ -32,7 +32,7 @@ class TermPageHandler(tornado_web.RequestHandler):
         return self.render(
             "termpage.html",
             static=self.static_url,
-            ws_url_path=f"/_websocket/{term_name}",
+            ws_url_path=f"/websocket/{term_name}",
         )
 
 

meerschaum/_internal/term/__init__.py

@@ -51,7 +51,7 @@ def get_webterm_app_and_manager(
     term_manager = terminado.NamedTermManager(shell_command=commands)
     handlers = [
         (
-            r"/_websocket/(.+)/?",
+            r"/websocket/(.+)/?",
             CustomTermSocket,
             {'term_manager': term_manager}
         ),

meerschaum/actions/api.py

@@ -140,16 +140,28 @@ def _api_start(
         If provided, serve over HTTPS with this certfile.
         Requires `--keyfile`.
     """
+    import json
+    import sys
+    import shutil
+    import pathlib
+    from copy import deepcopy
+
     from meerschaum.utils.packages import (
-        attempt_import, venv_contains_package, pip_install, run_python_package
+        attempt_import,
+        venv_contains_package,
+        pip_install,
+        run_python_package,
     )
     from meerschaum.utils.misc import is_int, filter_keywords
+    from meerschaum.utils.dtypes import json_serialize_value
     from meerschaum.utils.formatting import pprint, ANSI, _init
     from meerschaum.utils.debug import dprint
     from meerschaum.utils.warnings import error, warn
     from meerschaum.config import get_config, _config
     from meerschaum.config._paths import (
-        API_UVICORN_RESOURCES_PATH, API_UVICORN_CONFIG_PATH, CACHE_RESOURCES_PATH,
+        API_UVICORN_RESOURCES_PATH,
+        API_UVICORN_CONFIG_PATH,
+        CACHE_RESOURCES_PATH,
         PACKAGE_ROOT_PATH,
     )
     from meerschaum.config._patch import apply_patch_to_config
@@ -157,8 +169,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
-    import shutil
-    from copy import deepcopy
 
     if action is None:
         action = []
@@ -256,7 +266,6 @@ def _api_start(
     custom_keys = ['mrsm_instance', 'no_dash', 'no_auth', 'private', 'debug', 'production']
 
     ### write config to a temporary file to communicate with uvicorn threads
-    import json, sys
     try:
         if uvicorn_config_path.exists():
             os.remove(uvicorn_config_path)
@@ -275,12 +284,25 @@ def _api_start(
     MRSM_RUNTIME = STATIC_CONFIG['environment']['runtime']
     MRSM_PATCH = STATIC_CONFIG['environment']['patch']
     MRSM_ROOT_DIR = STATIC_CONFIG['environment']['root']
-    env_dict = {
+    env_dict = {}
+    env_dict.update({
         MRSM_SERVER_ID: SERVER_ID,
         MRSM_RUNTIME: 'api',
         MRSM_CONFIG: json.loads(os.environ.get(MRSM_CONFIG, '{}')),
         'FORWARDED_ALLOW_IPS': forwarded_allow_ips,
-    }
+        'TERM': os.environ.get('TERM', 'screen-256color'),
+        'SHELL': os.environ.get('SHELL', '/bin/bash'),
+        'LANG': os.environ.get('LANG', 'C.UTF-8'),
+        'HOME': os.environ.get('HOME', pathlib.Path.home().as_posix()),
+        'PATH': os.environ.get(
+            'PATH',
+            (
+                '/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin:'
+                f'{pathlib.Path.home().as_posix().rstrip("/")}/.local/bin'
+            )
+        ),
+        'HOSTNAME': os.environ.get('HOSTNAME', 'api'),
+    })
     for env_var in get_env_vars():
         if env_var in env_dict:
             continue
@@ -294,10 +316,10 @@ def _api_start(
     env_text = ''
     for key, val in env_dict.items():
         value = str(
-            json.dumps(val)
+            json.dumps(val, default=json_serialize_value)
             if isinstance(val, (dict))
             else val
-        ).replace('\\', '\\\\')
+        ).replace('\\', '\\\\').replace("'", "'\\''")
         env_text += f"{key}='{value}'\n"
     with open(uvicorn_env_path, 'w+', encoding='utf-8') as f:
         if debug:
@@ -329,7 +351,11 @@ def _api_start(
         for key, val in env_dict.items():
             gunicorn_args += [
                 '--env', key + "="
-                + (json.dumps(val) if isinstance(val, (dict, list)) else val)
+                + (
+                    json.dumps(val, default=json_serialize_value)
+                    if isinstance(val, (dict, list))
+                    else val
+                )
             ]
         if workers is not None:
             gunicorn_args += ['--workers', str(workers)]

meerschaum/actions/copy.py

@@ -70,6 +70,7 @@ def _copy_pipes(
     Copy pipes' attributes and make new pipes.
     """
     from meerschaum import get_pipes, Pipe
+    from meerschaum.connectors import instance_types
     from meerschaum.utils.prompt import prompt, yes_no, get_connectors_completer
     from meerschaum.utils.warnings import warn
     from meerschaum.utils.formatting import print_tuple
@@ -92,7 +93,8 @@ def _copy_pipes(
 
         instance_keys = prompt(
             f"Meerschaum instance for copy of {pipe}:",
-            default=pipe.instance_keys
+            default=pipe.instance_keys,
+            completer=get_connectors_completer(*instance_types),
         )
         new_pipe = Pipe(
             ck, mk, lk,

meerschaum/actions/index.py

@@ -48,7 +48,7 @@ def _index_pipes(
 
     for pipe in pipes:
         info(f"Creating indices for {pipe}...")
-        index_success, index_msg = pipe.create_indices(debug=debug)
+        index_success, index_msg = pipe.create_indices(columns=(action or None), debug=debug)
         success_dict[pipe] = index_msg
         if index_success:
             successes += 1

meerschaum/actions/show.py

@@ -442,7 +442,7 @@ def _show_rowcounts(
 
     msgs = []
     for p, rc in rc_dict.items():
-        msgs.append(f'{p}\n{rc}\n')
+        msgs.append(f'{p}\n{rc:,}\n')
 
     header = "Remote row-counts:" if remote else "Pipe row-counts:"
 
@@ -581,10 +581,10 @@ def _show_jobs(
             from meerschaum.utils.warnings import info
             info('No running or stopped jobs.')
             print(
-                f"    You can start a background job with `-d` or `--daemon`,\n" +
-                "    or run the command `start job` before action commands.\n\n" +
-                "    Examples:\n" +
-                "      - start api -d\n" +
+                "    You can start a background job with `-d` or `--daemon`,\n"
+                "    or run the command `start job` before action commands.\n\n"
+                "    Examples:\n"
+                "      - start api -d\n"
                 "      - start job sync pipes --loop"
             )
         return True, "No jobs to show."
@@ -610,7 +610,7 @@ def _show_logs(
         `show logs --nopretty`
         `show logs myjob myotherjob`
     """
-    import os, pathlib, random, asyncio
+    import asyncio
     from functools import partial
     from datetime import datetime, timezone
     from meerschaum.utils.packages import attempt_import, import_rich
@@ -676,7 +676,7 @@ def _show_logs(
         try:
             line_timestamp = datetime.strptime(date_prefix_str, timestamp_format)
             previous_line_timestamp = line_timestamp
-        except Exception as e:
+        except Exception:
             line_timestamp = None
         if line_timestamp:
             line = line[(len(now_str) + 3):]

meerschaum/actions/sync.py

@@ -49,6 +49,7 @@ def _pipes_lap(
     deduplicate: bool = False,
     bounded: Optional[bool] = None,
     chunk_interval: Union[timedelta, int, None] = None,
+    check_rowcounts_only: bool = False,
     mrsm_instance: Optional[str] = None,
     timeout_seconds: Optional[int] = None,
     nopretty: bool = False,
@@ -93,6 +94,7 @@ def _pipes_lap(
         'deduplicate': deduplicate,
         'bounded': bounded,
         'chunk_interval': chunk_interval,
+        'check_rowcounts_only': check_rowcounts_only,
     })
     locks = {'remaining_count': Lock(), 'results_dict': Lock(), 'pipes_threads': Lock(),}
     pipes = get_pipes(
@@ -254,6 +256,7 @@ def _sync_pipes(
     deduplicate: bool = False,
     bounded: Optional[bool] = None,
     chunk_interval: Union[timedelta, int, None] = None,
+    check_rowcounts_only: bool = False,
     shell: bool = False,
     nopretty: bool = False,
     debug: bool = False,
@@ -308,6 +311,7 @@ def _sync_pipes(
                     deduplicate=deduplicate,
                     bounded=bounded,
                     chunk_interval=chunk_interval,
+                    check_rowcounts_only=check_rowcounts_only,
                     unblock=unblock,
                     debug=debug,
                     nopretty=nopretty,
@@ -447,7 +451,7 @@ def _wrap_pipe(
                 sync_hook_result = sync_hook(pipe, **filter_keywords(sync_hook, **sync_kwargs))
                 if is_success_tuple(sync_hook_result):
                     return sync_hook_result
-            except Exception as e:
+            except Exception:
                 msg = (
                     f"Failed to execute sync hook '{sync_hook.__name__}' "
                     + f"from plugin '{plugin}':\n{traceback.format_exc()}"

meerschaum/actions/verify.py

@@ -7,7 +7,9 @@ Verify the states of pipes, pacakages, and more.
 """
 
 from __future__ import annotations
-from meerschaum.utils.typing import Union, Any, Sequence, SuccessTuple, Optional, Tuple, List
+
+from meerschaum.utils.typing import Any, SuccessTuple, Optional, List
+
 
 def verify(
     action: Optional[List[str]] = None,
@@ -22,6 +24,7 @@ def verify(
         'packages': _verify_packages,
         'venvs': _verify_venvs,
         'plugins': _verify_plugins,
+        'rowcounts': _verify_rowcounts,
     }
     return choose_subaction(action, options, **kwargs)
 
@@ -35,6 +38,16 @@ def _verify_pipes(**kwargs) -> SuccessTuple:
     return _sync_pipes(**kwargs)
 
 
+def _verify_rowcounts(**kwargs) -> SuccessTuple:
+    """
+    Verify the contents of pipes, syncing across their entire datetime intervals.
+    """
+    from meerschaum.actions.sync import _sync_pipes
+    kwargs['verify'] = True
+    kwargs['check_rowcounts_only'] = True
+    return _sync_pipes(**kwargs)
+
+
 def _verify_packages(
     debug: bool = False,
     venv: Optional[str] = 'mrsm',

meerschaum/api/__init__.py

@@ -6,15 +6,12 @@
 Meerschaum API backend. Start an API instance with `start api`.
 """
 from __future__ import annotations
-import os
-from meerschaum.utils.typing import Dict, Any, Optional
 
-from meerschaum import __version__ as version
-__version__ = version
-__doc__ = """
-The Meerschaum Web API lets you access and control your data over the Internet.
-"""
+import os
+from collections import defaultdict
 
+import meerschaum as mrsm
+from meerschaum.utils.typing import Dict, Any, Optional, PipesDict
 from meerschaum.config import get_config
 from meerschaum.config.static import STATIC_CONFIG, SERVER_ID
 from meerschaum.utils.packages import attempt_import
@@ -23,8 +20,14 @@ from meerschaum.config._paths import API_UVICORN_CONFIG_PATH, API_UVICORN_RESOUR
 from meerschaum.plugins import _api_plugins
 from meerschaum.utils.warnings import warn, dprint
 from meerschaum.utils.threading import RLock
+from meerschaum.utils.misc import is_pipe_registered
+
+from meerschaum import __version__ as version
+__version__ = version
+__doc__ = """The Meerschaum Web API lets you manage your pipes over the Internet."""
+
 
-_locks = {'pipes': RLock(), 'connector': RLock(), 'uvicorn_config': RLock()}
+_locks = defaultdict(lambda: RLock())
 
 ### Skip verifying packages in the docker image.
 CHECK_UPDATE = os.environ.get(STATIC_CONFIG['environment']['runtime'], None) != 'docker'
@@ -58,6 +61,7 @@ uv = attempt_import('uv', lazy=False, check_update=CHECK_UPDATE)
     venv=None,
 )
 from meerschaum.api._chain import check_allow_chaining, DISALLOW_CHAINING_MESSAGE
+from meerschaum.api._exceptions import APIPermissionError
 uvicorn_config_path = API_UVICORN_RESOURCES_PATH / SERVER_ID / 'config.json'
 
 uvicorn_config = None
@@ -78,13 +82,11 @@ def get_uvicorn_config() -> Dict[str, Any]:
                 with open(uvicorn_config_path, 'r', encoding='utf-8') as f:
                     uvicorn_config = json.load(f)
                 _uvicorn_config = uvicorn_config
-            except Exception as e:
+            except Exception:
                 _uvicorn_config = sys_config.get('uvicorn', None)
 
             if _uvicorn_config is None:
                 _uvicorn_config = {}
-
-            ### Default: main SQL connector
             if 'mrsm_instance' not in _uvicorn_config:
                 _uvicorn_config['mrsm_instance'] = get_config('meerschaum', 'api_instance')
     return _uvicorn_config
@@ -95,22 +97,47 @@ no_auth = get_uvicorn_config().get('no_auth', False)
 private = get_uvicorn_config().get('private', False)
 production = get_uvicorn_config().get('production', False)
 _include_dash = (not no_dash)
+docs_enabled = not production or sys_config.get('endpoints', {}).get('docs_in_production', True)
 
 connector = None
+default_instance_keys = None
+_instance_connectors = defaultdict(lambda: None)
 def get_api_connector(instance_keys: Optional[str] = None):
-    """Create the instance connector."""
-    global connector
-    with _locks['connector']:
-        if connector is None:
-            if instance_keys is None:
-                instance_keys = get_uvicorn_config().get('mrsm_instance', None)
+    """Create the instance connectors."""
+    global default_instance_keys
+    if instance_keys is None:
+        if default_instance_keys is None:
+            default_instance_keys = get_uvicorn_config().get('mrsm_instance', None)
+        instance_keys = default_instance_keys
+
+    allow_multiple_instances = permissions_config.get(
+        'instances', {}
+    ).get('allow_multiple_instances', False)
+    if not allow_multiple_instances and instance_keys != default_instance_keys:
+        raise APIPermissionError(
+            "This API instance does not allow for accessing additional instances."
+        )
+
+    allowed_instance_keys = permissions_config.get(
+        'instance', {}
+    ).get(
+        'allowed_instance_keys',
+        ['*']
+    )
+    if allowed_instance_keys != ['*'] and instance_keys not in allowed_instance_keys:
+        raise APIPermissionError(
+            f"Instance keys '{instance_keys}' not in list of allowed instances."
+        )
 
+    with _locks[f'instance-{instance_keys}']:
+        connector = _instance_connectors[instance_keys]
+        if connector is None:
             from meerschaum.connectors.parse import parse_instance_keys
             connector = parse_instance_keys(instance_keys, debug=debug)
-    if debug:
-        dprint(f"API instance connector: {connector}")
+            _instance_connectors[instance_keys] = connector
     return connector
 
+
 cache_connector = None
 def get_cache_connector(connector_keys: Optional[str] = None):
     """Return the `valkey` connector if running in production."""
@@ -146,28 +173,35 @@ def get_cache_connector(connector_keys: Optional[str] = None):
     return cache_connector
 
 
-_pipes = None
-def pipes(refresh=False):
+_instance_pipes = defaultdict(lambda: None)
+def pipes(instance_keys: Optional[str] = None, refresh: bool = False) -> PipesDict:
     """
-    Manage the global pipes dictionary.
+    Manage the global pipes dictionaries.
     """
-    global _pipes
-    with _locks['pipes']:
-        if _pipes is None or refresh:
-            _pipes = _get_pipes(mrsm_instance=get_api_connector())
-    return _pipes
-
-
-def get_pipe(connector_keys, metric_key, location_key, refresh=False):
+    instance_keys = str(get_api_connector(instance_keys))
+    with _locks['pipes-' + instance_keys]:
+        pipes = _instance_pipes[instance_keys]
+        if pipes is None or refresh:
+            pipes = _get_pipes(mrsm_instance=instance_keys)
+            _instance_pipes[instance_keys] = pipes
+    return pipes
+
+
+def get_pipe(
+    connector_keys: str,
+    metric_key: str,
+    location_key: Optional[str],
+    instance_keys: Optional[str] = None,
+    refresh: bool = False
+) -> mrsm.Pipe:
     """Index the pipes dictionary or create a new Pipe object."""
-    from meerschaum.utils.misc import is_pipe_registered
-    from meerschaum import Pipe
     if location_key in ('[None]', 'None', 'null'):
         location_key = None
-    p = Pipe(connector_keys, metric_key, location_key, mrsm_instance=get_api_connector())
-    if is_pipe_registered(p, pipes()):
-        return pipes(refresh=refresh)[connector_keys][metric_key][location_key]
-    return p
+    instance_keys = str(get_api_connector(instance_keys))
+    pipe = mrsm.Pipe(connector_keys, metric_key, location_key, mrsm_instance=instance_keys)
+    if is_pipe_registered(pipe, pipes(instance_keys)):
+        return pipes(instance_keys, refresh=refresh)[connector_keys][metric_key][location_key]
+    return pipe
 
 
 app = fastapi.FastAPI(
@@ -182,6 +216,9 @@ app = fastapi.FastAPI(
         'name': 'Apache 2.0',
         'url': 'https://www.apache.org/licenses/LICENSE-2.0.html',
     },
+    docs_url=(None if not docs_enabled else endpoints['docs']),
+    redoc_url=(None if not docs_enabled else endpoints['redoc']),
+    openapi_url=endpoints['openapi'],
     open_api_tags=[
         {
             'name': 'Pipes',
@@ -193,7 +230,7 @@ app = fastapi.FastAPI(
         },
         {
             'name': 'Connectors',
-            'description': 'Get information about the registered connectors.'
+            'description': 'Get information about the registered connectors.',
         },
         {
             'name': 'Users',
@@ -209,8 +246,8 @@ app = fastapi.FastAPI(
         },
         {
             'name': 'Version',
-            'description': 'Version information.'
-        }
+            'description': 'Version information.',
+        },
     ],
 )
 
@@ -228,7 +265,7 @@ app = fastapi.FastAPI(
 HTMLResponse = fastapi_responses.HTMLResponse
 Request = fastapi.Request
 
-from meerschaum.config._paths import API_RESOURCES_PATH, API_STATIC_PATH, API_TEMPLATES_PATH
+from meerschaum.config.paths import API_RESOURCES_PATH, API_STATIC_PATH, API_TEMPLATES_PATH
 app.mount('/static', fastapi_staticfiles.StaticFiles(directory=str(API_STATIC_PATH)), name='static')
 
 _custom_kwargs = {'mrsm_instance'}
@@ -252,7 +289,6 @@ if _include_dash:
     import meerschaum.api.dash
 
 ### Execute the API plugins functions.
-import meerschaum as mrsm
 for module_name, functions_list in _api_plugins.items():
     plugin_name = module_name.split('.')[-1] if module_name.startswith('plugins.') else None
     plugin = mrsm.Plugin(plugin_name) if plugin_name else None

meerschaum/api/_exceptions.py

@@ -0,0 +1,18 @@
+#! /usr/bin/env python3
+# vim:fenc=utf-8
+
+"""
+Define custom API exceptions.
+"""
+
+import meerschaum as mrsm
+
+_ = mrsm.attempt_import('fastapi', lazy=False)
+from fastapi import HTTPException
+
+
+class APIPermissionError(HTTPException):
+    """Raise if the configured Meerschaum API permissions disallow an action."""
+
+    def __init__(self, detail: str = "Permission denied.", status_code: int = 403):
+        super().__init__(status_code=status_code, detail=detail)

meerschaum/api/dash/__init__.py

@@ -7,10 +7,12 @@ Build the Dash app to be hooked into FastAPI.
 """
 
 from __future__ import annotations
-import uuid
 
 from meerschaum.utils.packages import (
-    attempt_import, import_dcc, import_html, _monkey_patch_get_distribution
+    attempt_import,
+    import_dcc,
+    import_html,
+    _monkey_patch_get_distribution,
 )
 flask_compress = attempt_import('flask_compress', lazy=False)
 _monkey_patch_get_distribution('flask-compress', flask_compress.__version__)

meerschaum/api/dash/callbacks/dashboard.py

@@ -665,7 +665,8 @@ dash_app.clientside_callback(
 
         iframe.contentWindow.postMessage(
             {
-                action: "__TMUX_NEW_WINDOW"
+                action: "__TMUX_NEW_WINDOW",
+                instance: window.instance
             },
             url
         );
@@ -692,6 +693,34 @@ dash_app.clientside_callback(
     State('mrsm-location', 'href'),
 )
 
+dash_app.clientside_callback(
+    """
+    function(n_clicks){
+        console.log('fullscreen');
+        if (!n_clicks) { return dash_clientside.no_update; }
+        iframe = document.getElementById('webterm-iframe');
+        if (!iframe){ return dash_clientside.no_update; }
+        const leftCol = document.getElementById('content-col-left');
+        const rightCol = document.getElementById('content-col-right');
+        const button = document.getElementById('webterm-fullscreen-button');
+
+        if (leftCol.style.display === 'none') {
+            leftCol.style.display = '';
+            rightCol.className = 'col-6';
+            button.innerHTML = "Full View";
+        } else {
+            leftCol.style.display = 'none';
+            rightCol.className = 'col-12';
+            button.innerHTML = "Side-by-side View";
+        }
+
+        return dash_clientside.no_update;
+    }
+    """,
+    Output('webterm-fullscreen-button', 'n_clicks'),
+    Input('webterm-fullscreen-button', 'n_clicks'),
+)
+
 @dash_app.callback(
     Output(component_id='connector-keys-input', component_property='value'),
     Input(component_id='clear-connector-keys-input-button', component_property='n_clicks'),

meerschaum/api/dash/components.py

@@ -13,7 +13,7 @@ from meerschaum.utils.typing import SuccessTuple, List
 from meerschaum.config.static import STATIC_CONFIG
 from meerschaum.utils.misc import remove_ansi
 from meerschaum._internal.shell.Shell import get_shell_intro
-from meerschaum.api import endpoints, CHECK_UPDATE
+from meerschaum.api import endpoints, CHECK_UPDATE, docs_enabled
 from meerschaum.connectors import instance_types, _load_builtin_custom_connectors
 from meerschaum.utils.misc import get_connector_labels
 from meerschaum.config import __doc__ as doc
@@ -127,7 +127,7 @@ navbar = dbc.Navbar(
                     align='center',
                     className='g-0 navbar-logo-row',
                 ),
-                href='/docs',
+                href=('/docs' if docs_enabled else '#'),
                 style={"textDecoration": "none"},
             ),
             dbc.NavbarToggler(id="navbar-toggler", n_clicks=0),

meerschaum/api/dash/webterm.py

@@ -7,6 +7,8 @@ Functions for interacting with the Webterm via the dashboard.
 """
 
 import time
+
+import meerschaum as mrsm
 from meerschaum.api import CHECK_UPDATE, get_api_connector
 from meerschaum.api.dash.sessions import is_session_authenticated, get_username_from_session
 from meerschaum.api.dash.components import alert_from_success_tuple, console_div
@@ -19,7 +21,9 @@ dcc, html = import_dcc(check_update=CHECK_UPDATE), import_html(check_update=CHEC
 dbc = attempt_import('dash_bootstrap_components', lazy=False, check_update=CHECK_UPDATE)
 
 MAX_WEBTERM_ATTEMPTS: int = 10
-TMUX_IS_AVAILABLE: bool = is_tmux_available()
+TMUX_IS_ENABLED: bool = (
+    is_tmux_available() and mrsm.get_config('system', 'webterm', 'tmux', 'enabled')
+)
 
 _locks = {'webterm_thread': RLock()}
 
@@ -48,10 +52,25 @@ def get_webterm(state: WebState) -> Tuple[Any, Any]:
                 [
                     html.Div(
                         [
-                            dbc.Button('Refresh', color='black', id='webterm-refresh-button'),
-                            dbc.Button('New Tab', color='black', id='webterm-new-tab-button'),
-                        ],
+                            dbc.Button(
+                                'Refresh',
+                                color='black',
+                                id='webterm-refresh-button',
+                            ),
+                            dbc.Button(
+                                'Full View',
+                                color='black',
+                                id='webterm-fullscreen-button',
+                            ),
+                        ] + [
+                            dbc.Button(
+                                'New Tab',
+                                color='black',
+                                id='webterm-new-tab-button',
+                            ),
+                        ] if TMUX_IS_ENABLED else [],
                         id='webterm-controls-div',
+                        style={'text-align': 'right'},
                     ),
                     html.Iframe(
                         src=f"/webterm/{session_id}",