meerschaum 3.0.0rc1__py3-none-any.whl → 3.0.0rc3__py3-none-any.whl

meerschaum/connectors/api/_pipes.py

@@ -191,7 +191,7 @@ def sync_pipe(
     from meerschaum.utils.misc import items_str, interval_str
     from meerschaum.config import get_config
     from meerschaum.utils.packages import attempt_import
-    from meerschaum.utils.dataframe import get_numeric_cols, to_json
+    from meerschaum.utils.dataframe import get_special_cols, to_json
     begin = time.perf_counter()
     more_itertools = attempt_import('more_itertools')
     if df is None:
@@ -223,22 +223,6 @@ def sync_pipe(
             else [partition.compute() for partition in df.partitions]
         )
 
-        numeric_cols = get_numeric_cols(df)
-        if numeric_cols:
-            for col in numeric_cols:
-                df[col] = df[col].apply(lambda x: f'{x:f}' if isinstance(x, Decimal) else x)
-            pipe_dtypes = pipe.dtypes
-            new_numeric_cols = [
-                col
-                for col in numeric_cols
-                if pipe_dtypes.get(col, None) != 'numeric'
-            ]
-            edit_success, edit_msg = pipe.update_parameters({'dtypes': {col: 'numeric' for col in new_numeric_cols}})
-            if not edit_success:
-                warn(
-                    "Failed to update new numeric columns "
-                    + f"{items_str(new_numeric_cols)}:\n{edit_msg}"
-                )
     elif isinstance(df, dict):
         ### `_chunks` is a dict of lists of dicts.
         ### e.g. {'a' : [ {'a':[1, 2]}, {'a':[3, 4]} ] }
@@ -325,7 +309,7 @@ def sync_pipe(
 def delete_pipe(
     self,
     pipe: Optional[mrsm.Pipe] = None,
-    debug: bool = None,        
+    debug: bool = False,
 ) -> SuccessTuple:
     """Delete a Pipe and drop its table."""
     if pipe is None:

meerschaum/connectors/api/_tokens.py

@@ -12,7 +12,6 @@ from typing import Union, List, Optional
 
 import meerschaum as mrsm
 from meerschaum.core import Token
-from meerschaum.models import TokenModel
 from meerschaum._internal.static import STATIC_CONFIG
 tokens_endpoint = STATIC_CONFIG['api']['endpoints']['tokens']
 
@@ -45,10 +44,11 @@ def register_token(self, token: Token, debug: bool = False) -> mrsm.SuccessTuple
     return True, f"Registered token '{token.label}'."
 
 
-def get_token_model(self, token_id: uuid.UUID, debug: bool = False) -> Union[TokenModel, None]:
+def get_token_model(self, token_id: uuid.UUID, debug: bool = False) -> 'Union[TokenModel, None]':
     """
     Return a token's model from the API instance.
     """
+    from meerschaum.models import TokenModel
     r_url = tokens_endpoint + f'/{token_id}'
     response = self.get(r_url, debug=debug)
     if not response:

meerschaum/connectors/instance/_tokens.py

@@ -14,7 +14,6 @@ from datetime import datetime, timezone
 import meerschaum as mrsm
 from meerschaum.core import Token, User
 from meerschaum.core.User import hash_password
-from meerschaum.models import TokenModel
 from meerschaum._internal.static import STATIC_CONFIG
 
 
@@ -43,8 +42,8 @@ def get_tokens_pipe(self) -> mrsm.Pipe:
         },
         dtypes={
             'id': 'uuid',
-            'creation': 'datetime64[ns, UTC]',
-            'expiration': 'datetime64[ns, UTC]',
+            'creation': 'datetime',
+            'expiration': 'datetime',
             'is_valid': 'bool',
             'label': 'string',
             'user_id': user_id_dtype,
@@ -54,7 +53,11 @@ def get_tokens_pipe(self) -> mrsm.Pipe:
     )
 
 
-def register_token(self, token: Token, debug: bool = False) -> mrsm.SuccessTuple:
+def register_token(
+    self,
+    token: Token,
+    debug: bool = False,
+) -> mrsm.SuccessTuple:
     """
     Register the new token to the tokens table.
     """
@@ -62,7 +65,7 @@ def register_token(self, token: Token, debug: bool = False) -> mrsm.SuccessTuple
     tokens_pipe = self.get_tokens_pipe()
     user_id = self.get_user_id(token.user) if token.user is not None else None
     if user_id is None:
-        raise ValueError("Cannot register a token without a user.")
+        return False, "Cannot register a token without a user."
 
     doc = {
         'id': token_id,
@@ -227,10 +230,11 @@ def get_token(self, token_id: Union[uuid.UUID, str], debug: bool = False) -> Uni
     return Token(**dict(token_model))
 
 
-def get_token_model(self, token_id: Union[uuid.UUID, Token], debug: bool = False) -> Union[TokenModel, None]:
+def get_token_model(self, token_id: Union[uuid.UUID, Token], debug: bool = False) -> 'Union[TokenModel, None]':
     """
     Return a token's model from the instance.
     """
+    from meerschaum.models import TokenModel
     if isinstance(token_id, Token):
         token_id = Token.id
     if not token_id:

meerschaum/connectors/sql/_SQLConnector.py

@@ -7,6 +7,8 @@ Interface with SQL servers using sqlalchemy.
 """
 
 from __future__ import annotations
+
+import pathlib
 import meerschaum as mrsm
 from meerschaum.utils.typing import Optional, Any, Union
 
@@ -376,6 +378,18 @@ class SQLConnector(InstanceConnector):
         self.__dict__['schema'] = _schema
         return _schema
 
+    def get_metadata_cache_path(self, kind: str = 'json') -> pathlib.Path:
+        """
+        Return the path to the file to which to write metadata cache.
+        """
+        from meerschaum.config.paths import SQL_CONN_CACHE_RESOURCES_PATH
+        filename = (
+            f'{self.label}-metadata.pkl'
+            if kind == 'pkl'
+            else f'{self.label}.json'
+        )
+        return SQL_CONN_CACHE_RESOURCES_PATH / filename
+
     def __getstate__(self):
         return self.__dict__
 

meerschaum/connectors/sql/_create_engine.py

@@ -31,7 +31,6 @@ install_flavor_drivers = {
     'mssql': ['pyodbc'],
     'oracle': ['oracledb'],
 }
-require_patching_flavors = {'cockroachdb': [('sqlalchemy-cockroachdb', 'sqlalchemy_cockroachdb')]}
 
 flavor_dialects = {
     'cockroachdb': (
@@ -63,19 +62,6 @@ def create_engine(
         )
         if self.flavor == 'mssql':
             _init_mssql_sqlalchemy()
-    if self.flavor in require_patching_flavors:
-        from meerschaum.utils.packages import determine_version, _monkey_patch_get_distribution
-        import pathlib
-        for install_name, import_name in require_patching_flavors[self.flavor]:
-            pkg = attempt_import(
-                import_name,
-                debug=debug,
-                lazy=False,
-                warn=False
-            )
-            _monkey_patch_get_distribution(
-                install_name, determine_version(pathlib.Path(pkg.__file__), venv='mrsm')
-            )
 
     ### supplement missing values with defaults (e.g. port number)
     for a, value in flavor_configs[self.flavor]['defaults'].items():
@@ -189,6 +175,9 @@ def _init_mssql_sqlalchemy():
         lazy=False,
         warn=False,
     )
+    if pyodbc is None:
+        raise EnvironmentError("Cannot import pyodbc. Is the MSSQL driver installed?")
+
     pyodbc.pooling = False
 
     MSDialect_pyodbc = sqlalchemy_dialects_mssql_pyodbc.MSDialect_pyodbc