cognite-extractor-utils 7.1.2__tar.gz → 7.1.4__tar.gz

{cognite_extractor_utils-7.1.2 → cognite_extractor_utils-7.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-extractor-utils
-Version: 7.1.2
+Version: 7.1.4
 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,<7.35.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.2 → cognite_extractor_utils-7.1.4}/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.2"
+__version__ = "7.1.4"
 from .base import Extractor

{cognite_extractor_utils-7.1.2 → cognite_extractor_utils-7.1.4}/cognite/extractorutils/base.py

@@ -189,9 +189,17 @@ class Extractor(Generic[CustomConfigClass]):
 
         state_store_config = recursive_find_state_store(self.config.__dict__)
         if state_store_config:
-            self.state_store = state_store_config.create_state_store(self.cognite_client, self.use_default_state_store)
+            self.state_store = state_store_config.create_state_store(
+                cdf_client=self.cognite_client,
+                default_to_local=self.use_default_state_store,
+                cancellation_token=self.cancellation_token,
+            )
         else:
-            self.state_store = LocalStateStore("states.json") if self.use_default_state_store else NoStateStore()
+            self.state_store = (
+                LocalStateStore("states.json", cancellation_token=self.cancellation_token)
+                if self.use_default_state_store
+                else NoStateStore()
+            )
 
         try:
             self.state_store.initialize()

{cognite_extractor_utils-7.1.2 → cognite_extractor_utils-7.1.4}/cognite/extractorutils/configtools/elements.py

@@ -623,7 +623,10 @@ class StateStoreConfig:
     local: Optional[LocalStateStoreConfig] = None
 
     def create_state_store(
-        self, cdf_client: Optional[CogniteClient] = None, default_to_local: bool = True
+        self,
+        cdf_client: Optional[CogniteClient] = None,
+        default_to_local: bool = True,
+        cancellation_token: Optional[CancellationToken] = None,
     ) -> AbstractStateStore:
         """
         Create a state store object based on the config.
@@ -648,15 +651,17 @@ class StateStoreConfig:
                 database=self.raw.database,
                 table=self.raw.table,
                 save_interval=self.raw.upload_interval.seconds,
+                cancellation_token=cancellation_token,
             )
 
         if self.local:
             return LocalStateStore(
                 file_path=self.local.path,
                 save_interval=self.local.save_interval.seconds,
+                cancellation_token=cancellation_token,
             )
 
         if default_to_local:
-            return LocalStateStore(file_path="states.json")
+            return LocalStateStore(file_path="states.json", cancellation_token=cancellation_token)
         else:
             return NoStateStore()

{cognite_extractor_utils-7.1.2 → cognite_extractor_utils-7.1.4}/cognite/extractorutils/statestore.py

@@ -132,7 +132,7 @@ class AbstractStateStore(ABC):
 
         self.logger = logging.getLogger(__name__)
 
-        self.thread = threading.Thread(target=self._run, daemon=True, name=thread_name)
+        self.thread = threading.Thread(target=self._run, daemon=cancellation_token is None, name=thread_name)
         self.lock = threading.RLock()
         self.cancellation_token = cancellation_token.create_child_token() if cancellation_token else CancellationToken()
 

{cognite_extractor_utils-7.1.2 → cognite_extractor_utils-7.1.4}/cognite/extractorutils/uploader/_base.py

@@ -58,7 +58,7 @@ class AbstractUploadQueue(ABC):
         self.trigger_log_level = _resolve_log_level(trigger_log_level)
         self.logger = logging.getLogger(__name__)
 
-        self.thread = threading.Thread(target=self._run, daemon=True, name=thread_name)
+        self.thread = threading.Thread(target=self._run, daemon=cancellation_token is None, name=thread_name)
         self.lock = threading.RLock()
         self.cancellation_token: CancellationToken = (
             cancellation_token.create_child_token() if cancellation_token else CancellationToken()

{cognite_extractor_utils-7.1.2 → cognite_extractor_utils-7.1.4}/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.2 → cognite_extractor_utils-7.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-extractor-utils"
-version = "7.1.2"
+version = "7.1.4"
 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, <7.35.0"
+cognite-sdk = "^7.41.0"
 prometheus-client = ">0.7.0, <=1.0.0"
 arrow = "^1.0.0"
 pyyaml = ">=5.3.0, <7"
@@ -70,8 +70,8 @@ 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 = "^5.0.0"
 sphinx = "^7.0.0"