airbyte-source-shopify 4.3.0__tar.gz → 4.3.2__tar.gz

{airbyte_source_shopify-4.3.0 → airbyte_source_shopify-4.3.2}/PKG-INFO

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

{airbyte_source_shopify-4.3.0 → airbyte_source_shopify-4.3.2}/pyproject.toml

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

{airbyte_source_shopify-4.3.0 → airbyte_source_shopify-4.3.2}/source_shopify/http_request.py

@@ -1,12 +1,13 @@
 # Copyright (c) 2024 Airbyte, Inc., all rights reserved.
 
+import re
 from typing import Optional, Union
 
 import requests
 from requests import exceptions
 
 from airbyte_cdk.models import FailureType
-from airbyte_cdk.sources.streams.http.error_handlers import ErrorHandler, ErrorResolution, ResponseAction
+from airbyte_cdk.sources.streams.http.error_handlers import ErrorHandler, ErrorResolution, HttpStatusErrorHandler, ResponseAction
 
 
 RESPONSE_CONSUMPTION_EXCEPTIONS = (
@@ -26,6 +27,26 @@ TRANSIENT_EXCEPTIONS = (
 _NO_ERROR_RESOLUTION = ErrorResolution(ResponseAction.SUCCESS, None, None)
 
 
+class ShopifyConnectionCheckErrorHandler(HttpStatusErrorHandler):
+    def interpret_response(self, response: Optional[Union[requests.Response, Exception]]) -> ErrorResolution:
+        if isinstance(response, requests.Response):
+            if response.status_code == 401:
+                return ErrorResolution(
+                    ResponseAction.FAIL,
+                    FailureType.config_error,
+                    "Shopify authentication failed: the access token is invalid or revoked. Re-authenticate the source or regenerate the Admin API access token.",
+                )
+            if response.status_code == 403:
+                scopes = sorted(set(re.findall(r"\b(?:read|write)_[a-z_]+\b", response.text)))
+                required = f" ({', '.join(scopes)})" if scopes else ""
+                return ErrorResolution(
+                    ResponseAction.FAIL,
+                    FailureType.config_error,
+                    f"Shopify access is denied. Grant the app the required access scopes{required}, then re-authorize the source or regenerate the Admin API access token.",
+                )
+        return super().interpret_response(response)
+
+
 class ShopifyErrorHandler(ErrorHandler):
     def __init__(self, stream_name: str = "<no specified stream>") -> None:
         self._stream_name = stream_name

{airbyte_source_shopify-4.3.0 → airbyte_source_shopify-4.3.2}/source_shopify/source.py

@@ -13,10 +13,12 @@ from requests.exceptions import ConnectionError, RequestException, SSLError
 from airbyte_cdk.models import FailureType, SyncMode
 from airbyte_cdk.sources import AbstractSource
 from airbyte_cdk.sources.streams import Stream
+from airbyte_cdk.sources.streams.http.error_handlers.default_error_mapping import DEFAULT_ERROR_MAPPING
 from airbyte_cdk.sources.streams.http.exceptions import BaseBackoffException
 from airbyte_cdk.utils import AirbyteTracedException
 
 from .auth import MissingAccessTokenError, ShopifyAuthenticator
+from .http_request import ShopifyConnectionCheckErrorHandler
 from .scopes import ShopifyScopes
 from .streams.streams import (
     AbandonedCheckouts,
@@ -71,7 +73,7 @@ from .streams.streams import (
     Transactions,
     TransactionsGraphql,
 )
-from .utils import ShopifyWrongShopNameError
+from .utils import ShopifyNonRetryableErrors, ShopifyWrongShopNameError
 
 
 class ConnectionCheckTest:
@@ -79,6 +81,9 @@ class ConnectionCheckTest:
         self.config = config
         # use `Shop` as a test stream for connection check
         self.test_stream = Shop(self.config)
+        self.test_stream._http_client._error_handler = ShopifyConnectionCheckErrorHandler(
+            self.test_stream.logger, error_mapping=DEFAULT_ERROR_MAPPING | ShopifyNonRetryableErrors(self.test_stream.name)
+        )
         # setting `max_retries` to 0 for the stage of `check connection`,
         # because it keeps retrying for wrong shop names,
         # but it should stop immediately
@@ -115,7 +120,11 @@ class ConnectionCheckTest:
             return False, self.describe_error("index_error", shop_name, response)
         except MissingAccessTokenError:
             return False, self.describe_error("missing_token_error")
-        except (BaseBackoffException, AirbyteTracedException) as error:
+        except AirbyteTracedException as error:
+            if error.failure_type == FailureType.config_error:
+                raise
+            return False, self.describe_error("connection_error", shop_name)
+        except BaseBackoffException as error:
             return False, self.describe_error("connection_error", shop_name) or str(error)
 
     def get_shop_id(self) -> str:
@@ -161,9 +170,12 @@ class SourceShopify(AbstractSource):
         # If a scheme is present, parse out the host; urlparse only fills netloc
         # when "://" is present.
         if "://" in value:
-            parsed = urlparse(value)
+            try:
+                parsed = urlparse(value)
+            except ValueError:
+                raise ShopifyWrongShopNameError(raw)
             host = parsed.netloc
-            if parsed.path not in ("", "/") or parsed.params or parsed.query or parsed.fragment:
+            if parsed.scheme not in ("http", "https") or parsed.path not in ("", "/") or parsed.params or parsed.query or parsed.fragment:
                 raise ShopifyWrongShopNameError(raw)
         else:
             host, _, path = value.partition("/")

{airbyte_source_shopify-4.3.0 → airbyte_source_shopify-4.3.2}/source_shopify/streams/streams.py

@@ -238,7 +238,7 @@ class DeletedProducts(IncrementalShopifyStream):
         query_filter = "action:destroy AND subject_type:Product"
         if stream_state and stream_state.get(self.cursor_field):
             state_value = stream_state[self.cursor_field]
-            query_filter += f" AND created_at:>'{state_value}'"
+            query_filter += f" AND created_at:>='{state_value}'"
 
         variables = {
             "first": 250,

{airbyte_source_shopify-4.3.0 → airbyte_source_shopify-4.3.2}/source_shopify/utils.py

@@ -81,7 +81,7 @@ class ShopifyWrongShopNameError(AirbyteTracedException):
     """Raises the error when `Shopify Store` name is incorrect or couldn't be verified by the Shopify"""
 
     def __init__(self, url, **kwargs) -> None:
-        self.message = f"The `Shopify Store` name is invalid or missing for `input configuration`, make sure it's valid. Details: {url}"
+        self.message = "The Shopify Store name is invalid or missing. Enter the store handle or its myshopify.com domain, without paths, credentials, query strings, or fragments."
         super().__init__(message=self.message, internal_message=self.message, failure_type=FailureType.config_error, **kwargs)