meerschaum 3.0.0rc4__py3-none-any.whl → 3.0.0rc8__py3-none-any.whl

meerschaum/api/dash/callbacks/register.py

@@ -15,6 +15,7 @@ from dash.exceptions import PreventUpdate
 from meerschaum.core import User
 from meerschaum._internal.static import STATIC_CONFIG
 from meerschaum.utils.packages import attempt_import
+from meerschaum.api._oauth2 import CustomOAuth2PasswordRequestForm
 dash = attempt_import('dash', check_update=CHECK_UPDATE)
 from fastapi.exceptions import HTTPException
 
@@ -97,10 +98,16 @@ def register_button_click(
         form_class += ' is-invalid'
         return {}, form_class, dash.no_update
     try:
-        _ = login({'username': username, 'password': password})
+        form = CustomOAuth2PasswordRequestForm(
+            grant_type='password',
+            username=username,
+            password=password,
+            scope=' '.join(STATIC_CONFIG['tokens']['scopes'])
+        )
+        _ = login(form)
         session_data = {'session-id': str(uuid.uuid4())}
         set_session(session_data['session-id'], {'username': username})
-    except HTTPException as e:
+    except HTTPException:
         form_class += ' is-invalid'
         session_data = None
     return session_data, form_class, (dash.no_update if not session_data else endpoints['dash'])

meerschaum/api/dash/pages/login.py

@@ -49,11 +49,11 @@ registration_div = html.Div(
                         html.Code('mrsm register user newuser -i sql:main', className='codeblock'),
                     ),
                     dcc.Markdown("""
-                        To enable online registration, open the `system` configuration file and""" +
+                        To enable online registration, open the `api` configuration file and""" +
                     """ set the permissions to `true`:"""
                     ),
                     html.Pre(
-                        html.Code('mrsm edit config system', className='codeblock'),
+                        html.Code('mrsm edit config api', className='codeblock'),
                     ),
                     html.Br(),
                     dcc.Markdown('The settings file should look something like this:'),

meerschaum/api/dash/pipes.py

@@ -377,48 +377,48 @@ def accordion_items_from_pipe(
                         html.Th(
                             html.Span(
                                 "Key",
-                                id={'type': 'key-table-header', 'id': pipe_meta_str},
+                                id={'type': 'key-table-header', 'index': pipe_meta_str},
                                 style={"textDecoration": "underline", "cursor": "pointer"},
                             ),
                         ),
                         html.Th(
                             html.Span(
                                 "Column",
-                                id={'type': 'column-table-header', 'id': pipe_meta_str},
+                                id={'type': 'column-table-header', 'index': pipe_meta_str},
                                 style={"textDecoration": "underline", "cursor": "pointer"},
                             ),
                         ),
                         html.Th(
                             html.Span(
                                 "Index",
-                                id={'type': 'index-table-header', 'id': pipe_meta_str},
+                                id={'type': 'index-table-header', 'index': pipe_meta_str},
                                 style={"textDecoration": "underline", "cursor": "pointer"},
                             ),
                         ),
                         html.Th(
                             html.Span(
                                 "Is Composite",
-                                id={'type': 'is-composite-table-header', 'id': pipe_meta_str},
+                                id={'type': 'is-composite-table-header', 'index': pipe_meta_str},
                                 style={"textDecoration": "underline", "cursor": "pointer"},
                             ),
                         ),
                         dbc.Tooltip(
                             "Unique reference name for the index "
                             "(e.g. `datetime` for the range axis)",
-                            target={'type': 'key-table-header', 'id': pipe_meta_str},
+                            target={'type': 'key-table-header', 'index': pipe_meta_str},
                         ),
                         dbc.Tooltip(
                             "The actual column (field name) in the target dataset.",
-                            target={'type': 'column-table-header', 'id': pipe_meta_str},
+                            target={'type': 'column-table-header', 'index': pipe_meta_str},
                         ),
                         dbc.Tooltip(
                             "The name of the index created on the given columns.",
-                            target={'type': 'index-table-header', 'id': pipe_meta_str},
+                            target={'type': 'index-table-header', 'index': pipe_meta_str},
                         ),
                         dbc.Tooltip(
                             "Whether the column is used in the composite primary key "
                             "to determine updates.",
-                            target={'type': 'is-composite-table-header', 'id': pipe_meta_str},
+                            target={'type': 'is-composite-table-header', 'index': pipe_meta_str},
                         ),
                     ]
                 )
@@ -483,9 +483,14 @@ def accordion_items_from_pipe(
                 ])
             )
 
-        items_bodies['overview'] = dbc.Table(
-            overview_header + [html.Tbody(overview_rows)],
-            bordered=False, hover=True, striped=False,
+        items_bodies['overview'] = html.Div(
+            dbc.Table(
+                overview_header + [html.Tbody(overview_rows)],
+                bordered=False,
+                hover=True,
+                striped=False,
+            ),
+            style={'overflowX': 'auto'},
         )
 
     if 'stats' in active_items:
@@ -497,17 +502,13 @@ def accordion_items_from_pipe(
                 (newest_time - oldest_time) if newest_time is not None and oldest_time is not None
                 else None
             )
-            rowcount = pipe.get_rowcount(debug=debug)
         except Exception:
             oldest_time = None
             newest_time = None
             interval = None
-            rowcount = None
 
         stats_rows = []
-        if rowcount is not None:
-            stats_rows.append(html.Tr([html.Td("Row Count"), html.Td(f"{rowcount:,}")]))
-        if interval is not None:
+        if interval is not None and not isinstance(interval, int):
             stats_rows.append(
                 html.Tr([html.Td("Timespan"), html.Td(humanfriendly.format_timespan(interval))])
             )
@@ -516,7 +517,39 @@ def accordion_items_from_pipe(
         if newest_time is not None:
             stats_rows.append(html.Tr([html.Td("Newest time"), html.Td(str(newest_time))]))
 
-        items_bodies['stats'] = dbc.Table(stats_header + [html.Tbody(stats_rows)], hover=True)
+        precision = pipe.precision
+        if precision:
+            stats_rows.append(
+                html.Tr([
+                    html.Td("Precision"),
+                    html.Td(str(precision.get('interval', 1)) + ' ' + str(precision.get('unit', 'unit')))
+                ])
+            )
+
+        stats_rows.append(
+            html.Tr([
+                html.Td("Row count"),
+                html.Td(
+                    html.Div(
+                        dbc.Button(
+                            "Calculate",
+                            color='link',
+                            size='sm',
+                            style={'text-decoration': 'none'},
+                            id={'type': 'calculate-rowcount-button', 'index': pipe_meta_str},
+                        )
+                        if pipe.exists(debug=debug)
+                        else '0'
+                    ),
+                    id={'type': 'calculate-rowcount-div', 'index': pipe_meta_str},
+                )
+            ])
+        )
+
+        items_bodies['stats'] = html.Div(
+            dbc.Table(stats_header + [html.Tbody(stats_rows)], hover=True),
+            style={'overflowX': 'auto'},
+        )
 
     if 'columns' in active_items:
         try:
@@ -546,7 +579,7 @@ def accordion_items_from_pipe(
             mode='norm',
             tabSize=4,
             theme='twilight',
-            id={'type': 'parameters-editor', 'index': json.dumps(pipe.meta)},
+            id={'type': 'parameters-editor', 'index': pipe_meta_str},
             width='100%',
             height='500px',
             readOnly=False,
@@ -558,19 +591,19 @@ def accordion_items_from_pipe(
         )
         update_parameters_button = dbc.Button(
             "Update",
-            id={'type': 'update-parameters-button', 'index': json.dumps(pipe.meta)},
+            id={'type': 'update-parameters-button', 'index': pipe_meta_str},
         )
 
         as_yaml_button = dbc.Button(
             "YAML",
-            id={'type': 'parameters-as-yaml-button', 'index': json.dumps(pipe.meta)},
+            id={'type': 'parameters-as-yaml-button', 'index': pipe_meta_str},
             color='link',
             size='sm',
             style={'text-decoration': 'none'},
         )
         as_json_button = dbc.Button(
             "JSON",
-            id={'type': 'parameters-as-json-button', 'index': json.dumps(pipe.meta)},
+            id={'type': 'parameters-as-json-button', 'index': pipe_meta_str},
             color='link',
             size='sm',
             style={'text-decoration': 'none', 'margin-left': '10px'},
@@ -596,7 +629,7 @@ def accordion_items_from_pipe(
                         html.Div(
                             id={
                                 'type': 'update-parameters-success-div',
-                                'index': json.dumps(pipe.meta),
+                                'index': pipe_meta_str,
                             }
                         )
                     ],
@@ -640,7 +673,7 @@ def accordion_items_from_pipe(
             mode='sql',
             tabSize=4,
             theme='twilight',
-            id={'type': 'sql-editor', 'index': json.dumps(pipe.meta)},
+            id={'type': 'sql-editor', 'index': pipe_meta_str},
             width='100%',
             height='500px',
             readOnly=False,
@@ -652,7 +685,7 @@ def accordion_items_from_pipe(
         )
         update_sql_button = dbc.Button(
             "Update",
-            id={'type': 'update-sql-button', 'index': json.dumps(pipe.meta)},
+            id={'type': 'update-sql-button', 'index': pipe_meta_str},
         )
         items_bodies['sql'] = html.Div([
             sql_editor,
@@ -661,7 +694,7 @@ def accordion_items_from_pipe(
                 dbc.Col([update_sql_button], width=2),
                 dbc.Col([
                     html.Div(
-                        id={'type': 'update-sql-success-div', 'index': json.dumps(pipe.meta)}
+                        id={'type': 'update-sql-success-div', 'index': pipe_meta_str}
                     )
                 ],
                 width=True,
@@ -683,7 +716,7 @@ def accordion_items_from_pipe(
             mode='norm',
             tabSize=4,
             theme='twilight',
-            id={'type': 'query-editor', 'index': json.dumps(pipe.meta)},
+            id={'type': 'query-editor', 'index': pipe_meta_str},
             width='100%',
             height='200px',
             readOnly=False,
@@ -695,17 +728,17 @@ def accordion_items_from_pipe(
         )
         query_data_button = dbc.Button(
             "Query",
-            id={'type': 'query-data-button', 'index': json.dumps(pipe.meta)},
+            id={'type': 'query-data-button', 'index': pipe_meta_str},
         )
 
         begin_end_input_group = dbc.InputGroup(
             [
                 dbc.Input(
-                    id={'type': 'query-data-begin-input', 'index': json.dumps(pipe.meta)},
+                    id={'type': 'query-data-begin-input', 'index': pipe_meta_str},
                     placeholder="Begin",
                 ),
                 dbc.Input(
-                    id={'type': 'query-data-end-input', 'index': json.dumps(pipe.meta)},
+                    id={'type': 'query-data-end-input', 'index': pipe_meta_str},
                     placeholder="End",
                 ),
             ],
@@ -719,9 +752,12 @@ def accordion_items_from_pipe(
             value=10,
             step=1,
             placeholder="Limit",
-            id={'type': 'limit-input', 'index': json.dumps(pipe.meta)},
+            id={'type': 'limit-input', 'index': pipe_meta_str},
+        )
+        query_result_div = html.Div(
+            id={'type': 'query-result-div', 'index': pipe_meta_str},
+            style={'overflowX': 'auto'},
         )
-        query_result_div = html.Div(id={'type': 'query-result-div', 'index': json.dumps(pipe.meta)})
 
         items_bodies['query-data'] = html.Div([
             query_editor,
@@ -746,7 +782,7 @@ def accordion_items_from_pipe(
             mode = 'norm',
             tabSize = 4,
             theme = 'twilight',
-            id = {'type': 'sync-editor', 'index': json.dumps(pipe.meta)},
+            id = {'type': 'sync-editor', 'index': pipe_meta_str},
             width = '100%',
             height = '500px',
             readOnly = False,
@@ -759,14 +795,14 @@ def accordion_items_from_pipe(
 
         sync_as_json_button = dbc.Button(
             "JSON",
-            id={'type': 'sync-as-json-button', 'index': json.dumps(pipe.meta)},
+            id={'type': 'sync-as-json-button', 'index': pipe_meta_str},
             color='link',
             size='sm',
             style={'text-decoration': 'none', 'margin-left': '10px'},
         )
         sync_as_lines_button = dbc.Button(
             "Lines",
-            id={'type': 'sync-as-lines-button', 'index': json.dumps(pipe.meta)},
+            id={'type': 'sync-as-lines-button', 'index': pipe_meta_str},
             color='link',
             size='sm',
             style={'text-decoration': 'none', 'margin-left': '10px'},
@@ -774,9 +810,9 @@ def accordion_items_from_pipe(
 
         update_sync_button = dbc.Button(
             "Sync",
-            id = {'type': 'update-sync-button', 'index': json.dumps(pipe.meta)},
+            id = {'type': 'update-sync-button', 'index': pipe_meta_str},
         )
-        sync_success_div = html.Div(id={'type': 'sync-success-div', 'index': json.dumps(pipe.meta)})
+        sync_success_div = html.Div(id={'type': 'sync-success-div', 'index': pipe_meta_str})
         items_bodies['sync-data'] = html.Div([
             sync_editor,
             html.Br(),

meerschaum/api/dash/webterm.py

@@ -7,12 +7,13 @@ Functions for interacting with the Webterm via the dashboard.
 """
 
 import time
+from typing import Optional, Tuple, Any
 
 import meerschaum as mrsm
-from meerschaum.api import CHECK_UPDATE, get_api_connector
+from meerschaum.api import CHECK_UPDATE, get_api_connector, webterm_port
 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
-from meerschaum.utils.typing import WebState, Tuple, Any
+from meerschaum.utils.typing import WebState
 from meerschaum.utils.packages import attempt_import, import_html, import_dcc
 from meerschaum._internal.term.tools import is_webterm_running
 from meerschaum.utils.threading import Thread, RLock
@@ -22,7 +23,7 @@ dbc = attempt_import('dash_bootstrap_components', lazy=False, check_update=CHECK
 
 MAX_WEBTERM_ATTEMPTS: int = 10
 TMUX_IS_ENABLED: bool = (
-    is_tmux_available() and mrsm.get_config('system', 'webterm', 'tmux', 'enabled')
+    is_tmux_available() and mrsm.get_config('api', 'webterm', 'tmux', 'enabled')
 )
 
 _locks = {'webterm_thread': RLock()}
@@ -51,7 +52,7 @@ def get_webterm(state: WebState) -> Tuple[Any, Any]:
         )
 
     for i in range(MAX_WEBTERM_ATTEMPTS):
-        if is_webterm_running('localhost', 8765, session_id=(username or session_id)):
+        if is_webterm_running('localhost', webterm_port, session_id=(username or session_id)):
             return (
                 [
                     html.Div(
@@ -91,7 +92,7 @@ def get_webterm(state: WebState) -> Tuple[Any, Any]:
 
 
 webterm_procs = {}
-def start_webterm() -> None:
+def start_webterm(webterm_port: Optional[int] = None) -> None:
     """
     Start the webterm thread.
     """
@@ -101,7 +102,14 @@ def start_webterm() -> None:
         conn = get_api_connector()
         _ = run_python_package(
             'meerschaum',
-            ['start', 'webterm', '-i', str(conn)],
+            (
+                ['start', 'webterm', '-i', str(conn)]
+                + (
+                    []
+                    if not webterm_port
+                    else ['-p', str(webterm_port)]
+                )
+            ),
             capture_output=True,
             as_proc=True,
             store_proc_dict=webterm_procs,

meerschaum/api/models/_pipes.py

@@ -54,7 +54,13 @@ class PipeModel(BasePipeModel):
 
 
 class FetchPipesKeysResponseModel(
-    RootModel[List[Tuple[ConnectorKeysModel, MetricKeyModel, LocationKeyModel]]]
+    RootModel[
+        Union[
+            List[Tuple[ConnectorKeysModel, MetricKeyModel, LocationKeyModel]],
+            List[Tuple[ConnectorKeysModel, MetricKeyModel, LocationKeyModel, Dict[str, Any]]],
+            List[Tuple[ConnectorKeysModel, MetricKeyModel, LocationKeyModel, List[str]]],
+        ]
+    ]
 ):
     """
     A list of tuples containing connector, metric, and location keys.

meerschaum/api/resources/static/js/terminado.js

@@ -11,7 +11,10 @@ function make_terminal(element, size, ws_url) {
     useStyle: true,
     scrollback: 9999999,
     cursorBlink: true,
+    allowProposedApi: true
   });
+  term.loadAddon(new Unicode11Addon.Unicode11Addon());
+  term.unicode.activeVersion = '11';
   term.attachCustomKeyEventHandler(copyPasteKeyEventHandler);
   term.open(element);
 

meerschaum/api/resources/static/js/xterm-addon-unicode11.js

@@ -0,0 +1,2 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.Unicode11Addon=t():e.Unicode11Addon=t()}(this,(()=>(()=>{"use strict";var e={433:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.UnicodeV11=void 0;const r=i(938),s=[[768,879],[1155,1161],[1425,1469],[1471,1471],[1473,1474],[1476,1477],[1479,1479],[1536,1541],[1552,1562],[1564,1564],[1611,1631],[1648,1648],[1750,1757],[1759,1764],[1767,1768],[1770,1773],[1807,1807],[1809,1809],[1840,1866],[1958,1968],[2027,2035],[2045,2045],[2070,2073],[2075,2083],[2085,2087],[2089,2093],[2137,2139],[2259,2306],[2362,2362],[2364,2364],[2369,2376],[2381,2381],[2385,2391],[2402,2403],[2433,2433],[2492,2492],[2497,2500],[2509,2509],[2530,2531],[2558,2558],[2561,2562],[2620,2620],[2625,2626],[2631,2632],[2635,2637],[2641,2641],[2672,2673],[2677,2677],[2689,2690],[2748,2748],[2753,2757],[2759,2760],[2765,2765],[2786,2787],[2810,2815],[2817,2817],[2876,2876],[2879,2879],[2881,2884],[2893,2893],[2902,2902],[2914,2915],[2946,2946],[3008,3008],[3021,3021],[3072,3072],[3076,3076],[3134,3136],[3142,3144],[3146,3149],[3157,3158],[3170,3171],[3201,3201],[3260,3260],[3263,3263],[3270,3270],[3276,3277],[3298,3299],[3328,3329],[3387,3388],[3393,3396],[3405,3405],[3426,3427],[3530,3530],[3538,3540],[3542,3542],[3633,3633],[3636,3642],[3655,3662],[3761,3761],[3764,3772],[3784,3789],[3864,3865],[3893,3893],[3895,3895],[3897,3897],[3953,3966],[3968,3972],[3974,3975],[3981,3991],[3993,4028],[4038,4038],[4141,4144],[4146,4151],[4153,4154],[4157,4158],[4184,4185],[4190,4192],[4209,4212],[4226,4226],[4229,4230],[4237,4237],[4253,4253],[4448,4607],[4957,4959],[5906,5908],[5938,5940],[5970,5971],[6002,6003],[6068,6069],[6071,6077],[6086,6086],[6089,6099],[6109,6109],[6155,6158],[6277,6278],[6313,6313],[6432,6434],[6439,6440],[6450,6450],[6457,6459],[6679,6680],[6683,6683],[6742,6742],[6744,6750],[6752,6752],[6754,6754],[6757,6764],[6771,6780],[6783,6783],[6832,6846],[6912,6915],[6964,6964],[6966,6970],[6972,6972],[6978,6978],[7019,7027],[7040,7041],[7074,7077],[7080,7081],[7083,7085],[7142,7142],[7144,7145],[7149,7149],[7151,7153],[7212,7219],[7222,7223],[7376,7378],[7380,7392],[7394,7400],[7405,7405],[7412,7412],[7416,7417],[7616,7673],[7675,7679],[8203,8207],[8234,8238],[8288,8292],[8294,8303],[8400,8432],[11503,11505],[11647,11647],[11744,11775],[12330,12333],[12441,12442],[42607,42610],[42612,42621],[42654,42655],[42736,42737],[43010,43010],[43014,43014],[43019,43019],[43045,43046],[43204,43205],[43232,43249],[43263,43263],[43302,43309],[43335,43345],[43392,43394],[43443,43443],[43446,43449],[43452,43453],[43493,43493],[43561,43566],[43569,43570],[43573,43574],[43587,43587],[43596,43596],[43644,43644],[43696,43696],[43698,43700],[43703,43704],[43710,43711],[43713,43713],[43756,43757],[43766,43766],[44005,44005],[44008,44008],[44013,44013],[64286,64286],[65024,65039],[65056,65071],[65279,65279],[65529,65531]],n=[[66045,66045],[66272,66272],[66422,66426],[68097,68099],[68101,68102],[68108,68111],[68152,68154],[68159,68159],[68325,68326],[68900,68903],[69446,69456],[69633,69633],[69688,69702],[69759,69761],[69811,69814],[69817,69818],[69821,69821],[69837,69837],[69888,69890],[69927,69931],[69933,69940],[70003,70003],[70016,70017],[70070,70078],[70089,70092],[70191,70193],[70196,70196],[70198,70199],[70206,70206],[70367,70367],[70371,70378],[70400,70401],[70459,70460],[70464,70464],[70502,70508],[70512,70516],[70712,70719],[70722,70724],[70726,70726],[70750,70750],[70835,70840],[70842,70842],[70847,70848],[70850,70851],[71090,71093],[71100,71101],[71103,71104],[71132,71133],[71219,71226],[71229,71229],[71231,71232],[71339,71339],[71341,71341],[71344,71349],[71351,71351],[71453,71455],[71458,71461],[71463,71467],[71727,71735],[71737,71738],[72148,72151],[72154,72155],[72160,72160],[72193,72202],[72243,72248],[72251,72254],[72263,72263],[72273,72278],[72281,72283],[72330,72342],[72344,72345],[72752,72758],[72760,72765],[72767,72767],[72850,72871],[72874,72880],[72882,72883],[72885,72886],[73009,73014],[73018,73018],[73020,73021],[73023,73029],[73031,73031],[73104,73105],[73109,73109],[73111,73111],[73459,73460],[78896,78904],[92912,92916],[92976,92982],[94031,94031],[94095,94098],[113821,113822],[113824,113827],[119143,119145],[119155,119170],[119173,119179],[119210,119213],[119362,119364],[121344,121398],[121403,121452],[121461,121461],[121476,121476],[121499,121503],[121505,121519],[122880,122886],[122888,122904],[122907,122913],[122915,122916],[122918,122922],[123184,123190],[123628,123631],[125136,125142],[125252,125258],[917505,917505],[917536,917631],[917760,917999]],o=[[4352,4447],[8986,8987],[9001,9002],[9193,9196],[9200,9200],[9203,9203],[9725,9726],[9748,9749],[9800,9811],[9855,9855],[9875,9875],[9889,9889],[9898,9899],[9917,9918],[9924,9925],[9934,9934],[9940,9940],[9962,9962],[9970,9971],[9973,9973],[9978,9978],[9981,9981],[9989,9989],[9994,9995],[10024,10024],[10060,10060],[10062,10062],[10067,10069],[10071,10071],[10133,10135],[10160,10160],[10175,10175],[11035,11036],[11088,11088],[11093,11093],[11904,11929],[11931,12019],[12032,12245],[12272,12283],[12288,12329],[12334,12350],[12353,12438],[12443,12543],[12549,12591],[12593,12686],[12688,12730],[12736,12771],[12784,12830],[12832,12871],[12880,19903],[19968,42124],[42128,42182],[43360,43388],[44032,55203],[63744,64255],[65040,65049],[65072,65106],[65108,65126],[65128,65131],[65281,65376],[65504,65510]],c=[[94176,94179],[94208,100343],[100352,101106],[110592,110878],[110928,110930],[110948,110951],[110960,111355],[126980,126980],[127183,127183],[127374,127374],[127377,127386],[127488,127490],[127504,127547],[127552,127560],[127568,127569],[127584,127589],[127744,127776],[127789,127797],[127799,127868],[127870,127891],[127904,127946],[127951,127955],[127968,127984],[127988,127988],[127992,128062],[128064,128064],[128066,128252],[128255,128317],[128331,128334],[128336,128359],[128378,128378],[128405,128406],[128420,128420],[128507,128591],[128640,128709],[128716,128716],[128720,128722],[128725,128725],[128747,128748],[128756,128762],[128992,129003],[129293,129393],[129395,129398],[129402,129442],[129445,129450],[129454,129482],[129485,129535],[129648,129651],[129656,129658],[129664,129666],[129680,129685],[131072,196605],[196608,262141]];let l;function d(e,t){let i,r=0,s=t.length-1;if(e<t[0][0]||e>t[s][1])return!1;for(;s>=r;)if(i=r+s>>1,e>t[i][1])r=i+1;else{if(!(e<t[i][0]))return!0;s=i-1}return!1}t.UnicodeV11=class{constructor(){if(this.version="11",!l){l=new Uint8Array(65536),l.fill(1),l[0]=0,l.fill(0,1,32),l.fill(0,127,160);for(let e=0;e<s.length;++e)l.fill(0,s[e][0],s[e][1]+1);for(let e=0;e<o.length;++e)l.fill(2,o[e][0],o[e][1]+1)}}wcwidth(e){return e<32?0:e<127?1:e<65536?l[e]:d(e,n)?0:d(e,c)?2:1}charProperties(e,t){let i=this.wcwidth(e),s=0===i&&0!==t;if(s){const e=r.UnicodeService.extractWidth(t);0===e?s=!1:e>i&&(i=e)}return r.UnicodeService.createPropertyValue(0,i,s)}}},345:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.runAndSubscribe=t.forwardEvent=t.EventEmitter=void 0,t.EventEmitter=class{constructor(){this._listeners=[],this._disposed=!1}get event(){return this._event||(this._event=e=>(this._listeners.push(e),{dispose:()=>{if(!this._disposed)for(let t=0;t<this._listeners.length;t++)if(this._listeners[t]===e)return void this._listeners.splice(t,1)}})),this._event}fire(e,t){const i=[];for(let e=0;e<this._listeners.length;e++)i.push(this._listeners[e]);for(let r=0;r<i.length;r++)i[r].call(void 0,e,t)}dispose(){this.clearListeners(),this._disposed=!0}clearListeners(){this._listeners&&(this._listeners.length=0)}},t.forwardEvent=function(e,t){return e((e=>t.fire(e)))},t.runAndSubscribe=function(e,t){return t(void 0),e((e=>t(e)))}},490:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.UnicodeV6=void 0;const r=i(938),s=[[768,879],[1155,1158],[1160,1161],[1425,1469],[1471,1471],[1473,1474],[1476,1477],[1479,1479],[1536,1539],[1552,1557],[1611,1630],[1648,1648],[1750,1764],[1767,1768],[1770,1773],[1807,1807],[1809,1809],[1840,1866],[1958,1968],[2027,2035],[2305,2306],[2364,2364],[2369,2376],[2381,2381],[2385,2388],[2402,2403],[2433,2433],[2492,2492],[2497,2500],[2509,2509],[2530,2531],[2561,2562],[2620,2620],[2625,2626],[2631,2632],[2635,2637],[2672,2673],[2689,2690],[2748,2748],[2753,2757],[2759,2760],[2765,2765],[2786,2787],[2817,2817],[2876,2876],[2879,2879],[2881,2883],[2893,2893],[2902,2902],[2946,2946],[3008,3008],[3021,3021],[3134,3136],[3142,3144],[3146,3149],[3157,3158],[3260,3260],[3263,3263],[3270,3270],[3276,3277],[3298,3299],[3393,3395],[3405,3405],[3530,3530],[3538,3540],[3542,3542],[3633,3633],[3636,3642],[3655,3662],[3761,3761],[3764,3769],[3771,3772],[3784,3789],[3864,3865],[3893,3893],[3895,3895],[3897,3897],[3953,3966],[3968,3972],[3974,3975],[3984,3991],[3993,4028],[4038,4038],[4141,4144],[4146,4146],[4150,4151],[4153,4153],[4184,4185],[4448,4607],[4959,4959],[5906,5908],[5938,5940],[5970,5971],[6002,6003],[6068,6069],[6071,6077],[6086,6086],[6089,6099],[6109,6109],[6155,6157],[6313,6313],[6432,6434],[6439,6440],[6450,6450],[6457,6459],[6679,6680],[6912,6915],[6964,6964],[6966,6970],[6972,6972],[6978,6978],[7019,7027],[7616,7626],[7678,7679],[8203,8207],[8234,8238],[8288,8291],[8298,8303],[8400,8431],[12330,12335],[12441,12442],[43014,43014],[43019,43019],[43045,43046],[64286,64286],[65024,65039],[65056,65059],[65279,65279],[65529,65531]],n=[[68097,68099],[68101,68102],[68108,68111],[68152,68154],[68159,68159],[119143,119145],[119155,119170],[119173,119179],[119210,119213],[119362,119364],[917505,917505],[917536,917631],[917760,917999]];let o;t.UnicodeV6=class{constructor(){if(this.version="6",!o){o=new Uint8Array(65536),o.fill(1),o[0]=0,o.fill(0,1,32),o.fill(0,127,160),o.fill(2,4352,4448),o[9001]=2,o[9002]=2,o.fill(2,11904,42192),o[12351]=1,o.fill(2,44032,55204),o.fill(2,63744,64256),o.fill(2,65040,65050),o.fill(2,65072,65136),o.fill(2,65280,65377),o.fill(2,65504,65511);for(let e=0;e<s.length;++e)o.fill(0,s[e][0],s[e][1]+1)}}wcwidth(e){return e<32?0:e<127?1:e<65536?o[e]:function(e,t){let i,r=0,s=t.length-1;if(e<t[0][0]||e>t[s][1])return!1;for(;s>=r;)if(i=r+s>>1,e>t[i][1])r=i+1;else{if(!(e<t[i][0]))return!0;s=i-1}return!1}(e,n)?0:e>=131072&&e<=196605||e>=196608&&e<=262141?2:1}charProperties(e,t){let i=this.wcwidth(e),s=0===i&&0!==t;if(s){const e=r.UnicodeService.extractWidth(t);0===e?s=!1:e>i&&(i=e)}return r.UnicodeService.createPropertyValue(0,i,s)}}},938:(e,t,i)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.UnicodeService=void 0;const r=i(345),s=i(490);class n{static extractShouldJoin(e){return 0!=(1&e)}static extractWidth(e){return e>>1&3}static extractCharKind(e){return e>>3}static createPropertyValue(e,t,i=!1){return(16777215&e)<<3|(3&t)<<1|(i?1:0)}constructor(){this._providers=Object.create(null),this._active="",this._onChange=new r.EventEmitter,this.onChange=this._onChange.event;const e=new s.UnicodeV6;this.register(e),this._active=e.version,this._activeProvider=e}dispose(){this._onChange.dispose()}get versions(){return Object.keys(this._providers)}get activeVersion(){return this._active}set activeVersion(e){if(!this._providers[e])throw new Error(`unknown Unicode version "${e}"`);this._active=e,this._activeProvider=this._providers[e],this._onChange.fire(e)}register(e){this._providers[e.version]=e}wcwidth(e){return this._activeProvider.wcwidth(e)}getStringCellWidth(e){let t=0,i=0;const r=e.length;for(let s=0;s<r;++s){let o=e.charCodeAt(s);if(55296<=o&&o<=56319){if(++s>=r)return t+this.wcwidth(o);const i=e.charCodeAt(s);56320<=i&&i<=57343?o=1024*(o-55296)+i-56320+65536:t+=this.wcwidth(i)}const c=this.charProperties(o,i);let l=n.extractWidth(c);n.extractShouldJoin(c)&&(l-=n.extractWidth(i)),t+=l,i=c}return t}charProperties(e,t){return this._activeProvider.charProperties(e,t)}}t.UnicodeService=n}},t={};function i(r){var s=t[r];if(void 0!==s)return s.exports;var n=t[r]={exports:{}};return e[r](n,n.exports,i),n.exports}var r={};return(()=>{var e=r;Object.defineProperty(e,"__esModule",{value:!0}),e.Unicode11Addon=void 0;const t=i(433);e.Unicode11Addon=class{activate(e){e.unicode.register(new t.UnicodeV11)}dispose(){}}})(),r})()));
+//# sourceMappingURL=addon-unicode11.js.map

meerschaum/api/resources/templates/termpage.html

@@ -9,6 +9,7 @@
 </style>
 <link rel="stylesheet" href="{{ static('css/xterm.css') }}"/>
 <script src="{{ static('js/xterm.js') }}"></script>
+<script src="{{ static('js/xterm-addon-unicode11.js') }}"></script>
 <script src="{{ static('js/terminado.js') }}"></script>
 <script>
 

meerschaum/api/routes/_jobs.py

@@ -54,7 +54,7 @@ def _get_job(name: str, sysargs: Union[str, List[str], None] = None):
 
 @app.get(endpoints['jobs'], tags=['Jobs'])
 def get_jobs(
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:read'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:read'])),
 ) -> Dict[str, Dict[str, Any]]:
     """
     Return metadata about the current jobs.
@@ -83,7 +83,7 @@ def get_jobs(
 @app.get(endpoints['jobs'] + '/{name}', tags=['Jobs'])
 def get_job(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:read'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:read'])),
 ) -> Dict[str, Any]:
     """
     Return metadata for a single job.
@@ -134,7 +134,7 @@ def clean_sysargs(sysargs: List[str]) -> List[str]:
 def create_job(
     name: str,
     metadata: Union[List[str], Dict[str, Any]],
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:execute', 'jobs:write'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:execute', 'jobs:write'])),
 ) -> SuccessTuple:
     """
     Create and start a new job.
@@ -167,7 +167,7 @@ def create_job(
 @app.delete(endpoints['jobs'] + '/{name}', tags=['Jobs'])
 def delete_job(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:delete'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:delete'])),
 ) -> SuccessTuple:
     """
     Delete a job.
@@ -182,7 +182,7 @@ def delete_job(
 @app.get(endpoints['jobs'] + '/{name}/exists', tags=['Jobs'])
 def get_job_exists(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:read'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:read'])),
 ) -> bool:
     """
     Return whether a job exists.
@@ -194,7 +194,7 @@ def get_job_exists(
 @app.get(endpoints['logs'] + '/{name}', tags=['Jobs'])
 def get_logs(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:read', 'logs:read'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:read', 'logs:read'])),
 ) -> Union[str, None]:
     """
     Return a job's log text.
@@ -213,7 +213,7 @@ def get_logs(
 @app.post(endpoints['jobs'] + '/{name}/start', tags=['Jobs'])
 def start_job(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:execute'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:execute'])),
 ) -> SuccessTuple:
     """
     Start a job if stopped.
