rcer-iot-client-pkg 0.1.0__tar.gz → 0.1.2__tar.gz

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/PKG-INFO

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

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/pyproject.toml

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

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/src/rcer_iot_client_pkg/general_types/error_types/common/__init__.py

@@ -1,4 +1,4 @@
-from src.rcer_iot_client_pkg.general_types.error_types.common.common_types import (
+from .common_types import (
     EmptyDataError,
     FtpClientError,
     HttpClientError,

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/src/rcer_iot_client_pkg/libs/async_http_client/clients/aiohttp_client.py

@@ -2,10 +2,10 @@ from typing import Any
 
 from aiohttp import ClientError, ClientSession
 
-from src.rcer_iot_client_pkg.libs.async_http_client.async_http_client_contract import (
+from rcer_iot_client_pkg.libs.async_http_client.async_http_client_contract import (
     AsyncHTTPClientContract,
 )
-from src.rcer_iot_client_pkg.libs.async_http_client.types.async_http_client_types import (
+from rcer_iot_client_pkg.libs.async_http_client.types.async_http_client_types import (
     AsyncHttpClientInitArgs,
     GetArgs,
     UploadFileArgs,

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/src/rcer_iot_client_pkg/libs/ftp_client/clients/aioftp_client.py

@@ -1,9 +1,9 @@
 from aioftp import Client
 
-from src.rcer_iot_client_pkg.libs.ftp_client.ftp_client_contract import (
+from rcer_iot_client_pkg.libs.ftp_client.ftp_client_contract import (
     FTPClientContract,
 )
-from src.rcer_iot_client_pkg.libs.ftp_client.types.ftp_client_types import (
+from rcer_iot_client_pkg.libs.ftp_client.types.ftp_client_types import (
     FtpClientInitArgs,
     ListFilesArgs,
     ReadFileArgs,
@@ -19,8 +19,11 @@ class AioFTPClient(FTPClientContract):
         self.client = Client()
 
     async def _async_start(self) -> None:
-        await self.client.connect(host=self.host, port=self.port)
-        await self.client.login(user=self.user, password=self.password)
+        try: 
+            await self.client.connect(host=self.host, port=self.port)
+            await self.client.login(user=self.user, password=self.password)
+        except Exception:
+            raise RuntimeError("Unexpected error occurred while trying to connect to the FTP server")
 
     async def list_files(self, args: ListFilesArgs) -> list[str]:
         await self._async_start()

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/src/rcer_iot_client_pkg/services/epii/api.py

@@ -1,7 +1,8 @@
 from typing import Dict
 
-from src.rcer_iot_client_pkg.services.epii.controllers import UpdateThiesDataController
-from src.rcer_iot_client_pkg.services.epii.controllers.types import UpdateThiesDataControllerInput
+from .controllers.types.update_thies_data_types import UpdateThiesDataControllerInput
+from .controllers.update_thies_data import UpdateThiesDataController
+
 
 class EpiiAPI:
     def update_thies_data(

rcer_iot_client_pkg-0.1.2/src/rcer_iot_client_pkg/services/epii/controllers/__init__.py

@@ -0,0 +1,3 @@
+from .update_thies_data import UpdateThiesDataController
+
+__all__ = ["UpdateThiesDataController"]

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/src/rcer_iot_client_pkg/services/epii/controllers/types/__init__.py

@@ -1,4 +1,4 @@
-from src.rcer_iot_client_pkg.services.epii.controllers.types.update_thies_data_types import (
+from .update_thies_data_types import (
     UpdateThiesDataControllerInput,
     UpdateThiesDataControllerOutput,
 )

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/src/rcer_iot_client_pkg/services/epii/controllers/update_thies_data.py

@@ -1,21 +1,21 @@
 from http import HTTPStatus
 
-from src.rcer_iot_client_pkg.general_types.error_types.api.update_thies_data_error_types import (
+from rcer_iot_client_pkg.general_types.error_types.api.update_thies_data_error_types import (
     FetchCloudFileNamesError,
     ThiesUploadEmptyError,
 )
-from src.rcer_iot_client_pkg.general_types.error_types.common import (
+from rcer_iot_client_pkg.general_types.error_types.common.common_types import (
     FtpClientError,
     HttpClientError,
 )
-from src.rcer_iot_client_pkg.services.epii.controllers.types.update_thies_data_types import (
+from rcer_iot_client_pkg.services.epii.controllers.types.update_thies_data_types import (
     UpdateThiesDataControllerInput,
     UpdateThiesDataControllerOutput,
 )
-from src.rcer_iot_client_pkg.services.epii.use_cases.types import (
+from rcer_iot_client_pkg.services.epii.use_cases.types import (
     UpdateThiesDataUseCaseInput,
 )
-from src.rcer_iot_client_pkg.services.epii.use_cases.update_thies_data import (
+from rcer_iot_client_pkg.services.epii.use_cases.update_thies_data import (
     UpdateThiesDataUseCase,
 )
 
@@ -31,38 +31,38 @@ class UpdateThiesDataController:
             data = await self.use_case.execute()
             return UpdateThiesDataControllerOutput(
                 message="THIES was synced successfully",
-                status=HTTPStatus.OK,
+                status=HTTPStatus.OK.value,
                 metadata={"data": data},
             )
         except (AttributeError, NameError, ValueError) as error:
             return UpdateThiesDataControllerOutput(
                 message="An unexpected error occurred during use case initialization.",
-                status=HTTPStatus.BAD_REQUEST,
+                status=HTTPStatus.BAD_REQUEST.value,
                 metadata={"error": error.__str__()},
             )
         except FtpClientError as error:
             return UpdateThiesDataControllerOutput(
                 message="Ftp Client initialization fails.",
-                status=HTTPStatus.INTERNAL_SERVER_ERROR,
+                status=HTTPStatus.BAD_REQUEST.value,
                 metadata={"error": error.__str__()},
             )
 
         except HttpClientError as error:
             return UpdateThiesDataControllerOutput(
                 message="Http Client initialization fails.",
-                status=HTTPStatus.INTERNAL_SERVER_ERROR,
+                status=HTTPStatus.BAD_REQUEST.value,
                 metadata={"error": error.__str__()},
             )
 
         except FetchCloudFileNamesError as error:
             return UpdateThiesDataControllerOutput(
                 message="An error occurred while retrieving file names from the RCER cloud",
-                status=HTTPStatus.INTERNAL_SERVER_ERROR,
+                status=HTTPStatus.INTERNAL_SERVER_ERROR.value,
                 metadata={"error": error.__str__()},
             )
         except ThiesUploadEmptyError as error:
             return UpdateThiesDataControllerOutput(
                 message="No files were found to upload.",
-                status=HTTPStatus.NO_CONTENT,
+                status=HTTPStatus.NO_CONTENT.value,
                 metadata={"error": error.__str__()},
             )

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/src/rcer_iot_client_pkg/services/epii/use_cases/update_thies_data.py

@@ -1,33 +1,31 @@
-import os
-
 from dotenv import load_dotenv
 
-import src.rcer_iot_client_pkg.services.epii.use_cases.constants as c
-from src.rcer_iot_client_pkg.general_types.error_types.api.update_thies_data_error_types import (
+import rcer_iot_client_pkg.services.epii.use_cases.constants as c
+from rcer_iot_client_pkg.general_types.error_types.api.update_thies_data_error_types import (
     FetchCloudFileNamesError,
     FetchThiesFileContentError,
     ThiesUploadEmptyError,
 )
-from src.rcer_iot_client_pkg.general_types.error_types.common import (
+from rcer_iot_client_pkg.general_types.error_types.common import (
     EmptyDataError,
     FtpClientError,
     HttpClientError,
 )
-from src.rcer_iot_client_pkg.libs.async_http_client import (
+from rcer_iot_client_pkg.libs.async_http_client import (
     AsyncHTTPClient,
     AsyncHttpClientInitArgs,
     GetArgs,
 )
-from src.rcer_iot_client_pkg.libs.ftp_client import (
+from rcer_iot_client_pkg.libs.ftp_client import (
     FTPClient,
     FtpClientInitArgs,
     ListFilesArgs,
     ReadFileArgs,
 )
-from src.rcer_iot_client_pkg.services.epii.use_cases.types import (
+from rcer_iot_client_pkg.services.epii.use_cases.types import (
     UpdateThiesDataUseCaseInput,
 )
-from src.rcer_iot_client_pkg.services.epii.utils import (
+from rcer_iot_client_pkg.services.epii.utils import (
     generate_file_content,
 )
 
@@ -54,7 +52,7 @@ class UpdateThiesDataUseCase:
                     base_url="https://graph.microsoft.com/v1.0/",
                 )
             )
-        except Exception as error:
+        except ConnectionError as error:
             raise HttpClientError(error)
 
     def _initialize_thies_ftp_client(self) -> FTPClient:
@@ -69,7 +67,7 @@ class UpdateThiesDataUseCase:
                     port=self.ftp_port,
                 )
             )
-        except Exception as error:
+        except RuntimeError as error:
             raise FtpClientError(error)
 
     async def fetch_cloud_file_names(self, folder_name: str) -> set[str]:
@@ -124,7 +122,11 @@ class UpdateThiesDataUseCase:
 
     async def execute(self) -> dict:
         """Synchronize data from the THIES Center to the cloud."""
-        thies_files = await self.fetch_thies_file_names()
+        try:
+            thies_files = await self.fetch_thies_file_names()
+        except RuntimeError as error:
+            raise FtpClientError(error)
+
         cloud_files = await self.fetch_cloud_file_names(folder_name="thies")
         self.uploading = thies_files - cloud_files
         if not self.uploading:

rcer_iot_client_pkg-0.1.2/src/rcer_iot_client_pkg/services/epii/utils/__init__.py

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

{rcer_iot_client_pkg-0.1.0 → rcer_iot_client_pkg-0.1.2}/src/rcer_iot_client_pkg/services/epii/utils/update_thies_data_utils.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from src.rcer_iot_client_pkg.libs.zero_dependency.utils.datetime_utils import (
+from rcer_iot_client_pkg.libs.zero_dependency.utils.datetime_utils import (
     datetime_to_str,
     today,
 )

rcer_iot_client_pkg-0.1.0/src/rcer_iot_client_pkg/services/epii/controllers/__init__.py

@@ -1,5 +0,0 @@
-from src.rcer_iot_client_pkg.services.epii.controllers.update_thies_data import (
-    UpdateThiesDataController,
-)
-
-__all__ = ["UpdateThiesDataController"]

rcer_iot_client_pkg-0.1.0/src/rcer_iot_client_pkg/services/epii/utils/__init__.py

@@ -1,3 +0,0 @@
-from src.rcer_iot_client_pkg.services.epii.utils.update_thies_data_utils import generate_file_content
-
-__all__ = ["generate_file_content"]