rcer-iot-client-pkg 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

rcer_iot_client_pkg/general_types/api/update_thies_data_types.py

@@ -0,0 +1,29 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class EpiiAPIConfig:
+    """
+    Configuration for Epii API.
+
+    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_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

rcer_iot_client_pkg/libs/ftp_client/clients/aioftp_client.py

@@ -12,10 +12,10 @@ from rcer_iot_client_pkg.libs.ftp_client.types.ftp_client_types import (
 
 class AioFTPClient(FTPClientContract):
     def __init__(self, args: FtpClientInitArgs) -> None:
-        self.host = args.host
-        self.port = args.port
-        self.password = args.password
-        self.user = args.user
+        self.host = args.config.ftp_host
+        self.port = args.config.ftp_port
+        self.password = args.config.ftp_password
+        self.user = args.config.ftp_user
         self.client = Client()
 
     async def _async_start(self) -> None:

rcer_iot_client_pkg/libs/ftp_client/types/ftp_client_types.py

@@ -1,13 +1,11 @@
 from dataclasses import dataclass
+from typing import Any
 
 
 @dataclass
 class FtpClientInitArgs:
-    host: str
-    user: str
-    password: str
+    config: Any
     client_name: str = "aioftp_client"
-    port: int = 21
 
 
 @dataclass

rcer_iot_client_pkg/libs/sharepoint_client/clients/sharepoint_rest_api.py

@@ -11,17 +11,23 @@ from rcer_iot_client_pkg.libs.sharepoint_client.types.sharepoint_client_types im
     SpListFilesArgs,
     SpListFoldersArgs,
     SpUploadFileArgs,
+    SharepointClientInitArgs,
 )
 
 load_dotenv()
 
 
 class SharepointRestAPI(SharepointClientContract):
-    def __init__(self):
+    def __init__(self, args: SharepointClientInitArgs):
         self.session: ClientSession | None = None
         self.base_headers = {}
         self.credentials = {}
         self.base_url = ""
+        self.tenant_id = args.config.sharepoint_tenant_id
+        self.tenant_name = args.config.sharepoint_tenant_name
+        self.client_secret = args.config.sharepoint_client_secret
+        self.client_id = args.config.sharepoint_client_id
+        self.site_name = args.config.sharepoint_site_name
 
     async def _load_form_digest_value(self) -> str:
         try:
@@ -32,18 +38,13 @@ class SharepointRestAPI(SharepointClientContract):
             raise ConnectionError(error) from error
 
     async def _load_credentials(self) -> dict:
-        tenant_id = os.getenv("TENANT_ID")
-        client_id = os.getenv("CLIENT_ID")
-        client_secret = os.getenv("CLIENT_SECRET")
         resource_base = "00000003-0000-0ff1-ce00-000000000000"
-        resource = (
-            f"{resource_base}/{os.getenv('TENANT_NAME')}.sharepoint.com@{tenant_id}"
-        )
-        url = f"https://accounts.accesscontrol.windows.net/{tenant_id}/tokens/OAuth/2"
+        resource = f"{resource_base}/{self.tenant_name}.sharepoint.com@{self.tenant_id}"
+        url = f"https://accounts.accesscontrol.windows.net/{self.tenant_id}/tokens/OAuth/2"
         payload = {
             "grant_type": "client_credentials",
-            "client_id": f"{client_id}@{tenant_id}",
-            "client_secret": client_secret,
+            "client_id": f"{self.client_id}@{self.tenant_id}",
+            "client_secret": self.client_secret,
             "resource": resource,
         }
         headers = {
@@ -65,15 +66,14 @@ class SharepointRestAPI(SharepointClientContract):
 
     async def __aenter__(self) -> "SharepointRestAPI":
         self.credentials = await self._load_credentials()
-        site_url = f"https://{os.getenv('TENANT_NAME')}.sharepoint.com"
-        site_name = os.getenv("SITE_NAME")
+        site_url = f"https://{self.tenant_name}.sharepoint.com"
 
         self.base_headers = {
             "Authorization": f"Bearer {self.credentials['access_token']}",
             "Accept": "application/json",
             "Content-Type": "application/json",
         }
-        self.base_url = f"{site_url}/sites/{site_name}/_api/"
+        self.base_url = f"{site_url}/sites/{self.site_name}/_api/"
         self.session = ClientSession(headers=self.base_headers, base_url=self.base_url)
         return self
 

rcer_iot_client_pkg/libs/sharepoint_client/sharepoint_client.py

@@ -16,7 +16,7 @@ class SharepointClient(SharepointClientContract):
             msg = f"Unsupported client {args.client_name}"
             raise KeyError(msg)
         elif args.client_name == "sharepoint_rest_api":
-            self.client_obj = SharepointRestAPI()
+            self.client_obj = SharepointRestAPI(args)
 
     async def __aenter__(self):
         return await self.client_obj.__aenter__()

rcer_iot_client_pkg/libs/sharepoint_client/types/sharepoint_client_types.py

@@ -1,8 +1,10 @@
 from dataclasses import dataclass
+from typing import Any
 
 
 @dataclass
 class SharepointClientInitArgs:
+    config: Any
     client_name: str = "sharepoint_rest_api"
 
 

rcer_iot_client_pkg/services/epii/api.py

@@ -1,7 +1,8 @@
-from typing import Dict, Any
+from typing import Any, Dict
 
 from .controllers.types.update_thies_data_types import UpdateThiesDataControllerInput
 from .controllers.update_thies_data import UpdateThiesDataController
+from rcer_iot_client_pkg.general_types.api.update_thies_data_types import EpiiAPIConfig
 
 
 class EpiiAPI:
@@ -9,31 +10,15 @@ class EpiiAPI:
     EpiiAPI is a service class that provides methods to interact with Patagonia Center system.
     """
 
