meerschaum 2.9.4__py3-none-any.whl → 2.9.5__py3-none-any.whl

meerschaum/api/dash/callbacks/dashboard.py

@@ -949,6 +949,37 @@ def sync_documents_click(n_clicks, sync_editor_text):
 
     return alert_from_success_tuple((success, msg))
 
+@dash_app.callback(
+    Output({'type': 'query-result-div', 'index': MATCH}, 'children'),
+    Input({'type': 'query-data-button', 'index': MATCH}, 'n_clicks'),
+    State({'type': 'query-editor', 'index': MATCH}, 'value'),
+    State({'type': 'limit-input', 'index': MATCH}, 'value'),
+    State({'type': 'query-data-begin-input', 'index': MATCH}, 'value'),
+    State({'type': 'query-data-end-input', 'index': MATCH}, 'value'),
+)
+def query_data_click(n_clicks, query_editor_text, limit_value, begin, end):
+    triggered = dash.callback_context.triggered
+    if triggered[0]['value'] is None:
+        raise PreventUpdate
+    pipe = pipe_from_ctx(triggered, 'n_clicks')
+    if pipe is None:
+        raise PreventUpdate
+
+    try:
+        params_query = json.loads(query_editor_text)
+    except Exception as e:
+        return alert_from_success_tuple((False, f"Invalid query:\n{e}"))
+
+    if limit_value is None:
+        limit_value = 100
+
+    df = pipe.get_data(params=params_query, debug=debug, begin=begin, end=end, limit=limit_value)
+    if df is None:
+        return [html.P("No data returned.")]
+    df = df.astype(str)
+    table = dbc.Table.from_dataframe(df, bordered=False, hover=True)
+    return table
+
 
 dash_app.clientside_callback(
     """

meerschaum/api/dash/pipes.py

@@ -343,6 +343,7 @@ def accordion_items_from_pipe(
         items_titles['sql'] = '📃 SQL Query'
     items_titles.update({
         'recent-data': '🗃️ Recent Data',
+        'query-data': '🔍 Query Data',
         'sync-data': '📝 Sync Documents',
     })
 
@@ -669,6 +670,68 @@ def accordion_items_from_pipe(
             table = html.P("Could not retrieve recent data.")
         items_bodies['recent-data'] = table
 
+    if 'query-data' in active_items:
+        query_editor = dash_ace.DashAceEditor(
+            value='{\n    \n}',
+            mode='norm',
+            tabSize=4,
+            theme='twilight',
+            id={'type': 'query-editor', 'index': json.dumps(pipe.meta)},
+            width='100%',
+            height='200px',
+            readOnly=False,
+            showGutter=True,
+            showPrintMargin=False,
+            highlightActiveLine=True,
+            wrapEnabled=True,
+            style={'min-height': '120px'},
+        )
+        query_data_button = dbc.Button(
+            "Query",
+            id={'type': 'query-data-button', 'index': json.dumps(pipe.meta)},
+        )
+
+        begin_end_input_group = dbc.InputGroup(
+            [
+                dbc.Input(
+                    id={'type': 'query-data-begin-input', 'index': json.dumps(pipe.meta)},
+                    placeholder="Begin",
+                ),
+                dbc.Input(
+                    id={'type': 'query-data-end-input', 'index': json.dumps(pipe.meta)},
+                    placeholder="End",
+                ),
+            ],
+            size="sm",
+        )
+
+        limit_input = dbc.Input(
+            type="number",
+            min=0,
+            max=100,
+            value=10,
+            step=1,
+            placeholder="Limit",
+            id={'type': 'limit-input', 'index': json.dumps(pipe.meta)},
+        )
+        query_result_div = html.Div(id={'type': 'query-result-div', 'index': json.dumps(pipe.meta)})
+
+        items_bodies['query-data'] = html.Div([
+            query_editor,
+            html.Br(),
+            dbc.Row(
+                [
+                    dbc.Col([query_data_button], lg=2, md=3, sm=4, xs=6, width=2),
+                    dbc.Col([begin_end_input_group], lg=3, md=3, sm=4, width=4),
+                    dbc.Col(html.Div([limit_input, dbc.FormText("Row Limit")]), lg=2, md=3, sm=4, xs=6, width=2),
+                ],
+                justify="between",
+            ),
+            dbc.Row([
+                dbc.Col([query_result_div], width=True),
+            ]),
+        ])
+
     if 'sync-data' in active_items:
         backtrack_df = pipe.get_backtrack_data(debug=debug, limit=1)
         try:

meerschaum/api/resources/static/css/dash.css

@@ -80,3 +80,19 @@ a {
 .pages-offcanvas-accordion div {
   padding: 0 !important;
 }
+
+/* restyle radio items */
+.radio-group .form-check {
+  padding-left: 0;
+}
+
+.radio-group .btn-group > .form-check:not(:last-child) > .btn {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.radio-group .btn-group > .form-check:not(:first-child) > .btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  margin-left: -1px;
+}

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.9.4"
+__version__ = "2.9.5"

meerschaum/connectors/sql/_sql.py

@@ -928,7 +928,7 @@ def to_sql(
             df[col] = df[col].apply(
                 functools.partial(
                     serialize_geometry,
-                    as_wkt=(self.flavor == 'mssql')
+                    geometry_format=('wkt' if self.flavor == 'mssql' else 'wkb_hex'),
                 )
             )
 

meerschaum/utils/dataframe.py

@@ -1138,10 +1138,10 @@ def enforce_dtypes(
         if parsed_geom_cols:
             if debug:
                 dprint(f"Converting to GeoDataFrame (geometry column: '{parsed_geom_cols[0]}')...")
-            df = geopandas.GeoDataFrame(df, geometry=parsed_geom_cols[0])
             try:
+                df = geopandas.GeoDataFrame(df, geometry=parsed_geom_cols[0])
                 df.rename_geometry(parsed_geom_cols[0], inplace=True)
-            except ValueError:
+            except (ValueError, TypeError):
                 pass
 
     df_dtypes = {c: str(t) for c, t in df.dtypes.items()}

meerschaum/utils/dtypes/__init__.py

@@ -541,7 +541,6 @@ def serialize_bytes(data: bytes) -> str:
 def serialize_geometry(
     geom: Any,
     geometry_format: str = 'wkb_hex',
-    as_wkt: bool = False,
 ) -> Union[str, Dict[str, Any], None]:
     """
     Serialize geometry data as a hex-encoded well-known-binary string. 
@@ -588,7 +587,7 @@ def deserialize_bytes_string(data: Optional[str], force_hex: bool = False) -> Un
 
     Parameters
     ----------
-    data: str | None
+    data: Optional[str]
         The string to be deserialized into bytes.
         May be base64- or hex-encoded (prefixed with `'\\x'`).
 
@@ -625,7 +624,7 @@ def deserialize_base64(data: str) -> bytes:
     return base64.b64decode(data)
 
 
-def encode_bytes_for_bytea(data: bytes, with_prefix: bool = True) -> str | None:
+def encode_bytes_for_bytea(data: bytes, with_prefix: bool = True) -> Union[str, None]:
     """
     Return the given bytes as a hex string for PostgreSQL's `BYTEA` type.
     """

meerschaum/utils/sql.py

@@ -1838,10 +1838,9 @@ def get_null_replacement(typ: str, flavor: str) -> str:
     A value which may stand in place of NULL for this type.
     `'None'` is returned if a value cannot be determined.
     """
-    from meerschaum.utils.dtypes import are_dtypes_equal
     from meerschaum.utils.dtypes.sql import DB_FLAVORS_CAST_DTYPES
     if 'geometry' in typ.lower():
-        return '010100000000008058346FCDC100008058346FCDC1'
+        return "'010100000000008058346FCDC100008058346FCDC1'"
     if 'int' in typ.lower() or typ.lower() in ('numeric', 'number'):
         return '-987654321'
     if 'bool' in typ.lower() or typ.lower() == 'bit':

{meerschaum-2.9.4.dist-info → meerschaum-2.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 2.9.4
+Version: 2.9.5
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.9.4.dist-info → meerschaum-2.9.5.dist-info}/RECORD

@@ -60,7 +60,7 @@ meerschaum/api/dash/connectors.py,sha256=-Wd40ieYJI2nOASXi4V1C4bvLekjnN_tj6zp7Hg
 meerschaum/api/dash/graphs.py,sha256=wJUDWzcLN8-C3xko6rj0F2v7Rt8YDkSXoVkkXJjYGIk,2046
 meerschaum/api/dash/jobs.py,sha256=mj9STE6AaQY4fwkjD1JcYRG0iW3VEcP04bO1SlKgiXw,7681
 meerschaum/api/dash/keys.py,sha256=mQT8MxtaeugbdZxGDhkr-G1mccPB4XpLN-UB7s3tamI,11144
-meerschaum/api/dash/pipes.py,sha256=Zm2UKovwz6K8Mt6dTCY2LgDyUyFhEZ5D8nWw4ecPUXI,26210
+meerschaum/api/dash/pipes.py,sha256=VJB30_e3KXgwvfrqoPWbO7A1PJ6sJlt-nwfWiYtSWd4,28347
 meerschaum/api/dash/plugins.py,sha256=KdfG04f6SsUpBg-nm7MUJegFGuElOj-GAkxDX98hi60,3768
 meerschaum/api/dash/sessions.py,sha256=i8qFGZX1zlxskj13F5B9TYd-mXdVA71Q8d8nESbiJG0,5068
 meerschaum/api/dash/sync.py,sha256=9lt7IRdG-fe9gf_ZO_viPiGlerX7ic6r_VFocv3I51A,504
@@ -75,7 +75,7 @@ meerschaum/api/dash/assets/logo_48x48.png,sha256=hTR5BHUHEN4yP2xiqAcDciuigoII9T3
 meerschaum/api/dash/assets/logo_500x500.png,sha256=9EUtf6wQcEZTXHKfQ2kjNXod6Rn_4DTB_BkTgxggq00,67702
 meerschaum/api/dash/callbacks/__init__.py,sha256=5dh8gsfcVaLlM4WcvGVE9Q1CtwaqJ2qwND0tdhvodng,607
 meerschaum/api/dash/callbacks/custom.py,sha256=af7O0OMoNOcAJOuE0N2WXQZbmHiUVcQB9YBe_xgcr7I,1795
-meerschaum/api/dash/callbacks/dashboard.py,sha256=BmFYp3yPkg0N4ywHcKhn2aevGc5BIYfjqtFy2YIj43w,35517
+meerschaum/api/dash/callbacks/dashboard.py,sha256=fIMIXsGHUFoB_1X4VFq2kr2A6JGW04Zlzt-uRC8ZaqI,36723
 meerschaum/api/dash/callbacks/jobs.py,sha256=JYTrDcUEte_MIT3EegLDmQDsmU_Mxqw8L60dvF71ho4,8418
 meerschaum/api/dash/callbacks/login.py,sha256=mEvMgV-f85H6DvqNdTvJPoiwHqTnhWY2nf_zLB26ipE,2876
 meerschaum/api/dash/callbacks/pipes.py,sha256=byphQn-wJOe8ft-fGU9wac0n5xsMjVHJzNvYYb9NsKU,1693
@@ -102,7 +102,7 @@ meerschaum/api/resources/__init__.py,sha256=LshFiqh0sL55QtC_15fz6A6r-1_H9sQWtlif
 meerschaum/api/resources/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/api/resources/static/css/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/api/resources/static/css/bootstrap.min.css,sha256=W8ArKu4Q_NnxCNqO3doJB2hqrNOIHNLFroAxpyxnYL8,180286
-meerschaum/api/resources/static/css/dash.css,sha256=nhHriUI9eos9bjMUofqNhqMQDK8W_f-vxfcWhbl1XBY,1886
+meerschaum/api/resources/static/css/dash.css,sha256=UVpQh1LaiYqwmPz9Q0Sqjnl8kiCRj6KLpxZiOx04KvY,2241
 meerschaum/api/resources/static/css/dbc_dark.css,sha256=2pka1ymFAjlWLv-mJaxGkPeL-gTEMD2g4Ba6LMuhHV4,6087
 meerschaum/api/resources/static/css/styles.css,sha256=dHcCtRUzs8kJhpG6d4gusROLSe9AFkUitybvgFmEDvI,81
 meerschaum/api/resources/static/css/xterm.css,sha256=gy8_LGA7Q61DUf8ElwFQzHqHMBQnbbEmpgZcbdgeSHI,5383
@@ -145,7 +145,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=RLC3HHi_1ndj7ITVDKLD9_uULY3caGRwSz3ATYE-ixA,15014
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=jHcWRkxd82_BgX8Xo8agsWvf7BSbv3qHLWmYl6ehp_0,4242
-meerschaum/config/_version.py,sha256=09TecL7mdmlPiCe6BZ5Wwed_OX5NwnjP74-XZx9sGLQ,71
+meerschaum/config/_version.py,sha256=scmWcW_oLQnDFEgon9TAHo6RC6IRVBGvwoznO__SO3M,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=2UukC0Lmk-aVL1o1qXzumqmuIrw3vu9fD7iCuz4XD4I,10544
@@ -180,7 +180,7 @@ meerschaum/connectors/sql/_fetch.py,sha256=mVe5zQo7SM9PSUU3Vjhacg4Bq1-Vttb7KkXL4
 meerschaum/connectors/sql/_instance.py,sha256=xCc8M0xWMzF5Tu_1uWIFivAoHey5N1ccFhN_Z7u04zk,6304
 meerschaum/connectors/sql/_pipes.py,sha256=udeAA-me-Lwq_gGRdvzvcaBWmkAb4eeXZvKdtUUcBfE,130202
 meerschaum/connectors/sql/_plugins.py,sha256=OVEdZ_UHTi-x5sF-5lu2TmR9ONxddp6SwDOmFo5TpU8,8051
-meerschaum/connectors/sql/_sql.py,sha256=EziDFp9mLU-VPvFczG94ZUtGy-JmKxXB4wbLtCfkykk,43786
+meerschaum/connectors/sql/_sql.py,sha256=lkGvmE72f59_RhDXvH5hiA93Wo5R08dyEbNDedAke6o,43820
 meerschaum/connectors/sql/_uri.py,sha256=BFzu5pjlbL3kxLH13vHWlpKGYTPfg8wuA2j58O9NsCM,3440
 meerschaum/connectors/sql/_users.py,sha256=mRyjsUCfPV52nfTQUbpu9gMXfV_DHXNqEhw4N-lSS4Q,9954
 meerschaum/connectors/sql/tools.py,sha256=jz8huOaRCwGlYdtGfAqAh7SoK8uydYBrasKQba9FT38,187
@@ -222,7 +222,7 @@ meerschaum/plugins/__init__.py,sha256=H0VwldqR_n5XaX3amBl58mDgugIo0Pnn-e1Xxyb103
 meerschaum/plugins/bootstrap.py,sha256=VwjpZAuYdqPJW0YoVgAoM_taHkdQHqP902-8T7OWWCI,11339
 meerschaum/utils/__init__.py,sha256=QrK1K9hIbPCRCM5k2nZGFqGnrqhA0Eh-iSmCU7FG6Cs,612
 meerschaum/utils/_get_pipes.py,sha256=tu4xKPoDn79Dz2kWM13cXTP4DSCkn-3G9M8KiLftopw,11073
-meerschaum/utils/dataframe.py,sha256=J7L2OWCuRI1Oxi-UMgQK9S_CiduuSopC7bmO1k-eQdM,54091
+meerschaum/utils/dataframe.py,sha256=Jk5FnnCtvErYPKEDi8JaccNi2cn-InL3GLN5nuRsR_o,54108
 meerschaum/utils/debug.py,sha256=GyIzJmunkoPnOcZNYVQdT4Sgd-aOb5MI2VbIgATOjIQ,3695
 meerschaum/utils/interactive.py,sha256=t-6jWozXSqL7lYGDHuwiOjTgr-UKhdcg61q_eR5mikI,3196
 meerschaum/utils/misc.py,sha256=dQ7WvcN7Z-LwkaipNeliqjdkKp_1U5JPq6lNLfwuE0U,48160
@@ -231,7 +231,7 @@ meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
 meerschaum/utils/process.py,sha256=as0-CjG4mqFP0TydVvmAmgki6er4thS5BqUopeiq98Q,8216
 meerschaum/utils/prompt.py,sha256=qj1As1tuiL0GZTku_YOC6I5DmOU6L5otDR7DW7LA5fM,19397
 meerschaum/utils/schedule.py,sha256=Vrcd2Qs-UPVn6xBayNUIgludf0Mlb6Wrgq6ATdyhV8c,11451
-meerschaum/utils/sql.py,sha256=xtGDI7QVgcHoBP7Uik-VGtDEE0DRusDCM1ChLbjU0wo,84594
+meerschaum/utils/sql.py,sha256=saT3lEKfGExZJB2MtDeeEd5D48Ebd0Or9TqzKWMjuK0,84539
 meerschaum/utils/threading.py,sha256=awjbVL_QR6G-o_9Qk85utac9cSdqkiC8tQSdERCdrG8,2814
 meerschaum/utils/typing.py,sha256=U3MC347sh1umpa3Xr1k71eADyDmk4LB6TnVCpq8dVzI,2830
 meerschaum/utils/warnings.py,sha256=n-phr3BftNNgyPnvnXC_VMSjtCvjiCZ-ewmVfcROhkc,6611
@@ -242,7 +242,7 @@ meerschaum/utils/daemon/RotatingFile.py,sha256=8_bXegBjjzNRlNEjFZ_EHU4pSaDfjXZTw
 meerschaum/utils/daemon/StdinFile.py,sha256=qdZ8E_RSOkURypwnS50mWeyWyRig1bAY9tKWMTVKajc,3307
 meerschaum/utils/daemon/__init__.py,sha256=ziRPyu_IM3l7Xd58y3Uvt0fZLoirJ9nuboFIxxult6c,8741
 meerschaum/utils/daemon/_names.py,sha256=d2ZwTxBoTAqXZkCfZ5LuX2XrkQmLNUq1OTlUqfoH5dA,4515
-meerschaum/utils/dtypes/__init__.py,sha256=NI09GgIcTxwXhGjaxqYFV0FmdrPpvrnjoKfX9gaHKf8,21348
+meerschaum/utils/dtypes/__init__.py,sha256=TPnFZcmHEevDKr2DYIWX7TA6xE4C8bGVWhhvPp_Pjlo,21331
 meerschaum/utils/dtypes/sql.py,sha256=zhwGnz6MfsaJEH7Sibtd-GfVEImnBSkZh1I3srxgiKE,31428
 meerschaum/utils/formatting/__init__.py,sha256=bA8qwBeTNIVHVQOBK682bJsKSKik1yS6xYJAoi0RErk,15528
 meerschaum/utils/formatting/_jobs.py,sha256=izsqPJhTtUkXUUtWnbXtReYsUYwulXtci3pBj72Ne64,6637
@@ -254,10 +254,10 @@ meerschaum/utils/packages/_packages.py,sha256=G3eMtqq4WJo_iTC4ctRAWkzKhN6ZQcdFRp
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=gc1TCeAj-kTZbQFAT9xl1bi4HXFV5ApT0dPOJfxwr78,3748
 meerschaum/utils/venv/__init__.py,sha256=RhWuDohBEROIu_9T6BNPgYCrGtuE14w7nXHR1E2qyh8,27321
-meerschaum-2.9.4.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.9.4.dist-info/METADATA,sha256=kzEGRIPg4O6WT0dVzJg_huXr0cU7U5z7GtUVdrebeqM,25061
-meerschaum-2.9.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-meerschaum-2.9.4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.9.4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.9.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.9.4.dist-info/RECORD,,
+meerschaum-2.9.5.dist-info/licenses/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.9.5.dist-info/METADATA,sha256=_PkhonbxfgtBc5wD0m9GN5vUzk_S9-dkazEbaUFb46M,25061
+meerschaum-2.9.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+meerschaum-2.9.5.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.9.5.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.9.5.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.9.5.dist-info/RECORD,,