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.

Sign up for GitHub

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

Jump to bottom

Source Marketo: fix semi incremental streams #15824

Merged
merged 8 commits into from
Aug 23, 2022
Merged

Source Marketo: fix semi incremental streams #15824

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e05e3a2
#15823 source marketo: fix semi incremental streams
davydov-d Aug 21, 2022
7b9e59c
source marketo - upd changelog
davydov-d Aug 21, 2022
0d703c9
Merge branch 'master' into ddavydov/#15823-source-marketo-fix-semiinc…
davydov-d Aug 22, 2022
515dfb9
#15823 fix SATs
davydov-d Aug 22, 2022
6dace17
#15823 source marketo: fix tests
davydov-d Aug 22, 2022
7142e64
#15823 source marketo: one more test fix
davydov-d Aug 22, 2022
c776c7a
#15823 source marketo - fix incremental catalog
davydov-d Aug 23, 2022
7e39e24
auto-bump connector version [ci skip]
octavia-squidington-iii Aug 23, 2022
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
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-marketo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ COPY source_marketo ./source_marketo
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.1.5
LABEL io.airbyte.version=0.1.6
LABEL io.airbyte.name=airbyte/source-marketo
11 changes: 8 additions & 3 deletions airbyte-integrations/connectors/source-marketo/source_marketo/source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def filter_by_state(self, stream_state: Mapping[str, Any] = None, record: Mappin
during the parsing.
"""

if not stream_state or record[self.cursor_field] >= stream_state.get(self.cursor_field):
if record[self.cursor_field] >= (stream_state or {}).get(self.cursor_field, self.start_date):
yield record

def parse_response(self, response: requests.Response, stream_state: Mapping[str, Any], **kwargs) -> Iterable[Mapping]:
Expand Down Expand Up @@ -136,6 +136,11 @@ def stream_slices(self, sync_mode, stream_state: Mapping[str, Any] = None, **kwa
return date_slices


class SemiIncrementalMarketoStream(IncrementalMarketoStream):
def stream_slices(self, sync_mode, stream_state: Mapping[str, Any] = None, **kwargs) -> Iterable[Optional[MutableMapping[str, any]]]:
return [None]


class MarketoExportBase(IncrementalMarketoStream):
"""
Base class for all the streams which support bulk extract.
Expand Down Expand Up @@ -459,14 +464,14 @@ def parse_response(self, response: requests.Response, stream_state: Mapping[str,
yield record


class Campaigns(IncrementalMarketoStream):
class Campaigns(SemiIncrementalMarketoStream):
"""
Return list of all campaigns.
API Docs: http://developers.marketo.com/rest-api/endpoint-reference/lead-database-endpoint-reference/#!/Campaigns/getCampaignsUsingGET
"""


class Lists(IncrementalMarketoStream):
class Lists(SemiIncrementalMarketoStream):
"""
Return list of all lists.
API Docs: http://developers.marketo.com/rest-api/endpoint-reference/lead-database-endpoint-reference/#!/Static_Lists/getListsUsingGET
Expand Down
17 changes: 9 additions & 8 deletions docs/integrations/sources/marketo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,13 @@ We're almost there! Armed with your Endpoint & Identity URLs and your Client ID

## CHANGELOG

| Version | Date | Pull Request | Subject |
|:--------|:-----------|:---------------------------------------------------------|:------------------------------------------------------|
| `0.1.5` | 2022-08-16 | [15683](https://github.com/airbytehq/airbyte/pull/15683) | Retry failed creation of a job instead of skipping it |
| `0.1.4` | 2022-06-20 | [13930](https://github.com/airbytehq/airbyte/pull/13930) | Process failing creation of export jobs |
| `0.1.3` | 2021-12-10 | [8429](https://github.com/airbytehq/airbyte/pull/8578) | Updated titles and descriptions |
| `0.1.2` | 2021-12-03 | [8483](https://github.com/airbytehq/airbyte/pull/8483) | Improve field conversion to conform schema |
| `0.1.1` | 2021-11-29 | [0000](https://github.com/airbytehq/airbyte/pull/0000) | Fix timestamp value format issue |
| `0.1.0` | 2021-09-06 | [5863](https://github.com/airbytehq/airbyte/pull/5863) | Release Marketo CDK Connector |
| Version | Date | Pull Request | Subject |
|:--------|:-----------|:---------------------------------------------------------|:----------------------------------------------------------------------------------------------|
| `0.1.6` | 2022-08-21 | [15824](https://github.com/airbytehq/airbyte/pull/15824) | Fix semi incremental streams: do not ignore start date, make one api call instead of multiple |
| `0.1.5` | 2022-08-16 | [15683](https://github.com/airbytehq/airbyte/pull/15683) | Retry failed creation of a job instead of skipping it |
| `0.1.4` | 2022-06-20 | [13930](https://github.com/airbytehq/airbyte/pull/13930) | Process failing creation of export jobs |
| `0.1.3` | 2021-12-10 | [8429](https://github.com/airbytehq/airbyte/pull/8578) | Updated titles and descriptions |
| `0.1.2` | 2021-12-03 | [8483](https://github.com/airbytehq/airbyte/pull/8483) | Improve field conversion to conform schema |
| `0.1.1` | 2021-11-29 | [0000](https://github.com/airbytehq/airbyte/pull/0000) | Fix timestamp value format issue |
| `0.1.0` | 2021-09-06 | [5863](https://github.com/airbytehq/airbyte/pull/5863) | Release Marketo CDK Connector |