saviialib 0.11.0__py3-none-any.whl → 0.11.2__py3-none-any.whl

saviialib/general_types/api/epii_api_types.py

@@ -59,6 +59,7 @@ class EpiiUpdateThiesConfig:
     sharepoint_tenant_id: str
     sharepoint_tenant_name: str
     sharepoint_site_name: str
+    logger: Logger
 
 
 @dataclass

saviialib/libs/ftp_client/clients/aioftp_client.py

@@ -45,5 +45,8 @@ class AioFTPClient(FTPClientContract):
 
     async def read_file(self, args: FtpReadFileArgs) -> bytes:
         await self._async_start()
-        async with self.client.download_stream(args.file_path) as stream:  # type: ignore
-            return await stream.read()
+        try:
+            async with self.client.download_stream(args.file_path) as stream:  # type: ignore
+                return await stream.read()
+        except StatusCodeError as error:
+            raise FileNotFoundError(f"File not found: {args.file_path}") from error

saviialib/services/epii/api.py

@@ -28,7 +28,6 @@ class EpiiAPI:
         self.sharepoint_tenant_id = config.sharepoint_tenant_id
         self.sharepoint_tenant_name = config.sharepoint_tenant_name
         self.sharepoint_site_name = config.sharepoint_site_name
-
         self.logger = config.logger
 
     async def update_thies_data(
@@ -39,7 +38,9 @@ class EpiiAPI:
 
         Args:
             sharepoint_folders_path (list): List of Sharepoint folder paths for AVG and EXT data.
+            The AVG path must be the first element.
             ftp_server_folders_path (list): List of FTP server folder paths for AVG and EXT data.
+            The AVG path must be the first element.
 
         Returns:
             dict: A dictionary representation of the API response.
@@ -54,6 +55,7 @@ class EpiiAPI:
             sharepoint_site_name=self.sharepoint_site_name,
             sharepoint_tenant_id=self.sharepoint_tenant_id,
             sharepoint_tenant_name=self.sharepoint_tenant_name,
+            logger=self.logger,
         )
         controller = UpdateThiesDataController(
             UpdateThiesDataControllerInput(

saviialib/services/epii/controllers/update_thies_data.py

@@ -45,6 +45,7 @@ class UpdateThiesDataController:
                 ),
                 sharepoint_folders_path=input.sharepoint_folders_path,
                 ftp_server_folders_path=input.ftp_server_folders_path,
+                logger=input.config.logger,
             )
         )
 

saviialib/services/epii/use_cases/types/update_thies_data_types.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass, field
 from typing import Dict, List
 from saviialib.general_types.api.epii_api_types import FtpClientConfig, SharepointConfig
+from logging import Logger
 
 
 @dataclass
@@ -9,6 +10,7 @@ class UpdateThiesDataUseCaseInput:
     sharepoint_config: SharepointConfig
     sharepoint_folders_path: List
     ftp_server_folders_path: List
+    logger: Logger
 
 
 @dataclass

saviialib/services/epii/use_cases/update_thies_data.py

@@ -38,6 +38,7 @@ class UpdateThiesDataUseCase:
         self.sharepoint_client = self._initialize_sharepoint_client(
             input.sharepoint_config
         )
+        self.logger = input.logger
         self.thies_ftp_client = self._initialize_thies_ftp_client(input.ftp_config)
         self.sharepoint_folders_path = input.sharepoint_folders_path
         self.ftp_server_folders_path = input.ftp_server_folders_path
@@ -122,16 +123,25 @@ class UpdateThiesDataUseCase:
         try:
             content_files = {}
             for file in self.uploading:
