saviialib 0.11.1__tar.gz → 1.0.0__tar.gz

{saviialib-0.11.1 → saviialib-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: saviialib
-Version: 0.11.1
+Version: 1.0.0
 Summary: A client library for IoT projects in the RCER initiative
 License: MIT
 Author: pedropablozavalat
@@ -11,12 +11,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: aiofiles (==24.1.0)
-Requires-Dist: aioftp (==0.25.1)
-Requires-Dist: aiohttp (==3.11.16)
+Requires-Dist: aiofiles
+Requires-Dist: aioftp
+Requires-Dist: aiohttp
 Requires-Dist: build
-Requires-Dist: dotenv (==0.9.9)
-Requires-Dist: pytest-cov (==6.1.1)
+Requires-Dist: dotenv (>=0.9.9,<0.10.0)
+Requires-Dist: pytest-cov (>=6.1.1,<7.0.0)
 Description-Content-Type: text/markdown
 
 # SAVIIA Library 

{saviialib-0.11.1 → saviialib-1.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "saviialib"
-version = "0.11.1"
+version = "1.0.0"
 description = "A client library for IoT projects in the RCER initiative"
 authors = ["pedropablozavalat"]
 license = "MIT"
@@ -8,11 +8,11 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-aioftp = "0.25.1"
-aiohttp = "3.11.16"
-aiofiles = "24.1.0"
-dotenv = "0.9.9"
-pytest-cov="6.1.1"
+aioftp = "*"
+aiohttp = "*"
+aiofiles = "*"
+dotenv = "^0.9.9"
+pytest-cov="^6.1.1"
 build="*"
 [tool.poetry.group.dev.dependencies]
 pytest = "8.3.5"

{saviialib-0.11.1 → saviialib-1.0.0}/src/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-0.11.1 → saviialib-1.0.0}/src/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-0.11.1 → saviialib-1.0.0}/src/saviialib/services/epii/api.py

@@ -55,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-0.11.1 → saviialib-1.0.0}/src/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-0.11.1 → saviialib-1.0.0}/src/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-0.11.1 → saviialib-1.0.0}/src/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.
                 )
@@ -162,7 +172,7 @@ class UpdateThiesDataUseCase:
                     folder_path = avg_folder if origin == "AVG" else ext_folder
 
                     relative_url = f"{self.sharepoint_base_url}/{folder_path}"
-                    print(relative_url)
+
                     args = SpUploadFileArgs(
                         folder_relative_url=relative_url,
                         file_content=file_content,
@@ -170,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)})"
                     )
@@ -186,16 +206,23 @@ 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.")
@@ -206,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