cognite-extractor-utils 7.5.1__tar.gz → 7.5.4__tar.gz

{cognite_extractor_utils-7.5.1 → cognite_extractor_utils-7.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-extractor-utils
-Version: 7.5.1
+Version: 7.5.4
 Summary: Utilities for easier development of extractors for CDF
 Home-page: https://github.com/cognitedata/python-extractor-utils
 License: Apache-2.0
@@ -19,7 +19,7 @@ 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.59.0,<8.0.0)
-Requires-Dist: croniter (>=3.0.3,<4.0.0)
+Requires-Dist: croniter (>=5.0.0,<6.0.0)
 Requires-Dist: dacite (>=1.6.0,<2.0.0)
 Requires-Dist: decorator (>=5.1.1,<6.0.0)
 Requires-Dist: httpx (>=0.27.0,<0.28.0)

{cognite_extractor_utils-7.5.1 → cognite_extractor_utils-7.5.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.5.1"
+__version__ = "7.5.4"
 from .base import Extractor

{cognite_extractor_utils-7.5.1 → cognite_extractor_utils-7.5.4}/cognite/extractorutils/uploader/files.py

@@ -25,7 +25,7 @@ from httpx import URL, Client, Headers, Request, StreamConsumed, SyncByteStream
 from requests.utils import super_len
 
 from cognite.client import CogniteClient
-from cognite.client.data_classes import FileMetadata
+from cognite.client.data_classes import FileMetadata, FileMetadataUpdate
 from cognite.client.data_classes.data_modeling import NodeId
 from cognite.client.data_classes.data_modeling.extractor_extensions.v1 import CogniteExtractorFileApply
 from cognite.client.utils._identifier import IdentifierSequence
@@ -261,13 +261,23 @@ class IOFileUploadQueue(AbstractUploadQueue):
             file_meta_response, url = self.cdf_client.files.create(
                 file_metadata=file_meta, overwrite=self.overwrite_existing
             )
-            # trigger update after creation (upsert =P)
-            basic_attributes = set(["externalId", "name"])
-            attr = set(file_meta.dump().keys())
-            diff = attr - basic_attributes
 
-            if len(diff) >= 1 and "externalId" in attr:
-                file_meta_response = self.cdf_client.files.update(file_meta)
+            # The files API for whatever reason doesn't update directory or source when you overwrite,
+            # so we need to update those later.
+            any_unchaged = (
+                file_meta_response.directory != file_meta.directory or file_meta_response.source != file_meta.source
+            )
+            if any_unchaged:
+                update = FileMetadataUpdate(external_id=file_meta.external_id)
+                any = False
+                if file_meta.source:
+                    any = True
+                    update.source.set(file_meta.source)
+                if file_meta.directory:
+                    any = True
+                    update.directory.set(file_meta.directory)
+                if any:
+                    self.cdf_client.files.update(update)
 
         return file_meta_response, url
 

{cognite_extractor_utils-7.5.1 → cognite_extractor_utils-7.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-extractor-utils"
-version = "7.5.1"
+version = "7.5.4"
 description = "Utilities for easier development of extractors for CDF"
 authors = ["Mathias Lohne <mathias.lohne@cognite.com>"]
 license = "Apache-2.0"
@@ -74,16 +74,16 @@ orjson = "^3.10.3"
 httpx = "^0.27.0"
 pydantic = "^2.8.2"
 pyhumps = "^3.8.0"
-croniter = "^3.0.3"
+croniter = "^5.0.0"
 
 [tool.poetry.extras]
 experimental = ["cognite-sdk-experimental"]
 
 [tool.poetry.group.dev.dependencies]
-mypy = "1.12.1"
+mypy = "1.13.0"
 ruff = "^0.7.0"
 pytest = "^8.0.0"
-pytest-cov = "^5.0.0"
+pytest-cov = "^6.0.0"
 sphinx = "^7.0.0"
 sphinx-rtd-theme = "^3.0.0"
 pre-commit = "^4.0.0"
@@ -94,7 +94,7 @@ parameterized = "*"
 requests = "^2.31.0"
 types-requests = "^2.31.0.20240125"
 httpx = "^0.27.0"
-faker = "^30.0.0"
+faker = "^33.0.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]