airbyte-source-shopify 2.6.7__py3-none-any.whl → 3.0.0__py3-none-any.whl

{airbyte_source_shopify-2.6.7.dist-info → airbyte_source_shopify-3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: airbyte-source-shopify
-Version: 2.6.7
+Version: 3.0.0
 Summary: Source CDK implementation for Shopify.
 License: ELv2
 Author: Airbyte

{airbyte_source_shopify-2.6.7.dist-info → airbyte_source_shopify-3.0.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ source_shopify/schemas/balance_transactions.json,sha256=RAU7duUHTWS7nI0pochhTZt5
 source_shopify/schemas/blogs.json,sha256=ciBS_3eCf4UJUaB0DPCVadeJR4W6ndq7N0JwykXp0RY,2151
 source_shopify/schemas/collections.json,sha256=2iJMCyAn_yeMKsQVt7jGR3_u3N3CA8QQ6179QvRuwqY,1889
 source_shopify/schemas/collects.json,sha256=dOX0_O7meWELWHYQG_MWqGkWLelAoiIlPtDXuxz9ig8,1173
-source_shopify/schemas/countries.json,sha256=HrDHbtuc1WHyAzKVMqllTzcYdDmPQ2kwnEwY3MjTgyg,2161
+source_shopify/schemas/countries.json,sha256=fdJPrd8tQEzzonkunm0hvMbqZeXixPaphHd3PSt8g58,1783
 source_shopify/schemas/custom_collections.json,sha256=ElDY1y_G_VFPOGr9ipU022AZDWKB2LC8n8Cb6FGF8UM,3100
 source_shopify/schemas/customer_address.json,sha256=kLKylul_xK7eO_aduvDddj078k8aQLM4JtUEpa5Tp_8,2628
 source_shopify/schemas/customer_journey_summary.json,sha256=GlZmIqFeR1x84DwgwMo28HQ8QseImkhvYxLSNRkUmwg,12733
@@ -38,32 +38,33 @@ source_shopify/schemas/metafield_smart_collections.json,sha256=uk25Bxu5tATE5Cweo
 source_shopify/schemas/order_agreements.json,sha256=LywW-Nyynoutitxtj4PukVNmaDknU0GAu4yxa0XQ56U,6821
 source_shopify/schemas/order_refunds.json,sha256=TRja1SGCFYyf--T_M3-JGG0EnwwH50hwzH-RzbQ4tjY,26296
 source_shopify/schemas/order_risks.json,sha256=6gK26TewYqT2KfF7rvMTEQODstom2SS0ViHNJESuB8k,10425
-source_shopify/schemas/orders.json,sha256=DbipJlJqW2lzuGF2ce4JLRa4H491kVVAWBsoh8YcV50,103922
+source_shopify/schemas/orders.json,sha256=SxX6fDtMnEkvm-58uNgaoF47Ep8DIwLpXK09C2MSNA0,105169
 source_shopify/schemas/pages.json,sha256=J7jxtk2nE_q-0oHmGz8orFq3EfSjJqUvF6qPJtiZCrg,2093
 source_shopify/schemas/price_rules.json,sha256=aZ-Re9Oc9g0ci8SPn0_ufvKPsGDBcTaXHVsq_9-Ygq4,7004
 source_shopify/schemas/product_images.json,sha256=0l3ACfOfnXz8N8oMHwvvfZUFKeeuZ2DlRRu5-FxUhaI,1760
-source_shopify/schemas/product_variants.json,sha256=gEX-ZjfE95zJndX6MfmImCg499vYh97t7OWD5EQPHF0,8267
+source_shopify/schemas/product_variants.json,sha256=hBtmB-OyVlmkQacY0s7Mpe-bMdYjx8mpwMqcGwN05kA,8121
 source_shopify/schemas/products.json,sha256=n7m1ndEnAM7Pee5ca0JZWCl5Y0VffGmTZjqjHhiht1I,22609
+source_shopify/schemas/profile_location_groups.json,sha256=2_QdfMeM_WNDT-06fQfFUHXjN9D6ndKIGcviJxEl8kM,189
 source_shopify/schemas/shop.json,sha256=vEGiTvEYX7qnMq06MRVBycqih49h49xjTNC6gJuxTWs,8137
 source_shopify/schemas/smart_collections.json,sha256=kv7dINsvgzJ0RyKfFNKjU0apdNDXwQaHfnNZfQsshcU,2009
 source_shopify/schemas/tender_transactions.json,sha256=U8fdT-eflycEPzYSpBDiB0lp9wxmJHgioHTrICflh78,2006
 source_shopify/schemas/transactions.json,sha256=vbwscH3UcAtbSsC70mBka4oNaFR4S3S6IFBmzR7t37U,10226
-source_shopify/scopes.py,sha256=UVDERXNismYSnRaXwUXcn8x7Z6EtoNKOHts0Vs_Kl2I,6443
+source_shopify/scopes.py,sha256=N0njfMHn3Q1AQXuTj5VfjQOio10jaDarpC_oLYnWvqc,6490
 source_shopify/shopify_graphql/bulk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 source_shopify/shopify_graphql/bulk/exceptions.py,sha256=4dj7Za4xIfwL-zf8joT9svF_RSoGlE3GviMiIl1e1rs,2532
-source_shopify/shopify_graphql/bulk/job.py,sha256=_GL2WXK23yJjYcnOzuiBgpBxvng3RF_ezPhl265puz4,27635
-source_shopify/shopify_graphql/bulk/query.py,sha256=jWALChkDaQ1upglE-qwv-gBCGXKjWK8vWup-o61DlB4,123798
+source_shopify/shopify_graphql/bulk/job.py,sha256=0a3els2a5Fea-o30rkotq7yoPx56c481zwpZzxDajEw,27832
+source_shopify/shopify_graphql/bulk/query.py,sha256=vo_ZryWIOaMYP0ZmEnL3KSPQJRD2cHuWG2lhYeg7f8c,130977
 source_shopify/shopify_graphql/bulk/record.py,sha256=X6VGngugv7a_S8UEeDo121BkdCVLj5nWlHK76A21kyo,16898
 source_shopify/shopify_graphql/bulk/retry.py,sha256=R5rSJJE8D5zcj6mN-OmmNO2aFZEIdjAlWclDDVW5KPI,2626
 source_shopify/shopify_graphql/bulk/status.py,sha256=RmuQ2XsYL3iRCpVGxea9F1wXGmbwasDCSXjaTyL4LMA,328
 source_shopify/shopify_graphql/bulk/tools.py,sha256=nUQ2ZmPTKJNJdfLToR6KJtLKcJFCChSifkAOvwg0Vss,4065
-source_shopify/source.py,sha256=WmtSMHMop9NvREj0VUR6P8qWYWyv21y6rFk42bPBzAo,8445
+source_shopify/source.py,sha256=txb3wIm-3xXd8-5QLSeu2TeHBSnppwy5PEIOEl40mVw,8517
 source_shopify/spec.json,sha256=ITYWiQ-NrI5VISk5qmUQhp9ChUE2FV18d8xzVzPwvAg,6144
-source_shopify/streams/base_streams.py,sha256=-Yww6tSot5xG4MSwSK2JWHjR3DDFYM9q5Lw3GAKDNsc,40491
-source_shopify/streams/streams.py,sha256=UoWe89U5xfM2jdgCpWqRv5S4tXGM7GTMU0gq8nCr9oU,9618
+source_shopify/streams/base_streams.py,sha256=FFIpHd5_-Z61W_jUucdr8D2MzUete1Y2E50bQDCLakE,41555
+source_shopify/streams/streams.py,sha256=8LkM-SRhbGX2MwfHsjcWY62Z6g0jKZ0QfcS4B-vKPoM,13882
 source_shopify/transform.py,sha256=mn0htL812_90zc_YszGQa0hHcIZQpYYdmk8IqpZm5TI,4685
 source_shopify/utils.py,sha256=CAEKcxIroBo6kRFCyvC1bfOyfbGy7Z7seqZB7Eekl44,14209
-airbyte_source_shopify-2.6.7.dist-info/METADATA,sha256=Dv_Lf_jP4uhetiy79atzdQ4zTWfWBUH46NyAo9pyfng,5309
-airbyte_source_shopify-2.6.7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-airbyte_source_shopify-2.6.7.dist-info/entry_points.txt,sha256=SyTwKSsPk9MCdPf01saWpnp8hcmZOgBssVcSIvMbBeQ,57
-airbyte_source_shopify-2.6.7.dist-info/RECORD,,
+airbyte_source_shopify-3.0.0.dist-info/METADATA,sha256=gpaUrJ35t5g2NxtE9jVYCJsx2lSzzjL7Xf_tTB_B-AQ,5309
+airbyte_source_shopify-3.0.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+airbyte_source_shopify-3.0.0.dist-info/entry_points.txt,sha256=SyTwKSsPk9MCdPf01saWpnp8hcmZOgBssVcSIvMbBeQ,57
+airbyte_source_shopify-3.0.0.dist-info/RECORD,,

source_shopify/schemas/countries.json

@@ -36,31 +36,19 @@
             "description": "Name of the province.",
             "type": ["null", "string"]
           },
-          "tax": {
-            "description": "Tax information for the province.",
-            "type": ["null", "number"]
-          },
-          "tax_name": {
-            "description": "Name of the tax applicable for the province.",
-            "type": ["null", "string"]
-          },
-          "tax_type": {
-            "description": "Type of tax (e.g., sales tax, VAT) applicable in the province.",
+          "translated_name": {
+            "description": "Translated name of the province.",
             "type": ["null", "string"]
-          },
-          "tax_percentage": {
-            "description": "Percentage value of tax applicable in the province.",
-            "type": ["null", "number"]
           }
         }
       }
     },
