cognite-extractor-utils 6.3.0__py3-none-any.whl → 6.3.2__py3-none-any.whl

cognite/extractorutils/__init__.py

@@ -16,5 +16,5 @@
 Cognite extractor utils is a Python package that simplifies the development of new extractors.
 """
 
-__version__ = "6.3.0"
+__version__ = "6.3.2"
 from .base import Extractor

cognite/extractorutils/configtools/loaders.py

@@ -61,7 +61,8 @@ class KeyVaultLoader:
                 "Include an `azure-keyvault` section in your config to use the !keyvault tag."
             )
 
-        if "keyvault-name" not in self.config:
+        keyvault_name = self.config.get("keyvault-name")
+        if not keyvault_name:
             raise InvalidConfigError("Please add the keyvault-name")
 
         if "authentication-method" not in self.config:
@@ -70,7 +71,7 @@ class KeyVaultLoader:
                 "Possible values are: default or client-secret"
             )
 
-        vault_url = f"https://{self.config['keyvault-name']}.vault.azure.net"
+        vault_url = f"https://{keyvault_name}.vault.azure.net"
 
         if self.config["authentication-method"] == KeyVaultAuthenticationMethod.DEFAULT.value:
             _logger.info("Using Azure DefaultCredentials to access KeyVault")
@@ -151,7 +152,7 @@ def _load_yaml_dict(
     if not isinstance(source, str):
         source.seek(0)
 
-    keyvault_config = initial_load.get("azure-keyvault")
+    keyvault_config = initial_load.get("azure-keyvault", initial_load.get("key-vault"))
 
     _EnvLoader.add_implicit_resolver("!env", re.compile(r"\$\{([^}^{]+)\}"), None)
     _EnvLoader.add_constructor("!env", _env_constructor)

cognite/extractorutils/statestore.py

@@ -92,6 +92,8 @@ from abc import ABC, abstractmethod
 from types import TracebackType
 from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Type, Union
 
+from requests.exceptions import ConnectionError
+
 from cognite.client import CogniteClient
 from cognite.client.exceptions import CogniteAPIError, CogniteException
 from cognite.extractorutils.uploader import DataPointList
@@ -346,7 +348,7 @@ class RawStateStore(AbstractStateStore):
         self._ensure_table()
 
     @retry(
-        exceptions=(CogniteException,),
+        exceptions=(CogniteException, ConnectionError),
         tries=RETRIES,
         delay=RETRY_DELAY,
         max_delay=RETRY_MAX_DELAY,
@@ -368,7 +370,7 @@ class RawStateStore(AbstractStateStore):
         self._initialize_implementation(force)
 
     @retry(
-        exceptions=(CogniteException,),
+        exceptions=(CogniteException, ConnectionError),
         tries=RETRIES,
         delay=RETRY_DELAY,
         max_delay=RETRY_MAX_DELAY,
@@ -402,7 +404,7 @@ class RawStateStore(AbstractStateStore):
         self._synchronize_implementation()
 
     @retry(
-        exceptions=(CogniteException,),
+        exceptions=(CogniteException, ConnectionError),
         tries=RETRIES,
         delay=RETRY_DELAY,
         max_delay=RETRY_MAX_DELAY,

{cognite_extractor_utils-6.3.0.dist-info → cognite_extractor_utils-6.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-extractor-utils
-Version: 6.3.0
+Version: 6.3.2
 Summary: Utilities for easier development of extractors for CDF
 Home-page: https://github.com/cognitedata/python-extractor-utils
 License: Apache-2.0

{cognite_extractor_utils-6.3.0.dist-info → cognite_extractor_utils-6.3.2.dist-info}/RECORD

@@ -1,15 +1,15 @@
-cognite/extractorutils/__init__.py,sha256=GQEacMSjuMca4PqxS0wM8KyHMNPmrMZEzHspOCyo8ME,739
+cognite/extractorutils/__init__.py,sha256=X7tmNy4D8099iyXkXH1QrvXWk2l-Q2z5KWymIjB-J2Y,739
 cognite/extractorutils/_inner_util.py,sha256=jCPLg-FfTpyLAHkhoKaKObNwbqm19d2Z11to_DYk5EU,1558
 cognite/extractorutils/base.py,sha256=8kzePjVlCIQVftDQ1t_4join9qhs-VOlB6eTpeX9zGk,16018
 cognite/extractorutils/configtools/__init__.py,sha256=fj9kH8DdisNi9mI8cKm2sz50vnzeOkJQErIGB3mTYRo,2861
 cognite/extractorutils/configtools/_util.py,sha256=SZycZm_py9v9WZbDiDQbgS6_PiLtu-TtwuuH7tG2YCI,4739
 cognite/extractorutils/configtools/elements.py,sha256=OgNuLF6iOBnPsANwMsSRrJ_0KwBngD_ZKIgE4NZfOOc,20626
-cognite/extractorutils/configtools/loaders.py,sha256=PmD2AWca4gG_hLSugAT6pZ_VUlQntFvbAnRnRwtmkn8,14913
+cognite/extractorutils/configtools/loaders.py,sha256=s4tHuNgBhk6TnrDDifIYQX8CickXVSqVCol9E62DPIs,14969
 cognite/extractorutils/exceptions.py,sha256=PERRmySUfJRM2Ta8cFvADTe-KUdXsoMLKdk4140AOHI,1061
 cognite/extractorutils/metrics.py,sha256=PFrOO0yDRGaFiJmNLXModKY7CW1gvHDBtPaoK-ETCxw,15508
 cognite/extractorutils/middleware.py,sha256=d5bnKEOmC49QmoBK7OyM9krOGDYX8sXxM00wRWKhmHg,1108
 cognite/extractorutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/extractorutils/statestore.py,sha256=rzfjYlTdDL1mawKBOK41H8CUDdDiviDUB90ta_ycbUI,18175
+cognite/extractorutils/statestore.py,sha256=wC619be0L0EKmn_Fn-ccT3-D2_wt4Mb9eAr_oqrDdis,18272
 cognite/extractorutils/uploader/__init__.py,sha256=W22u6QHA4cR0j78LN5LTL5YGbfC-uTApagTyP5ab7uQ,3110
 cognite/extractorutils/uploader/_base.py,sha256=ed9F-qFmlIylTg8UtuxfykYUfEsG_R0PrfufXYEPcjI,5169
 cognite/extractorutils/uploader/_metrics.py,sha256=J2LJXb19L_SLSJ_voNIQHYLp0pjxUKevpH1q_xKX6Hk,3247
@@ -21,7 +21,7 @@ cognite/extractorutils/uploader/time_series.py,sha256=ZPkz9NVCmz2vE7SkRm0-LjYi-Z
 cognite/extractorutils/uploader_extractor.py,sha256=K8cH8CIDiFNB0fXNdUymE_MKh1GYfqxHHcRoH07CFew,7673
 cognite/extractorutils/uploader_types.py,sha256=5MKT14DUnTFVD5Nx4Zvnfp2SfaICuTKLWAFAYaZishk,1045
 cognite/extractorutils/util.py,sha256=GDDpsoOQpgoTHUWVAUjWxGdulgOQovlD8yBWp_kObp8,14234
-cognite_extractor_utils-6.3.0.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-cognite_extractor_utils-6.3.0.dist-info/METADATA,sha256=zWpIalHPdw6VU1mxuPltKmldkBP_pu9g6EQW7QiEL94,5560
-cognite_extractor_utils-6.3.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-cognite_extractor_utils-6.3.0.dist-info/RECORD,,
+cognite_extractor_utils-6.3.2.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+cognite_extractor_utils-6.3.2.dist-info/METADATA,sha256=9anL2vuUyAut2x8fe1wpUys1J0rEJmDQYINyshCsMCk,5560
+cognite_extractor_utils-6.3.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+cognite_extractor_utils-6.3.2.dist-info/RECORD,,