-    async def update_thies_data(
-        self,
-        ftp_port: int,
-        ftp_host: str,
-        ftp_password: str,
-        ftp_user: str,
-    ) -> Dict[str, Any]:
+    async def update_thies_data(self, config: EpiiAPIConfig) -> Dict[str, Any]:
         """
         This method establishes a connection to an FTP server using the provided
         credentials and updates data related to THIES Data Logger.
         Args:
-            ftp_port (int): The port number of the FTP server.
-            ftp_host (str): The hostname or IP address of the FTP server.
-            ftp_password (str): The password for the FTP server.
-            ftp_user (str): The username for the FTP server.
+            config (EpiiAPIConfig): configuration class for FTP Server and Microsoft SharePoint credentials.
         Returns:
             response (dict): A dictionary representation of the API response.
         """
-        controller = UpdateThiesDataController(
-            UpdateThiesDataControllerInput(
-                ftp_port=ftp_port,
-                ftp_host=ftp_host,
-                ftp_password=ftp_password,
-                ftp_user=ftp_user,
-            )
-        )
+        controller = UpdateThiesDataController(UpdateThiesDataControllerInput(config))
         response = await controller.execute()
         return response.__dict__

rcer_iot_client_pkg/services/epii/controllers/types/update_thies_data_types.py

@@ -1,13 +1,11 @@
 from dataclasses import dataclass, field
 from typing import Dict
+from rcer_iot_client_pkg.general_types.api.update_thies_data_types import EpiiAPIConfig
 
 
 @dataclass
 class UpdateThiesDataControllerInput:
-    ftp_host: str
-    ftp_port: str
-    ftp_user: str
-    ftp_password: str
+    config: EpiiAPIConfig
 
 
 @dataclass

rcer_iot_client_pkg/services/epii/controllers/update_thies_data.py

