vavacars-data-utils 1.1.3__tar.gz → 1.2.0__tar.gz

{vavacars_data_utils-1.1.3 → vavacars_data_utils-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vavacars_data_utils
-Version: 1.1.3
+Version: 1.2.0
 Summary: Package with utils
 Home-page: https://dev.azure.com/vavacars/DataScience/_git/Data.Utils
 Author: Vavacars Data Science Team
@@ -10,6 +10,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+Requires-Dist: pandas
+Requires-Dist: PyYAML>=6.0
+Requires-Dist: requests
+Requires-Dist: sqlalchemy<2.0
+Requires-Dist: redis
+Requires-Dist: msal
+Requires-Dist: pyodbc
+Requires-Dist: unidecode
+Requires-Dist: azure-communication-email
 
 # Vavacars
 

{vavacars_data_utils-1.1.3 → vavacars_data_utils-1.2.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = vavacars_data_utils
-version = 1.1.3
+version = 1.2.0
 author = Vavacars Data Science Team
 author_email = acg@vava.cars
 description = Package with utils

{vavacars_data_utils-1.1.3 → vavacars_data_utils-1.2.0}/vava_utils/sql/sql_helper.py

@@ -1,5 +1,7 @@
 from sqlalchemy import create_engine, event, text
 from sqlalchemy.engine.url import URL
+from sqlalchemy.engine.cursor import LegacyCursorResult
+
 from msal import ConfidentialClientApplication
 import urllib
 import struct
@@ -175,7 +177,7 @@ class SQL_Helper:
             chunksize (int): number of rows in each batch to be written at a time
         """
         if self.engine_type == "sql_server":
-            tmp_table_name = f"##{table_name}_tmp_{random.randrange(0, 100)}"  # This has to be a global table
+            tmp_table_name = f"##{table_name}_tmp_{random.randrange(0, 1000)}"  # This has to be a global table
             create_sql_model = """
                 SELECT TOP 0 * INTO dbo.{tmp_table_name} FROM dbo.{table_name}
             """
@@ -196,8 +198,11 @@ class SQL_Helper:
                     WHERE {not_exists_part_cols}
                 );
             """
+            col_names = [f'[{x}]' for x in df.columns]
+            upsert_cols = [f'[{x}]' for x in upsert_cols]
+
         elif self.engine_type == "mysql":
-            tmp_table_name = f"{table_name}_tmp_{random.randrange(0, 100)}"
+            tmp_table_name = f"{table_name}_tmp_{random.randrange(0, 1000)}"
             create_sql_model = """
                 CREATE TEMPORARY TABLE IF NOT EXISTS {tmp_table_name} LIKE {table_name};
             """
@@ -217,6 +222,9 @@ class SQL_Helper:
                     WHERE {not_exists_part_cols}
                 );
             """
+            col_names = [f'`{x}`' for x in df.columns]
+            upsert_cols = [f'`{x}`' for x in upsert_cols]
+
         else:
             raise NotImplementedError(f"Method not implemented for {self.engine_type} engine")
 
@@ -233,7 +241,6 @@ class SQL_Helper:
                     df.to_sql(tmp_table_name, conn, if_exists="append", index=False, chunksize=chunksize)
 
                     # UPDATE Existing
-                    col_names = list(df.columns)
                     set_part = []
                     for col in col_names:
                         set_part.append(set_part_sql_model.format(col=col))
@@ -263,7 +270,10 @@ class SQL_Helper:
                         not_exists_part_cols=not_exists_part_cols,
                     )
                     conn.execute(text(insert_sql))
-
+                    
+                    # DROP tmp table
+                    conn.execute(text(f"DROP TABLE {tmp_table_name};"))
+                    
                     trans.commit()
                 except Exception as ex:
                     LOGGER.warning(str(ex))
@@ -331,7 +341,7 @@ class SQL_Helper:
             [f"{k} = {_value_to_str(row[k])}" if not pd.isna(row[k]) else f"{k} IS NULL" for k in keys]
         )
 
-        exists = self._engine.execute(f"SELECT EXISTS (SELECT * FROM {table_name} WHERE {condition_exists})").first()[0]
+        exists = int(self._engine.execute(f"SELECT COUNT(1) FROM {table_name} WHERE {condition_exists}").first()[0])
 
         if exists:
             self.update_row(row, keys, table_name)
@@ -339,3 +349,7 @@ class SQL_Helper:
             self.write_row(row, table_name)
 
         return "UPDATE" if exists else "CREATE"
+
+
+    def execute(self, query: str) -> LegacyCursorResult:
+        return self._engine.execute(query)

{vavacars_data_utils-1.1.3 → vavacars_data_utils-1.2.0}/vavacars_data_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vavacars-data-utils
-Version: 1.1.3
+Version: 1.2.0
 Summary: Package with utils
 Home-page: https://dev.azure.com/vavacars/DataScience/_git/Data.Utils
 Author: Vavacars Data Science Team
@@ -10,6 +10,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+Requires-Dist: pandas
+Requires-Dist: PyYAML>=6.0
+Requires-Dist: requests
+Requires-Dist: sqlalchemy<2.0
+Requires-Dist: redis
+Requires-Dist: msal
+Requires-Dist: pyodbc
+Requires-Dist: unidecode
+Requires-Dist: azure-communication-email
 
 # Vavacars