berryworld 1.0.0.169823__py3-none-any.whl → 1.0.0.170753__py3-none-any.whl

berryworld/email_con.py

@@ -267,6 +267,8 @@ class EmailConnection:
             response = requests.get(url=base_url, headers=header)
             json_resp = response.json()
 
+            if 'value' not in json_resp.keys():
+                return False
             emails_df = pd.DataFrame(json_resp['value'])
             if emails_df.shape[0] > 0:
                 emails_df = emails_df.loc[emails_df['isRead'] == False]
@@ -278,6 +280,9 @@ class EmailConnection:
 
     @staticmethod
     def get_mimetype(file_path):
+        """ Get the mimetype of the file to be attached to the email
+        :param file_path: Path of the file to be attached
+        """
         # Get mimetype
         mimetype = None
         extension = None

berryworld/sharepoint_con.py

@@ -21,19 +21,19 @@ class SharepointConnection:
         """
         try:
             if env_name is None:
-                raise ValueError("Please provide a value for env_name")
-            self.env_name = env_name
+                raise ValueError('Please provide a valid env_name')
+
             if api_version is None:
                 self.api_version = 'v1.0'
+            else:
+                self.api_version = api_version
 
-            self.client_id = os.environ.get(f"SHAREPOINT_CLIENT_ID_{self.env_name.upper()}")
+            self.env_name = env_name
+            self.client_id = os.environ.get(f"SHAREPOINT_CLIENT_ID")
+            self.organisation_id = os.environ.get(f"SHAREPOINT_ORG_ID")
+            self.username = os.environ.get(f"SHAREPOINT_USER")
+            self.password = os.environ.get(f"SHAREPOINT_PASSWORD")
             self.scopes = ['Sites.ReadWrite.All', 'Files.ReadWrite.All']
-            self.organisation_id = os.environ.get(f"SHAREPOINT_ORG_{self.env_name.upper()}")
-            self.username = os.environ.get(f"SHAREPOINT_USER_{self.env_name.upper()}")
-            self.password = os.environ.get(f"SHAREPOINT_PASSWORD_{self.env_name.upper()}")
-            self.site_id = os.environ.get(f"SHAREPOINT_SITE_ID_{self.env_name.upper()}")
-            self.site_name = os.environ.get(f"SHAREPOINT_SITE_NAME_{self.env_name.upper()}")
-            self.api_version = self.api_version
 
         except ValueError as e:
             raise ValueError(f"Variable {str(e)} not found")
@@ -42,6 +42,7 @@ class SharepointConnection:
         self.headers = self.get_headers()
         self.children = 'children?select=id,name,webUrl,file'
 
+        self.site_id = self.list_sites(site_name=env_name)['id'].values[0]
         self.drive_id = self.set_drive_id()
 
     def get_headers(self):
@@ -64,14 +65,24 @@ class SharepointConnection:
             raise ValueError(f"Could not retrieve the root folders: {traceback.format_exc()}")
         return drive_id
 
-    def list_sites(self):
+    def list_sites(self, site_name=None):
         """ List Sites in SharePoint
+        :param site_name: Name of the site to retrieve the information
         """
         site_url = f'{self.graph_url}/sites?search=*'
         try:
             result = requests.get(site_url, headers=self.headers)
             site_values = result.json()['value']
-            return pd.DataFrame(site_values)[['id', 'name', 'webUrl']]
+            sites_df = pd.DataFrame(site_values)[['id', 'name', 'webUrl']]
+
+            if site_name is not None:
+                sites_df = sites_df.loc[
+                    sites_df['name'].str.lower().str.replace(' ', '') == site_name.lower().replace(' ', '')]
+                if sites_df.shape[0] == 0:
+                    raise ValueError(f"The site {site_name} was not found")
+
+            return sites_df
+
         except ValueError as e:
             raise ValueError(f"Could not retrieve the sites: {str(e)}")
 

{berryworld-1.0.0.169823.dist-info → berryworld-1.0.0.170753.dist-info}/METADATA

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

{berryworld-1.0.0.169823.dist-info → berryworld-1.0.0.170753.dist-info}/RECORD

@@ -6,7 +6,7 @@ berryworld/app_logs_query.py,sha256=U94b-z3X9cuY_KFozupUcfaYciXWBn7p_RHkoRsfROU,
 berryworld/cache_data.py,sha256=2cStWbFQHimon_lHMbcM_0vU7lt-FCge96D-T9YXaxQ,2242
 berryworld/credentials.py,sha256=Knxo4gssLT7sbaBjOTFe3mX5k70G2e0M_6CdtlddjtA,10200
 berryworld/devops.py,sha256=BAsVonVwCXoApUOovkt-BCzwc6KnXjxRDGff_ejSGw8,9719
-berryworld/email_con.py,sha256=N-3R69MrqnzUSW4h9k0JJTjmzJuCKC_HkkQzClWRdX8,14142
+berryworld/email_con.py,sha256=_QGA575BPVIqz7Z2AAghZCgN9YOkgDDYDpvcwnNo6ns,14358
 berryworld/email_logging.py,sha256=br2wlwoxVspEuUJJ7VXa4hUxPbBKBRfSKfTQ0GRrreI,3468
 berryworld/generate_env.py,sha256=Tk9Z_u7cA4Ve8YYTyLH2qwmLVAuYoTIWoFc0h8Va8lY,7842
 berryworld/handy_mix.py,sha256=SLCAdl2xaWEewWkECzcVFUDODDEkvUgpmJjTiccyVwU,9771
@@ -16,7 +16,7 @@ berryworld/persistent_storage.py,sha256=_lGdXa7IyxfMF3xNF9y26X_z9RDb2Ah7R0oF61HR
 berryworld/pickle_management.py,sha256=O49ojVtTqYCT510rVRTbZWWaur_-5q3HSVG03Azn8mQ,2393
 berryworld/postgres_connection.py,sha256=whKDnchd5Feqpmxpoh2vlyn36EKHR-dVEULYq0N_4wA,8287
 berryworld/power_automate.py,sha256=9rDuRy0v-Ttq-SThid4lOB_tD4ibkyEmobiROpa--g4,25414
-berryworld/sharepoint_con.py,sha256=72CZSVpAoHxocAWFuSSeUkNHa4Vu8FdM09NX-QC5-eE,22011
+berryworld/sharepoint_con.py,sha256=TuH-Vxk1VxjTi7x80KFssf_J8YPLRXpV27RBaFZi37U,22254
 berryworld/sql_conn.py,sha256=GxkCTUpGouJ9ppiP_71_nfHrxOQSjlmh6UPlIRf7L98,46191
 berryworld/sql_connection.py,sha256=u-2oNFC8cTP0nXkBGp62XjD06kukMFkwFMQ57CwsySQ,44364
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
@@ -29,8 +29,8 @@ 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.169823.dist-info/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
-berryworld-1.0.0.169823.dist-info/METADATA,sha256=xdLrr2dPgULwzjSgTzaZWz7zuIVhAy34L3DtD7tjAUU,1107
-berryworld-1.0.0.169823.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-berryworld-1.0.0.169823.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.169823.dist-info/RECORD,,
+berryworld-1.0.0.170753.dist-info/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.170753.dist-info/METADATA,sha256=fvG-6-6i-EWLQJdwZ4a86jcOrjgpGHYVP8Yx_8S4G6k,1107
+berryworld-1.0.0.170753.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+berryworld-1.0.0.170753.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.170753.dist-info/RECORD,,