berryworld 1.0.0.192686__py3-none-any.whl → 1.0.0.192942__py3-none-any.whl

berryworld/persistent_storage.py

@@ -16,12 +16,12 @@ class PersistentStorage:
         if os.name == 'nt':
             root = os.getcwd()
         else:
-            root = '/mnt/datascience-persistent-store-file-share'
+            root = 'storage'
 
         if base is not None:
-            self.base_path = os.path.join(root, base)
+            self.base_path = os.path.join(os.getcwd(), root, base)
         else:
-            self.base_path = root
+            self.base_path = os.path.join(os.getcwd(), root)
 
         self.connect()
 
@@ -52,7 +52,7 @@ class PersistentStorage:
     def connect(self):
         """ Check if the base path exists """
         if not self.if_exists(self.base_path):
-            raise ValueError("The current project doesn't have access to persistent storage, please check YAML file.")
+            raise ValueError(f"The persistent storage path: {self.base_path} is not properly set up.")
 
     def return_base_path(self):
         """ Return the base path """

berryworld/sql_connenction.py

@@ -109,16 +109,17 @@ class SQLConnection:
             database = str(self.db_name).lower().replace('primary;', '')
 
         if self.master:
-            self.con_string = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/master' +
+            self.con_string = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server_name + '/master' +
                               '?driver=' + self.driver + '&trusted_connection=yes' + self.trusted_certificate +
                                self.encrypt)
             self.engine = sa.create_engine(self.con_string % parse.quote_plus(self.password))
         else:
-            self.con_string = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/' + database +
+            self.con_string = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server_name + '/' + database +
                               '?driver=' + self.driver + self.trusted_certificate + self.encrypt)
             self.engine = sa.create_engine(self.con_string % parse.quote_plus(self.password))
         if not commit_as_transaction:
             self.engine = self.engine.execution_options(isolation_level="AUTOCOMMIT")
+
         self.con = self.engine.connect().connection
 
     def open_write_connection(self, commit_as_transaction=True):
@@ -126,7 +127,7 @@ class SQLConnection:
         :param commit_as_transaction: Indicate whether the connection will be done using the autocommit option or not
         :return: The opened connection
         """
-        constring = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/' + self.db_name +
+        constring = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server_name + '/' + self.db_name +
                     '?driver=' + self.driver + self.trusted_certificate + self.encrypt)
         self.engine = sa.create_engine(constring % parse.quote_plus(self.password))
         if not commit_as_transaction:

{berryworld-1.0.0.192686.dist-info → berryworld-1.0.0.192942.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: berryworld
-Version: 1.0.0.192686
+Version: 1.0.0.192942
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd

{berryworld-1.0.0.192686.dist-info → berryworld-1.0.0.192942.dist-info}/RECORD

@@ -13,25 +13,25 @@ berryworld/handy_mix.py,sha256=ZPr5Z4l5TfyXQjhuLjttGi90whBooTQhB7M-Lq5L1DQ,10683
 berryworld/logging.py,sha256=tOxzaFALQm3aVVEc3I7t8MU6PwgUI9VSnzNCH9yRryo,1013
 berryworld/logic_apps.py,sha256=a0uU4tNO3v2w7grdBv-OOx4hUf7VBIerJpwZ9U-29dQ,14591
 berryworld/microsoft_teams.py,sha256=8uPo0yku-euBj2VdzBoZCeX3IcsCCOqISLqaVZUVxfA,16030
-berryworld/persistent_storage.py,sha256=KQA57ez8eVTUCtudYkHPg_S5lcOEa_E7xXcaN1DYMMc,8601
+berryworld/persistent_storage.py,sha256=fKdC36q5MqQTurq0TkJWrCbm4p9rj4cSFV33cbTU8fk,8588
 berryworld/pickle_management.py,sha256=5o6UuXBpTj23Jgpz6sj9V-vdcdWBK1xMEckWxT-Whj4,2436
 berryworld/power_automate.py,sha256=V86QEGG9H36DrDvod9Q6yp8OUu307hfYcXJhw06pYrA,27912
 berryworld/sharepoint_con.py,sha256=TuH-Vxk1VxjTi7x80KFssf_J8YPLRXpV27RBaFZi37U,22254
 berryworld/snowflake_conn.py,sha256=go5ZJjnhz5SkG83B0G0XZSwKgU6tg7AFTBso59oRG5M,2434
 berryworld/sql_conn.py,sha256=tYKgD8ja7NQuvLB1WBjdsJbPcm3eX1Y76QPTEgx8R8Q,47564
-berryworld/sql_connenction.py,sha256=lnPFw0PLMGTPuRkW92eSJJcZlUqHJLC7UdoghbhMobA,48333
+berryworld/sql_connenction.py,sha256=iFGQHs3QQ7jnLwmhPpnFqI7DFHHE5UuWCfq_QW3SM7U,48349
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
 berryworld/transportation_solver.py,sha256=tNc1JJk71azIBccdWVHbqcvXWhalOdKffv6HmBD6tG0,5014
 berryworld/verify_keys.py,sha256=X4Nuz3o0XbRDYofbJGvxIDeN5gfWj19PN7lhO6T3hR8,4356
 berryworld/vivantio.py,sha256=QfZo0UKqkzVRg_LyiwivNd3aEup4TH57x4KxLZkCJwc,10627
 berryworld/vivantio_logging.py,sha256=ciy7gA4u3FrgUIpEBnMgocbNPp6jcu9TPoy-kLcrTZU,5736
 berryworld/xml_parser.py,sha256=HWD71NaTN3DaIOGT6Wzxs4CEsroFhGQwe9iPLIL80Co,957
-berryworld-1.0.0.192686.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.192942.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_allocation_config.py,sha256=e12l6fE9U57eSPS35g6ekJ_hol7-RHg89JV60_m1BlE,4633
 tests/test_handy_mix_config.py,sha256=Un56mz9KJmdn4K4OwzHAHLSRzDU1Xv2nFrONNuzOG04,2594
 tests/test_xml_parser.py,sha256=3QTlhFEd6KbK6nRFKZnc35tad6wqukTbe4QrFi8mr_8,859
-berryworld-1.0.0.192686.dist-info/METADATA,sha256=aWLN6nx7m9vDBMnRFALaL6CNZZCdRKznjNumwtc49bQ,1362
-berryworld-1.0.0.192686.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.192686.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.192686.dist-info/RECORD,,
+berryworld-1.0.0.192942.dist-info/METADATA,sha256=LurenorkZUosMBxMLVh2-RfDnb2ISt1QBCAKmi3KRWY,1362
+berryworld-1.0.0.192942.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.192942.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.192942.dist-info/RECORD,,