meerschaum 2.9.0rc2__tar.gz → 2.9.0rc3__tar.gz

{meerschaum-2.9.0rc2/meerschaum.egg-info → meerschaum-2.9.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: meerschaum
-Version: 2.9.0rc2
+Version: 2.9.0rc3
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares
@@ -87,6 +87,10 @@ Requires-Dist: mycli>=1.23.2; extra == "cli"
 Requires-Dist: litecli>=1.5.0; extra == "cli"
 Requires-Dist: mssql-cli>=1.0.0; extra == "cli"
 Requires-Dist: gadwall>=0.2.0; extra == "cli"
+Provides-Extra: gis
+Requires-Dist: pyproj>=3.7.1; extra == "gis"
+Requires-Dist: geopandas>=1.0.1; extra == "gis"
+Requires-Dist: shapely>=2.0.7; extra == "gis"
 Provides-Extra: stack
 Requires-Dist: docker-compose>=1.29.2; extra == "stack"
 Provides-Extra: build
@@ -126,8 +130,6 @@ Requires-Dist: importlib-metadata>=4.12.0; extra == "extras"
 Provides-Extra: sql
 Requires-Dist: numpy>=1.18.5; extra == "sql"
 Requires-Dist: pandas[parquet]>=2.0.1; extra == "sql"
-Requires-Dist: geopandas>=1.0.1; extra == "sql"
-Requires-Dist: shapely>=2.0.7; extra == "sql"
 Requires-Dist: pyarrow>=16.1.0; extra == "sql"
 Requires-Dist: dask[complete]>=2024.12.1; extra == "sql"
 Requires-Dist: partd>=1.4.2; extra == "sql"
@@ -167,6 +169,9 @@ Requires-Dist: fasteners>=0.19.0; extra == "sql"
 Requires-Dist: virtualenv>=20.1.0; extra == "sql"
 Requires-Dist: attrs>=24.2.0; extra == "sql"
 Requires-Dist: uv>=0.2.11; extra == "sql"
+Requires-Dist: pyproj>=3.7.1; extra == "sql"
+Requires-Dist: geopandas>=1.0.1; extra == "sql"
+Requires-Dist: shapely>=2.0.7; extra == "sql"
 Provides-Extra: dash
 Requires-Dist: Flask-Compress>=1.10.1; extra == "dash"
 Requires-Dist: dash>=2.6.2; extra == "dash"
@@ -189,8 +194,6 @@ Requires-Dist: httpcore>=1.0.6; extra == "api"
 Requires-Dist: valkey>=6.0.0; extra == "api"
 Requires-Dist: numpy>=1.18.5; extra == "api"
 Requires-Dist: pandas[parquet]>=2.0.1; extra == "api"
-Requires-Dist: geopandas>=1.0.1; extra == "api"
-Requires-Dist: shapely>=2.0.7; extra == "api"
 Requires-Dist: pyarrow>=16.1.0; extra == "api"
 Requires-Dist: dask[complete]>=2024.12.1; extra == "api"
 Requires-Dist: partd>=1.4.2; extra == "api"
@@ -230,6 +233,9 @@ Requires-Dist: fasteners>=0.19.0; extra == "api"
 Requires-Dist: virtualenv>=20.1.0; extra == "api"
 Requires-Dist: attrs>=24.2.0; extra == "api"
 Requires-Dist: uv>=0.2.11; extra == "api"
+Requires-Dist: pyproj>=3.7.1; extra == "api"
+Requires-Dist: geopandas>=1.0.1; extra == "api"
+Requires-Dist: shapely>=2.0.7; extra == "api"
 Requires-Dist: pprintpp>=0.4.0; extra == "api"
 Requires-Dist: asciitree>=0.3.3; extra == "api"
 Requires-Dist: typing-extensions>=4.7.1; extra == "api"
@@ -292,13 +298,14 @@ Requires-Dist: aiomysql>=0.0.21; extra == "full"
 Requires-Dist: sqlalchemy-cockroachdb>=2.0.0; extra == "full"
 Requires-Dist: duckdb>=1.0.0; extra == "full"
 Requires-Dist: duckdb-engine>=0.13.0; extra == "full"
+Requires-Dist: pyproj>=3.7.1; extra == "full"
+Requires-Dist: geopandas>=1.0.1; extra == "full"
+Requires-Dist: shapely>=2.0.7; extra == "full"
 Requires-Dist: toga>=0.3.0-dev29; extra == "full"
 Requires-Dist: pywebview>=3.6.3; extra == "full"
 Requires-Dist: pycparser>=2.21.0; extra == "full"
 Requires-Dist: numpy>=1.18.5; extra == "full"
 Requires-Dist: pandas[parquet]>=2.0.1; extra == "full"
-Requires-Dist: geopandas>=1.0.1; extra == "full"
-Requires-Dist: shapely>=2.0.7; extra == "full"
 Requires-Dist: pyarrow>=16.1.0; extra == "full"
 Requires-Dist: dask[complete]>=2024.12.1; extra == "full"
 Requires-Dist: partd>=1.4.2; extra == "full"

{meerschaum-2.9.0rc2 → meerschaum-2.9.0rc3}/meerschaum/api/routes/_pipes.py

@@ -383,6 +383,10 @@ def get_pipe_data(
     params: Optional[str] = None,
     limit: int = MAX_RESPONSE_ROW_LIMIT,
     order: str = 'asc', 
+    date_format: str = 'iso',
+    date_unit: str = 'us',
+    double_precision: int = 15,
+    geometry_format: str = 'wkb_hex',
     as_chunks: bool = False,
     chunk_interval: Optional[int] = None,
     curr_user = (
@@ -401,6 +405,21 @@ def get_pipe_data(
         The connector key to the instance on which the pipe is registered.
         Defaults to the configured value for `meerschaum:api_instance`.
 
+    date_format: str, default 'iso'
+        Serialzation format for datetime values.
+        Accepted values are `'iso`' (ISO8601) and `'epoch'` (epoch milliseconds).
+
+    date_unit: str, default 'us'
+        Timestamp precision for serialization. Accepted values are `'s'` (seconds),
+        `'ms'` (milliseconds), `'us'` (microseconds), and `'ns'`.
+
+    double_precision: int, default 15
+        The number of decimal places to use when encoding floating point values (maximum 15).
+
+    geometry_format: str, default 'wkb_hex'
+        The serialization format for geometry data.
+        Accepted values are `geojson`, `wkb_hex`, and `wkt`.
+
     as_chunks: bool, default False
         If `True`, return a chunk token to be consumed by the `/chunks` endpoint.
     """
@@ -483,7 +502,7 @@ def get_pipe_data(
         )
         return fastapi.Response(
             json.dumps({
-                'chunks_cursor': chunks_cursor,
+                'chunks_cursor': chunks_cursor_token,
             }),
             media_type='application/json',
         )
@@ -504,7 +523,13 @@ def get_pipe_data(
             detail="Could not fetch data with the given parameters.",
         )
 
-    json_content = to_json(df)
+    json_content = to_json(
+        df,
+        date_format=date_format,
+        date_unit=date_unit,
+        geometry_format=geometry_format,
+        double_precision=double_precision,
+    )
     return fastapi.Response(
         json_content,
         media_type='application/json',

{meerschaum-2.9.0rc2 → meerschaum-2.9.0rc3}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.9.0rc2"
+__version__ = "2.9.0rc3"

{meerschaum-2.9.0rc2 → meerschaum-2.9.0rc3}/meerschaum/connectors/valkey/_ValkeyConnector.py

@@ -50,6 +50,8 @@ class ValkeyConnector(Connector):
         get_sync_time,
         get_pipe_rowcount,
         fetch_pipes_keys,
+        get_document_key,
+        get_table_quoted_doc_key,
     )
     from ._fetch import (
         fetch,

{meerschaum-2.9.0rc2 → meerschaum-2.9.0rc3}/meerschaum/connectors/valkey/_pipes.py

@@ -10,8 +10,9 @@ from datetime import datetime, timezone
 
 import meerschaum as mrsm
 from meerschaum.utils.typing import SuccessTuple, Any, Union, Optional, Dict, List, Tuple
-from meerschaum.utils.misc import json_serialize_datetime, string_to_dict
-from meerschaum.utils.warnings import warn
+from meerschaum.utils.misc import string_to_dict
+from meerschaum.utils.dtypes import json_serialize_value
+from meerschaum.utils.warnings import warn, dprint
 from meerschaum.config.static import STATIC_CONFIG
 
 PIPES_TABLE: str = 'mrsm_pipes'
@@ -46,25 +47,15 @@ def serialize_document(doc: Dict[str, Any]) -> str:
     -------
     A serialized string for the document.
     """
-    from meerschaum.utils.dtypes import serialize_bytes
     return json.dumps(
         doc,
-        default=(
-            lambda x: (
-                json_serialize_datetime(x)
-                if hasattr(x, 'tzinfo')
-                else (
-                    serialize_bytes(x)
-                    if isinstance(x, bytes)
-                    else str(x)
-                )
-            )
-        ),
+        default=json_serialize_value,
         separators=(',', ':'),
         sort_keys=True,
     )
 
 
+@staticmethod
 def get_document_key(
     doc: Dict[str, Any],
     indices: List[str],
@@ -91,25 +82,39 @@ def get_document_key(
     from meerschaum.utils.dtypes import coerce_timezone
     index_vals = {
         key: (
-            str(val)
+            str(val).replace(':', COLON)
             if not isinstance(val, datetime)
             else str(int(coerce_timezone(val).replace(tzinfo=timezone.utc).timestamp()))
         )
         for key, val in doc.items()
-        if key in indices
-    } if indices else {}
-    indices_str = ((table_name + ':indices:') if table_name else '') + ','.join(
-        sorted(
-            [
-                f'{key}{COLON}{val}'
-                for key, val in index_vals.items()
-            ]
+        if ((key in indices) if indices else True)
+    }
+    indices_str = (
+        (
+            (
+                (
+                    table_name
+                    + ':'
+                    + ('indices:' if True else '')
+                )
+            )
+            if table_name
+            else ''
+        ) + ','.join(
+            sorted(
+                [
+                    f'{key}{COLON}{val}'
+                    for key, val in index_vals.items()
+                ]
+            )
         )
-    ) if indices else serialize_document(doc)
+    )
     return indices_str
 
 
+@classmethod
 def get_table_quoted_doc_key(
+    cls,
     table_name: str,
     doc: Dict[str, Any],
     indices: List[str],
@@ -120,7 +125,7 @@ def get_table_quoted_doc_key(
     """
     return json.dumps(
         {
-            get_document_key(doc, indices, table_name): serialize_document(doc),
+            cls.get_document_key(doc, indices, table_name): serialize_document(doc),
             **(
                 {datetime_column: doc.get(datetime_column, 0)}
                 if datetime_column
@@ -129,7 +134,7 @@ def get_table_quoted_doc_key(
         },
         sort_keys=True,
         separators=(',', ':'),
-        default=(lambda x: json_serialize_datetime(x) if hasattr(x, 'tzinfo') else str(x)),
+        default=json_serialize_value,
     )
 
 
@@ -377,7 +382,7 @@ def delete_pipe(
         doc = docs[0]
         doc_str = json.dumps(
             doc,
-            default=(lambda x: json_serialize_datetime(x) if hasattr(x, 'tzinfo') else str(x)),
+            default=json_serialize_value,
             separators=(',', ':'),
             sort_keys=True,
         )
@@ -445,9 +450,13 @@ def get_pipe_data(
     ]
     try:
         docs_strings = [
-            self.get(get_document_key(
-                doc, indices, table_name
-            ))
+            self.get(
+                self.get_document_key(
+                    doc,
+                    indices,
+                    table_name,
+                )
+            )
             for doc in ix_docs
         ]
     except Exception as e:
@@ -535,7 +544,7 @@ def sync_pipe(
     def _serialize_indices_docs(_docs):
         return [
             {
-                'ix': get_document_key(doc, indices),
+                'ix': self.get_document_key(doc, indices),
                 **(
                     {
                         dt_col: doc.get(dt_col, 0)
@@ -594,7 +603,7 @@ def sync_pipe(
     unseen_docs = unseen_df.to_dict(orient='records') if unseen_df is not None else []
     unseen_indices_docs = _serialize_indices_docs(unseen_docs)
     unseen_ix_vals = {
-        get_document_key(doc, indices, table_name): serialize_document(doc)
+        self.get_document_key(doc, indices, table_name): serialize_document(doc)
         for doc in unseen_docs
     }
     for key, val in unseen_ix_vals.items():
@@ -615,7 +624,7 @@ def sync_pipe(
 
     update_docs = update_df.to_dict(orient='records') if update_df is not None else []
     update_ix_docs = {
-        get_document_key(doc, indices, table_name): doc
+        self.get_document_key(doc, indices, table_name): doc
         for doc in update_docs
     }
     existing_docs_data = {
@@ -633,7 +642,7 @@ def sync_pipe(
         if key not in existing_docs
     }
     new_ix_vals = {
-        get_document_key(doc, indices, table_name): serialize_document(doc)
+        self.get_document_key(doc, indices, table_name): serialize_document(doc)
         for doc in new_update_docs.values()
     }
     for key, val in new_ix_vals.items():
@@ -743,8 +752,8 @@ def clear_pipe(
     table_name = self.quote_table(pipe.target)
     indices = [col for col in pipe.columns.values() if col]
     for doc in docs:
-        set_doc_key = get_document_key(doc, indices)
-        table_doc_key = get_document_key(doc, indices, table_name)
+        set_doc_key = self.get_document_key(doc, indices)
+        table_doc_key = self.get_document_key(doc, indices, table_name)
         try:
             if dt_col:
                 self.client.zrem(table_name, set_doc_key)
@@ -826,13 +835,15 @@ def get_pipe_rowcount(
         return 0
 
     try:
-        if begin is None and end is None and params is None:
+        if begin is None and end is None and not params:
             return (
                 self.client.zcard(table_name)
                 if dt_col
-                else self.client.llen(table_name)
+                else self.client.scard(table_name)
             )
-    except Exception:
+    except Exception as e:
+        if debug:
+            dprint(f"Failed to get rowcount for {pipe}:\n{e}")
         return None
 
     df = pipe.get_data(begin=begin, end=end, params=params, debug=debug)

{meerschaum-2.9.0rc2 → meerschaum-2.9.0rc3}/meerschaum/core/Pipe/__init__.py

@@ -137,6 +137,7 @@ class Pipe:
         _persist_new_numeric_columns,
         _persist_new_uuid_columns,
         _persist_new_bytes_columns,
+        _persist_new_geometry_columns,
     )
     from ._verify import (
         verify,

{meerschaum-2.9.0rc2 → meerschaum-2.9.0rc3}/meerschaum/core/Pipe/_sync.py

@@ -158,6 +158,7 @@ def sync(
         'error_callback': error_callback,
         'sync_chunks': sync_chunks,
         'chunksize': chunksize,
+        'safe_copy': True,
     })
 
     ### NOTE: Invalidate `_exists` cache before and after syncing.
@@ -268,6 +269,7 @@ def sync(
                             **kw
                         )
                     )
+                    kw['safe_copy'] = False
             except Exception as e:
                 get_console().print_exception(
                     suppress=[
@@ -402,6 +404,7 @@ def sync(
         self._persist_new_numeric_columns(df, debug=debug)
         self._persist_new_uuid_columns(df, debug=debug)
         self._persist_new_bytes_columns(df, debug=debug)
+        self._persist_new_geometry_columns(df, debug=debug)
 
         if debug:
             dprint(
@@ -1009,7 +1012,7 @@ def _persist_new_numeric_columns(self, df, debug: bool = False) -> SuccessTuple:
 
     self._attributes_sync_time = None
     dtypes = self.parameters.get('dtypes', {})
-    dtypes.update({col: 'numeric' for col in numeric_cols})
+    dtypes.update({col: 'numeric' for col in new_numeric_cols})
     self.parameters['dtypes'] = dtypes
     if not self.temporary:
         edit_success, edit_msg = self.edit(interactive=False, debug=debug)
@@ -1034,7 +1037,7 @@ def _persist_new_uuid_columns(self, df, debug: bool = False) -> SuccessTuple:
 
     self._attributes_sync_time = None
     dtypes = self.parameters.get('dtypes', {})
-    dtypes.update({col: 'uuid' for col in uuid_cols})
+    dtypes.update({col: 'uuid' for col in new_uuid_cols})
     self.parameters['dtypes'] = dtypes
     if not self.temporary:
         edit_success, edit_msg = self.edit(interactive=False, debug=debug)
@@ -1059,7 +1062,7 @@ def _persist_new_json_columns(self, df, debug: bool = False) -> SuccessTuple:
 
     self._attributes_sync_time = None
     dtypes = self.parameters.get('dtypes', {})
-    dtypes.update({col: 'json' for col in json_cols})
+    dtypes.update({col: 'json' for col in new_json_cols})
     self.parameters['dtypes'] = dtypes
 
     if not self.temporary:
@@ -1085,7 +1088,64 @@ def _persist_new_bytes_columns(self, df, debug: bool = False) -> SuccessTuple:
 
     self._attributes_sync_time = None
     dtypes = self.parameters.get('dtypes', {})
-    dtypes.update({col: 'bytes' for col in bytes_cols})
+    dtypes.update({col: 'bytes' for col in new_bytes_cols})
+    self.parameters['dtypes'] = dtypes
+
+    if not self.temporary:
+        edit_success, edit_msg = self.edit(interactive=False, debug=debug)
+        if not edit_success:
+            warn(f"Unable to update bytes dtypes for {self}:\n{edit_msg}")
+
+        return edit_success, edit_msg
+
+    return True, "Success"
+
+
+def _persist_new_geometry_columns(self, df, debug: bool = False) -> SuccessTuple:
+    """
+    Check for new `geometry` columns and update the parameters.
+    """
+    from meerschaum.utils.dataframe import get_geometry_cols
+    geometry_cols_types_srids = get_geometry_cols(df, with_types_srids=True)
+    existing_geometry_cols = [
+        col
+        for col, typ in self.dtypes.items()
+        if typ.startswith('geometry') or typ.startswith('geography')
+    ]
+    new_geometry_cols = [
+        col
+        for col in geometry_cols_types_srids
+        if col not in existing_geometry_cols
+    ]
+    if not new_geometry_cols:
+        return True, "Success"
+
+    self._attributes_sync_time = None
+    dtypes = self.parameters.get('dtypes', {})
+
+    new_cols_types = {}
+    for col, (geometry_type, srid) in geometry_cols_types_srids.items():
+        if col not in new_geometry_cols:
+            continue
+
+        new_dtype = "geometry"
+        modifier = ""
+        if not srid and geometry_type.lower() == 'geometry':
+            new_cols_types[col] = new_dtype
+            continue
+
+        modifier = "["
+        if geometry_type.lower() != 'geometry':
+            modifier += f"{geometry_type}"
+
+        if srid:
+            if modifier != '[':
+                modifier += ", "
+            modifier += f"{srid}"
+        modifier += "]"
+        new_cols_types[col] = f"{new_dtype}{modifier}"
+
+    dtypes.update(new_cols_types)
     self.parameters['dtypes'] = dtypes
 
     if not self.temporary:

{meerschaum-2.9.0rc2 → meerschaum-2.9.0rc3}/meerschaum/utils/dataframe.py

@@ -871,7 +871,10 @@ def get_bytes_cols(df: 'pd.DataFrame') -> List[str]:
     ]
 
 
-def get_geometry_cols(df: 'pd.DataFrame') -> List[str]:
+def get_geometry_cols(
+    df: 'pd.DataFrame',
+    with_types_srids: bool = False,
+) -> Union[List[str], Dict[str, Any]]:
     """
     Get the columns which contain shapely objects from a Pandas DataFrame.
 
@@ -880,9 +883,13 @@ def get_geometry_cols(df: 'pd.DataFrame') -> List[str]:
     df: pd.DataFrame
         The DataFrame which may contain bytes strings.
 
+    with_types_srids: bool, default False
+        If `True`, return a dictionary mapping columns to geometry types and SRIDs.
+
     Returns
     -------
     A list of columns to treat as `geometry`.
+    If `with_types_srids`, return a dictionary mapping columns to tuples in the form (type, SRID).
     """
     if df is None:
         return []
@@ -898,7 +905,7 @@ def get_geometry_cols(df: 'pd.DataFrame') -> List[str]:
         col: df[col].first_valid_index()
         for col in df.columns
     }
-    return [
+    geo_cols = [
         col
         for col, ix in cols_indices.items()
         if (
@@ -907,6 +914,31 @@ def get_geometry_cols(df: 'pd.DataFrame') -> List[str]:
             'shapely' in str(type(df.loc[ix][col]))
         )
     ]
+    if not with_types_srids:
+        return geo_cols
+
+    gpd = mrsm.attempt_import('geopandas', lazy=False)
+    geo_cols_types_srids = {}
+    for col in geo_cols:
+        try:
+            sample_geo_series = gpd.GeoSeries(df[col], crs=None)
+            geometry_types = {geom.geom_type for geom in sample_geo_series}
+            srid = (
+                (
+                    sample_geo_series.crs.sub_crs_list[0].to_epsg()
+                    if sample_geo_series.crs.is_compound
+                    else sample_geo_series.crs.to_epsg()
+                )
+                if sample_geo_series.crs
+                else 0
+            )
+            geometry_type = list(geometry_types)[0] if len(geometry_types) == 1 else 'geometry'
+        except Exception:
+            srid = 0
+            geometry_type = 'geometry'
+        geo_cols_types_srids[col] = (geometry_type, srid)
+
+    return geo_cols_types_srids
 
 
 def enforce_dtypes(
@@ -1658,6 +1690,8 @@ def to_json(
     orient: str = 'records',
     date_format: str = 'iso',
     date_unit: str = 'us',
+    double_precision: int = 15,
+    geometry_format: str = 'geojson',
     **kwargs: Any
 ) -> str:
     """
@@ -1677,11 +1711,19 @@ def to_json(
     date_unit: str, default 'us'
         The precision of the timestamps.
 
+    double_precision: int, default 15
+        The number of decimal places to use when encoding floating point values (maximum 15).
+
+    geometry_format: str, default 'geojson'
+        The serialization format for geometry data.
+        Accepted values are `geojson`, `wkb_hex`, and `wkt`.
+
     Returns
     -------
     A JSON string.
     """
     import warnings
+    import functools
     from meerschaum.utils.packages import import_pandas
     from meerschaum.utils.dtypes import (
         serialize_bytes,
@@ -1704,10 +1746,16 @@ def to_json(
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
         for col in geometry_cols:
-            df[col] = df[col].apply(serialize_geometry)
+            df[col] = df[col].apply(
+                functools.partial(
+                    serialize_geometry,
+                    geometry_format=geometry_format,
+                )
+            )
     return df.infer_objects(copy=False).fillna(pd.NA).to_json(
         date_format=date_format,
         date_unit=date_unit,
+        double_precision=double_precision,
         orient=orient,
         **kwargs
     )

{meerschaum-2.9.0rc2 → meerschaum-2.9.0rc3}/meerschaum/utils/dtypes/__init__.py

@@ -7,6 +7,7 @@ Utility functions for working with data types.
 """
 
 import traceback
+import json
 import uuid
 from datetime import timezone, datetime
 from decimal import Decimal, Context, InvalidOperation, ROUND_HALF_UP
@@ -28,6 +29,7 @@ MRSM_ALIAS_DTYPES: Dict[str, str] = {
     'guid': 'uuid',
     'UUID': 'uuid',
     'geom': 'geometry',
+    'geog': 'geography',
 }
 MRSM_PD_DTYPES: Dict[Union[str, None], str] = {
     'json': 'object',
@@ -76,6 +78,7 @@ def to_pandas_dtype(dtype: str) -> str:
         return get_pd_type_from_db_type(dtype)
 
     from meerschaum.utils.packages import attempt_import
+    _ = attempt_import('pyarrow', lazy=False)
     pandas = attempt_import('pandas', lazy=False)
 
     try:
@@ -294,10 +297,21 @@ def attempt_cast_to_geometry(value: Any) -> Any:
     """
     Given a value, attempt to coerce it into a `shapely` (`geometry`) object.
     """
-    shapely_wkt, shapely_wkb = mrsm.attempt_import('shapely.wkt', 'shapely.wkb', lazy=False)
+    shapely, shapely_wkt, shapely_wkb = mrsm.attempt_import(
+        'shapely',
+        'shapely.wkt',
+        'shapely.wkb',
+        lazy=False,
+    )
     if 'shapely' in str(type(value)):
         return value
 
+    if isinstance(value, (dict, list)):
+        try:
+            return shapely.from_geojson(json.dumps(value))
+        except Exception as e:
+            return value
+
     value_is_wkt = geometry_is_wkt(value)
     if value_is_wkt is None:
         return value
@@ -327,6 +341,9 @@ def geometry_is_wkt(value: Union[str, bytes]) -> Union[bool, None]:
     Return `None` if `value` should be parsed as neither.
     """
     import re
+    if not isinstance(value, (str, bytes)):
+        return None
+
     if isinstance(value, bytes):
         return False
     
@@ -521,7 +538,11 @@ def serialize_bytes(data: bytes) -> str:
     return base64.b64encode(data).decode('utf-8')
 
 
-def serialize_geometry(geom: Any, as_wkt: bool = False) -> str:
+def serialize_geometry(
+    geom: Any,
+    geometry_format: str = 'wkb_hex',
+    as_wkt: bool = False,
+) -> Union[str, Dict[str, Any]]:
     """
     Serialize geometry data as a hex-encoded well-known-binary string. 
 
@@ -530,16 +551,22 @@ def serialize_geometry(geom: Any, as_wkt: bool = False) -> str:
     geom: Any
         The potential geometry data to be serialized.
 
-    as_wkt, bool, default False
-        If `True`, serialize geometry data as well-known text (WKT)
-        instead of well-known binary (WKB).
+    geometry_format: str, default 'wkb_hex'
+        The serialization format for geometry data.
+        Accepted formats are `wkb_hex` (well-known binary hex string),
+        `wkt` (well-known text), and `geojson`.
 
     Returns
     -------
     A string containing the geometry data.
     """
+    shapely = mrsm.attempt_import('shapely', lazy=False)
+    if geometry_format == 'geojson':
+        geojson_str = shapely.to_geojson(geom)
+        return json.loads(geojson_str)
+
     if hasattr(geom, 'wkb_hex'):
-        return geom.wkb_hex if not as_wkt else geom.wkt
+        return geom.wkb_hex if geometry_format == 'wkb_hex' else geom.wkt
 
     return str(geom)
 
@@ -711,6 +738,8 @@ def get_geometry_type_srid(
     ('Point', 4376)
     """
     from meerschaum.utils.misc import is_int
+    ### NOTE: PostGIS syntax must also be parsed.
+    dtype = dtype.replace('(', '[').replace(')', ']')
     bare_dtype = dtype.split('[', maxsplit=1)[0]
     modifier = dtype.split(bare_dtype, maxsplit=1)[-1].lstrip('[').rstrip(']')
     if not modifier: