From 5765e55b5da476ea824a87ccffec61f0b356551a Mon Sep 17 00:00:00 2001 From: Vladimir remar Date: Tue, 18 Apr 2023 19:25:27 +0200 Subject: [PATCH] :tada: Source Facebook Marketing: Increase pause interval time after reach MIN_RATE or MAX_RATE. (#22990) * Change min rate and increase time in pauses * Update Dockerfile * Update source_definitions.yaml * Update facebook-marketing.md * auto-bump connector version --------- Co-authored-by: Marcos Marx Co-authored-by: Octavia Squidington III --- .../init-oss/src/main/resources/seed/oss_catalog.json | 2 +- .../init-oss/src/main/resources/seed/source_definitions.yaml | 2 +- .../init-oss/src/main/resources/seed/source_specs.yaml | 2 +- .../connectors/source-facebook-marketing/Dockerfile | 2 +- .../source_facebook_marketing/api.py | 4 ++-- connectors.md | 2 +- docs/integrations/sources/facebook-marketing.md | 3 ++- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json b/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json index 4c99aea90f9f52..5d439939ae326a 100644 --- a/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json +++ b/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json @@ -12073,7 +12073,7 @@ "sourceDefinitionId": "e7778cfc-e97c-4458-9ecb-b4f2bba8946c", "name": "Facebook Marketing", "dockerRepository": "airbyte/source-facebook-marketing", - "dockerImageTag": "0.3.3", + "dockerImageTag": "0.3.4", "documentationUrl": "https://docs.airbyte.com/integrations/sources/facebook-marketing", "icon": "facebook.svg", "sourceType": "api", diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml b/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml index 725a4ada6dcf29..f9f0ceda261f00 100644 --- a/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml @@ -562,7 +562,7 @@ - name: Facebook Marketing sourceDefinitionId: e7778cfc-e97c-4458-9ecb-b4f2bba8946c dockerRepository: airbyte/source-facebook-marketing - dockerImageTag: 0.3.3 + dockerImageTag: 0.3.4 documentationUrl: https://docs.airbyte.com/integrations/sources/facebook-marketing icon: facebook.svg sourceType: api diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml b/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml index afe9286fd4d120..e6e56be4b26baf 100644 --- a/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml @@ -3882,7 +3882,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-facebook-marketing:0.3.3" +- dockerImage: "airbyte/source-facebook-marketing:0.3.4" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/facebook-marketing" changelogUrl: "https://docs.airbyte.com/integrations/sources/facebook-marketing" diff --git a/airbyte-integrations/connectors/source-facebook-marketing/Dockerfile b/airbyte-integrations/connectors/source-facebook-marketing/Dockerfile index 7ea538b4a6f3d0..29f3177076b82b 100644 --- a/airbyte-integrations/connectors/source-facebook-marketing/Dockerfile +++ b/airbyte-integrations/connectors/source-facebook-marketing/Dockerfile @@ -13,5 +13,5 @@ ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.3.3 +LABEL io.airbyte.version=0.3.4 LABEL io.airbyte.name=airbyte/source-facebook-marketing diff --git a/airbyte-integrations/connectors/source-facebook-marketing/source_facebook_marketing/api.py b/airbyte-integrations/connectors/source-facebook-marketing/source_facebook_marketing/api.py index b9d9908327bb7d..48238280c88afd 100644 --- a/airbyte-integrations/connectors/source-facebook-marketing/source_facebook_marketing/api.py +++ b/airbyte-integrations/connectors/source-facebook-marketing/source_facebook_marketing/api.py @@ -29,8 +29,8 @@ class FacebookAPIException(Exception): class MyFacebookAdsApi(FacebookAdsApi): """Custom Facebook API class to intercept all API calls and handle call rate limits""" - MAX_RATE, MAX_PAUSE_INTERVAL = (95, pendulum.duration(minutes=5)) - MIN_RATE, MIN_PAUSE_INTERVAL = (90, pendulum.duration(minutes=1)) + MAX_RATE, MAX_PAUSE_INTERVAL = (95, pendulum.duration(minutes=10)) + MIN_RATE, MIN_PAUSE_INTERVAL = (85, pendulum.duration(minutes=2)) @dataclass class Throttle: diff --git a/connectors.md b/connectors.md index 84fe2dcff27ab7..ee439231fd0855 100644 --- a/connectors.md +++ b/connectors.md @@ -69,7 +69,7 @@ | **EmailOctopus** | EmailOctopus icon | Source | airbyte/source-emailoctopus:0.1.0 | alpha | [docs](https://docs.airbyte.com/integrations/sources/emailoctopus) | [connectors/source/emailoctopus](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/emailoctopus) | [source-emailoctopus](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-emailoctopus) | `46b25e70-c980-4590-a811-8deaf50ee09f` | | **Everhour** | Everhour icon | Source | airbyte/source-everhour:0.1.0 | alpha | [docs](https://docs.airbyte.com/integrations/sources/everhour) | [connectors/source/everhour](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/everhour) | [source-everhour](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-everhour) | `6babfc42-c734-4ef6-a817-6eca15f0f9b7` | | **Exchange Rates Api** | Exchange Rates Api icon | Source | airbyte/source-exchange-rates:1.2.8 | alpha | [docs](https://docs.airbyte.com/integrations/sources/exchangeratesapi) | [connectors/source/exchange-rates](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/exchange-rates) | [source-exchange-rates](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-exchange-rates) | `e2b40e36-aa0e-4bed-b41b-bcea6fa348b1` | -| **Facebook Marketing** | Facebook Marketing icon | Source | airbyte/source-facebook-marketing:0.3.3 | generally_available | [docs](https://docs.airbyte.com/integrations/sources/facebook-marketing) | [connectors/source/facebook-marketing](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/facebook-marketing) | [source-facebook-marketing](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-facebook-marketing) | `e7778cfc-e97c-4458-9ecb-b4f2bba8946c` | +| **Facebook Marketing** | Facebook Marketing icon | Source | airbyte/source-facebook-marketing:0.3.4 | generally_available | [docs](https://docs.airbyte.com/integrations/sources/facebook-marketing) | [connectors/source/facebook-marketing](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/facebook-marketing) | [source-facebook-marketing](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-facebook-marketing) | `e7778cfc-e97c-4458-9ecb-b4f2bba8946c` | | **Facebook Pages** | Facebook Pages icon | Source | airbyte/source-facebook-pages:0.2.4 | beta | [docs](https://docs.airbyte.com/integrations/sources/facebook-pages) | [connectors/source/facebook-pages](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/facebook-pages) | [source-facebook-pages](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-facebook-pages) | `010eb12f-837b-4685-892d-0a39f76a98f5` | | **Fastbill** | Fastbill icon | Source | airbyte/source-fastbill:0.1.0 | alpha | [docs](https://docs.airbyte.com/integrations/sources/fastbill) | [connectors/source/fastbill](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/fastbill) | [source-fastbill](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-fastbill) | `eb3e9c1c-0467-4eb7-a172-5265e04ccd0a` | | **Fauna** | Fauna icon | Source | airbyte/source-fauna:0.1.1 | alpha | [docs](https://docs.airbyte.com/integrations/sources/fauna) | [connectors/source/fauna](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/fauna) | [source-fauna](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-fauna) | `3825db3e-c94b-42ac-bd53-b5a9507ace2b` | diff --git a/docs/integrations/sources/facebook-marketing.md b/docs/integrations/sources/facebook-marketing.md index dbfade05c29572..c3bb8de0959f60 100644 --- a/docs/integrations/sources/facebook-marketing.md +++ b/docs/integrations/sources/facebook-marketing.md @@ -136,7 +136,8 @@ Please be informed that the connector uses the `lookback_window` parameter to pe | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| 0.3.3 | 2023-04-14 | [00000](https://github.com/airbytehq/airbyte/pull/00000) | Fix data retention period validation | +| 0.3.4 | 2023-04-18 | [22990](https://github.com/airbytehq/airbyte/pull/22990) | Increase pause interval | +| 0.3.3 | 2023-04-14 | [25204](https://github.com/airbytehq/airbyte/pull/25204) | Fix data retention period validation | | 0.3.2 | 2023-04-08 | [25003](https://github.com/airbytehq/airbyte/pull/25003) | Don't fetch `thumbnail_data_url` if it's None | | 0.3.1 | 2023-03-27 | [24600](https://github.com/airbytehq/airbyte/pull/24600) | Reduce request record limit when retrying second page or further | | 0.3.0 | 2023-03-16 | [19141](https://github.com/airbytehq/airbyte/pull/19141) | Added Level parameter to custom Ads Insights |