saviialib 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

saviialib/services/epii/use_cases/upload_backup_to_sharepoint.py

@@ -36,28 +36,32 @@ class UploadBackupToSharepointUsecase:
         self.sharepoint_config = input.sharepoint_config
         self.local_backup_source_path = input.local_backup_source_path
         self.destination_folders = input.destination_folders
-        self.grouped_files_by_folder = self._extract_filesnames_by_folder()
         self.files_client = self._initialize_files_client()
-        self.total_files = sum(
-            len(files) for files in self.grouped_files_by_folder.values()
-        )
         self.log_history = []
+        self.grouped_files_by_folder = None
+        self.total_files = None
 
     def _initialize_files_client(self):
         return FilesClient(FilesClientInitArgs(client_name="aiofiles_client"))
 
-    def _extract_filesnames_by_folder(self) -> dict[str, list[str]]:
+    async def _extract_filesnames_by_folder(self) -> dict[str, list[str]]:
         """Groups files by their parent folder."""
-        if not os.path.exists(self.local_backup_source_path):
+        backup_folder_exists = await asyncio.to_thread(
+            os.path.exists, self.local_backup_source_path
+        )
+        if not backup_folder_exists:
             return {}
+        folder_names = await asyncio.to_thread(
+            os.listdir, self.local_backup_source_path
+        )
         return {
             folder_name: [
                 file_name
-                for file_name in os.listdir(
-                    os.path.join(self.local_backup_source_path, folder_name)
+                for file_name in await asyncio.to_thread(
+                    os.listdir, os.path.join(self.local_backup_source_path, folder_name)
                 )
             ]
-            for folder_name in os.listdir(self.local_backup_source_path)
+            for folder_name in folder_names
         }
 
     def _save_log_history(self) -> None:
@@ -84,7 +88,9 @@ class UploadBackupToSharepointUsecase:
 
         async with sharepoint_client:
             try:
-                destination_folder = self.destination_folders.get(folder_name, folder_name)
+                destination_folder = self.destination_folders.get(
+                    folder_name, folder_name
+                )
                 folder_url = f"{c.SHAREPOINT_BASE_URL}/{destination_folder}"
                 args = SpUploadFileArgs(
                     folder_relative_url=folder_url,
@@ -150,20 +156,33 @@ class UploadBackupToSharepointUsecase:
 
     async def execute(self):
         """Exports all files from the local backup folder to SharePoint cloud."""
+        self.grouped_files_by_folder = await self._extract_filesnames_by_folder()
+        self.total_files = sum(
+            len(files) for files in self.grouped_files_by_folder.values()
+        )
         tasks = []
         start_time = time()
-        
+
         # Check if the local path exists in the main directory
-        if not directory_exists(self.local_backup_source_path):
+        if not await directory_exists(self.local_backup_source_path):
             raise BackupSourcePathError(
                 reason=f"'{self.local_backup_source_path}' doesn't exist."
             )
 
         # Check if the current folder only have files.
-        for item in os.listdir(self.local_backup_source_path):
+        items = [
+            item
+            for item in await asyncio.to_thread(
+                os.listdir, self.local_backup_source_path
+            )
+        ]
+        for item in items:
             folder_included = item in self.destination_folders.keys()
-            is_file = not os.path.isdir(os.path.join(self.local_backup_source_path, item))
-            if not folder_included and not is_file: 
+            is_file = not await asyncio.to_thread(
+                os.path.isdir, os.path.join(self.local_backup_source_path, item)
+            )
+
+            if not folder_included and not is_file:
                 raise BackupSourcePathError(
                     reason=(
                         f"'{item}' must be included in the destination folders dictionary",
@@ -171,12 +190,8 @@ class UploadBackupToSharepointUsecase:
                 )
             elif folder_included and is_file:
                 print(folder_included, is_file)
-                raise BackupSourcePathError(
-                    reason=(
-                        f"'{item}' must be a directory.",
-                    )
-                )
-            
+                raise BackupSourcePathError(reason=(f"'{item}' must be a directory.",))
+
         if self.total_files == 0:
             no_files_message = (
                 f"[BACKUP] {self.local_backup_source_path} has no files ⚠️"
@@ -187,7 +202,9 @@ class UploadBackupToSharepointUsecase:
         # Create task for each file stored in the the local backup folder.
         for folder_name in self.grouped_files_by_folder:
             if (
-                count_files_in_directory(self.local_backup_source_path, folder_name)
+                await count_files_in_directory(
+                    self.local_backup_source_path, folder_name
+                )
                 == 0
             ):
                 empty_folder_message = f"[BACKUP] The folder '{folder_name}' is empty ⚠️"

saviialib/services/epii/utils/upload_backup_to_sharepoint_utils.py

@@ -1,5 +1,6 @@
 import re
 from typing import List, Dict, Optional
+import asyncio
 import os
 from saviialib.general_types.error_types.api.epii_api_error_types import (
     BackupSourcePathError,
@@ -93,9 +94,9 @@ def calculate_percentage_uploaded(results: List[Dict], total_files: int) -> floa
     return (uploaded_count / total_files) * 100 if total_files > 0 else 0
 
 
-def directory_exists(path: str) -> bool:
-    return os.path.exists(path)
+async def directory_exists(path: str) -> bool:
+    return await asyncio.to_thread(os.path.exists, path)
 
 
-def count_files_in_directory(path: str, folder_name: str) -> int:
-    return len(os.listdir(os.path.join(path, folder_name)))
+async def count_files_in_directory(path: str, folder_name: str) -> int:
+    return len(await asyncio.to_thread(os.listdir, os.path.join(path, folder_name)))

{saviialib-0.9.0.dist-info → saviialib-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: saviialib
-Version: 0.9.0
+Version: 0.9.1
 Summary: A client library for IoT projects in the RCER initiative
 License: MIT
 Author: pedropablozavalat

{saviialib-0.9.0.dist-info → saviialib-0.9.1.dist-info}/RECORD

@@ -39,11 +39,11 @@ saviialib/services/epii/use_cases/types/__init__.py,sha256=u6fyodOEJE2j6FMqJux40
 saviialib/services/epii/use_cases/types/update_thies_data_types.py,sha256=BoT6N9YoVw3f8Cyb88T7fJTCCnkVybOh1K1u2fJ3X7k,419
 saviialib/services/epii/use_cases/types/upload_backup_to_sharepoint_types.py,sha256=rvuhJnjsCQpuNz5UO_0lGMR_KJRybNdq_11Be9ZaY1U,267
 saviialib/services/epii/use_cases/update_thies_data.py,sha256=WLBpdAUkxAL_XdDnc49scmst1xMjrdScjr6Cmgg3UEE,6494
-saviialib/services/epii/use_cases/upload_backup_to_sharepoint.py,sha256=3XrkE2LNw3DRP3FA0SVpdD4AnCIL6uBSA-9sctjfKyw,9144
+saviialib/services/epii/use_cases/upload_backup_to_sharepoint.py,sha256=rurCi-01Rm1SKa6o_SPcbsnOBfHlUD1ZMmIn6k7JbCQ,9608
 saviialib/services/epii/utils/__init__.py,sha256=cYt2tvq65_OMjFaqb8-CCC7IGCQgFd4ziEUWJV7s1iY,98
 saviialib/services/epii/utils/update_thies_data_utils.py,sha256=EpjYWXqyHxJ-dO3MHhdXp-rGV7WyUckeFko-nnfnNac,555
-saviialib/services/epii/utils/upload_backup_to_sharepoint_utils.py,sha256=4psc4EHpgnuiOVc0Tn_PR2mDsDh774ERbhIewSwYSZg,3422
-saviialib-0.9.0.dist-info/LICENSE,sha256=NWpf6b38xgBWPBo5HZsCbdfp9hZSliEbRqWQgm0fkOo,1076
-saviialib-0.9.0.dist-info/METADATA,sha256=WnSLd2VoJRXqhypq0NXow8eqQ8Pu9swBbSn9oX5BPhc,4082
-saviialib-0.9.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-saviialib-0.9.0.dist-info/RECORD,,
+saviialib/services/epii/utils/upload_backup_to_sharepoint_utils.py,sha256=DnV4ddqZ0eeD50Wh66J9__m3Sqk5-1p_93e9YuQitpA,3499
+saviialib-0.9.1.dist-info/LICENSE,sha256=NWpf6b38xgBWPBo5HZsCbdfp9hZSliEbRqWQgm0fkOo,1076
+saviialib-0.9.1.dist-info/METADATA,sha256=8xbbpq_CG90pYR9SaNjkuVcGPM2vZ0-9qPrjd8aHazo,4082
+saviialib-0.9.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+saviialib-0.9.1.dist-info/RECORD,,