cognite-extractor-utils 7.5.1__py3-none-any.whl → 7.5.4__py3-none-any.whl

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/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.dist-info → cognite_extractor_utils-7.5.4.dist-info}/METADATA

@@ -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.dist-info → cognite_extractor_utils-7.5.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cognite/extractorutils/__init__.py,sha256=UC4u-ugttsnuWjP4G_NqFqLVcfMbKVb68mowVYvJXXE,739
+cognite/extractorutils/__init__.py,sha256=3EXu1PpneUoKYLLIAlPg5-z059GC1YWnFCbRNJrDfk0,739
 cognite/extractorutils/_inner_util.py,sha256=gmz6aqS7jDNsg8z4RHgJjMFohDLOMiaU4gMWBhg3xcE,1558
 cognite/extractorutils/base.py,sha256=q6NU2bPec3WOasVnnIFoh-aUJudVZWZ2R6emz3IRj8Q,16391
 cognite/extractorutils/configtools/__init__.py,sha256=YEpFGJoza23eM8Zj5DqqUj7sEstERV_QYsN6Nw4dKCg,3092
@@ -34,13 +34,13 @@ cognite/extractorutils/uploader/_metrics.py,sha256=J2LJXb19L_SLSJ_voNIQHYLp0pjxU
 cognite/extractorutils/uploader/assets.py,sha256=2E90N1kxsaA6Ah4h0_r_dTVhDYY_68ItRWrHYkkltJw,5628
 cognite/extractorutils/uploader/data_modeling.py,sha256=w35Ix5mu0Cgfn4ywnDyif4VVjo04LVTlkMEevk6ztUs,3639
 cognite/extractorutils/uploader/events.py,sha256=NZP2tMoU_rh_rb-EZiUBsOT5KdNABHN4c9Oddk0OsdE,5680
-cognite/extractorutils/uploader/files.py,sha256=9yLtqStAQuFj33Fi12zo5HJYo-HdVYop8tkAHsmhHXg,22581
+cognite/extractorutils/uploader/files.py,sha256=OYBLQXzS1HLDd_g5KrcwmwITjCVYLqXKuP0lWFrgpr0,23047
 cognite/extractorutils/uploader/raw.py,sha256=wFjF90PFTjmByOWx_Y4_YfDJ2w2jl0EQJ2Tjx2MP2PM,6738
 cognite/extractorutils/uploader/time_series.py,sha256=HBtQdsQoIOaL-EG5lMsaY-ORwVb0kGiXG86VjE5-_Bg,26815
 cognite/extractorutils/uploader_extractor.py,sha256=E-mpVvbPg_Tk90U4S9JybV0duptJ2SXE88HB6npE3zI,7732
 cognite/extractorutils/uploader_types.py,sha256=wxfrsiKPTzG5lmoYtQsxt8Xyj-s5HnaLl8WDzJNrazg,1020
 cognite/extractorutils/util.py,sha256=cFrbO8XCFT7QBs2vvOk4dWyOvaHclvsuPlrDJYFG0xA,21160
-cognite_extractor_utils-7.5.1.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-cognite_extractor_utils-7.5.1.dist-info/METADATA,sha256=9CbjaMli40Sd2X88ksrr7gx0be_bilWAY4RtOtHLa14,5649
-cognite_extractor_utils-7.5.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-cognite_extractor_utils-7.5.1.dist-info/RECORD,,
+cognite_extractor_utils-7.5.4.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+cognite_extractor_utils-7.5.4.dist-info/METADATA,sha256=ylZnUNTFglZUVhZQsiVIOg-ChKYpKO6lsfhIR2g8JsM,5649
+cognite_extractor_utils-7.5.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+cognite_extractor_utils-7.5.4.dist-info/RECORD,,