@@ -234,7 +234,7 @@ def start_job(
 @app.post(endpoints['jobs'] + '/{name}/stop', tags=['Jobs'])
 def stop_job(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:execute', 'josb:stop'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:execute', 'josb:stop'])),
 ) -> SuccessTuple:
     """
     Stop a job if running.
@@ -255,7 +255,7 @@ def stop_job(
 @app.post(endpoints['jobs'] + '/{name}/pause', tags=['Jobs'])
 def pause_job(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:execute', 'jobs:pause'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:execute', 'jobs:pause'])),
 ) -> SuccessTuple:
     """
     Pause a job if running.
@@ -276,7 +276,7 @@ def pause_job(
 @app.get(endpoints['jobs'] + '/{name}/stop_time', tags=['Jobs'])
 def get_stop_time(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:read'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:read'])),
 ) -> Union[datetime, None]:
     """
     Get the timestamp when the job was manually stopped.
@@ -288,7 +288,7 @@ def get_stop_time(
 @app.get(endpoints['jobs'] + '/{name}/is_blocking_on_stdin', tags=['Jobs'])
 def get_is_blocking_on_stdin(
     name: str,
-    curr_user=fastapi.Depends(ScopedAuth(['jobs:read'])),
+    curr_user=fastapi.Security(ScopedAuth(['jobs:read'])),
 ) -> bool:
     """
     Return whether a job is blocking on stdin.
@@ -297,6 +297,18 @@ def get_is_blocking_on_stdin(
     return job.is_blocking_on_stdin()
 
 
+@app.get(endpoints['jobs'] + '{name}/prompt_kwargs', tags=['Jobs'])
+def get_prompt_kwargs(
+    name: str,
+    curr_user=fastapi.Security(ScopedAuth(['jobs:read'])),
+) -> Dict[str, Any]:
+    """
+    Return the kwargs for the blocking `prompt`, if available.
+    """
+    job = _get_job(name)
+    return job.get_prompt_kwargs()
+
+
 _job_clients = defaultdict(lambda: [])
 _job_stop_events = defaultdict(lambda: asyncio.Event())
 _job_queues = defaultdict(lambda: asyncio.Queue())