hid_data_transfer_lib 0.2.2__tar.gz → 0.3.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/PKG-INFO +7 -5
  2. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/conf/hid_dt_configuration.py +20 -17
  3. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/hid_dt_lib.py +530 -29
  4. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/nifi/nifi_client.py +174 -11
  5. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/nifi/nifi_rest.py +79 -0
  6. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/util/util.py +22 -21
  7. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/pyproject.toml +19 -15
  8. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/.env +0 -1
  9. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/conf/__pycache__/__init__.cpython-311.pyc +0 -0
  10. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/conf/__pycache__/__init__.cpython-39.pyc +0 -0
  11. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/conf/__pycache__/cli_configuration.cpython-311.pyc +0 -0
  12. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/conf/__pycache__/cli_configuration.cpython-39.pyc +0 -0
  13. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/conf/__pycache__/conf.cpython-39.pyc +0 -0
  14. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/conf/__pycache__/hid_dt_configuration.cpython-311.pyc +0 -0
  15. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/exceptions/__pycache__/__init__.cpython-311.pyc +0 -0
  16. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/exceptions/__pycache__/cli_exceptions.cpython-311.pyc +0 -0
  17. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/exceptions/__pycache__/hid_dt_exceptions.cpython-311.pyc +0 -0
  18. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/keycloak/__pycache__/__init__.cpython-311.pyc +0 -0
  19. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/keycloak/__pycache__/keycloak_api.cpython-311.pyc +0 -0
  20. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/keycloak/__pycache__/keycloak_rest.cpython-311.pyc +0 -0
  21. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/nifi/__pycache__/__init__.cpython-311.pyc +0 -0
  22. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/nifi/__pycache__/__init__.cpython-39.pyc +0 -0
  23. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/nifi/__pycache__/client.cpython-311.pyc +0 -0
  24. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/nifi/__pycache__/client.cpython-39.pyc +0 -0
  25. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/nifi/__pycache__/nifi_client.cpython-311.pyc +0 -0
  26. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/nifi/__pycache__/nifi_rest.cpython-311.pyc +0 -0
  27. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/util/__pycache__/__init__.cpython-311.pyc +0 -0
  28. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/util/__pycache__/__init__.cpython-39.pyc +0 -0
  29. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/util/__pycache__/util.cpython-311.pyc +0 -0
  30. hid_data_transfer_lib-0.2.2/hid_data_transfer_lib/util/__pycache__/util.cpython-39.pyc +0 -0
  31. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/README.md +0 -0
  32. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/__init__.py +0 -0
  33. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/conf/__init__.py +0 -0
  34. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/conf/hid_dt.cfg +0 -0
  35. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/conf/hid_dt_local.cfg +0 -0
  36. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/conf/hid_dt_psnc.cfg +0 -0
  37. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/exceptions/__init__.py +0 -0
  38. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/exceptions/hid_dt_exceptions.py +0 -0
  39. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/keycloak/__init__.py +0 -0
  40. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/keycloak/keycloak_rest.py +0 -0
  41. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/nifi/__init__.py +0 -0
  42. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/py.typed +0 -0
  43. {hid_data_transfer_lib-0.2.2 → hid_data_transfer_lib-0.3.0}/hid_data_transfer_lib/util/__init__.py +0 -0
@@ -1,17 +1,19 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.3
2
2
  Name: hid_data_transfer_lib
3
- Version: 0.2.2
3
+ Version: 0.3.0
4
4
  Summary: HiDALGO Data Transfer library provides methods to transfer data between different data providers and consumers using NIFI pipelines
5
5
  License: APL-2.0
6
6
  Author: Jesús Gorroñogoitia
7
7
  Author-email: jesus.gorronogoitia@eviden.com
8
- Requires-Python: >=3.11,<4.0
8
+ Requires-Python: >=3.11
9
9
  Classifier: License :: Other/Proprietary License
10
10
  Classifier: Programming Language :: Python :: 3
11
11
  Classifier: Programming Language :: Python :: 3.11
12
12
  Classifier: Programming Language :: Python :: 3.12
13
- Requires-Dist: paramiko (>=3.3.1,<4.0.0)
14
- Requires-Dist: requests (>=2.31.0,<3.0.0)
13
+ Classifier: Programming Language :: Python :: 3.13
14
+ Requires-Dist: paramiko (>=3.3.1)
15
+ Requires-Dist: requests (>=2.31.0)
16
+ Requires-Dist: setuptools (>=79.0.0,<80.0.0)
15
17
  Description-Content-Type: text/markdown
