mtsql 1.9.202401091637__py3-none-any.whl → 1.10.202401161934__py3-none-any.whl

mt/sql/base.py

@@ -7,7 +7,6 @@ import psycopg2 as ps
 from halo import Halo
 
 from mt import tp, logg, pd, ctx
-from mt.base import deprecated_func
 
 
 __all__ = [

mt/sql/psql.py

@@ -2038,3 +2038,22 @@ def readsync_table(
         else:
             pd.dfsave(df, df_filepath, index=True)
             return df
+
+
+def list_stored_procedure():
+    query = """SELECT
+        n.nspname,
+        b.usename,
+        p.proname,
+        p.prosrc
+    FROM
+        pg_catalog.pg_namespace n
+    JOIN pg_catalog.pg_proc p ON
+        pronamespace = n.oid
+    join pg_user b on
+        b.usesysid = p.proowner
+    where
+        nspname not in ('information_schema',
+        'pg_catalog')
+    """
+    pass

mt/sql/redshift.py

@@ -1,6 +1,7 @@
 """Useful modules for accessing Redshift"""
 
-from mt import tp, logg
+import sqlalchemy as sa
+from mt import tp, np, pd, logg
 
 from .base import *
 from .psql import compliance_check
@@ -19,6 +20,7 @@ __api__ = [
     "drop_matview",
     "rename_column",
     "drop_column",
+    "conform",
 ]
 
 
@@ -525,3 +527,60 @@ def to_sql(
         )
 
     return retval
+
+
+def conform(
+    df: pd.DataFrame,
+    table_decl: sa.sql.schema.Table,
+) -> pd.DataFrame:
+    """Conforms a dataframe to a declarative base so that the columns are properly represented.
+
+    The idea is so that the output dataframe can be used to upload data to a Redshift DB. Primary
+    keys and indices are ignored. But whether an integer column is nullable or not is inspected.
+
+    Parameters
+    ----------
+    df : pandas.DataFrame
+        input dataframe
+    table_decl : sqlalchemy.sql.schema.Table
+        the table declaration to conform to. The output columns are converted where possible to the
+        right dtype declared by the base. If you have a declarative base `x`, an instance of
+        :class:`sqlalchemy.orm.decl_api.DeclarativeMeta`, you can pass `x.__table__`.
+
+    Returns
+    -------
+    out_df : pandas.DataFrame
+       the output dataframe, where columns of the input dataframe are copied and converted properly
+    """
+
+    # extract relevant columns
+    columns = [x.name for x in table_decl.columns]
+    df = df[columns].copy()
+
+    for x in table_decl.columns:
+        if isinstance(x.type, sa.BigInteger):
+            dtype = pd.Int64Dtype() if x.nullable else np.int64
+        elif isinstance(x.type, sa.Integer):
+            dtype = pd.Int32Dtype() if x.nullable else np.int32
+        elif isinstance(x.type, sa.SmallInteger):
+            dtype = pd.Int16Dtype() if x.nullable else np.int16
+        elif isinstance(x.type, sa.String):
+            dtype = str
+        elif isinstance(x.type, sa.Float):
+            dtype = float
+        elif isinstance(x.type, sa.REAL):
+            dtype = np.float32
+        elif isinstance(x.type, sa.Boolean):
+            dtype = pd.BooleanDtype() if x.nullable else np.bool
+        elif isinstance(x.type, sa.DateTime):
+            dtype = pd.Timestamp
+        else:
+            raise NotImplementedError(
+                "Unable to conform table declaration '{table_decl.name}' column '{x.name}' with type '{type(x.type)}'."
+            )
+        if dtype is pd.Timestamp:
+            df[x.name] = pd.to_datetime(df[x.name])
+        else:
+            df[x.name] = df[x.name].astype(dtype)
+
+    return df

mt/sql/version.py

@@ -1,11 +1,11 @@
 VERSION_YEAR = 2024
 VERSION_MONTH = int('01')
-VERSION_DAY = int('09')
-VERSION_HOUR = int('16')
-VERSION_MINUTE = int('37')
+VERSION_DAY = int('16')
+VERSION_HOUR = int('19')
+VERSION_MINUTE = int('34')
 MAJOR_VERSION = 1
-MINOR_VERSION = 9
-PATCH_VERSION = 202401091637
-version_date = '2024/01/09 16:37'
+MINOR_VERSION = 10
+PATCH_VERSION = 202401161934
+version_date = '2024/01/16 19:34'
 version = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 __all__  = ['MAJOR_VERSION', 'MINOR_VERSION', 'PATCH_VERSION', 'version_date', 'version']

{mtsql-1.9.202401091637.dist-info → mtsql-1.10.202401161934.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtsql
-Version: 1.9.202401091637
+Version: 1.10.202401161934
 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']
@@ -11,6 +11,6 @@ Requires-Dist: sqlalchemy
 Requires-Dist: tzlocal
 Requires-Dist: tqdm
 Requires-Dist: psycopg2-binary
-Requires-Dist: mtbase (>=4.1)
-Requires-Dist: mtpandas (>=1.1)
+Requires-Dist: mtbase (>=4.21)
+Requires-Dist: mtpandas (>=1.15)
 

mtsql-1.10.202401161934.dist-info/RECORD

@@ -0,0 +1,12 @@
+mt/sql/__init__.py,sha256=b7zO50apZxt9Hg2eOkJhRLrXgACR8eS5b-Rphdn5qNQ,44
+mt/sql/base.py,sha256=ifWObR5YUu0yFmx1j0rDWD_hwf_Hd_JI5bcfNkeQ3lg,10572
+mt/sql/mysql.py,sha256=n2ENDctdUqZuSaDAcrqZYtPtawq3Wx4dOPCRsCB5Q4w,4894
+mt/sql/psql.py,sha256=tzsIN2XyBJX8t7p0D2yXgEQwUTkTcDzllI4HunCfq3s,66345
+mt/sql/redshift.py,sha256=k7AJVlb6z5IqyOTQcYh_DuNtHK0879Vm5Wmv8afRols,17037
+mt/sql/sqlite.py,sha256=T2ak_hhNi_zRfpg_gp8JhNHn7D2kl4i-Ey6-9ANMtz0,8678
+mt/sql/version.py,sha256=uUdi7ZQkpbbCuDBZLgsh62wVnw77RSZFoKvrkk-hGAM,397
+mtsql-1.10.202401161934.dist-info/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
+mtsql-1.10.202401161934.dist-info/METADATA,sha256=IOvXw5DDAlLP2ccwPFBzQwV6Hx5c_b0KuOCp9xvVugI,592
+mtsql-1.10.202401161934.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+mtsql-1.10.202401161934.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
+mtsql-1.10.202401161934.dist-info/RECORD,,

mtsql-1.9.202401091637.dist-info/RECORD

@@ -1,12 +0,0 @@
-mt/sql/__init__.py,sha256=b7zO50apZxt9Hg2eOkJhRLrXgACR8eS5b-Rphdn5qNQ,44
-mt/sql/base.py,sha256=GJLSQfz0GNXgFBzK6dSCVqQ4rjyTvFEBPmsM37d8eXc,10608
-mt/sql/mysql.py,sha256=n2ENDctdUqZuSaDAcrqZYtPtawq3Wx4dOPCRsCB5Q4w,4894
-mt/sql/psql.py,sha256=m41LsBQ57OVVtakUZ01o_YY-vBwY5Z3TVPvSUMylNaU,65964
-mt/sql/redshift.py,sha256=EliV4C9E3VuNjqFXWnTrU8Dm_utQrVwht5DF4oHl7qY,14808
-mt/sql/sqlite.py,sha256=T2ak_hhNi_zRfpg_gp8JhNHn7D2kl4i-Ey6-9ANMtz0,8678
-mt/sql/version.py,sha256=nb0i2eAMsoLqFeLpvANq9ovAtp3TRIZsz2c02XZ4xBs,396
-mtsql-1.9.202401091637.dist-info/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
-mtsql-1.9.202401091637.dist-info/METADATA,sha256=0OS_X0KCiNKKzDFiiXTnttkBWJSeS6OoEsdmykC4JAc,589
-mtsql-1.9.202401091637.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-mtsql-1.9.202401091637.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
-mtsql-1.9.202401091637.dist-info/RECORD,,