meerschaum 2.9.4__tar.gz → 2.9.5__tar.gz

{meerschaum-2.9.4 → meerschaum-2.9.5}/PKG-INFO

@@ -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 → meerschaum-2.9.5}/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-2.9.4 → meerschaum-2.9.5}/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-2.9.4 → meerschaum-2.9.5}/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-2.9.4 → meerschaum-2.9.5}/meerschaum/config/_version.py

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

{meerschaum-2.9.4 → meerschaum-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-2.9.4 → meerschaum-2.9.5}/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-2.9.4 → meerschaum-2.9.5}/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-2.9.4 → meerschaum-2.9.5}/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 → meerschaum-2.9.5}/meerschaum.egg-info/PKG-INFO

@@ -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 → meerschaum-2.9.5}/tests/test_sync.py

@@ -620,7 +620,7 @@ def test_sync_inplace_no_datetime(flavor: str):
         str(conn), 'inplace', 'no-datetime',
         instance=conn,
         columns={'id': 'id'},
-        dtypes={'a': 'int', 'id': 'uuid'},
+        dtypes={'a': 'int', 'id': 'uuid', 'geom': 'geometry'},
         upsert=False,
         static=False,
         parameters={
@@ -630,12 +630,16 @@ def test_sync_inplace_no_datetime(flavor: str):
         },
     )
 
+    shapely = mrsm.attempt_import('shapely')
+    geom = shapely.MultiLineString([[[0, 0], [1, 2]], [[4, 4], [5, 6]]])
+    geom2 = shapely.MultiLineString([[[1, 1], [2, 3]], [[5, 5], [6, 7]]])
+
     docs = [
-        {'id': UUID('9f680a72-b5f7-4336-8f7c-30927ec21cb1')},
-        {'id': UUID('335b0322-4b54-40aa-8019-07666cbefa52')},
-        {'id': UUID('d7d42913-2dfe-47d6-b0e0-7f71e13e814e'), 'd': 7},
-        {'id': UUID('7e194a2c-26b4-4632-af02-e0a8b2c6ce1e')},
-        {'id': UUID('31e5fd08-fb81-47f4-8a1c-0c9dcf08ac5e')},
+        {'id': UUID('9f680a72-b5f7-4336-8f7c-30927ec21cb1'), 'geom': geom},
+        {'id': UUID('335b0322-4b54-40aa-8019-07666cbefa52'), 'geom': geom},
+        {'id': UUID('d7d42913-2dfe-47d6-b0e0-7f71e13e814e'), 'd': 7, 'geom': geom},
+        {'id': UUID('7e194a2c-26b4-4632-af02-e0a8b2c6ce1e'), 'geom': geom},
+        {'id': UUID('31e5fd08-fb81-47f4-8a1c-0c9dcf08ac5e'), 'geom': geom},
     ]
     success, msg = source_pipe.sync(docs)
     assert success, msg
@@ -653,7 +657,7 @@ def test_sync_inplace_no_datetime(flavor: str):
         {'id': UUID('8b7bf428-d0ed-40fa-951b-bb115a03eac5'), 'c': 8},
         {'id': UUID('36aed9b4-4c7a-4566-a321-d1774ef1015a'), 'c': 7},
         {'id': UUID('7a4ef6cc-37d8-4899-9ddb-07b4998d0b53'), 'c': 6},
-        {'id': UUID('59244211-fdb8-46f1-b14b-8631146758c0'), 'c': 5},
+        {'id': UUID('59244211-fdb8-46f1-b14b-8631146758c0'), 'c': 5,},
     ]
     success, msg = source_pipe.sync(new_docs)
     assert success, msg
@@ -665,7 +669,7 @@ def test_sync_inplace_no_datetime(flavor: str):
     update_docs = [
         {'id': UUID('9f680a72-b5f7-4336-8f7c-30927ec21cb1'), 'a': 1},
         {'id': UUID('335b0322-4b54-40aa-8019-07666cbefa52'), 'a': 2},
-        {'id': UUID('d7d42913-2dfe-47d6-b0e0-7f71e13e814e'), 'a': 3},
+        {'id': UUID('d7d42913-2dfe-47d6-b0e0-7f71e13e814e'), 'a': 3, 'geom': geom2},
         {'id': UUID('7e194a2c-26b4-4632-af02-e0a8b2c6ce1e'), 'a': 4},
         {'id': UUID('31e5fd08-fb81-47f4-8a1c-0c9dcf08ac5e'), 'a': 5},
     ]
@@ -681,6 +685,7 @@ def test_sync_inplace_no_datetime(flavor: str):
     assert len(df) == 1
     assert df['a'][0] == 3
     assert df['d'][0] == 7
+    assert df['geom'][0] == geom2
 
 
 @pytest.mark.parametrize("flavor", get_flavors())