@@ -16,6 +16,8 @@ from rcer_iot_client_pkg.services.epii.controllers.types.update_thies_data_types
 )
 from rcer_iot_client_pkg.services.epii.use_cases.types import (
     UpdateThiesDataUseCaseInput,
+    SharepointConfig,
+    FtpClientConfig,
 )
 from rcer_iot_client_pkg.services.epii.use_cases.update_thies_data import (
     UpdateThiesDataUseCase,
@@ -25,7 +27,21 @@ from rcer_iot_client_pkg.services.epii.use_cases.update_thies_data import (
 class UpdateThiesDataController:
     def __init__(self, input: UpdateThiesDataControllerInput):
         self.use_case = UpdateThiesDataUseCase(
-            UpdateThiesDataUseCaseInput(**input.__dict__)
+            UpdateThiesDataUseCaseInput(
+                ftp_config=FtpClientConfig(
+                    ftp_host=input.config.ftp_host,
+                    ftp_password=input.config.ftp_password,
+                    ftp_port=input.config.ftp_port,
+                    ftp_user=input.config.ftp_user,
+                ),
+                sharepoint_config=SharepointConfig(
+                    sharepoint_client_id=input.config.sharepoint_client_id,
+                    sharepoint_client_secret=input.config.sharepoint_client_secret,
+                    sharepoint_site_name=input.config.sharepoint_site_name,
+                    sharepoint_tenant_name=input.config.sharepoint_tenant_name,
+                    sharepoint_tenant_id=input.config.sharepoint_tenant_id,
+                ),
+            )
         )
 
     async def execute(self) -> UpdateThiesDataControllerOutput:

rcer_iot_client_pkg/services/epii/use_cases/types/__init__.py

@@ -1,3 +1,7 @@
-from .update_thies_data_types import UpdateThiesDataUseCaseInput
+from .update_thies_data_types import (
+    FtpClientConfig,
+    SharepointConfig,
+    UpdateThiesDataUseCaseInput,
+)
 
-__all__ = ["UpdateThiesDataUseCaseInput"]
+__all__ = ["UpdateThiesDataUseCaseInput", "FtpClientConfig", "SharepointConfig"]

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

@@ -3,13 +3,28 @@ from typing import Dict
 
 
 @dataclass
-class UpdateThiesDataUseCaseInput:
+class FtpClientConfig:
     ftp_host: str
     ftp_port: int
     ftp_user: str
     ftp_password: str
 
 
+@dataclass
+class SharepointConfig:
+    sharepoint_client_id: str
+    sharepoint_client_secret: str
+    sharepoint_tenant_id: str
+    sharepoint_tenant_name: str
+    sharepoint_site_name: str
+
+
+@dataclass
+class UpdateThiesDataUseCaseInput:
+    ftp_config: FtpClientConfig
+    sharepoint_config: SharepointConfig
+
+
 @dataclass
 class UpdateThiesDataUseCaseOutput:
     message: str

rcer_iot_client_pkg/services/epii/use_cases/update_thies_data.py

@@ -24,6 +24,8 @@ from rcer_iot_client_pkg.libs.sharepoint_client import (
 )
 from rcer_iot_client_pkg.services.epii.use_cases.types import (
     UpdateThiesDataUseCaseInput,
+    FtpClientConfig,
+    SharepointConfig,
 )
 from rcer_iot_client_pkg.services.epii.utils import (
     parse_execute_response,
@@ -34,35 +36,27 @@ load_dotenv()
 
 class UpdateThiesDataUseCase:
     def __init__(self, input: UpdateThiesDataUseCaseInput):
-        self.ftp_port = input.ftp_port
-        self.ftp_host = input.ftp_host
-        self.ftp_password = input.ftp_password
-        self.ftp_user = input.ftp_user
-        self.sharepoint_client = self._initialize_sharepoint_client()
-        self.thies_ftp_client = self._initialize_thies_ftp_client()
+        self.sharepoint_client = self._initialize_sharepoint_client(
+            input.sharepoint_config
+        )
+        self.thies_ftp_client = self._initialize_thies_ftp_client(input.ftp_config)
         self.uploading = set()
 
-    def _initialize_sharepoint_client(self) -> SharepointClient:
+    def _initialize_sharepoint_client(
+        self, config: SharepointConfig
+    ) -> SharepointClient:
         """Initialize the HTTP client."""
         try:
             return SharepointClient(
-                SharepointClientInitArgs(client_name="sharepoint_rest_api")
+                SharepointClientInitArgs(config, client_name="sharepoint_rest_api")
             )
         except ConnectionError as error:
             raise SharepointClientError(error)
 
-    def _initialize_thies_ftp_client(self) -> FTPClient:
+    def _initialize_thies_ftp_client(self, config: FtpClientConfig) -> FTPClient:
         """Initialize the FTP client."""
         try:
-            return FTPClient(
-                FtpClientInitArgs(
-                    client_name="aioftp_client",
-                    host=self.ftp_host,
-                    user=self.ftp_user,
-                    password=self.ftp_password,
-                    port=self.ftp_port,
-                )
-            )
+            return FTPClient(FtpClientInitArgs(config, client_name="aioftp_client"))
         except RuntimeError as error:
             raise FtpClientError(error)
 

{rcer_iot_client_pkg-0.4.0.dist-info → rcer_iot_client_pkg-0.5.0.dist-info}/METADATA

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

{rcer_iot_client_pkg-0.4.0.dist-info → rcer_iot_client_pkg-0.5.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 rcer_iot_client_pkg/__init__.py,sha256=Uy9WDPvHbwKUs7JeDHgQi_MGuXn6m7lKVniJgj49xOo,186
 rcer_iot_client_pkg/general_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rcer_iot_client_pkg/general_types/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rcer_iot_client_pkg/general_types/api/update_thies_data_types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rcer_iot_client_pkg/general_types/api/update_thies_data_types.py,sha256=NqViiGKm1FdhgxJrNkLBLzqI-8SnPieAYv21kEN752U,963
 rcer_iot_client_pkg/general_types/error_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rcer_iot_client_pkg/general_types/error_types/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rcer_iot_client_pkg/general_types/error_types/api/update_thies_data_error_types.py,sha256=lDVcK7RrqT4s0Bzxa5nEyIsNee93GaIRCyPV9k0s4-o,928
@@ -16,30 +16,30 @@ rcer_iot_client_pkg/libs/async_http_client/types/__init__.py,sha256=TnJOBj5R6rVA
 rcer_iot_client_pkg/libs/async_http_client/types/async_http_client_types.py,sha256=d-_rHQ21ajTr5AI66fH3-cpJzF8VhSqG0BHbVrlwND8,329
 rcer_iot_client_pkg/libs/ftp_client/__init__.py,sha256=dW2Yutgc7mJJJzgKLhWKXMgQ6KIWJYfFa1sGpjHH5xU,191
 rcer_iot_client_pkg/libs/ftp_client/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rcer_iot_client_pkg/libs/ftp_client/clients/aioftp_client.py,sha256=b0YYNXOTlYqsxwmxrcCqb__xy7CBv6PO5-WiZkOioRk,1589
+rcer_iot_client_pkg/libs/ftp_client/clients/aioftp_client.py,sha256=5CI9J4axAeoqlN-cYToVcPF9sAZEk0vIOhPOHrhlpk4,1633
 rcer_iot_client_pkg/libs/ftp_client/ftp_client.py,sha256=RhWnGwfU8SN0tRqfDc3u6NKDj9qla4cOI2IANyb-S2s,820
 rcer_iot_client_pkg/libs/ftp_client/ftp_client_contract.py,sha256=2x1MPZNFVw3l-sVd65Z6kZYkXlk_8isH_ykzRZB9Cv8,326
 rcer_iot_client_pkg/libs/ftp_client/types/__init__.py,sha256=syfwf9feP4QK7fkCTfl4j8l11ic-jHtfi1DE2chaWbs,155
-rcer_iot_client_pkg/libs/ftp_client/types/ftp_client_types.py,sha256=4ywi5UROTR5TOaApPrm-JyV2PeTvD-cv5K_lL4Fj9AA,282
+rcer_iot_client_pkg/libs/ftp_client/types/ftp_client_types.py,sha256=e4SmYkewldulaD8ms2q75zVgLFXyBxBqoa_L-IQOmso,256
 rcer_iot_client_pkg/libs/sharepoint_client/__init__.py,sha256=v7h-cNsK-BaPp-hTU3NWRNXYRD9ztU-hsCk0eNRPIKA,334
-rcer_iot_client_pkg/libs/sharepoint_client/clients/sharepoint_rest_api.py,sha256=fjmpP7ityjBRBLpok0GYQMrMNIhrCwVjIvLKbBdsQkk,5095
-rcer_iot_client_pkg/libs/sharepoint_client/sharepoint_client.py,sha256=cTHQan7vMCJ2In3D1s1Nizvnt7K5Y8n87WiYcmVdjhk,1230
+rcer_iot_client_pkg/libs/sharepoint_client/clients/sharepoint_rest_api.py,sha256=e0f4F8_Elt-y8dgxLqviQUy8PR8E2Qn60ecP0v78VQM,5269
+rcer_iot_client_pkg/libs/sharepoint_client/sharepoint_client.py,sha256=UYfAhckzmal5-Jjvbz0P4gt64w5gOYJYksVSHXdJPiQ,1234
 rcer_iot_client_pkg/libs/sharepoint_client/sharepoint_client_contract.py,sha256=xqNHzCjp7GvUGGUox9YTJj2QJgTc5819t2etOk8X26o,485
-rcer_iot_client_pkg/libs/sharepoint_client/types/sharepoint_client_types.py,sha256=NTV5kL1xEOr5tUZOJMkr3gFTwSXRG1V9PkmHtntyQk0,375
+rcer_iot_client_pkg/libs/sharepoint_client/types/sharepoint_client_types.py,sha256=gfXhvKuqZjxSdbgbEgGF1EKYDDq7CjK9Tdth-Waq5xo,414
 rcer_iot_client_pkg/libs/zero_dependency/utils/datetime_utils.py,sha256=kD38wC087H3jwTIgrntBajE55cR2ioo_ftPUHiyGs_M,751
 rcer_iot_client_pkg/services/epii/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rcer_iot_client_pkg/services/epii/api.py,sha256=lqoyBR6ub6BLqwOPR_kvtG8z80KqUNpJD8Yl6VT7z34,1369
+rcer_iot_client_pkg/services/epii/api.py,sha256=imw7crOMCuGLztEf5MpfpdzWC9IBnvDZJ4N957wRcIE,1038
 rcer_iot_client_pkg/services/epii/constants/update_thies_data_constants.py,sha256=XeBNsQaTsc0mylQegB4Wf9ECIo0i1Fk-BurWm84WDqE,273
 rcer_iot_client_pkg/services/epii/controllers/__init__.py,sha256=mCdGgKGDgGxCtRoiZN9Rki-fTOyOuJWw9e7festpQYA,98
 rcer_iot_client_pkg/services/epii/controllers/types/__init__.py,sha256=xzky-oTSojLNkWETp_k8a4dcXYvYSQY0VhWo23Yhb8U,195
-rcer_iot_client_pkg/services/epii/controllers/types/update_thies_data_types.py,sha256=0zbNgjln7PXQRjFPAbiNV9n_cXV1H1-XtXMCC_VA4kE,336
-rcer_iot_client_pkg/services/epii/controllers/update_thies_data.py,sha256=Si-oGHyunp8lgxvjdZjRizAJuf2uoq5b6QD1dRHYVuM,3272
-rcer_iot_client_pkg/services/epii/use_cases/types/__init__.py,sha256=c2RRUbjWq2PIqYW8DcxmYDg0gLZ74kmHh3BkeQCVii0,108
-rcer_iot_client_pkg/services/epii/use_cases/types/update_thies_data_types.py,sha256=JGmBwQtQB-nfopNlGwuI8Jf3A2QBFTGtrzjrDZDWMQ0,334
-rcer_iot_client_pkg/services/epii/use_cases/update_thies_data.py,sha256=7H7Y6jDRb8ymsZv8spJ_NUWPBTiGFeD42FH1-eo1FS8,5268
+rcer_iot_client_pkg/services/epii/controllers/types/update_thies_data_types.py,sha256=M5rYsjgqTndhPIRi77McxLyTrjmGsoVUIAGPETNXz9U,374
+rcer_iot_client_pkg/services/epii/controllers/update_thies_data.py,sha256=Suxehwi1onUsc2rWGbzO1vBsBp0RfgCp6FUqe-lrY20,4054
+rcer_iot_client_pkg/services/epii/use_cases/types/__init__.py,sha256=u6fyodOEJE2j6FMqJux40Xf9ccYAi-UUYxqT-Kzc0kE,199
+rcer_iot_client_pkg/services/epii/use_cases/types/update_thies_data_types.py,sha256=C0TU50KKYodpaX87OnG0MnHyGY4gRzmluUHk-esCEVU,635
+rcer_iot_client_pkg/services/epii/use_cases/update_thies_data.py,sha256=Tc12NUnZ0or2Tz5BA9jE62I5XxmKvZ__v4w5dTBk_5A,5052
 rcer_iot_client_pkg/services/epii/utils/__init__.py,sha256=cYt2tvq65_OMjFaqb8-CCC7IGCQgFd4ziEUWJV7s1iY,98
 rcer_iot_client_pkg/services/epii/utils/update_thies_data_utils.py,sha256=-q8t-xZmpwFDADGlDu0S7EKvZK7R0GUR6JqOxQShWgE,415
-rcer_iot_client_pkg-0.4.0.dist-info/LICENSE,sha256=NWpf6b38xgBWPBo5HZsCbdfp9hZSliEbRqWQgm0fkOo,1076
-rcer_iot_client_pkg-0.4.0.dist-info/METADATA,sha256=Byx8wk_eQeCPMTS_46IeXPkB6hxSlNW_M3Qhj-8x5Lo,3483
-rcer_iot_client_pkg-0.4.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rcer_iot_client_pkg-0.4.0.dist-info/RECORD,,
+rcer_iot_client_pkg-0.5.0.dist-info/LICENSE,sha256=NWpf6b38xgBWPBo5HZsCbdfp9hZSliEbRqWQgm0fkOo,1076
+rcer_iot_client_pkg-0.5.0.dist-info/METADATA,sha256=0gMjeJqGyVtA_p-VFp6DIYOyLROhFAatUDXGCT_Qw48,3483
+rcer_iot_client_pkg-0.5.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rcer_iot_client_pkg-0.5.0.dist-info/RECORD,,