saviialib 1.3.0__tar.gz → 1.4.0__tar.gz

{saviialib-1.3.0 → saviialib-1.4.0}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: saviialib
-Version: 1.3.0
+Version: 1.4.0
 Summary: A client library for IoT projects in the RCER initiative
 License: MIT
+License-File: LICENSE
 Author: pedropablozavalat
 Requires-Python: >=3.11,<4.0
 Classifier: License :: OSI Approved :: MIT License
@@ -10,15 +11,16 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: aiofiles
 Requires-Dist: aioftp
 Requires-Dist: aiohttp
 Requires-Dist: bitarray
 Requires-Dist: build
+Requires-Dist: certifi
 Requires-Dist: dotenv (>=0.9.9,<0.10.0)
 Requires-Dist: numpy (>=2.2.0,<2.4.0)
 Requires-Dist: pandas (>=2.2.3,<2.3.1)
-Requires-Dist: pytest-cov (>=6.1.1,<7.0.0)
 Description-Content-Type: text/markdown
 
 # SAVIIA Library 

{saviialib-1.3.0 → saviialib-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "saviialib"
-version = "1.3.0"
+version = "1.4.0"
 description = "A client library for IoT projects in the RCER initiative"
 authors = ["pedropablozavalat"]
 license = "MIT"
@@ -12,11 +12,11 @@ aioftp = "*"
 aiohttp = "*"
 aiofiles = "*"
 dotenv = "^0.9.9"
-pytest-cov="^6.1.1"
 build="*"
 numpy = ">=2.2.0,<2.4.0"
 pandas = ">=2.2.3,<2.3.1"
 bitarray="*"
+certifi="*"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "8.3.5"

saviialib-1.4.0/src/saviialib/__init__.py

@@ -0,0 +1,77 @@
+# read version from installed package
+from importlib.metadata import version
+
+__version__ = version("saviialib")
+
+from .general_types.api.saviia_api_types import SaviiaAPIConfig
+
+from typing import Dict, Type, Any, overload, Literal, List
+
+from saviialib.services.backup.api import SaviiaBackupAPI
+from saviialib.services.thies.api import SaviiaThiesAPI
+from saviialib.general_types.api.saviia_thies_api_types import SaviiaThiesConfig
+from saviialib.general_types.api.saviia_backup_api_types import SaviiaBackupConfig
+
+
+class SaviiaAPI:
+    API_REGISTRY: Dict[str, Type] = {
+        "thies": SaviiaThiesAPI,
+        "backup": SaviiaBackupAPI,
+    }
+
+    @overload
+    def get(self, name: Literal["thies"]) -> SaviiaThiesAPI: ...
+    @overload
+    def get(self, name: Literal["backup"]) -> SaviiaBackupAPI: ...
+
+    def __init__(self, config: SaviiaAPIConfig):
+        """
+        Receive a dictionary of configurations, with the same key
+        as those registered in API_REGISTRY.
+
+        :params configs: Dictionary of configurations for each API.
+
+        Example:
+            configs = {
+                "thies": SaviiaThiesConfig(...),
+                "backup": SaviiaBackupConfig(...)
+            }
+        """
+        self._instances: Dict[str, Any] = {}
+
+        for name, api_class in SaviiaAPI.API_REGISTRY.items():
+            if name == "thies":
+                service_config = SaviiaThiesConfig(
+                    ftp_host=config.ftp_host,
+                    ftp_port=config.ftp_port,
+                    ftp_user=config.ftp_user,
+                    ftp_password=config.ftp_password,
+                    sharepoint_client_id=config.sharepoint_client_id,
+                    sharepoint_client_secret=config.sharepoint_client_secret,
+                    sharepoint_tenant_id=config.sharepoint_tenant_id,
+                    sharepoint_tenant_name=config.sharepoint_tenant_name,
+                    sharepoint_site_name=config.sharepoint_site_name,
+                    logger=config.logger,
+                )
+            elif name == "backup":
+                service_config = SaviiaBackupConfig(
+                    sharepoint_client_id=config.sharepoint_client_id,
+                    sharepoint_client_secret=config.sharepoint_client_secret,
+                    sharepoint_tenant_id=config.sharepoint_tenant_id,
+                    sharepoint_tenant_name=config.sharepoint_tenant_name,
+                    sharepoint_site_name=config.sharepoint_site_name,
+                    logger=config.logger,
+                )
+
+            self._instances[name] = api_class(service_config)
+
+    def get(self, name: Literal["thies", "backup"]) -> Any:
+        """Returns the API instance associated with the given name."""
+        try:
+            return self._instances[name]
+        except KeyError:
+            raise ValueError(f"API '{name}' is not registered or not configured.")
+
+    def list_available(self) -> List[str]:
+        """List of available registered APIs."""
+        return list(self._instances.keys())

saviialib-1.3.0/src/saviialib/general_types/api/epii_api_types.py → saviialib-1.4.0/src/saviialib/general_types/api/saviia_api_types.py

@@ -3,9 +3,9 @@ from logging import Logger
 
 
 @dataclass
-class EpiiAPIConfig:
+class SaviiaAPIConfig:
     """
-    Configuration for Epii API.
+    Configuration for SAVIIA API.
 
     Attributes:
         ftp_port (int): Port number of the FTP server.
@@ -30,7 +30,6 @@ class EpiiAPIConfig:
     sharepoint_site_name: str
     logger: Logger
 
-
 @dataclass
 class FtpClientConfig:
     ftp_host: str
@@ -46,39 +45,3 @@ class SharepointConfig:
     sharepoint_tenant_id: str
     sharepoint_tenant_name: str
     sharepoint_site_name: str
-
-
-@dataclass
-class EpiiUpdateThiesConfig:
-    ftp_port: int
-    ftp_host: str
-    ftp_user: str
-    ftp_password: str
-    sharepoint_client_id: str
-    sharepoint_client_secret: str
-    sharepoint_tenant_id: str
-    sharepoint_tenant_name: str
-    sharepoint_site_name: str
-    logger: Logger
-
-
-@dataclass
-class EpiiSharepointBackupConfig:
-    """
-    Configuration for backing up files to SharePoint.
-
-    Attributes:
-        sharepoint_client_id (str): Client ID for SharePoint authentication.
-        sharepoint_client_secret (str): Client secret for SharePoint authentication.
-        sharepoint_tenant_id (str): Tenant ID for SharePoint authentication.
-        sharepoint_tenant_name (str): Tenant name for SharePoint.
-        sharepoint_site_name (str): Site name in SharePoint.
-        local_backup_source_path (str): Local path to backup.
-    """
-
-    sharepoint_client_id: str
-    sharepoint_client_secret: str
-    sharepoint_tenant_id: str
-    sharepoint_tenant_name: str
-    sharepoint_site_name: str
-    logger: Logger

saviialib-1.4.0/src/saviialib/general_types/api/saviia_backup_api_types.py

@@ -0,0 +1,24 @@
+from dataclasses import dataclass
+from logging import Logger
+
+
+@dataclass
+class SaviiaBackupConfig:
+    """
+    Configuration for backing up files to SharePoint.
+
+    Attributes:
+        sharepoint_client_id (str): Client ID for SharePoint authentication.
+        sharepoint_client_secret (str): Client secret for SharePoint authentication.
+        sharepoint_tenant_id (str): Tenant ID for SharePoint authentication.
+        sharepoint_tenant_name (str): Tenant name for SharePoint.
+        sharepoint_site_name (str): Site name in SharePoint.
+        local_backup_source_path (str): Local path to backup.
+    """
+
+    sharepoint_client_id: str
+    sharepoint_client_secret: str
+    sharepoint_tenant_id: str
+    sharepoint_tenant_name: str
+    sharepoint_site_name: str
+    logger: Logger

saviialib-1.4.0/src/saviialib/general_types/api/saviia_thies_api_types.py

@@ -0,0 +1,31 @@
+from dataclasses import dataclass
+from logging import Logger
+
+
+@dataclass
+class SaviiaThiesConfig:
+    """
+    Configuration for Saviia Thies.
+
+    Attributes:
+        ftp_port (int): Port number of the FTP server.
+        ftp_host (str): Hostname or IP address of the FTP server.
+        ftp_user (str): Username for the FTP server.
+        ftp_password (str): Password for the FTP server.
+        sharepoint_client_id (str): Client ID for SharePoint authentication.
+        sharepoint_client_secret (str): Client secret for SharePoint authentication.
+        sharepoint_tenant_id (str): Tenant ID for SharePoint authentication.
+        sharepoint_tenant_name (str): Tenant name for SharePoint.
+        sharepoint_site_name (str): Site name in SharePoint.
+    """
+
+    ftp_host: str
+    ftp_port: int
+    ftp_user: str
+    ftp_password: str
+    sharepoint_client_id: str
+    sharepoint_client_secret: str
+    sharepoint_tenant_id: str
+    sharepoint_tenant_name: str
+    sharepoint_site_name: str
+    logger: Logger

{saviialib-1.3.0 → saviialib-1.4.0}/src/saviialib/libs/sharepoint_client/clients/sharepoint_rest_api.py

@@ -1,7 +1,9 @@
 from typing import Any
 import json
-from aiohttp import ClientError, ClientSession
+from aiohttp import ClientError, ClientSession, TCPConnector
 from dotenv import load_dotenv
+import ssl
+import certifi
 
 from saviialib.libs.sharepoint_client.sharepoint_client_contract import (
     SharepointClientContract,
@@ -15,7 +17,7 @@ from saviialib.libs.sharepoint_client.types.sharepoint_client_types import (
 )
 
 load_dotenv()
-
+ssl_context = ssl.create_default_context(cafile=certifi.where())
 
 class SharepointRestAPI(SharepointClientContract):
     def __init__(self, args: SharepointClientInitArgs):
@@ -51,7 +53,7 @@ class SharepointRestAPI(SharepointClientContract):
             "Content-Type": "application/x-www-form-urlencoded",
         }
 
-        async with ClientSession() as session:
+        async with ClientSession(connector=TCPConnector(ssl=ssl_context)) as session:
             # Load access token
             response = await session.post(url, data=payload, headers=headers)
             if response.status != 200:
@@ -75,8 +77,9 @@ class SharepointRestAPI(SharepointClientContract):
                 "Content-Type": "application/json",
             }
             self.base_url = f"{site_url}/sites/{self.site_name}/_api/"
+            connector = TCPConnector(ssl=ssl_context)
             self.session = ClientSession(
-                headers=self.base_headers, base_url=self.base_url
+                headers=self.base_headers, base_url=self.base_url, connector=connector
             )
             return self
         except ClientError as error:

saviialib-1.4.0/src/saviialib/services/backup/api.py

@@ -0,0 +1,36 @@
+from typing import Any, Dict, List
+
+from .controllers.upload_backup_to_sharepoint import (
+    UploadBackupToSharepointControllerInput,
+)
+from .controllers.upload_backup_to_sharepoint import UploadBackupToSharepointController
+from saviialib.general_types.api.saviia_backup_api_types import SaviiaBackupConfig
+
+
+class SaviiaBackupAPI:
+    """
+    EpiiAPI is a service class that provides methods to interact with Patagonia Center system.
+    """
+
+    def __init__(self, config: SaviiaBackupConfig):
+        self.config = config
+
+    async def upload_backup_to_sharepoint(
+        self, local_backup_source_path: str, sharepoint_destination_path: str
+    ) -> Dict[str, Any]:
+        """Migrate a backup folder from Home assistant to Sharepoint directory.
+        Args:
+            local_backup_source_path (str): Local path to backup.
+        Returns:
+            response (dict): A dictionary containing the response from the upload operation.
+                This dictionary will typically include information about the success or
+                failure of the upload, as well as any relevant metadata.
+        """
+
+        controller = UploadBackupToSharepointController(
+            UploadBackupToSharepointControllerInput(
+                self.config, local_backup_source_path, sharepoint_destination_path
+            )
+        )
+        response = await controller.execute()
+        return response.__dict__

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/backup}/controllers/types/__init__.py

@@ -1,4 +1,4 @@
-from .update_thies_data_types import (
+from ....thies.controllers.types.update_thies_data_types import (
     UpdateThiesDataControllerInput,
     UpdateThiesDataControllerOutput,
 )

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/backup}/controllers/types/upload_backup_to_sharepoint_types.py

@@ -1,12 +1,12 @@
 from dataclasses import dataclass, field
 from typing import Dict
 
-from saviialib.general_types.api.epii_api_types import EpiiSharepointBackupConfig
+from saviialib.general_types.api.saviia_backup_api_types import SaviiaBackupConfig
 
 
 @dataclass
 class UploadBackupToSharepointControllerInput:
-    config: EpiiSharepointBackupConfig
+    config: SaviiaBackupConfig
     local_backup_source_path: str
     sharepoint_destination_path: str
 

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/backup}/controllers/upload_backup_to_sharepoint.py

@@ -1,7 +1,7 @@
 from http import HTTPStatus
-from saviialib.general_types.api.epii_api_types import SharepointConfig
+from saviialib.general_types.api.saviia_api_types import SharepointConfig
 
-from saviialib.general_types.error_types.api.epii_api_error_types import (
+from saviialib.general_types.error_types.api.saviia_api_error_types import (
     BackupUploadError,
     BackupSourcePathError,
     BackupEmptyError,
@@ -10,14 +10,14 @@ from saviialib.general_types.error_types.common.common_types import (
     EmptyDataError,
     SharepointClientError,
 )
-from saviialib.services.epii.controllers.types.upload_backup_to_sharepoint_types import (
+from saviialib.services.backup.controllers.types.upload_backup_to_sharepoint_types import (
     UploadBackupToSharepointControllerInput,
     UploadBackupToSharepointControllerOutput,
 )
-from saviialib.services.epii.use_cases.types.upload_backup_to_sharepoint_types import (
+from saviialib.services.backup.use_cases.types.upload_backup_to_sharepoint_types import (
     UploadBackupToSharepointUseCaseInput,
 )
-from saviialib.services.epii.use_cases.upload_backup_to_sharepoint import (
+from saviialib.services.backup.use_cases.upload_backup_to_sharepoint import (
     UploadBackupToSharepointUsecase,
 )
 

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/backup}/use_cases/types/__init__.py

@@ -1,4 +1,4 @@
-from .update_thies_data_types import (
+from ....thies.use_cases.types.update_thies_data_types import (
     FtpClientConfig,
     SharepointConfig,
     UpdateThiesDataUseCaseInput,

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/backup}/use_cases/types/upload_backup_to_sharepoint_types.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from saviialib.general_types.api.epii_api_types import SharepointConfig
+from saviialib.general_types.api.saviia_api_types import SharepointConfig
 from logging import Logger
 
 

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/backup}/use_cases/upload_backup_to_sharepoint.py

@@ -2,7 +2,7 @@ import asyncio
 from time import time
 from saviialib.libs.zero_dependency.utils.datetime_utils import today, datetime_to_str
 from logging import Logger
-from saviialib.general_types.error_types.api.epii_api_error_types import (
+from saviialib.general_types.error_types.api.saviia_api_error_types import (
     BackupEmptyError,
     BackupSourcePathError,
     BackupUploadError,
@@ -23,7 +23,7 @@ from saviialib.libs.sharepoint_client import (
     SpUploadFileArgs,
     SpCreateFolderArgs,
 )
-from saviialib.services.epii.utils.upload_backup_to_sharepoint_utils import (
+from saviialib.services.backup.utils.upload_backup_to_sharepoint_utils import (
     calculate_percentage_uploaded,
     count_files_in_directory,
     extract_error_message,

saviialib-1.4.0/src/saviialib/services/backup/utils/__init__.py

@@ -0,0 +1,3 @@
+from ...thies.utils.update_thies_data_utils import parse_execute_response
+
+__all__ = ["parse_execute_response"]

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/backup}/utils/upload_backup_to_sharepoint_utils.py

@@ -1,7 +1,7 @@
 import re
 from logging import Logger
 from typing import List, Dict, Optional
-from saviialib.general_types.error_types.api.epii_api_error_types import (
+from saviialib.general_types.error_types.api.saviia_api_error_types import (
     BackupSourcePathError,
 )
 from saviialib.libs.directory_client import DirectoryClient, DirectoryClientArgs

saviialib-1.4.0/src/saviialib/services/thies/api.py

@@ -0,0 +1,35 @@
+from typing import Any, Dict, List
+
+from .controllers.types.update_thies_data_types import UpdateThiesDataControllerInput
+from .controllers.update_thies_data import UpdateThiesDataController
+from saviialib.general_types.api.saviia_thies_api_types import (
+    SaviiaThiesConfig,
+)
+
+
+class SaviiaThiesAPI:
+    def __init__(self, config: SaviiaThiesConfig) -> None:
+        self.config = config
+
+    async def update_thies_data(
+        self, sharepoint_folders_path: List[str], ftp_server_folders_path: List[str]
+    ) -> Dict[str, Any]:
+        """Updates data from a THIES Data Logger by connecting to an FTP server
+        and transferring data to specified Sharepoint folders.
+
+        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.
+        """
+        controller = UpdateThiesDataController(
+            UpdateThiesDataControllerInput(
+                self.config, sharepoint_folders_path, ftp_server_folders_path
+            )
+        )
+        response = await controller.execute()
+        return response.__dict__

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/thies}/controllers/types/update_thies_data_types.py

@@ -1,13 +1,11 @@
 from dataclasses import dataclass, field
 from typing import Dict
-from saviialib.general_types.api.epii_api_types import (
-    EpiiUpdateThiesConfig,
-)
+from saviialib.general_types.api.saviia_thies_api_types import SaviiaThiesConfig
 
 
 @dataclass
 class UpdateThiesDataControllerInput:
-    config: EpiiUpdateThiesConfig
+    config: SaviiaThiesConfig
     sharepoint_folders_path: list
     ftp_server_folders_path: list
 

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/thies}/controllers/update_thies_data.py

@@ -1,6 +1,6 @@
 from http import HTTPStatus
 
-from saviialib.general_types.error_types.api.epii_api_error_types import (
+from saviialib.general_types.error_types.api.saviia_api_error_types import (
     SharePointFetchingError,
     ThiesConnectionError,
     ThiesFetchingError,
@@ -12,16 +12,16 @@ from saviialib.general_types.error_types.common.common_types import (
     FtpClientError,
     SharepointClientError,
 )
-from saviialib.services.epii.controllers.types.update_thies_data_types import (
+from saviialib.services.thies.controllers.types.update_thies_data_types import (
     UpdateThiesDataControllerInput,
     UpdateThiesDataControllerOutput,
 )
-from saviialib.services.epii.use_cases.types import (
+from saviialib.services.backup.use_cases.types import (
     UpdateThiesDataUseCaseInput,
     SharepointConfig,
     FtpClientConfig,
 )
-from saviialib.services.epii.use_cases.update_thies_data import (
+from saviialib.services.thies.use_cases.update_thies_data import (
     UpdateThiesDataUseCase,
 )
 

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/thies}/use_cases/components/create_thies_statistics_file.py

@@ -70,7 +70,7 @@ UNITS = {
 
 
 async def create_thies_daily_statistics_file(
-    os_client: DirectoryClient, logger: Logger, daily_files: List[str]
+    os_client: DirectoryClient, logger: Logger
 ) -> None:
     logger.debug("[thies_synchronization_lib] Creating Daily Statistics ...")
     csv_client = FilesClient(FilesClientInitArgs(client_name="csv_client"))
@@ -127,6 +127,15 @@ async def create_thies_daily_statistics_file(
             if max_col not in row:
                 max_val = 0
 
+            if (mean < min_val or mean > max_val) and col not in ["WD"]:
+                logger.warning(
+                    f"[thies_synchronization_lib] Inconsistent data for {col}: "
+                    f"min {min_val}, max {max_val}, mean {mean}. "
+                )
+                mean = (min_val + max_val) / 2
+                logger.warning(
+                    f"[thies_synchronization_lib] Mean value corrected to {mean}.")
+
             if col in ["WD"]:  # Avoid error
                 rows.append(
                     {

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/thies}/use_cases/types/update_thies_data_types.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 from typing import Dict, List
-from saviialib.general_types.api.epii_api_types import FtpClientConfig, SharepointConfig
+from saviialib.general_types.api.saviia_api_types import FtpClientConfig, SharepointConfig
 from logging import Logger
 
 

{saviialib-1.3.0/src/saviialib/services/epii → saviialib-1.4.0/src/saviialib/services/thies}/use_cases/update_thies_data.py

@@ -1,4 +1,4 @@
-from saviialib.general_types.error_types.api.epii_api_error_types import (
+from saviialib.general_types.error_types.api.saviia_api_error_types import (
     SharePointFetchingError,
     SharePointDirectoryError,
     SharePointUploadError,
@@ -26,16 +26,17 @@ from saviialib.libs.sharepoint_client import (
 from saviialib.libs.directory_client import DirectoryClient, DirectoryClientArgs
 
 from saviialib.libs.files_client import FilesClient, FilesClientInitArgs, WriteArgs
-from saviialib.services.epii.use_cases.types import (
+from saviialib.services.backup.use_cases.types import (
     FtpClientConfig,
     SharepointConfig,
     UpdateThiesDataUseCaseInput,
 )
-from saviialib.services.epii.utils import (
+from saviialib.services.backup.utils import (
     parse_execute_response,
 )
 from saviialib.libs.zero_dependency.utils.datetime_utils import today, datetime_to_str
 from .components.create_thies_statistics_file import create_thies_daily_statistics_file
+from typing import Set, Dict, List
 
 
 class UpdateThiesDataUseCase:
@@ -66,7 +67,7 @@ class UpdateThiesDataUseCase:
     def _initialize_thies_ftp_client(self, config: FtpClientConfig) -> FTPClient:
         """Initialize the FTP client."""
         try:
-            return FTPClient(FtpClientInitArgs(config, client_name="ftplib_client"))
+            return FTPClient(FtpClientInitArgs(config, client_name="aioftp_client"))
         except RuntimeError as error:
             raise FtpClientError(error)
 
@@ -95,7 +96,7 @@ class UpdateThiesDataUseCase:
                     reason=f"The current folder '{folder_name}' doesn't exist."
                 )
 
-    async def fetch_cloud_file_names(self) -> set[str]:
+    async def fetch_cloud_file_names(self) -> Set[str]:
         """Fetch file names from the RCER cloud."""
         await self._validate_sharepoint_current_folders()
         try:
@@ -113,7 +114,7 @@ class UpdateThiesDataUseCase:
         except Exception as error:
             raise SharePointFetchingError(reason=error)
 
-    async def fetch_thies_file_names(self) -> set[str]:
+    async def fetch_thies_file_names(self) -> Set[str]:
         """Fetch file names from the THIES FTP server."""
         try:
             thies_files = set()
@@ -131,7 +132,7 @@ class UpdateThiesDataUseCase:
         except ConnectionAbortedError as error:
             raise ThiesFetchingError(reason=error)
 
-    async def fetch_thies_file_content(self) -> dict[str, bytes]:
+    async def fetch_thies_file_content(self) -> Dict[str, bytes]:
         """Fetch the content of files from the THIES FTP server."""
         try:
             content_files = {}
@@ -165,8 +166,8 @@ class UpdateThiesDataUseCase:
             raise ThiesFetchingError(reason=error)
 
     async def upload_thies_files_to_sharepoint(
-        self, files: dict
-    ) -> dict[str, list[str]]:
+        self, files: Dict
+    ) -> Dict[str, List[str]]:
         """Upload files to SharePoint and categorize the results."""
         upload_results = {"failed_files": [], "new_files": []}
 
@@ -269,7 +270,15 @@ class UpdateThiesDataUseCase:
                     FtpReadFileArgs(file_path)
                 )
             except FileNotFoundError as error:
-                raise ThiesFetchingError(reason=str(error))
+                reason = str(error) + ". The file might not be available yet for statistics."
+                self.logger.warning(
+                    "[thies_synchronization_lib] Warning: %s", reason
+                )
+                self.logger.warning(
+                    "[thies_synchronization_lib] Skipping the creation of daily statistics %s",
+                    filename,
+                )
+                return
             # Destination local folder
             self.logger.debug(file_path)
 
@@ -305,9 +314,7 @@ class UpdateThiesDataUseCase:
                     dest_folder,
                 )
         # Read the files with ThiesDayData class
-        await create_thies_daily_statistics_file(
-            self.os_client, self.logger, daily_files
-        )
+        await create_thies_daily_statistics_file(self.os_client, self.logger)
 
     async def execute(self):
         """Synchronize data from the THIES Center to the cloud."""

saviialib-1.3.0/src/saviialib/__init__.py

@@ -1,9 +0,0 @@
-# read version from installed package
-from importlib.metadata import version
-
-__version__ = version("saviialib")
-
-from .services.epii.api import EpiiAPI
-from .general_types.api.epii_api_types import EpiiAPIConfig
-
-__all__ = ["EpiiAPI", "EpiiAPIConfig"]

saviialib-1.3.0/src/saviialib/general_types/api/__init__.py

@@ -1,3 +0,0 @@
-from .epii_api_types import EpiiUpdateThiesConfig, EpiiSharepointBackupConfig
-
-__all__ = ["EpiiUpdateThiesConfig", "EpiiSharepointBackupConfig"]

saviialib-1.3.0/src/saviialib/services/epii/api.py

@@ -1,94 +0,0 @@
-from typing import Any, Dict, List
-
-from .controllers.types.update_thies_data_types import UpdateThiesDataControllerInput
-from .controllers.types.upload_backup_to_sharepoint_types import (
-    UploadBackupToSharepointControllerInput,
-)
-from .controllers.update_thies_data import UpdateThiesDataController
-from .controllers.upload_backup_to_sharepoint import UploadBackupToSharepointController
-from saviialib.general_types.api.epii_api_types import (
-    EpiiUpdateThiesConfig,
-    EpiiSharepointBackupConfig,
-    EpiiAPIConfig,
-)
-
-
-class EpiiAPI:
-    """
-    EpiiAPI is a service class that provides methods to interact with Patagonia Center system.
-    """
-
-    def __init__(self, config: EpiiAPIConfig):
-        self.ftp_port = config.ftp_port
-        self.ftp_host = config.ftp_host
-        self.ftp_user = config.ftp_user
-        self.ftp_password = config.ftp_password
-        self.sharepoint_client_id = config.sharepoint_client_id
-        self.sharepoint_client_secret = config.sharepoint_client_secret
-        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(
-        self, sharepoint_folders_path: List[str], ftp_server_folders_path: List[str]
-    ) -> Dict[str, Any]:
-        """Updates data from a THIES Data Logger by connecting to an FTP server
-        and transferring data to specified Sharepoint folders.
-
-        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.
-        """
-        config = EpiiUpdateThiesConfig(
-            ftp_port=self.ftp_port,
-            ftp_host=self.ftp_host,
-            ftp_user=self.ftp_user,
-            ftp_password=self.ftp_password,
-            sharepoint_client_id=self.sharepoint_client_id,
-            sharepoint_client_secret=self.sharepoint_client_secret,
-            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(
-                config, sharepoint_folders_path, ftp_server_folders_path
-            )
-        )
-        response = await controller.execute()
-        return response.__dict__
-
-    async def upload_backup_to_sharepoint(
-        self, local_backup_source_path: str, sharepoint_destination_path: str
-    ) -> Dict[str, Any]:
-        """Migrate a backup folder from Home assistant to Sharepoint directory.
-        Args:
-            local_backup_source_path (str): Local path to backup.
-        Returns:
-            response (dict): A dictionary containing the response from the upload operation.
-                This dictionary will typically include information about the success or
-                failure of the upload, as well as any relevant metadata.
-        """
-        config = EpiiSharepointBackupConfig(
-            sharepoint_client_id=self.sharepoint_client_id,
-            sharepoint_client_secret=self.sharepoint_client_secret,
-            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 = UploadBackupToSharepointController(
-            UploadBackupToSharepointControllerInput(
-                config, local_backup_source_path, sharepoint_destination_path
-            )
-        )
-        response = await controller.execute()
-        return response.__dict__

saviialib-1.3.0/src/saviialib/services/epii/utils/__init__.py

@@ -1,3 +0,0 @@
-from .update_thies_data_utils import parse_execute_response
-
-__all__ = ["parse_execute_response"]