wcp-library 1.1.9__py3-none-any.whl → 1.2.2__py3-none-any.whl

wcp_library/__init__.py

@@ -13,3 +13,16 @@ if getattr(sys, 'frozen', False):
     application_path = Path(application_path).parent
 else:
     application_path = Path().absolute()
+
+
+def divide_chunks(list_obj: list, size: int) -> list:
+    """
+    Divide a list into chunks of size
+
+    :param list_obj:
+    :param size:
+    :return:
+    """
+
+    for i in range(0, len(list_obj), size):
+        yield list_obj[i:i + size]

wcp_library/async_sql/oracle.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 
+import numpy as np
 import pandas as pd
 import oracledb
 from oracledb import AsyncConnectionPool
@@ -204,14 +205,17 @@ class AsyncOracleConnection(object):
             bindList.append(':' + column)
         bind = ', '.join(bindList)
 
-        main_dict = dfObj.to_dict('records')
         if remove_nan:
-            for val, item in enumerate(main_dict):
-                for sub_item, value in item.items():
-                    if pd.isna(value):
-                        main_dict[val][sub_item] = None
-                    else:
-                        main_dict[val][sub_item] = value
+            dfObj = dfObj.replace({np.nan: None})
+        main_dict = dfObj.to_dict('records')
+
+        # if remove_nan:
+        #     for val, item in enumerate(main_dict):
+        #         for sub_item, value in item.items():
+        #             if pd.isna(value):
+        #                 main_dict[val][sub_item] = None
+        #             else:
+        #                 main_dict[val][sub_item] = value
 
         query = """INSERT INTO {} ({}) VALUES ({})""".format(outputTableName, col, bind)
         await self.execute_many(query, main_dict)

wcp_library/async_sql/postgres.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 
+import numpy as np
 import pandas as pd
 from psycopg.sql import SQL
 from psycopg_pool import AsyncConnectionPool
@@ -187,14 +188,17 @@ class AsyncPostgresConnection(object):
             param_list.append(f"%({column})s")
         params = ', '.join(param_list)
 
-        main_dict = dfObj.to_dict('records')
         if remove_nan:
-            for val, item in enumerate(main_dict):
-                for sub_item, value in item.items():
-                    if pd.isna(value):
-                        main_dict[val][sub_item] = None
-                    else:
-                        main_dict[val][sub_item] = value
+            dfObj = dfObj.replace({np.nan: None})
+        main_dict = dfObj.to_dict('records')
+
+        # if remove_nan:
+        #     for val, item in enumerate(main_dict):
+        #         for sub_item, value in item.items():
+        #             if pd.isna(value):
+        #                 main_dict[val][sub_item] = None
+        #             else:
+        #                 main_dict[val][sub_item] = value
 
         query = """INSERT INTO {} ({}) VALUES ({})""".format(outputTableName, col, params)
         await self.execute_many(query, main_dict)

wcp_library/sql/oracle.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 
+import numpy as np
 import pandas as pd
 import oracledb
 from oracledb import ConnectionPool
@@ -208,14 +209,17 @@ class OracleConnection(object):
             bindList.append(':' + column)
         bind = ', '.join(bindList)
 
-        main_dict = dfObj.to_dict('records')
         if remove_nan:
-            for val, item in enumerate(main_dict):
-                for sub_item, value in item.items():
-                    if pd.isna(value):
-                        main_dict[val][sub_item] = None
-                    else:
-                        main_dict[val][sub_item] = value
+            dfObj = dfObj.replace({np.nan: None})
+        main_dict = dfObj.to_dict('records')
+
+        # if remove_nan:
+        #     for val, item in enumerate(main_dict):
+        #         for sub_item, value in item.items():
+        #             if pd.isna(value):
+        #                 main_dict[val][sub_item] = None
+        #             else:
+        #                 main_dict[val][sub_item] = value
 
         query = """INSERT INTO {} ({}) VALUES ({})""".format(outputTableName, col, bind)
         self.execute_many(query, main_dict)

wcp_library/sql/postgres.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 
+import numpy as np
 import pandas as pd
 from psycopg.sql import SQL
 from psycopg_pool import ConnectionPool
@@ -187,14 +188,17 @@ class PostgresConnection(object):
             param_list.append(f"%({column})s")
         params = ', '.join(param_list)
 
-        main_dict = dfObj.to_dict('records')
         if remove_nan:
-            for val, item in enumerate(main_dict):
-                for sub_item, value in item.items():
-                    if pd.isna(value):
-                        main_dict[val][sub_item] = None
-                    else:
-                        main_dict[val][sub_item] = value
+            dfObj = dfObj.replace({np.nan: None})
+        main_dict = dfObj.to_dict('records')
+
+        # if remove_nan:
+        #     for val, item in enumerate(main_dict):
+        #         for sub_item, value in item.items():
+        #             if pd.isna(value):
+        #                 main_dict[val][sub_item] = None
+        #             else:
+        #                 main_dict[val][sub_item] = value
 
         query = """INSERT INTO {} ({}) VALUES ({})""".format(outputTableName, col, params)
         self.execute_many(query, main_dict)

{wcp_library-1.1.9.dist-info → wcp_library-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.1.9
+Version: 1.2.2
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen

{wcp_library-1.1.9.dist-info → wcp_library-1.2.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-wcp_library/__init__.py,sha256=7JG050lnLc-Djo5MyftR_keI7-vZjlBwmx-LLdEVUCM,349
+wcp_library/__init__.py,sha256=hwLbcu00uI6L_xjXO9-I0YcODl2WtIOkdNLoDcXv7zk,591
 wcp_library/async_credentials/__init__.py,sha256=ny6UitVV_xIecVzaWuHrJO9LpywBPke6u4C0F2wiM7o,1881
 wcp_library/async_credentials/api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcp_library/async_credentials/oracle.py,sha256=MvC7wsHnSyAyPGnRVlH0dvvW2xk5ap_IAByoHX4rUWY,5436
 wcp_library/async_credentials/postgres.py,sha256=3wjqtLH0Nc-U80iscYnz5DV-9M2X4IjPW51C5MI2_tI,5297
 wcp_library/async_sql/__init__.py,sha256=m4eWmUGYUEDomhhOp1ScB2uSIXFsNUNO589o5RwWdyM,1035
-wcp_library/async_sql/oracle.py,sha256=T4wLdX3sHQQOfDNqb35GM4wHFP5Vs5veB7iQtdCxPVM,7402
-wcp_library/async_sql/postgres.py,sha256=MGPv1ffUDn7oJX1ojviVD3N7jk8dtQERnbDateuwZJo,6597
+wcp_library/async_sql/oracle.py,sha256=W4_zXc3XxNnMZYXmyCCqx4dx1SQ6J8Tf_ifht_d8btI,7509
+wcp_library/async_sql/postgres.py,sha256=gFkgSpJQ7Giwjtjbh-38szhtFHPAt8WbvtZEp7UZ3oM,6704
 wcp_library/credentials/__init__.py,sha256=HRmg7mqcATeclIz3lZQjSR4nmK6aY6MK9-QXEYZoFrw,1857
 wcp_library/credentials/ftp.py,sha256=FRxKVWifz7olQIrSjDgkTqk7rmc7Zdwmkfq7b62DQY8,4965
 wcp_library/credentials/oracle.py,sha256=IJVGd10LH5LUNKUSFAbApi0sjR1AbloMJRHTuR9zFrQ,5095
@@ -18,8 +18,8 @@ wcp_library/informatica.py,sha256=IXZtk_9X1XLbOEwFrsyOwTgajQKvtXgANBHmuTOP3Kk,40
 wcp_library/logging.py,sha256=tpnEuet-V6SK68JWk5cpt4K51YO0AxaebXrwGDGabFs,2048
 wcp_library/selenium_helper.py,sha256=rlphTXsUgnbaXZknY5nfQqxFhnc7UmrpzhV3hQ-cv7k,2509
 wcp_library/sql/__init__.py,sha256=CLlBEBrWVAwE79bUxuQiwikSrYH8m9QRYSJ2l0-ofsY,1003
-wcp_library/sql/oracle.py,sha256=QT1-SHMs6ebQpzkJ1vjgsAP5TWHDdJF7pWL9QJ52O9Y,7235
-wcp_library/sql/postgres.py,sha256=I2iDQ13z_hbEfpFBliozLfsg8xUdSzEVqr12yyPSdh4,6489
-wcp_library-1.1.9.dist-info/METADATA,sha256=pT9xT59f-L2Adxx5ExaP9m8-r0J_vpHTPmpz82zbt5o,1513
-wcp_library-1.1.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-wcp_library-1.1.9.dist-info/RECORD,,
+wcp_library/sql/oracle.py,sha256=a0wc9zwBdzhZCZFRWxZlokDJEEt-HqhqmwRbtp2T8ZA,7342
+wcp_library/sql/postgres.py,sha256=397Ii0ImjEo_e_QuWJRazfs0WpT9cGrnc6sBPyr4UyY,6596
+wcp_library-1.2.2.dist-info/METADATA,sha256=c3w7APbcjSEvXv1JFvRJzyyxMSgi7RuaZ_pYfs2nS_s,1513
+wcp_library-1.2.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+wcp_library-1.2.2.dist-info/RECORD,,