cognite-extractor-utils 6.3.0__tar.gz → 6.3.2__tar.gz

{cognite_extractor_utils-6.3.0 → cognite_extractor_utils-6.3.2}/PKG-INFO

@@ -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 → cognite_extractor_utils-6.3.2}/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_extractor_utils-6.3.0 → cognite_extractor_utils-6.3.2}/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_extractor_utils-6.3.0 → cognite_extractor_utils-6.3.2}/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 → cognite_extractor_utils-6.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-extractor-utils"
-version = "6.3.0"
+version = "6.3.2"
 description = "Utilities for easier development of extractors for CDF"
 authors = ["Mathias Lohne <mathias.lohne@cognite.com>"]
 license = "Apache-2.0"