From 09eb2e82846f90474dd2eaec33d987b8b319abb5 Mon Sep 17 00:00:00 2001 From: Denys Davydov Date: Mon, 6 Feb 2023 13:59:06 +0200 Subject: [PATCH 1/3] #1058 source Mailchimp: revert extra logging --- .../connectors/source-mailchimp/Dockerfile | 2 +- .../source-mailchimp/source_mailchimp/streams.py | 10 ---------- docs/integrations/sources/mailchimp.md | 1 + 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/airbyte-integrations/connectors/source-mailchimp/Dockerfile b/airbyte-integrations/connectors/source-mailchimp/Dockerfile index 71dff9422b63e..46f63dc351cd7 100644 --- a/airbyte-integrations/connectors/source-mailchimp/Dockerfile +++ b/airbyte-integrations/connectors/source-mailchimp/Dockerfile @@ -12,5 +12,5 @@ COPY main.py ./ 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-mailchimp diff --git a/airbyte-integrations/connectors/source-mailchimp/source_mailchimp/streams.py b/airbyte-integrations/connectors/source-mailchimp/source_mailchimp/streams.py index 1fca51b24d0b3..517e6c17f4c5b 100644 --- a/airbyte-integrations/connectors/source-mailchimp/source_mailchimp/streams.py +++ b/airbyte-integrations/connectors/source-mailchimp/source_mailchimp/streams.py @@ -55,7 +55,6 @@ def request_params( return params def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]: - self.logger.info(f"Parsing response for stream {self.name}") response_json = response.json() yield from response_json[self.data_field] @@ -98,13 +97,11 @@ def get_updated_state(self, current_stream_state: MutableMapping[str, Any], late def stream_slices( self, *, sync_mode: SyncMode, cursor_field: List[str] = None, stream_state: Mapping[str, Any] = None ) -> Iterable[Optional[Mapping[str, Any]]]: - self.logger.info(f"Slicing stream: {self.name}") slice_ = {} stream_state = stream_state or {} cursor_value = stream_state.get(self.cursor_field) if cursor_value: slice_[self.filter_field] = cursor_value - self.logger.info(f"Yielding slice {slice_}") yield slice_ def request_params(self, stream_state=None, stream_slice=None, **kwargs): @@ -113,7 +110,6 @@ def request_params(self, stream_state=None, stream_slice=None, **kwargs): params = super().request_params(stream_state=stream_state, stream_slice=stream_slice, **kwargs) default_params = {"sort_field": self.sort_field, "sort_dir": "ASC", **stream_slice} params.update(default_params) - self.logger.info(f"Request params are {params}") return params @@ -148,20 +144,16 @@ def stream_slices( self, *, sync_mode: SyncMode, cursor_field: List[str] = None, stream_state: Mapping[str, Any] = None ) -> Iterable[Optional[Mapping[str, Any]]]: stream_state = stream_state or {} - self.logger.info(f"Slicing the stream: {self.name}") if self.campaign_id: # this is a workaround to speed up SATs and enable incremental tests campaigns = [{"id": self.campaign_id}] else: - self.logger.info("Reading campaigns") campaigns = Campaigns(authenticator=self.authenticator).read_records(sync_mode=SyncMode.full_refresh) - self.logger.info("Starting for loop to slice the stream") for campaign in campaigns: slice_ = {"campaign_id": campaign["id"]} cursor_value = stream_state.get(campaign["id"], {}).get(self.cursor_field) if cursor_value: slice_[self.filter_field] = cursor_value - self.logger.info(f"Yielding slice {slice_}") yield slice_ def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str: @@ -187,7 +179,6 @@ def get_updated_state(self, current_stream_state: MutableMapping[str, Any], late return current_stream_state def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]: - self.logger.info(f"Parsing response for stream {self.name}") response_json = response.json() # transform before save # [{'campaign_id', 'list_id', 'list_is_active', 'email_id', 'email_address', 'activity[array[object]]', '_links'}] -> @@ -196,4 +187,3 @@ def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapp for item in data: for activity_item in item.pop("activity", []): yield {**item, **activity_item} - self.logger.info("Parsed response") diff --git a/docs/integrations/sources/mailchimp.md b/docs/integrations/sources/mailchimp.md index d93484a8d43ad..7c15220deda8c 100644 --- a/docs/integrations/sources/mailchimp.md +++ b/docs/integrations/sources/mailchimp.md @@ -230,6 +230,7 @@ Now that you have set up the Mailchimp source connector, check out the following | Version | Date | Pull Request | Subject | |---------|------------|----------------------------------------------------------|----------------------------------------------------------------------------| +| 0.3.4 | 2023-02-06 | [00000](https://github.com/airbytehq/airbyte/pull/00000) | Revert extra logging | | 0.3.3 | 2023-02-01 | [22228](https://github.com/airbytehq/airbyte/pull/22228) | Add extra logging | | 0.3.2 | 2023-01-27 | [22014](https://github.com/airbytehq/airbyte/pull/22014) | Set `AvailabilityStrategy` for streams explicitly to `None` | | 0.3.1 | 2022-12-20 | [20720](https://github.com/airbytehq/airbyte/pull/20720) | Use stream slices as a source for request params instead of a stream state | From ca35835f9b1abbd2379a3c873c5cb90768930646 Mon Sep 17 00:00:00 2001 From: Denys Davydov Date: Mon, 6 Feb 2023 14:01:38 +0200 Subject: [PATCH 2/3] #1058 source Mailchimp: upd changelog --- docs/integrations/sources/mailchimp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/mailchimp.md b/docs/integrations/sources/mailchimp.md index 7c15220deda8c..06e16dbd1b50a 100644 --- a/docs/integrations/sources/mailchimp.md +++ b/docs/integrations/sources/mailchimp.md @@ -230,7 +230,7 @@ Now that you have set up the Mailchimp source connector, check out the following | Version | Date | Pull Request | Subject | |---------|------------|----------------------------------------------------------|----------------------------------------------------------------------------| -| 0.3.4 | 2023-02-06 | [00000](https://github.com/airbytehq/airbyte/pull/00000) | Revert extra logging | +| 0.3.4 | 2023-02-06 | [22405](https://github.com/airbytehq/airbyte/pull/22405) | Revert extra logging | | 0.3.3 | 2023-02-01 | [22228](https://github.com/airbytehq/airbyte/pull/22228) | Add extra logging | | 0.3.2 | 2023-01-27 | [22014](https://github.com/airbytehq/airbyte/pull/22014) | Set `AvailabilityStrategy` for streams explicitly to `None` | | 0.3.1 | 2022-12-20 | [20720](https://github.com/airbytehq/airbyte/pull/20720) | Use stream slices as a source for request params instead of a stream state | From 6ba4cb9c8cd715bf78d7a6136f2b8d3e1e910a6c Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Mon, 6 Feb 2023 19:56:41 +0000 Subject: [PATCH 3/3] auto-bump connector version --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index e991df4059c40..3a288f248d131 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -979,7 +979,7 @@ - name: Mailchimp sourceDefinitionId: b03a9f3e-22a5-11eb-adc1-0242ac120002 dockerRepository: airbyte/source-mailchimp - dockerImageTag: 0.3.3 + dockerImageTag: 0.3.4 documentationUrl: https://docs.airbyte.com/integrations/sources/mailchimp icon: mailchimp.svg sourceType: api diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index 416f886afed38..4c28dad3733d4 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -7895,7 +7895,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-mailchimp:0.3.3" +- dockerImage: "airbyte/source-mailchimp:0.3.4" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/mailchimp" connectionSpecification: