vavacars-data-utils 1.3.5__tar.gz → 1.3.7__tar.gz

{vavacars_data_utils-1.3.5 → vavacars_data_utils-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vavacars_data_utils
-Version: 1.3.5
+Version: 1.3.7
 Summary: Package with utils
 Home-page: https://dev.azure.com/vavacars/DataScience/_git/Data.Utils
 Author: Vavacars Data Science Team

{vavacars_data_utils-1.3.5 → vavacars_data_utils-1.3.7}/setup.cfg

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

{vavacars_data_utils-1.3.5 → vavacars_data_utils-1.3.7}/vava_utils/azure/az_helper.py

@@ -9,6 +9,7 @@ from azureml.core.authentication import ServicePrincipalAuthentication
 from azureml.core.model import Model
 from azureml.data.datapath import DataPath
 
+from azure.storage.blob import BlobServiceClient
 
 from vava_utils.utils.singleton import singleton
 
@@ -26,7 +27,7 @@ class Az_Helper:
                 - service_principal_password
                 - subscription_id
                 - resource_group
-                - workspace_name
+                - workspace
         """
         self.auth = ServicePrincipalAuthentication(
             tenant_id=config["tenant_id"],
@@ -39,6 +40,9 @@ class Az_Helper:
             workspace_name=config["workspace"],
             auth=self.auth,
         )
+        self.blob = BlobServiceClient.from_connection_string(
+            f"DefaultEndpointsProtocol=https;AccountName={self.account_name};AccountKey={account_key};EndpointSuffix=core.windows.net"
+        )
 
     def register_model(self, path, name, include_version=True, **kwargs):
         """
@@ -258,3 +262,15 @@ class Az_Helper:
             tags=tags,
             **kwargs,
         )
+
+    def write_blob_file(self, container, local_file):
+        """
+        Write local file to Azure Blob Storage
+
+        Parameters:
+            container (string): Azure Blob Storage container name
+            local_file (string): local file path
+        """
+        blob = Datastore.get(self.ws, container)
+        blob.upload_files(files=[local_file], target_path=".", overwrite=True)
+

{vavacars_data_utils-1.3.5 → vavacars_data_utils-1.3.7}/vava_utils/sql/sql_helper.py

@@ -49,18 +49,39 @@ def get_mysql_helper(host, user, port, database=None, password=None, **kwargs):
     return SQL_Helper(engine, engine_type=MYSQL)
 
 
-def get_sqlserver_helper(
+def _get_sqlserver_helper_from_user_password(
+    host,
+    database,
+    user,
+    password,
+    port,
+    db_driver,
+    fast_execute_many,
+    **kwargs,
+):
+    conn_str = urllib.parse.quote_plus(
+        f"DRIVER={{{db_driver}}};SERVER={host},{port};DATABASE={database};UID={user};PWD={password}"
+    )
+    engine = create_engine(
+        url=URL.create("mssql+pyodbc", query={"odbc_connect": conn_str}),
+        fast_executemany=fast_execute_many,
+        pool_pre_ping=True,
+        **kwargs,
+    )
+    return SQL_Helper(engine, engine_type=SQL_SERVER)
+
+
+def _get_sqlserver_helper_from_service_principal(
     host,
     database,
     service_principal_id,
     service_principal_secret,
     tenant_id,
-    port=1433,
-    db_driver="ODBC Driver 17 for SQL Server",
-    fast_execute_many=True,
+    port,
+    db_driver,
+    fast_execute_many,
     **kwargs,
 ):
-
     creds = ConfidentialClientApplication(
         client_id=service_principal_id,
         client_credential=service_principal_secret,
@@ -89,6 +110,49 @@ def get_sqlserver_helper(
     return SQL_Helper(engine, engine_type=SQL_SERVER)
 
 
+def get_sqlserver_helper(
+    host,
+    database,
+    service_principal_id=None,
+    service_principal_secret=None,
+    tenant_id=None,
+    user=None,
+    password=None,
+    port=1433,
+    db_driver="ODBC Driver 17 for SQL Server",
+    fast_execute_many=True,
+    **kwargs,
+):
+
+    if user and password:
+        return _get_sqlserver_helper_from_user_password(
+            host,
+            database,
+            user,
+            password,
+            port,
+            db_driver,
+            fast_execute_many,
+            **kwargs,
+        )
+    elif service_principal_id and service_principal_secret and tenant_id:
+        return _get_sqlserver_helper_from_service_principal(
+            host,
+            database,
+            service_principal_id,
+            service_principal_secret,
+            tenant_id,
+            port,
+            db_driver,
+            fast_execute_many,
+            **kwargs,
+        )
+    else:
+        raise ValueError(
+            "Either user and password or service_principal_id, service_principal_secret and tenant_id must be provided"
+        )
+
+
 def _value_to_str(v):
     if isinstance(v, bool):
         return str(int(v))
@@ -170,19 +234,19 @@ class SQL_Helper:
             df (pd.DataFrame): data to write
             table_name (str): output database table name
             if_exists (str): action to take if table already exists
-                * fail, 
-                * replace 
-                * append 
+                * fail,
+                * replace
+                * append
                 * truncate: NEW, truncate table before writing, like 'replace' but keeps structure
             **kwargs: additional keyword parameters passed to df.to_sql
         """
         with self._engine.connect() as conn:
             trans = conn.begin()
             try:
-                if if_exists == "truncate": 
+                if if_exists == "truncate":
                     conn.execute(f"TRUNCATE TABLE {table_name}")
                     if_exists = "append"
-                df.to_sql(table_name.lower(), conn, chunksize=chunksize, index=index, **kwargs)
+                df.to_sql(table_name.lower(), conn, chunksize=chunksize, index=index, if_exists=if_exists, **kwargs)
                 trans.commit()
             except Exception as ex:
                 LOGGER.warning(str(ex))

{vavacars_data_utils-1.3.5 → vavacars_data_utils-1.3.7}/vavacars_data_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vavacars_data_utils
-Version: 1.3.5
+Version: 1.3.7
 Summary: Package with utils
 Home-page: https://dev.azure.com/vavacars/DataScience/_git/Data.Utils
 Author: Vavacars Data Science Team

{vavacars_data_utils-1.3.5 → vavacars_data_utils-1.3.7}/vavacars_data_utils.egg-info/SOURCES.txt

@@ -30,6 +30,35 @@ setup.cfg
 ./vava_utils/utils/utils.py
 ./vava_utils/vavaprice/__init__.py
 ./vava_utils/vavaprice/vavaprice_helper.py
+test/utils/__init__.py
+test/utils/test_strings.py
+vava_utils/__init__.py
+vava_utils/azure/__init__.py
+vava_utils/azure/az_helper.py
+vava_utils/bigquery/__init__.py
+vava_utils/bigquery/bigquery_helper.py
+vava_utils/camunda/__init__.py
+vava_utils/camunda/camunda_helper.py
+vava_utils/email/__init__.py
+vava_utils/email/email_helper.py
+vava_utils/salesforce/__init__.py
+vava_utils/salesforce/salesforce_helper.py
+vava_utils/smartiq/__init__.py
+vava_utils/smartiq/smartiq_helper.py
+vava_utils/smartiq/smartiq_helper_v2.py
+vava_utils/sql/__init__.py
+vava_utils/sql/sql_helper.py
+vava_utils/turkey/__init__.py
+vava_utils/turkey/dates.py
+vava_utils/utils/__init__.py
+vava_utils/utils/callables.py
+vava_utils/utils/comparisons.py
+vava_utils/utils/naming.py
+vava_utils/utils/singleton.py
+vava_utils/utils/strings.py
+vava_utils/utils/utils.py
+vava_utils/vavaprice/__init__.py
+vava_utils/vavaprice/vavaprice_helper.py
 vavacars_data_utils.egg-info/PKG-INFO
 vavacars_data_utils.egg-info/SOURCES.txt
 vavacars_data_utils.egg-info/dependency_links.txt