saviialib 0.11.0__tar.gz → 0.11.1__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "saviialib"
-version = "0.11.0"
+version = "0.11.1"
 description = "A client library for IoT projects in the RCER initiative"
 authors = ["pedropablozavalat"]
 license = "MIT"

{saviialib-0.11.0 → saviialib-0.11.1}/src/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.

{saviialib-0.11.0 → saviialib-0.11.1}/src/saviialib/services/epii/use_cases/update_thies_data.py

@@ -150,14 +150,19 @@ 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]
-                    relative_url = f"{self.sharepoint_base_url}/{folder_path}"
+                        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}"
+                    print(relative_url)
                     args = SpUploadFileArgs(
                         folder_relative_url=relative_url,
                         file_content=file_content,
@@ -194,7 +199,6 @@ class UpdateThiesDataUseCase:
         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()