airbyte-source-shopify 4.2.3__tar.gz → 4.2.4__tar.gz

{airbyte_source_shopify-4.2.3 → airbyte_source_shopify-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-source-shopify
-Version: 4.2.3
+Version: 4.2.4
 Summary: Source CDK implementation for Shopify.
 Home-page: https://airbyte.com
 License: ELv2

{airbyte_source_shopify-4.2.3 → airbyte_source_shopify-4.2.4}/pyproject.toml

@@ -3,7 +3,7 @@ requires = [ "poetry-core>=1.0.0",]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-version = "4.2.3"
+version = "4.2.4"
 name = "airbyte-source-shopify"
 description = "Source CDK implementation for Shopify."
 authors = [ "Airbyte <contact@airbyte.io>",]

{airbyte_source_shopify-4.2.3 → airbyte_source_shopify-4.2.4}/source_shopify/shopify_graphql/bulk/job.py

@@ -600,6 +600,20 @@ class ShopifyBulkManager:
         step = self._job_size if self._job_size else self._job_size_min
         return slice_start.add(days=step)
 
+    def _checkpoint_cursor_within_slice(
+        self,
+        slice_start: datetime,
+        checkpointed_cursor: Optional[str | int],
+        filter_checkpointed_cursor: Optional[str],
+    ) -> bool:
+        if not checkpointed_cursor:
+            return False
+        if isinstance(checkpointed_cursor, str):
+            return pdm.parse(checkpointed_cursor) > slice_start
+        if isinstance(checkpointed_cursor, int):
+            return bool(filter_checkpointed_cursor) and pdm.parse(filter_checkpointed_cursor) > slice_start
+        return False
+
     def _adjust_slice_end(
         self, slice_end: datetime, checkpointed_cursor: Optional[str] = None, filter_checkpointed_cursor: Optional[str] = None
     ) -> datetime:
@@ -645,12 +659,18 @@ class ShopifyBulkManager:
             checkpoint_from_self_cancel = self._job_checkpoint_from_self_cancel
             # set the checkpointing to default, before the next slice is emitted, to avoid inf.loop
             self._reset_checkpointing()
-            if checkpoint_from_failed_job and not checkpointed_cursor:
-                # the partial result has no records to resume from, the rest of the slice must not be skipped
-                self._raise_job_without_result("exited with FAILED and its partial result has no records to checkpoint from")
-            if checkpoint_from_self_cancel and not checkpointed_cursor:
-                # the result has no records to resume from, the slice is re-run with the checkpointing disabled
-                self._disable_checkpointing("but its result has no records to checkpoint from")
+            if checkpoint_from_failed_job and not self._checkpoint_cursor_within_slice(
+                slice_start, checkpointed_cursor, filter_checkpointed_cursor
+            ):
+                # the partial result has no records within the current slice to resume from, the rest of the slice must not be skipped
+                self._raise_job_without_result(
+                    "exited with FAILED and its partial result has no records within the slice to checkpoint from"
+                )
+            if checkpoint_from_self_cancel and not self._checkpoint_cursor_within_slice(
+                slice_start, checkpointed_cursor, filter_checkpointed_cursor
+            ):
+                # the result has no records within the current slice to resume from, the slice is re-run with the checkpointing disabled
+                self._disable_checkpointing("but its result has no records within the slice to checkpoint from")
                 return slice_start
             return self._adjust_slice_end(slice_end, checkpointed_cursor, filter_checkpointed_cursor)