cognite-extractor-utils 7.1.1__tar.gz → 7.1.3__tar.gz

{cognite_extractor_utils-7.1.1 → cognite_extractor_utils-7.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-extractor-utils
-Version: 7.1.1
+Version: 7.1.3
 Summary: Utilities for easier development of extractors for CDF
 Home-page: https://github.com/cognitedata/python-extractor-utils
 License: Apache-2.0
@@ -18,7 +18,7 @@ Provides-Extra: experimental
 Requires-Dist: arrow (>=1.0.0,<2.0.0)
 Requires-Dist: azure-identity (>=1.14.0,<2.0.0)
 Requires-Dist: azure-keyvault-secrets (>=4.7.0,<5.0.0)
-Requires-Dist: cognite-sdk (>=7.28.1,<8.0.0)
+Requires-Dist: cognite-sdk (>=7.41.0,<8.0.0)
 Requires-Dist: dacite (>=1.6.0,<2.0.0)
 Requires-Dist: decorator (>=5.1.1,<6.0.0)
 Requires-Dist: more-itertools (>=10.0.0,<11.0.0)

{cognite_extractor_utils-7.1.1 → cognite_extractor_utils-7.1.3}/cognite/extractorutils/__init__.py

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

{cognite_extractor_utils-7.1.1 → cognite_extractor_utils-7.1.3}/cognite/extractorutils/uploader/time_series.py

@@ -22,6 +22,7 @@ from cognite.client.data_classes import (
     Sequence,
     SequenceData,
     SequenceRows,
+    StatusCode,
     TimeSeries,
 )
 from cognite.client.exceptions import CogniteDuplicatedError, CogniteNotFoundError
@@ -51,7 +52,10 @@ MIN_DATAPOINT_VALUE = -1e100
 
 TimeStamp = Union[int, datetime]
 
-DataPoint = Union[Tuple[TimeStamp, float], Tuple[TimeStamp, str]]
+DataPointWithoutStatus = Union[Tuple[TimeStamp, float], Tuple[TimeStamp, str], Tuple[TimeStamp, int]]
+FullStatusCode = Union[StatusCode, int]
+DataPointWithStatus = Union[Tuple[TimeStamp, float, FullStatusCode], Tuple[TimeStamp, str, FullStatusCode]]
+DataPoint = Union[DataPointWithoutStatus, DataPointWithStatus]
 DataPointList = List[DataPoint]
 
 
@@ -283,7 +287,7 @@ class TimeSeriesUploadQueue(AbstractUploadQueue):
         with self.lock:
             upload_this = _upload_batch(
                 [
-                    {either_id.type(): either_id.content(), "datapoints": datapoints}
+                    {either_id.type(): either_id.content(), "datapoints": list(datapoints)}
                     for either_id, datapoints in self.upload_queue.items()
                     if len(datapoints) > 0
                 ]

{cognite_extractor_utils-7.1.1 → cognite_extractor_utils-7.1.3}/cognite/extractorutils/util.py

@@ -16,6 +16,7 @@
 The ``util`` package contains miscellaneous functions and classes that can some times be useful while developing
 extractors.
 """
+
 import logging
 import random
 from functools import partial, wraps
@@ -27,7 +28,7 @@ from decorator import decorator
 
 from cognite.client import CogniteClient
 from cognite.client.data_classes import Asset, ExtractionPipelineRun, TimeSeries
-from cognite.client.exceptions import CogniteAPIError, CogniteException, CogniteNotFoundError
+from cognite.client.exceptions import CogniteAPIError, CogniteException, CogniteFileUploadError, CogniteNotFoundError
 from cognite.extractorutils.threading import CancellationToken
 
 
@@ -492,7 +493,7 @@ def cognite_exceptions(
     status_codes = status_codes or [408, 425, 429, 500, 502, 503, 504]
 
     def handle_cognite_errors(exception: CogniteException) -> bool:
-        if isinstance(exception, CogniteAPIError):
+        if isinstance(exception, (CogniteAPIError, CogniteFileUploadError)):
             return exception.code in status_codes
         return True
 

{cognite_extractor_utils-7.1.1 → cognite_extractor_utils-7.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-extractor-utils"
-version = "7.1.1"
+version = "7.1.3"
 description = "Utilities for easier development of extractors for CDF"
 authors = ["Mathias Lohne <mathias.lohne@cognite.com>"]
 license = "Apache-2.0"
@@ -53,7 +53,7 @@ exclude = "tests/*"
 
 [tool.poetry.dependencies]
 python = "^3.8.0"
-cognite-sdk = "^7.28.1"
+cognite-sdk = "^7.41.0"
 prometheus-client = ">0.7.0, <=1.0.0"
 arrow = "^1.0.0"
 pyyaml = ">=5.3.0, <7"
@@ -70,10 +70,10 @@ azure-keyvault-secrets = "^4.7.0"
 experimental = ["cognite-sdk-experimental"]
 
 [tool.poetry.group.dev.dependencies]
-mypy = "1.9.0"
-ruff = "^0.3.0"
+mypy = "1.10.0"
+ruff = "^0.4.0"
 pytest = "^8.0.0"
-pytest-cov = "^4.0.0"
+pytest-cov = "^5.0.0"
 sphinx = "^7.0.0"
 sphinx-rtd-theme = "^2.0.0"
 pre-commit = "^3.3.0"