Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Source Shopify: fix OOM/memory leak #23473

Merged
merged 6 commits into from
Feb 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@
- name: Shopify
sourceDefinitionId: 9da77001-af33-4bcd-be46-6252bf9342b9
dockerRepository: airbyte/source-shopify
dockerImageTag: 0.3.1
dockerImageTag: 0.3.2
documentationUrl: https://docs.airbyte.com/integrations/sources/shopify
icon: shopify.svg
sourceType: api
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13513,7 +13513,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-shopify:0.3.1"
- dockerImage: "airbyte/source-shopify:0.3.2"
spec:
documentationUrl: "https://docs.airbyte.com/integrations/sources/shopify"
connectionSpecification:
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-shopify/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ COPY source_shopify ./source_shopify
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.3.1
LABEL io.airbyte.version=0.3.2
LABEL io.airbyte.name=airbyte/source-shopify
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-shopify/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
MAIN_REQUIREMENTS = ["airbyte-cdk", "sgqlc~=16.0"]

TEST_REQUIREMENTS = [
"pytest~=6.1",
"pytest-mock~=3.10.0",
"pytest",
"pytest-mock",
"requests-mock",
"connector-acceptance-test",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@


from abc import ABC, abstractmethod
from functools import cached_property
from typing import Any, Dict, Iterable, List, Mapping, MutableMapping, Optional, Tuple, Union
from urllib.parse import parse_qsl, urlparse

Expand Down Expand Up @@ -185,7 +186,7 @@ class ShopifySubstream(IncrementalShopifyStream):
nested_substream = None
nested_substream_list_field_id = None

@property
@cached_property
def parent_stream(self) -> object:
"""
Returns the instance of parent stream, if the substream has a `parent_stream_class` dependency.
Expand Down
2 changes: 1 addition & 1 deletion connectors.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
| **Sendinblue** | <img alt="Sendinblue icon" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/airbyte-config/init/src/main/resources/icons/sendinblue.svg" height="30" height="30"/> | Source | airbyte/source-sendinblue:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/sendinblue) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-sendinblue) | <small>`2e88fa20-a2f6-43cc-bba6-98a0a3f244fb`</small> |
| **Senseforce** | <img alt="Senseforce icon" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/airbyte-config/init/src/main/resources/icons/senseforce.svg" height="30" height="30"/> | Source | airbyte/source-senseforce:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/senseforce) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-senseforce) | <small>`39de93cb-1511-473e-a673-5cbedb9436af`</small> |
| **Sentry** | <img alt="Sentry icon" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/airbyte-config/init/src/main/resources/icons/sentry.svg" height="30" height="30"/> | Source | airbyte/source-sentry:0.1.11 | generally_available | [link](https://docs.airbyte.com/integrations/sources/sentry) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-sentry) | <small>`cdaf146a-9b75-49fd-9dd2-9d64a0bb4781`</small> |
| **Shopify** | <img alt="Shopify icon" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/airbyte-config/init/src/main/resources/icons/shopify.svg" height="30" height="30"/> | Source | airbyte/source-shopify:0.3.1 | alpha | [link](https://docs.airbyte.com/integrations/sources/shopify) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-shopify) | <small>`9da77001-af33-4bcd-be46-6252bf9342b9`</small> |
| **Shopify** | <img alt="Shopify icon" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/airbyte-config/init/src/main/resources/icons/shopify.svg" height="30" height="30"/> | Source | airbyte/source-shopify:0.3.2 | alpha | [link](https://docs.airbyte.com/integrations/sources/shopify) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-shopify) | <small>`9da77001-af33-4bcd-be46-6252bf9342b9`</small> |
| **Short.io** | <img alt="Short.io icon" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/airbyte-config/init/src/main/resources/icons/short.svg" height="30" height="30"/> | Source | airbyte/source-shortio:0.1.3 | alpha | [link](https://docs.airbyte.com/integrations/sources/shortio) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-shortio) | <small>`2fed2292-5586-480c-af92-9944e39fe12d`</small> |
| **Slack** | <img alt="Slack icon" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/airbyte-config/init/src/main/resources/icons/slack.svg" height="30" height="30"/> | Source | airbyte/source-slack:0.1.23 | generally_available | [link](https://docs.airbyte.com/integrations/sources/slack) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-slack) | <small>`c2281cee-86f9-4a86-bb48-d23286b4c7bd`</small> |
| **Smaily** | <img alt="Smaily icon" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/airbyte-config/init/src/main/resources/icons/smaily.svg" height="30" height="30"/> | Source | airbyte/source-smaily:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/smaily) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-smaily) | <small>`781f8b1d-4e20-4842-a2c3-cd9b119d65fa`</small> |
Expand Down
3 changes: 2 additions & 1 deletion docs/integrations/sources/shopify.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ This is expected when the connector hits the 429 - Rate Limit Exceeded HTTP Erro

| Version | Date | Pull Request | Subject |
|:--------|:-----------|:----------------------------------------------------------|:----------------------------------------------------------------------------------------------------------|
| 0.3.1 | 2023-01-16 | [21461](https://github.com/airbytehq/airbyte/pull/21461) | Add `discount_applications` to `orders` stream |
| 0.3.2 | 2023-02-27 | [23473](https://github.com/airbytehq/airbyte/pull/23473) | Fixed OOM / Memory leak issue for Airbyte Cloud |
| 0.3.1 | 2023-01-16 | [21461](https://github.com/airbytehq/airbyte/pull/21461) | Add `discount_applications` to `orders` stream |
| 0.3.0 | 2022-11-16 | [19492](https://github.com/airbytehq/airbyte/pull/19492) | Add support for graphql and add a graphql products stream |
| 0.2.0 | 2022-10-21 | [18298](https://github.com/airbytehq/airbyte/pull/18298) | Updated API version to the `2022-10`, make stream schemas backward cpmpatible |
| 0.1.39 | 2022-10-13 | [17962](https://github.com/airbytehq/airbyte/pull/17962) | Add metafield streams; support for nested list streams |
Expand Down