16
18
 
17
19
  # Hidalgo2 Data Transfer Lib
@@ -18,6 +18,7 @@ This module manages the configuration of the Data Transfer CLI
18
18
  import configparser
19
19
  import os
20
20
  import logging
21
+ from typing import Optional
21
22
  from urllib.parse import urlparse
22
23
  from hid_data_transfer_lib.exceptions.hid_dt_exceptions import (
23
24
  HidDataTransferException
@@ -42,8 +43,8 @@ class HidDataTransferConfiguration:
42
43
  __keycloak_login = None
43
44
  __keycloak_passwd = None
44
45
 
45
- def __init__(self) -> None:
46
- self.__get_configuration()
46
+ def __init__(self, logging_level: Optional[int] = None) -> None:
47
+ self.__get_configuration(logging_level)
47
48
 
48
49
  def check_keycloak_conf(self):
49
50
  """Check if keycloak configuration is valid"""
@@ -189,7 +190,7 @@ class HidDataTransferConfiguration:
189
190
 
190
191
  def logger(self, logger_name):
191
192
  """Returns the logging level"""
192
- return self.__set_logger(self.__logging_level, logger_name)
193
+ return self.__set_logger(logger_name)
193
194
 
194
195
  def is_logger_valid(self, logger):
195
196
  """Check if the logger is valid:
@@ -208,7 +209,7 @@ class HidDataTransferConfiguration:
208
209
  return handler
209
210
  return None
210
211
 
211
- def __get_configuration(self):
212
+ def __get_configuration(self, logging_level: Optional[int]):
212
213
  """
213
214
  Reads the configuration file and sets this class' configuration values
214
215
 
@@ -244,7 +245,12 @@ class HidDataTransferConfiguration:
244
245
  )
245
246
 
246
247
  # Logging section
247
- self.__logging_level = config.get("Logging", "logging_level")
248
+ if logging_level is not None:
249
+ self.__logging_level = logging_level
250
+ else:
251
+ logging_level_str = config.get("Logging", "logging_level")
252
+ self.__logging_level = getattr(
253
+ logging, logging_level_str.upper(), logging.INFO)
248
254
 
249
255
  except configparser.NoSectionError as ex:
250
256
  raise HidDataTransferException(
@@ -344,33 +350,29 @@ class HidDataTransferConfiguration:
344
350
  "environment variables must be set"
345
351
  )
346
352
 
347
- def __set_logger(self, logging_level_str, logger_name):
353
+ def __set_logger(self, logger_name):
348
354
  """
349
355
  Set up logging configuration
350
356
  """
351
- if logging_level_str is None:
352
- logging_level_str = "INFO"
353
- logging_level = getattr(
354
- logging, logging_level_str.upper(), logging.INFO)
355
357
 
356
358
  # Create a console handler
357
- console_handler = logging.StreamHandler()
358
- console_handler.setLevel(logging_level)
359
+ # console_handler = logging.StreamHandler()
360
+ # console_handler.setLevel(logging_level)
359
361
 
360
362
  # Create a file handler
361
363
  file_handler = logging.FileHandler("dtcli.log")
362
- file_handler.setLevel(logging_level)
364
+ file_handler.setLevel(self.__logging_level)
363
365
 
364
366
  # Create a formatter and set it for the handler
365
367
  formatter = logging.Formatter(
366
368
  "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
367
369
  )
368
- console_handler.setFormatter(formatter)
370
+ # console_handler.setFormatter(formatter)
369
371
  file_handler.setFormatter(formatter)
370
372
 
371
373
  # Get the root logger and set its level
372
374
  logger = logging.getLogger(logger_name)
373
- logger.setLevel(logging_level)
375
+ logger.setLevel(self.__logging_level)
374
376
 
375
377
  # Add the custom filter to the root logger
376
378
  # class_filter = ClassFilter("KeycloakAPIClient")
@@ -378,8 +380,9 @@ class HidDataTransferConfiguration:
378
380
  # logger.addFilter(package_filter)
379
381
 
380
382
  # Add the console handler to the logger
381
- logger.addHandler(console_handler)
382
- logger.addHandler(file_handler)
383
+ # logger.addHandler(console_handler)
384
+ if len(logger.handlers) == 0:
385
+ logger.addHandler(file_handler)
383
386
 
384
387
  return logger
385
388