cognite-extractor-utils 7.5.9__tar.gz → 7.5.11__tar.gz

{cognite_extractor_utils-7.5.9 → cognite_extractor_utils-7.5.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-extractor-utils
-Version: 7.5.9
+Version: 7.5.11
 Summary: Utilities for easier development of extractors for CDF
 Project-URL: repository, https://github.com/cognitedata/python-extractor-utils
 Author-email: Mathias Lohne <mathias.lohne@cognite.com>
@@ -14,7 +14,7 @@ Requires-Dist: azure-identity>=1.14.0
 Requires-Dist: azure-keyvault-secrets>=4.7.0
 Requires-Dist: cognite-sdk>=7.59.0
 Requires-Dist: croniter>=6.0.0
-Requires-Dist: dacite>=1.6.0
+Requires-Dist: dacite<1.9.0,>=1.6.0
 Requires-Dist: decorator>=5.1.1
 Requires-Dist: httpx<1,>=0.27.0
 Requires-Dist: jsonlines>=4.0.0

{cognite_extractor_utils-7.5.9 → cognite_extractor_utils-7.5.11}/cognite/extractorutils/__init__.py

@@ -16,7 +16,7 @@
 Cognite extractor utils is a Python package that simplifies the development of new extractors.
 """
 
-__version__ = "7.5.9"
+__version__ = "7.5.11"
 from .base import Extractor
 
 __all__ = ["Extractor"]

{cognite_extractor_utils-7.5.9 → cognite_extractor_utils-7.5.11}/cognite/extractorutils/unstable/configuration/models.py

@@ -1,3 +1,4 @@
+import os
 import re
 from datetime import timedelta
 from enum import Enum
@@ -215,6 +216,36 @@ class ConnectionConfig(ConfigModel):
 
         return CogniteClient(client_config)
 
+    @classmethod
+    def from_environment(cls) -> "ConnectionConfig":
+        auth: AuthenticationConfig
+        if "COGNITE_CLIENT_SECRET" in os.environ:
+            auth = _ClientCredentialsConfig(
+                type="client-credentials",
+                client_id=os.environ["COGNITE_CLIENT_ID"],
+                client_secret=os.environ["COGNITE_CLIENT_SECRET"],
+                token_url=os.environ["COGNITE_TOKEN_URL"],
+                scopes=os.environ["COGNITE_TOKEN_SCOPES"].split(","),
+            )
+        elif "COGNITE_CLIENT_CERTIFICATE_PATH" in os.environ:
+            auth = _ClientCertificateConfig(
+                type="client-certificate",
+                client_id=os.environ["COGNITE_CLIENT_ID"],
+                path=Path(os.environ["COGNITE_CLIENT_CERTIFICATE_PATH"]),
+                password=os.environ.get("COGNITE_CLIENT_CERTIFICATE_PATH"),
+                authority_url=os.environ["COGNITE_AUTHORITY_URL"],
+                scopes=os.environ["COGNITE_TOKEN_SCOPES"].split(","),
+            )
+        else:
+            raise KeyError("Missing auth, either COGNITE_CLIENT_SECRET or COGNITE_CLIENT_CERTIFICATE_PATH must be set")
+
+        return ConnectionConfig(
+            project=os.environ["COGNITE_PROJECT"],
+            base_url=os.environ["COGNITE_BASE_URL"],
+            integration=os.environ["COGNITE_INTEGRATION"],
+            authentication=auth,
+        )
+
 
 class CronConfig(ConfigModel):
     type: Literal["cron"]

{cognite_extractor_utils-7.5.9 → cognite_extractor_utils-7.5.11}/cognite/extractorutils/uploader/files.py

@@ -25,6 +25,7 @@ from typing import (
 )
 from urllib.parse import ParseResult, urlparse
 
+from h11._util import LocalProtocolError
 from httpx import URL, Client, Headers, Request, StreamConsumed, SyncByteStream
 from requests.utils import super_len
 
@@ -481,6 +482,19 @@ class IOFileUploadQueue(AbstractUploadQueue):
             try:
                 upload_file(read_file, file_meta)
 
+            except LocalProtocolError as e:
+                error_message = str(e)
+                if (
+                    "Too much data for declared Content" in error_message
+                    or "Too little data for declared Content-Length" in error_message
+                ):
+                    self.logger.error(
+                        f"Content Length Mismatch while uploading file: {file_meta} error message: {error_message}"
+                    )
+
+                self.add_entry_failure_logger(file_name=str(file_meta.name), error=e)
+                self.errors.append(e)
+
             except Exception as e:
                 self.logger.exception(
                     f"Unexpected error while uploading file: {file_meta.external_id} {file_meta.name}"

{cognite_extractor_utils-7.5.9 → cognite_extractor_utils-7.5.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite-extractor-utils"
-version = "7.5.9"
+version = "7.5.11"
 description = "Utilities for easier development of extractors for CDF"
 authors = [
     {name = "Mathias Lohne", email = "mathias.lohne@cognite.com"}
@@ -19,7 +19,7 @@ dependencies = [
     "prometheus-client>=0.7.0,<=1.0.0",
     "arrow>=1.0.0",
     "pyyaml>=5.3.0,<7",
-    "dacite>=1.6.0",
+    "dacite>=1.6.0,<1.9.0",
     "psutil>=6.0.0",
     "decorator>=5.1.1",
     "more-itertools>=10.0.0",