mtsql 1.12.10__py3-none-any.whl → 1.12.12__py3-none-any.whl

mt/sql/base.py

@@ -31,7 +31,7 @@ __all__ = [
 
 
 def frame_sql(frame_name, schema: tp.Optional[str] = None):
-    return frame_name if schema is None else "{}.{}".format(schema, frame_name)
+    return frame_name if schema is None else f"{schema}.{frame_name}"
 
 
 def indices(df):
@@ -48,26 +48,26 @@ def run_func(
     *args,
     nb_trials: int = 3,
     logger: tp.Optional[logg.IndentedLoggerAdapter] = None,
-    **kwargs,
+    **kwds,
 ):
     """Attempt to run a function a number of times to overcome OperationalError exceptions.
 
     Parameters
     ----------
-    func: function
+    func : function
         function to be invoked
-    args: sequence
-        arguments to be passed to the function
-    nb_trials: int
+    nb_trials : int
         number of query trials
-    logger: mt.logg.IndentedLoggerAdapter, optional
+    logger : mt.logg.IndentedLoggerAdapter, optional
         logger for debugging
-    kwargs: dict
+    *args : iterable
+        arguments to be passed to the function
+    **kwds : dict
         keyword arguments to be passed to the function
     """
     for x in range(nb_trials):
         try:
-            return func(*args, **kwargs)
+            return func(*args, **kwds)
         except (se.ProgrammingError, se.IntegrityError):
             raise
         except (
@@ -92,10 +92,10 @@ def conn_ctx(engine):
     return ctx.nullcontext(engine)
 
 
-def engine_execute(engine, sql, *args, **kwargs):
+def engine_execute(engine, sql, *args, **kwds):
     text_sql = sa.text(sql) if isinstance(sql, str) else sql
     with conn_ctx(engine) as conn:
-        return conn.execute(text_sql, *args, **kwargs)
+        return conn.execute(text_sql, *args, **kwds)
 
 
 def trim_sql_query(sql_query: str) -> str:
@@ -112,7 +112,7 @@ def read_sql(
     nb_trials: int = 3,
     exception_handling: str = "raise",
     logger: tp.Optional[logg.IndentedLoggerAdapter] = None,
-    **kwargs,
+    **kwds,
 ) -> pd.DataFrame:
     """Read an SQL query with a number of trials to overcome OperationalError.
 
@@ -165,7 +165,7 @@ def read_sql(
     text_sql = trim_sql_query(text_sql)
 
     if chunksize is not None:
-        s = "read_sql: '{}'".format(text_sql)
+        s = f"read_sql: '{text_sql}'"
         spinner = halo.Halo(s, spinner="dots", enabled=bool(logger))
         spinner.start()
         ts = pd.Timestamp.now()
@@ -180,7 +180,7 @@ def read_sql(
             chunksize=chunksize,
             nb_trials=nb_trials,
             logger=logger,
-            **kwargs,
+            **kwds,
         )
 
     if chunksize is None:
@@ -192,24 +192,21 @@ def read_sql(
             dfs.append(df)
             cnt += len(df)
             td = (pd.Timestamp.now() - ts).total_seconds() + 0.001
-            s = "{} rows ({} rows/sec)".format(cnt, cnt / td)
+            s = f"{cnt} rows ({cnt / td} rows/sec)"
             spinner.text = s
         df = pd.concat(dfs)
-        s = "{} rows".format(cnt)
+        s = f"{cnt} rows"
         spinner.succeed(s)
     except:
-        s = "{} rows".format(cnt)
+        s = f"{cnt} rows"
         spinner.fail(s)
         if logger:
             logger.warn_last_exception()
         if exception_handling == "raise":
             raise
         if exception_handling != "warn":
-            raise ValueError(
-                "Unknown value for argument 'exception_handling': '{}'.".format(
-                    exception_handling
-                )
-            )
+            msg = f"Unknown value for argument 'exception_handling': '{exception_handling}'."
+            raise ValueError(msg)
         df = pd.concat(dfs)
 
     return df
@@ -220,7 +217,7 @@ def read_sql_table(
     engine,
     nb_trials: int = 3,
     logger: tp.Optional[logg.IndentedLoggerAdapter] = None,
-    **kwargs,
+    **kwds,
 ):
     """Read an SQL table with a number of trials to overcome OperationalError.
 
@@ -246,7 +243,7 @@ def read_sql_table(
         engine,
         nb_trials=nb_trials,
         logger=logger,
-        **kwargs,
+        **kwds,
     )
 
 
@@ -256,7 +253,7 @@ def exec_sql(
     *args,
     nb_trials: int = 3,
     logger: tp.Optional[logg.IndentedLoggerAdapter] = None,
-    **kwargs,
+    **kwds,
 ):
     """Execute an SQL query with a number of trials to overcome OperationalError.
 
@@ -280,7 +277,7 @@ def exec_sql(
     """
 
     return run_func(
-        engine_execute, engine, sql, *args, nb_trials=nb_trials, logger=logger, **kwargs
+        engine_execute, engine, sql, *args, nb_trials=nb_trials, logger=logger, **kwds
     )
 
 

mt/sql/psql.py

@@ -197,7 +197,7 @@ def to_sql(
     if_exists="fail",
     nb_trials: int = 3,
     logger: tp.Optional[logg.IndentedLoggerAdapter] = None,
-    **kwargs,
+    **kwds,
 ):
     """Writes records stored in a DataFrame to a PostgreSQL database.
 
@@ -222,6 +222,8 @@ def to_sql(
         number of query trials
     logger: mt.logg.IndentedLoggerAdapter, optional
         logger for debugging
+    **kwds : dict
+        other keyword arguments to be passed as-is to :func:`pandas.DataFrame.to_sql`
 
     Raises
     ------
@@ -241,12 +243,12 @@ def to_sql(
 
     """
 
-    if kwargs:
-        if "index" in kwargs:
+    if kwds:
+        if "index" in kwds:
             raise ValueError(
                 "The `mt.sql.psql.to_sql()` function does not accept `index` as a keyword."
             )
-        if "index_label" in kwargs:
+        if "index_label" in kwds:
             raise ValueError(
                 "This `mt.sql.psql.to_sql()` function does not accept `index_label` as a keyword."
             )
@@ -274,7 +276,7 @@ def to_sql(
                 index_label=None,
                 nb_trials=nb_trials,
                 logger=logger,
-                **kwargs,
+                **kwds,
             )
         retval = run_func(
             df.to_sql,
@@ -286,7 +288,7 @@ def to_sql(
             index_label=None,
             nb_trials=nb_trials,
             logger=logger,
-            **kwargs,
+            **kwds,
         )
         if if_exists == "replace":
             query_str = "ALTER TABLE {} ADD PRIMARY KEY ({});".format(
@@ -346,7 +348,7 @@ def to_sql(
         index_label=None,
         nb_trials=nb_trials,
         logger=logger,
-        **kwargs,
+        **kwds,
     )
 
 

mt/sql/redshift/dialect.py

@@ -485,7 +485,7 @@ class TIMESTAMPTZ(RedshiftTypeEngine, sa.dialects.postgresql.TIMESTAMP):
 
     def __init__(self, timezone=True, precision=None):
         # timezone param must be present as it's provided in base class so the
-        # object can be instantiated with kwargs. see
+        # object can be instantiated with kwds. see
         # :meth:`~sqlalchemy.dialects.postgresql.base.PGDialect._get_column_info`
         super(TIMESTAMPTZ, self).__init__(timezone=True, precision=precision)
 
@@ -506,7 +506,7 @@ class TIMETZ(RedshiftTypeEngine, sa.dialects.postgresql.TIME):
 
     def __init__(self, timezone=True, precision=None):
         # timezone param must be present as it's provided in base class so the
-        # object can be instantiated with kwargs. see
+        # object can be instantiated with kwds. see
         # :meth:`~sqlalchemy.dialects.postgresql.base.PGDialect._get_column_info`
         super(TIMETZ, self).__init__(timezone=True, precision=precision)
 
@@ -747,12 +747,12 @@ class RedshiftDDLCompiler(PGDDLCompiler):
     """
 
     def post_create_table(self, table):
-        kwargs = ["diststyle", "distkey", "sortkey", "interleaved_sortkey"]
+        kwds = ["diststyle", "distkey", "sortkey", "interleaved_sortkey"]
         info = table.dialect_options["mtsql_redshift"]
-        info = {key: info.get(key) for key in kwargs}
+        info = {key: info.get(key) for key in kwds}
         return get_table_attributes(self.preparer, **info)
 
-    def get_column_specification(self, column, **kwargs):
+    def get_column_specification(self, column, **kwds):
         colspec = self.preparer.format_column(column)
 
         colspec += " " + self.dialect.type_compiler.process(column.type)
@@ -1156,8 +1156,8 @@ class RedshiftDialectMixin(DefaultDialect):
                 relation_names.append(key.name)
         return relation_names
 
-    def _get_column_info(self, *args, **kwargs):
-        kw = kwargs.copy()
+    def _get_column_info(self, *args, **kwds):
+        kw = kwds.copy()
         encode = kw.pop("encode", None)
         if sa_version >= Version("1.3.16"):
             # SQLAlchemy 1.3.16 introduced generated columns,
@@ -1422,8 +1422,8 @@ class RedshiftDialect(RedshiftDialectMixin, PGDialect):
     supports_statement_cache = False
     use_setinputsizes = False  # not implemented in redshift_connector
 
-    def __init__(self, client_encoding=None, **kwargs):
-        super(RedshiftDialect, self).__init__(client_encoding=client_encoding, **kwargs)
+    def __init__(self, client_encoding=None, **kwds):
+        super(RedshiftDialect, self).__init__(client_encoding=client_encoding, **kwds)
         self.client_encoding = client_encoding
 
     @classmethod
@@ -1523,7 +1523,7 @@ class RedshiftDialect(RedshiftDialectMixin, PGDialect):
         else:
             return None
 
-    def create_connect_args(self, *args, **kwargs):
+    def create_connect_args(self, *args, **kwds):
         """
         Build DB-API compatible connection arguments.
 
@@ -1536,7 +1536,7 @@ class RedshiftDialect(RedshiftDialectMixin, PGDialect):
             "application_name": "sqlalchemy-redshift",
         }
         cargs, cparams = super(RedshiftDialectMixin, self).create_connect_args(
-            *args, **kwargs
+            *args, **kwds
         )
         # set client_encoding so it is picked up by on_connect(), as
         # redshift_connector does not have client_encoding connection parameter
@@ -1570,7 +1570,7 @@ def gen_columns_from_children(root):
 
 
 @compiles(Delete, "redshift")
-def visit_delete_stmt(element, compiler, **kwargs):
+def visit_delete_stmt(element, compiler, **kwds):
     """
     Adds redshift-dialect specific compilation rule for the
     delete statement.
@@ -1635,25 +1635,25 @@ def visit_delete_stmt(element, compiler, **kwargs):
     # note:
     #   the tables in the using clause are sorted in the order in
     #   which they first appear in the where clause.
-    delete_stmt_table = compiler.process(element.table, asfrom=True, **kwargs)
+    delete_stmt_table = compiler.process(element.table, asfrom=True, **kwds)
 
     if sa_version >= Version("1.4.0"):
         if element.whereclause is not None:
-            clause = compiler.process(element.whereclause, **kwargs)
+            clause = compiler.process(element.whereclause, **kwds)
             if clause:
                 whereclause = " WHERE {clause}".format(clause=clause)
     else:
         whereclause_tuple = element.get_children()
         if whereclause_tuple:
             whereclause = " WHERE {clause}".format(
-                clause=compiler.process(*whereclause_tuple, **kwargs)
+                clause=compiler.process(*whereclause_tuple, **kwds)
             )
 
     if whereclause:
         usingclause_tables = []
         whereclause_columns = gen_columns_from_children(element)
         for col in whereclause_columns:
-            table = compiler.process(col.table, asfrom=True, **kwargs)
+            table = compiler.process(col.table, asfrom=True, **kwds)
             if table != delete_stmt_table and table not in usingclause_tables:
                 usingclause_tables.append(table)
         if usingclause_tables:

mt/sql/redshift/main.py

@@ -418,7 +418,7 @@ def to_sql(
     if_exists="fail",
     nb_trials: int = 3,
     logger: tp.Optional[logg.IndentedLoggerAdapter] = None,
-    **kwargs,
+    **kwds,
 ):
     """Writes records stored in a DataFrame to a Redshift database.
 
@@ -440,7 +440,7 @@ def to_sql(
         number of query trials
     logger: mt.logg.IndentedLoggerAdapter, optional
         logger for debugging
-    kwargs : dict
+    **kwds : dict
         keyword arguments passed as-is to :func:`pandas.DataFrame.to_sql`
 
     Raises
@@ -460,12 +460,12 @@ def to_sql(
 
     """
 
-    if kwargs:
-        if "index" in kwargs:
+    if kwds:
+        if "index" in kwds:
             raise ValueError(
                 "The `mt.sql.psql.to_sql()` function does not accept `index` as a keyword."
             )
-        if "index_label" in kwargs:
+        if "index_label" in kwds:
             raise ValueError(
                 "This `mt.sql.psql.to_sql()` function does not accept `index_label` as a keyword."
             )
@@ -490,7 +490,7 @@ def to_sql(
             index_label=None,
             nb_trials=nb_trials,
             logger=logger,
-            **kwargs,
+            **kwds,
         )
 
         if if_exists == "replace":
@@ -507,7 +507,7 @@ def to_sql(
             index_label=None,
             nb_trials=nb_trials,
             logger=logger,
-            **kwargs,
+            **kwds,
         )
 
     return retval

mt/sql/version.py

@@ -1,5 +1,5 @@
 MAJOR_VERSION = 1
 MINOR_VERSION = 12
-PATCH_VERSION = 10
+PATCH_VERSION = 12
 version = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 __all__  = ['MAJOR_VERSION', 'MINOR_VERSION', 'PATCH_VERSION', 'version']

{mtsql-1.12.10.dist-info → mtsql-1.12.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mtsql
-Version: 1.12.10
+Version: 1.12.12
 Summary: Extra Python modules to deal with the interaction between pandas dataframes and remote SQL servers, for Minh-Tri Pham
 Home-page: https://github.com/inteplus/mtsql
 Author: ['Minh-Tri Pham']

mtsql-1.12.12.dist-info/RECORD

@@ -0,0 +1,17 @@
+mt/sql/__init__.py,sha256=b7zO50apZxt9Hg2eOkJhRLrXgACR8eS5b-Rphdn5qNQ,44
+mt/sql/base.py,sha256=rEDlXivxH06ZsdpSXkraiqBCDDYh3FLVZfuH-spVw8w,12976
+mt/sql/mysql.py,sha256=n2ENDctdUqZuSaDAcrqZYtPtawq3Wx4dOPCRsCB5Q4w,4894
+mt/sql/psql.py,sha256=w5klr_2lUZnAFee-Fzbn3G8jdYcf_iX4N_GfAGIdsMI,66670
+mt/sql/sqlite.py,sha256=T2ak_hhNi_zRfpg_gp8JhNHn7D2kl4i-Ey6-9ANMtz0,8678
+mt/sql/version.py,sha256=7Ierb-IwvIgb7So3QUVyOb206Eut5KTX02AND5UIhfc,208
+mt/sql/redshift/__init__.py,sha256=S-eRxJWcrvncF7LZXuulCdPV-UERu9eiw6uyDb5aGsM,443
+mt/sql/redshift/commands.py,sha256=xhGUBf3bL66EYdZI5HCUtOx-XqPCnXT_P-LnhPgtzrY,40193
+mt/sql/redshift/ddl.py,sha256=eUcZj9oIajiE1wKKBAP-V64gYJ7cVnSAt8dLFfluOJA,9777
+mt/sql/redshift/dialect.py,sha256=-0JjJubZZHRw0abhl6H6rKWaUE9pKtGwAuX-62T0e_c,53399
+mt/sql/redshift/main.py,sha256=H8_5sjtJ7dzWoCMXzPNjYhrMQ18eLUQ9xg-aYl5QeTc,17104
+mt/sql/redshift/redshift-ca-bundle.crt,sha256=532qYkOpQOstFE0mdXE1GVtL3v00XDKgZNTr6gK5-KE,8621
+mtsql-1.12.12.dist-info/licenses/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
+mtsql-1.12.12.dist-info/METADATA,sha256=pDALCX7SklLIq1omFMmUKOx9cYkaBVXHTYXXDIFmaE8,740
+mtsql-1.12.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mtsql-1.12.12.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
+mtsql-1.12.12.dist-info/RECORD,,

mtsql-1.12.10.dist-info/RECORD

@@ -1,17 +0,0 @@
-mt/sql/__init__.py,sha256=b7zO50apZxt9Hg2eOkJhRLrXgACR8eS5b-Rphdn5qNQ,44
-mt/sql/base.py,sha256=k7yav8JVP-Z0hqlsSuKmzm_HKYtq7dFtpaLhyhgyc7k,13088
-mt/sql/mysql.py,sha256=n2ENDctdUqZuSaDAcrqZYtPtawq3Wx4dOPCRsCB5Q4w,4894
-mt/sql/psql.py,sha256=dNPOvJBxZ8S88uOmIKnfjo1ssRiMLDLwVeJcVcdcNco,66580
-mt/sql/sqlite.py,sha256=T2ak_hhNi_zRfpg_gp8JhNHn7D2kl4i-Ey6-9ANMtz0,8678
-mt/sql/version.py,sha256=BgX8JcjmUH-qTZ5xTJECQnYYXE0gZHb8rHFgiprkJMs,208
-mt/sql/redshift/__init__.py,sha256=S-eRxJWcrvncF7LZXuulCdPV-UERu9eiw6uyDb5aGsM,443
-mt/sql/redshift/commands.py,sha256=xhGUBf3bL66EYdZI5HCUtOx-XqPCnXT_P-LnhPgtzrY,40193
-mt/sql/redshift/ddl.py,sha256=eUcZj9oIajiE1wKKBAP-V64gYJ7cVnSAt8dLFfluOJA,9777
-mt/sql/redshift/dialect.py,sha256=oomLiQib0iMhotRY3GjDrQI3iWGXgcIQyK5WTbmj8kc,53431
-mt/sql/redshift/main.py,sha256=6dwnwNJ1F0_V9o2oqrSOkyN_pAMrgE01CCoqAjoyOME,17116
-mt/sql/redshift/redshift-ca-bundle.crt,sha256=532qYkOpQOstFE0mdXE1GVtL3v00XDKgZNTr6gK5-KE,8621
-mtsql-1.12.10.dist-info/licenses/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
-mtsql-1.12.10.dist-info/METADATA,sha256=jnU1oJtaT3iRrapN8HdlceCoqpaE6iIerQqSwndOoVI,740
-mtsql-1.12.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mtsql-1.12.10.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
-mtsql-1.12.10.dist-info/RECORD,,