wcp-library 1.1.9__tar.gz → 1.2.1__tar.gz

{wcp_library-1.1.9 → wcp_library-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.1.9
+Version: 1.2.1
 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 → wcp_library-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.1.9"
+version = "1.2.1"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"

{wcp_library-1.1.9 → wcp_library-1.2.1}/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-1.1.9 → wcp_library-1.2.1}/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-1.1.9 → wcp_library-1.2.1}/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-1.1.9 → wcp_library-1.2.1}/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)