-                _, filename = file.split("_", 1)
-                folder_path = (
-                    self.ftp_server_folders_path[0]
-                    if "AV" in self.ftp_server_folders_path[0]  # Folder with AVG prefix
-                    else self.ftp_server_folders_path[1]  # Folder with EXT prefix
+                prefix, filename = file.split("_", 1)
+                # The first path is for AVG files. The second file is for EXT files
+                folder_path = next(
+                    (
+                        path
+                        for path in self.ftp_server_folders_path
+                        if prefix == ("AVG" if "AV" in path else "EXT")
+                    ),
+                    self.ftp_server_folders_path[0],  # Default to the first path
                 )
                 file_path = f"{folder_path}/{filename}"
                 content = await self.thies_ftp_client.read_file(
                     FtpReadFileArgs(file_path)
                 )
+                self.logger.debug(
+                    "[thies_synchronization_lib] Fetching file '%s' from '%s'.",
+                    file,
+                    folder_path,
+                )
                 content_files[file] = (
                     content  # Save file content with its original name.
                 )
@@ -150,12 +160,17 @@ class UpdateThiesDataUseCase:
         async with self.sharepoint_client:
             for file, file_content in files.items():
                 try:
-                    _, file_name = file.split("_", 1)
-                    # Could be AVG or EXT.
-                    if file_name in self.sharepoint_folders_path[0]:
-                        folder_path = self.sharepoint_folders_path[0]
+                    origin, file_name = file.split("_", 1)
+                    # Check if the first folder is for AVG, otherwise assume it's for EXT
+                    if "AVG" in self.sharepoint_folders_path[0]:
+                        avg_folder = self.sharepoint_folders_path[0]
+                        ext_folder = self.sharepoint_folders_path[1]
                     else:
-                        folder_path = self.sharepoint_folders_path[1]
+                        avg_folder = self.sharepoint_folders_path[1]
+                        ext_folder = self.sharepoint_folders_path[0]
+
+                    folder_path = avg_folder if origin == "AVG" else ext_folder
+
                     relative_url = f"{self.sharepoint_base_url}/{folder_path}"
 
                     args = SpUploadFileArgs(
@@ -165,8 +180,18 @@ class UpdateThiesDataUseCase:
                     )
                     await self.sharepoint_client.upload_file(args)
                     upload_results["new_files"].append(file)
+                    self.logger.debug(
+                        "[thies_synchronization_lib] File '%s' from '%s' uploaded successfully to '%s' ✅",
+                        file_name,
+                        folder_path,
+                        relative_url,
+                    )
 
                 except ConnectionError as error:
+                    self.logger.error(
+                        "[thies_synchronization_lib] Unexpected error from with file '%s'",
+                        file_name,
+                    )
                     upload_results["failed_files"].append(
                         f"{file} (Error: {str(error)})"
                     )
@@ -181,20 +206,26 @@ class UpdateThiesDataUseCase:
 
     async def execute(self):
         """Synchronize data from the THIES Center to the cloud."""
+        self.logger.debug("[thies_synchronization_lib] Starting ...")
         try:
             thies_files = await self.fetch_thies_file_names()
         except RuntimeError as error:
             raise FtpClientError(error)
-
+        self.logger.debug(
+            "[thies_synchronization_lib] Total files fetched from THIES: %s",
+            str(len(thies_files)),
+        )
         try:
             cloud_files = await self.fetch_cloud_file_names()
         except RuntimeError as error:
             raise SharepointClient(error)  # type: ignore
-
+        self.logger.debug(
+            "[thies_synchronization_lib] Total files fetched from Sharepoint: %s",
+            str(len(cloud_files)),
+        )
         self.uploading = thies_files - cloud_files
         if not self.uploading:
             raise EmptyDataError(reason="No files to upload.")
-
         # Fetch the content of the files to be uploaded from THIES FTP Server
         thies_fetched_files = await self.fetch_thies_file_content()
 
@@ -202,5 +233,7 @@ class UpdateThiesDataUseCase:
         upload_statistics = await self.upload_thies_files_to_sharepoint(
             thies_fetched_files
         )
-
+        self.logger.debug(
+            "[thies_synchronization_lib] All the files were uploaded successfully 🎉"
+        )
         return parse_execute_response(thies_fetched_files, upload_statistics)  # type: ignore

{saviialib-0.11.0.dist-info → saviialib-0.11.2.dist-info}/METADATA

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

{saviialib-0.11.0.dist-info → saviialib-0.11.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 saviialib/__init__.py,sha256=TMsEY8OOjo9KOz-0jf3QBh6WFOhCY07Rd7W2PK7C-1A,253
 saviialib/general_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 saviialib/general_types/api/__init__.py,sha256=jXhoMlbSv7UCizW_Fm2mqR_3n99qkocVwg6CF7s3w7w,145
-saviialib/general_types/api/epii_api_types.py,sha256=0_YzFLvv7asSZJ_K4FFqLeJsCFMMHRpHTQehmUok8b8,2326
+saviialib/general_types/api/epii_api_types.py,sha256=jspp5tDN06qx27O3ubRyPfZ3i9ybvn2HLxjh3UTFNcY,2345
 saviialib/general_types/error_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 saviialib/general_types/error_types/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 saviialib/general_types/error_types/api/epii_api_error_types.py,sha256=iprpNvVoNA3vakMm7-dQdjCv7ZrRs6tRiXK1uaV3DNU,3049
@@ -19,7 +19,7 @@ saviialib/libs/files_client/files_client_contract.py,sha256=fYvd68IMpc1OFkxbzNSm
 saviialib/libs/files_client/types/files_client_types.py,sha256=8OHm4nvZTW9K3ryeIUvthE_Cj7wF4zVcqG0KCi_vQIU,718
 saviialib/libs/ftp_client/__init__.py,sha256=dW2Yutgc7mJJJzgKLhWKXMgQ6KIWJYfFa1sGpjHH5xU,191
 saviialib/libs/ftp_client/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-saviialib/libs/ftp_client/clients/aioftp_client.py,sha256=npkB2IBTTcHg-_zXTv1OlRagxR6irT33TvFVSvtPqXU,1779
+saviialib/libs/ftp_client/clients/aioftp_client.py,sha256=5sgr3PMETgaBRlKeu_avxHIh6tr1gb7t2mkxmpRas_k,1925
 saviialib/libs/ftp_client/ftp_client.py,sha256=UWpuIrfO27A1M40YaBvAUdkdwPYJ4Ty4q55x7H4y1F8,844
 saviialib/libs/ftp_client/ftp_client_contract.py,sha256=tymkugDzsJ5PzUXIaSkwX1h7T0naR15qAkjrqswqDyM,338
 saviialib/libs/ftp_client/types/__init__.py,sha256=syfwf9feP4QK7fkCTfl4j8l11ic-jHtfi1DE2chaWbs,155
@@ -31,23 +31,23 @@ saviialib/libs/sharepoint_client/sharepoint_client_contract.py,sha256=xqNHzCjp7G
 saviialib/libs/sharepoint_client/types/sharepoint_client_types.py,sha256=OmPlCJ9rLrAFBeG6aDp5cxMiQ5BZlDyGVx5S4GN4aqg,414
 saviialib/libs/zero_dependency/utils/datetime_utils.py,sha256=NFPHxOTuCtfkYjUnsbRqw9ZK87UGAK-Eira2CwG8rJ8,754
 saviialib/services/epii/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-saviialib/services/epii/api.py,sha256=kd4kL475C8CtEj0Yg8Eg1ig8J90GbIbdl9A8pqPtc58,3901
+saviialib/services/epii/api.py,sha256=99G-iC8Nz8vv9TuNPpdFsHxDAH8DXVCHnUQzwAUO9Ao,4036
 saviialib/services/epii/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 saviialib/services/epii/controllers/types/__init__.py,sha256=xzky-oTSojLNkWETp_k8a4dcXYvYSQY0VhWo23Yhb8U,195
 saviialib/services/epii/controllers/types/update_thies_data_types.py,sha256=kmt18vq7RLEAfIJj9MYz62fJH9etuU1WqZJ5MYmjiIg,448
 saviialib/services/epii/controllers/types/upload_backup_to_sharepoint_types.py,sha256=5mDMLy3J5grACl1ezBGYZPOyhIkWYeIWWBOklaP2IlQ,471
-saviialib/services/epii/controllers/update_thies_data.py,sha256=Bq00uqcu26Ro1gCpFGqNys88kzMTnnJvEmxOBitLUks,4840
+saviialib/services/epii/controllers/update_thies_data.py,sha256=8TV420d4VWTvCW18M6sAguHZrX5VODXscgrUfhwO1fs,4884
 saviialib/services/epii/controllers/upload_backup_to_sharepoint.py,sha256=7-ABo89yXhrWv-iOFjCkBGX-y_I62eFaOi1LtO5Gb4k,3817
 saviialib/services/epii/use_cases/constants/upload_backup_to_sharepoint_constants.py,sha256=erkn-3E8YwBMFs25o7exXoK7s73NdgP9IYDXeWzALcI,98
 saviialib/services/epii/use_cases/types/__init__.py,sha256=u6fyodOEJE2j6FMqJux40Xf9ccYAi-UUYxqT-Kzc0kE,199
-saviialib/services/epii/use_cases/types/update_thies_data_types.py,sha256=VQM8oJxrwvmH7NeBpJ6JYZtDV_MujMRWwFazsSgHY_M,493
+saviialib/services/epii/use_cases/types/update_thies_data_types.py,sha256=3lJzG1nuZoP1mqFlvQ0-aFJp80SECaeiROlvucVhaSY,539
 saviialib/services/epii/use_cases/types/upload_backup_to_sharepoint_types.py,sha256=J_sGhqSaPoMZA0GIrzCx6pmgSKgIkGi0uyrsltU_H8w,320
-saviialib/services/epii/use_cases/update_thies_data.py,sha256=EPzRCo4X7khTp7afX3jCpHdQTCjk7a-PmYnm4Br2vTI,8246
+saviialib/services/epii/use_cases/update_thies_data.py,sha256=SKW9_Z2pbvE0rgyFHmpBynGVqfQ30OMqK3zofW_tY8Y,9866
 saviialib/services/epii/use_cases/upload_backup_to_sharepoint.py,sha256=UZ2Pe_mavdquYG00_GYtANY4nn0wHjT_Z0HLUvtfW2c,11143
 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=hEeV4_kcG8YL6t_3V8AlhgDHtHiUNsdYpilfgTLaQMc,3528
-saviialib-0.11.0.dist-info/LICENSE,sha256=NWpf6b38xgBWPBo5HZsCbdfp9hZSliEbRqWQgm0fkOo,1076
-saviialib-0.11.0.dist-info/METADATA,sha256=diHGwoPOT3vsY78ni4-ON6Aom5jTnWgQwO3QPY3E-z4,4083
-saviialib-0.11.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-saviialib-0.11.0.dist-info/RECORD,,
+saviialib-0.11.2.dist-info/LICENSE,sha256=NWpf6b38xgBWPBo5HZsCbdfp9hZSliEbRqWQgm0fkOo,1076
+saviialib-0.11.2.dist-info/METADATA,sha256=Af3aG28BKcG0Fsfds49sWCWJTBuWs4xo--RhfBsAjSE,4083
+saviialib-0.11.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+saviialib-0.11.2.dist-info/RECORD,,