-    "tax": {
-      "description": "Overall tax information for the country.",
-      "type": ["null", "number"]
+    "rest_of_world": {
+      "description": "Whether the country in a catch-all group of countries that are not individually listed or assigned to any specific zone or market.",
+      "type": ["null", "boolean"]
     },
-    "tax_name": {
-      "description": "Name of the tax applicable for the country.",
+    "translated_name": {
+      "description": "Translated name of the country",
       "type": ["null", "string"]
     },
     "shop_url": {

source_shopify/schemas/orders.json

@@ -259,6 +259,10 @@
       "description": "The ID of the device used to place the order",
       "type": ["null", "string"]
     },
+    "duties_included": {
+      "description": "Whether duties included in the subtotal price of the order.",
+      "type": ["null", "boolean"]
+    },
     "discount_applications": {
       "type": ["null", "array"],
       "items": {
@@ -340,6 +344,10 @@
       "description": "The app ID of the merchant of record",
       "type": ["null", "string"]
     },
+    "merchant_business_entity_id": {
+      "description": "The business entity ID of the merchant of record.",
+      "type": ["null", "string"]
+    },
     "name": {
       "description": "The name of the order",
       "type": ["null", "string"]
@@ -418,6 +426,36 @@
       "description": "The terms of payment for the order",
       "type": ["null", "string"]
     },
+    "total_cash_rounding_payment_adjustment_set": {
+      "description": "The money set that represents the amount adjusted on the order total due to cash rounding.",
+      "type": ["null", "object"],
+      "properties": {
+        "presentment_money": {
+          "description": "The amount in the customer's presentment currency.",
+          "type": ["null", "object"],
+          "properties": {
+            "amount": {
+              "type": ["null", "string"]
+            },
+            "currency_code": {
+              "type": ["null", "string"]
+            }
+          }
+        },
+        "shop_money": {
+          "description": "The amount in the shop's local currency.",
+          "type": ["null", "object"],
+          "properties": {
+            "amount": {
+              "type": ["null", "string"]
+            },
+            "currency_code": {
+              "type": ["null", "string"]
+            }
+          }
+        }
+      }
+    },
     "phone": {
       "description": "The phone number of the customer",
       "type": ["null", "string"]

source_shopify/schemas/product_variants.json

@@ -34,14 +34,6 @@
       "description": "The original price of the variant before any discount",
       "type": ["null", "string"]
     },
-    "fulfillment_service": {
-      "description": "The fulfillment service for the variant",
-      "type": ["null", "string"]
-    },
-    "inventory_management": {
-      "description": "The method used to manage inventory for the variant",
-      "type": ["null", "string"]
-    },
     "option1": {
       "description": "The value for option 1 of the variant",
       "type": ["null", "string"]
@@ -236,6 +228,10 @@
     "tax_code": {
       "description": "The tax code for the product variant.",
       "type": ["null", "string"]
+    },
+    "tracked": {
+      "description": "Whether inventory levels are tracked for the item.",
+      "type": ["null", "boolean"]
     }
   }
 }

source_shopify/schemas/profile_location_groups.json

@@ -0,0 +1,10 @@
+{
+  "type": ["null", "object"],
+  "additionalProperties": true,
+  "properties": {
+    "id": {
+      "description": "ID of the location group.",
+      "type": ["null", "string"]
+    }
+  }
+}

source_shopify/scopes.py

@@ -72,12 +72,13 @@ SCOPES_MAPPING: Mapping[str, set[str]] = {
     "MetafieldArticles": ("read_online_store_pages",),
     "Blogs": ("read_online_store_pages",),
     "MetafieldBlogs": ("read_online_store_pages",),
+    # SCOPE: read_shipping
+    "Countries": ("read_shipping",),
 }
 
 ALWAYS_PERMITTED_STREAMS: List[str] = [
     "MetafieldShops",
     "Shop",
-    "Countries",
 ]
 
 

source_shopify/shopify_graphql/bulk/job.py

@@ -4,6 +4,7 @@
 
 from dataclasses import dataclass, field
 from datetime import datetime
+from enum import Enum
 from time import sleep, time
 from typing import Any, Final, Iterable, List, Mapping, Optional
 
@@ -23,6 +24,16 @@ from .status import ShopifyBulkJobStatus
 from .tools import END_OF_FILE, BulkTools
 
 
+class BulkOperationUserErrorCode(Enum):
+    """
+    Possible error codes that can be returned by BulkOperationUserError.
+    https://shopify.dev/docs/api/admin-graphql/latest/enums/BulkOperationUserErrorCode
+    """
+
+    INVALID = "INVALID"
+    OPERATION_IN_PROGRESS = "OPERATION_IN_PROGRESS"
+
+
 @dataclass
 class ShopifyBulkManager:
     http_client: HttpClient
@@ -246,8 +257,7 @@ class ShopifyBulkManager:
         _, canceled_response = self.http_client.send_request(
             http_method="POST",
             url=self.base_url,
-            data=ShopifyBulkTemplates.cancel(self._job_id),
-            headers={"Content-Type": "application/graphql"},
+            json={"query": ShopifyBulkTemplates.cancel(self._job_id)},
             request_kwargs={},
         )
         # mark the job was self-canceled
@@ -405,8 +415,7 @@ class ShopifyBulkManager:
         _, response = self.http_client.send_request(
             http_method="POST",
             url=self.base_url,
-            data=ShopifyBulkTemplates.status(self._job_id),
-            headers={"Content-Type": "application/graphql"},
+            json={"query": ShopifyBulkTemplates.status(self._job_id)},
             request_kwargs={},
         )
         self._job_healthcheck(response)
@@ -419,18 +428,17 @@ class ShopifyBulkManager:
         Error example:
         [
             {
+                'code': 'OPERATION_IN_PROGRESS',
                 'field': None,
                 'message': 'A bulk query operation for this app and shop is already in progress: gid://shopify/BulkOperation/4039184154813.',
             }
         ]
         """
-
-        concurrent_job_pattern = "A bulk query operation for this app and shop is already in progress"
         # the errors are handled in `job_job_check_for_errors`
         if errors:
             for error in errors:
-                message = error.get("message", "") if isinstance(error, dict) else ""
-                if concurrent_job_pattern in message:
+                error_code = error.get("code", "") if isinstance(error, dict) else ""
+                if error_code == BulkOperationUserErrorCode.OPERATION_IN_PROGRESS.value:
                     return True
         return False
 

source_shopify/shopify_graphql/bulk/query.py

@@ -11,6 +11,7 @@ from typing import Any, Iterable, List, Mapping, MutableMapping, Optional, Union
 
 from attr import dataclass
 from graphql_query import Argument, Field, InlineFragment, Operation, Query
+from setuptools.command.alias import alias
 
 from .tools import BULK_PARENT_KEY, BulkTools
 
@@ -68,6 +69,7 @@ class ShopifyBulkTemplates:
                         createdAt
                     }
                     userErrors {
+                        code
                         field
                         message
                     }
@@ -2652,7 +2654,15 @@ class ProductVariant(ShopifyBulkQuery):
             Field(name="src", alias="image_src"),
             Field(name="url", alias="image_url"),
         ]
-
+        measurement_fields = [
+            Field(name="weight", fields=["value", "unit"]),
+        ]
+        inventory_item_fields = [
+            Field(name="id", alias="inventory_item_id"),
+            Field(name="tracked", alias="tracked"),
+            Field(name="requiresShipping", alias="requires_shipping"),
+            Field(name="measurement", alias="measurement", fields=measurement_fields),
+        ]
         query_nodes: List[Field] = [
             "__typename",
             "id",
@@ -2662,25 +2672,19 @@ class ProductVariant(ShopifyBulkQuery):
             "position",
             "inventoryPolicy",
             "compareAtPrice",
-            "inventoryManagement",
             "createdAt",
             "updatedAt",
             "taxable",
             "barcode",
-            "weight",
-            "weightUnit",
             "inventoryQuantity",
-            "requiresShipping",
             "availableForSale",
             "displayName",
             "taxCode",
             Field(name="selectedOptions", alias="options", fields=option_fields),
-            Field(name="weight", alias="grams"),
             Field(name="image", fields=image_fields),
             Field(name="inventoryQuantity", alias="old_inventory_quantity"),
             Field(name="product", fields=[Field(name="id", alias="product_id")]),
-            Field(name="fulfillmentService", fields=[Field(name="handle", alias="fulfillment_service")]),
-            Field(name="inventoryItem", fields=[Field(name="id", alias="inventory_item_id")]),
+            Field(name="inventoryItem", fields=inventory_item_fields),
         ] + presentment_prices
 
         return query_nodes
@@ -2741,17 +2745,21 @@ class ProductVariant(ShopifyBulkQuery):
         # unnest mandatory fields from their placeholders
         record["product_id"] = self._unnest_and_resolve_id(record, "product", "product_id")
         record["inventory_item_id"] = self._unnest_and_resolve_id(record, "inventoryItem", "inventory_item_id")
+        inventory_item = record.get("inventoryItem")
+        measurement_weight = record.get("inventoryItem", {}).get("measurement", {}).get("weight")
+        record["weight"] = measurement_weight.get("value") if measurement_weight.get("value") else 0.0
+        record["weight_unit"] = measurement_weight.get("unit") if measurement_weight else None
+        record["tracked"] = inventory_item.get("tracked") if inventory_item else None
+        record["requires_shipping"] = inventory_item.get("requires_shipping") if inventory_item else None
         record["image_id"] = self._unnest_and_resolve_id(record, "image", "image_id")
         image = record.get("image", {})
         record["image_src"] = image.get("image_src") if image else None
         record["image_url"] = image.get("image_url") if image else None
-        # unnest `fulfillment_service` from `fulfillmentService`
-        record["fulfillment_service"] = record.get("fulfillmentService", {}).get("fulfillment_service")
         # cast the `price` to number, could be literally `None`
         price = record.get("price")
         record["price"] = float(price) if price else None
         # cast the `grams` to integer
-        record["grams"] = int(record.get("grams", 0))
+        record["grams"] = int(record.get("weight", 0))
         # convert date-time cursors
         record["createdAt"] = self.tools.from_iso8601_to_rfc3339(record, "createdAt")
         record["updatedAt"] = self.tools.from_iso8601_to_rfc3339(record, "updatedAt")
@@ -3193,3 +3201,175 @@ class OrderAgreement(ShopifyBulkQuery):
         record["agreements"] = agreements_with_sales if agreements_with_sales else {}
 
         yield record
+
+
+class DeliveryZoneList:
+    query_name = "deliveryProfiles"
+    operation_name = "DeliveryZoneList"
+    operation_type = "query"
+
+    query_nodes: List[str] = []
+
+    page_size = 100
+
+    def resolve(self, query: Query) -> str:
+        # return the constructed query operation
+        return Operation(type=self.operation_type, name=self.operation_name, queries=[query]).render()
+
+    def build(self, name: str, query_args: Mapping[str, Any] = None) -> Query:
+        arguments = [Argument(name="first", value=self.page_size)]
+
+        if query_args:
+            if query_args.get("cursor"):
+                cursor = '"' + query_args["cursor"] + '"'
+                arguments.append(Argument(name="after", value=cursor))
+
+        query = Query(name=name, arguments=arguments, fields=self.query_nodes)
+        # return constructed query
+        return query
+
+    def query(self, query_args: Mapping[str, Any] = None) -> Query:
+        return self.build(self.query_name, query_args)
+
+    def get(self, query_args: Mapping[str, Any] = None) -> str:
+        query: Query = self.query(query_args)
+        return self.resolve(query)
+
+
+class ProfileLocationGroups(ShopifyBulkQuery):
+    query_name = "deliveryProfiles"
+    filter_field = None
+
+    record_composition = {"new_record": "DeliveryProfile"}
+
+    query_nodes: List[Field] = [
+        "__typename",
+        Field(
+            name="profileLocationGroups",
+            fields=[Field(name="locationGroup", fields=["id"])],
+        ),
+    ]
+
+
+class DeliveryProfile(DeliveryZoneList):
+    """
+        query DeliveryZoneList {
+      deliveryProfiles(
+        first: 1
+      ) {
+        pageInfo {
+          hasNextPage
+          endCursor
+        }
+        nodes {
+          profileLocationGroups(
+            locationGroupId: "<locationGroupId>"
+          ) {
+            locationGroupZones(
+              first: 100
+            ) {
+              nodes {
+                zone {
+                  id
+                  name
+                  countries {
+                    id
+                    name
+                    translatedName
+                    code {
+                      countryCode
+                      restOfWorld
+                    }
+                    provinces {
+                      id
+                      translatedName
+                      name
+                      code
+                    }
+                  }
+                }
+              }
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
+            }
+          }
+        }
+      }
+    }
+    """
+
+    page_size = 1
+    sub_page_size = 100
+
+    def __init__(self, location_group_id: str, location_group_zones_cursor: str = None):
+        self.location_group_id = location_group_id
+        self.location_group_zones_cursor = location_group_zones_cursor
+
+    @property
+    def query_nodes(self) -> Optional[Union[List[Field], List[str]]]:
+        location_group_id = '"' + self.location_group_id + '"'
+        location_group_zones_arguments = [Argument(name="first", value=self.sub_page_size)]
+        if self.location_group_zones_cursor:
+            cursor = '"' + self.location_group_zones_cursor + '"'
+            location_group_zones_arguments.append(Argument(name="after", value=cursor))
+
+        query_nodes: List[Field] = [
+            Field(name="pageInfo", fields=["hasNextPage", "endCursor"]),
+            Field(
+                name="nodes",
+                fields=[
+                    Field(
+                        name="profileLocationGroups",
+                        arguments=[Argument(name="locationGroupId", value=location_group_id)],
+                        fields=[
+                            Field(
+                                name="locationGroupZones",
+                                arguments=location_group_zones_arguments,
+                                fields=[
+                                    Field(
+                                        name="nodes",
+                                        fields=[
+                                            Field(
+                                                name="zone",
+                                                fields=[
+                                                    "id",
+                                                    "name",
+                                                    Field(
+                                                        name="countries",
+                                                        fields=[
+                                                            "id",
+                                                            "name",
+                                                            Field(name="translatedName", alias="translated_name"),
+                                                            Field(
+                                                                name="code",
+                                                                fields=[
+                                                                    Field(name="countryCode", alias="country_code"),
+                                                                    Field(name="restOfWorld", alias="rest_of_world"),
+                                                                ],
+                                                            ),
+                                                            Field(
+                                                                name="provinces",
+                                                                fields=[
+                                                                    "id",
+                                                                    "name",
+                                                                    "code",
+                                                                    Field(name="translatedName", alias="translated_name"),
+                                                                ],
+                                                            ),
+                                                        ],
+                                                    ),
+                                                ],
+                                            )
+                                        ],
+                                    ),
+                                    Field(name="pageInfo", fields=["hasNextPage", "endCursor"]),
+                                ],
+                            ),
+                        ],
+                    ),
+                ],
+            ),
+        ]
+        return query_nodes

source_shopify/source.py

@@ -57,6 +57,7 @@ from .streams.streams import (
     ProductImages,
     Products,
     ProductVariants,
+    ProfileLocationGroups,
     Shop,
     SmartCollections,
     TenderTransactions,
@@ -216,7 +217,7 @@ class SourceShopify(AbstractSource):
             TenderTransactions(config),
             self.select_transactions_stream(config),
             CustomerAddress(config),
-            Countries(config),
+            Countries(config=config, parent=ProfileLocationGroups(config)),
         ]
 
         return [

source_shopify/streams/base_streams.py

@@ -15,10 +15,10 @@ import requests
 from requests.exceptions import RequestException
 from source_shopify.http_request import ShopifyErrorHandler
 from source_shopify.shopify_graphql.bulk.job import ShopifyBulkManager
-from source_shopify.shopify_graphql.bulk.query import ShopifyBulkQuery
+from source_shopify.shopify_graphql.bulk.query import DeliveryZoneList, ShopifyBulkQuery
 from source_shopify.transform import DataTypeEnforcer
+from source_shopify.utils import ApiTypeEnum, ShopifyNonRetryableErrors
 from source_shopify.utils import EagerlyCachedStreamState as stream_state_cache
-from source_shopify.utils import ShopifyNonRetryableErrors
 from source_shopify.utils import ShopifyRateLimiter as limiter
 
 from airbyte_cdk.models import SyncMode
@@ -33,7 +33,7 @@ class ShopifyStream(HttpStream, ABC):
     logger = logging.getLogger("airbyte")
 
     # Latest Stable Release
-    api_version = "2024-04"
+    api_version = "2025-01"
     # Page size
     limit = 250
 
@@ -89,7 +89,7 @@ class ShopifyStream(HttpStream, ABC):
                 records = json_response.get(self.data_field, []) if self.data_field is not None else json_response
                 yield from self.produce_records(records)
             except RequestException as e:
-                self.logger.warning(f"Unexpected error in `parse_ersponse`: {e}, the actual response data: {response.text}")
+                self.logger.warning(f"Unexpected error in `parse_response`: {e}, the actual response data: {response.text}")
                 yield {}
 
     def produce_records(
@@ -855,3 +855,29 @@ class IncrementalShopifyGraphQlBulkStream(IncrementalShopifyStream):
         yield from self.filter_records_newer_than_state(stream_state, self.sort_output_asc(records))
         # add log message about the checkpoint value
         self.emit_checkpoint_message()
+
+
+class FullRefreshShopifyGraphQlBulkStream(ShopifyStream):
+    data_field = "graphql"
+    http_method = "POST"
+
+    query: DeliveryZoneList
+    response_field: str
+
+    def request_body_json(
+        self,
+        stream_state: Optional[Mapping[str, Any]],
+        stream_slice: Optional[Mapping[str, Any]] = None,
+        next_page_token: Optional[Mapping[str, Any]] = None,
+    ) -> Optional[Mapping[str, Any]]:
+        return {"query": self.query().get()}
+
+    @limiter.balance_rate_limit(api_type=ApiTypeEnum.graphql.value)
+    def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]:
+        if response.status_code is requests.codes.OK:
+            try:
+                json_response = response.json().get("data", {}).get(self.response_field, {}).get("nodes", [])
+                yield from json_response
+            except RequestException as e:
+                self.logger.warning(f"Unexpected error in `parse_response`: {e}, the actual response data: {response.text}")
+                yield {}

source_shopify/streams/streams.py

@@ -3,12 +3,14 @@
 #
 
 
-from typing import Any, Mapping, MutableMapping
+from typing import Any, Iterable, Mapping, MutableMapping, Optional
 
+import requests
 from source_shopify.shopify_graphql.bulk.query import (
     Collection,
     CustomerAddresses,
     CustomerJourney,
+    DeliveryProfile,
     DiscountCode,
     FulfillmentOrder,
     InventoryItem,
@@ -26,13 +28,16 @@ from source_shopify.shopify_graphql.bulk.query import (
     Product,
     ProductImage,
     ProductVariant,
+    ProfileLocationGroups,
     Transaction,
 )
 
+from airbyte_cdk import HttpSubStream
 from airbyte_cdk.sources.streams.core import package_name_from_class
 from airbyte_cdk.sources.utils.schema_helpers import ResourceSchemaLoader
 
 from .base_streams import (
+    FullRefreshShopifyGraphQlBulkStream,
     IncrementalShopifyGraphQlBulkStream,
     IncrementalShopifyNestedStream,
     IncrementalShopifyStream,
@@ -327,5 +332,90 @@ class CustomerAddress(IncrementalShopifyGraphQlBulkStream):
     cursor_field = "id"
 
 
-class Countries(ShopifyStream):
-    data_field = "countries"
+class ProfileLocationGroups(IncrementalShopifyGraphQlBulkStream):
+    bulk_query: ProfileLocationGroups = ProfileLocationGroups
+    filter_field = None
+
+
+class Countries(HttpSubStream, FullRefreshShopifyGraphQlBulkStream):
+    # https://shopify.dev/docs/api/admin-graphql/latest/queries/deliveryProfiles
+    _page_cursor = None
+    _sub_page_cursor = None
+
+    _synced_countries_ids = []
+
+    query = DeliveryProfile
+    response_field = "deliveryProfiles"
+
+    def next_page_token(self, response: requests.Response) -> Optional[Mapping[str, Any]]:
+        json_response = response.json().get("data", {})
+        if not json_response:
+            return None
+
+        page_info = json_response.get("deliveryProfiles", {}).get("pageInfo", {})
+
+        sub_page_info = {"hasNextPage": False}
+        # only one top page in query
+        delivery_profiles_nodes = json_response.get("deliveryProfiles", {}).get("nodes")
+        if delivery_profiles_nodes:
+            profile_location_groups = delivery_profiles_nodes[0].get("profileLocationGroups")
+            if profile_location_groups:
+                sub_page_info = (
+                    # only first one
+                    profile_location_groups[0].get("locationGroupZones", {}).get("pageInfo", {})
+                )
+
+        if not sub_page_info["hasNextPage"] and not page_info["hasNextPage"]:
+            return None
+        if sub_page_info["hasNextPage"]:
+            # The cursor to retrieve nodes after in the connection. Typically, you should pass the endCursor of the previous page as after.
+            self._sub_page_cursor = sub_page_info["endCursor"]
+        if page_info["hasNextPage"] and not sub_page_info["hasNextPage"]:
+            # The cursor to retrieve nodes after in the connection. Typically, you should pass the endCursor of the previous page as after.
+            self._page_cursor = page_info["endCursor"]
+            self._sub_page_cursor = None
+
+        return {
+            "cursor": self._page_cursor,
+            "sub_cursor": self._sub_page_cursor,
+        }
+
+    def request_body_json(
+        self,
+        stream_state: Optional[Mapping[str, Any]],
+        stream_slice: Optional[Mapping[str, Any]] = None,
+        next_page_token: Optional[Mapping[str, Any]] = None,
+    ) -> Optional[Mapping[str, Any]]:
+        location_group_id = stream_slice["parent"]["profile_location_groups"][0]["locationGroup"]["id"]
+        return {
+            "query": self.query(location_group_id=location_group_id, location_group_zones_cursor=self._sub_page_cursor).get(
+                query_args={
+                    "cursor": self._page_cursor,
+                }
+            ),
+        }
+
+    def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]:
+        # TODO: to refactor this using functools + partial, see comment https://github.com/airbytehq/airbyte/pull/55823#discussion_r2016335672
+        for node in super().parse_response(response, **kwargs):
+            for location_group in node.get("profileLocationGroups", []):
+                for location_group_zone in location_group.get("locationGroupZones", {}).get("nodes", []):
+                    for country in location_group_zone.get("zone", {}).get("countries"):
+                        country = self._process_country(country)
+                        if country["id"] not in self._synced_countries_ids:
+                            self._synced_countries_ids.append(country["id"])
+                            yield country
+
+    def _process_country(self, country: Mapping[str, Any]) -> Mapping[str, Any]:
+        country["id"] = int(country["id"].split("/")[-1])
+
+        for province in country.get("provinces", []):
+            province["id"] = int(province["id"].split("/")[-1])
+            province["country_id"] = country["id"]
+
+        if country.get("code"):
+            country["rest_of_world"] = country["code"]["rest_of_world"] if country["code"].get("rest_of_world") is not None else "*"
+            country["code"] = country["code"]["country_code"] if country["code"].get("country_code") is not None else "*"
+
+        country["shop_url"] = self.config["shop"]
+        return country