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

[low-code-connectors] Replace JelloExtractor with DpathExtractor #15514

Merged
merged 20 commits into from
Aug 11, 2022

Conversation

girarda
Copy link
Contributor

@girarda girarda commented Aug 10, 2022

What

Replace JelloExtractor with DpathExtractor which has a simple contract.

How

  • Create RecordExtractor interface, which JelloExtractor implements
  • Create DpathExtractor which implements RecordExtractor and uses dpath.util.get to extract records from the decoded response
  • If the field pointer is empty, then the full response body is returned

Testing

Recommended reading order

  1. airbyte-cdk/python/airbyte_cdk/sources/declarative/extractors/record_extractor.py
  2. airbyte-cdk/python/airbyte_cdk/sources/declarative/extractors/dpath_extractor.py
  3. airbyte-cdk/python/unit_tests/sources/declarative/extractors/test_dpath_extractor.py
  4. airbyte-cdk/python/airbyte_cdk/sources/declarative/extractors/record_selector.py
  5. airbyte-cdk/python/unit_tests/sources/declarative/extractors/test_record_selector.py
  6. airbyte-cdk/python/airbyte_cdk/sources/declarative/extractors/jello.py
  7. airbyte-cdk/python/unit_tests/sources/declarative/extractors/test_jello.py

Follow up items

  • Test the connector configs
  • Update template
  • Update docs and tutorial
  • Delete JelloExtractor

🚨 User Impact 🚨

Are there any breaking changes? What is the end result perceived by the user? If yes, please merge this PR with the 🚨🚨 emoji so changelog authors can further highlight this if needed.

Pre-merge Checklist

Expand the relevant checklist and delete the others.

New Connector

Community member or Airbyter

  • Community member? Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
    • docs/integrations/README.md
    • airbyte-integrations/builds.md
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub by running the /publish command described here
  • After the connector is published, connector added to connector index as described here
  • Seed specs have been re-generated by building the platform and committing the changes to the seed spec files, as described here
Updating a connector

Community member or Airbyter

  • Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • Changelog updated in docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub and connector version bumped by running the /publish command described here
Connector Generator
  • Issue acceptance criteria met
  • PR name follows PR naming conventions
  • If adding a new generator, add it to the list of scaffold modules being tested
  • The generator test modules (all connectors with -scaffold in their name) have been updated with the latest scaffold by running ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates then checking in your changes
  • Documentation which references the generator is updated as needed

Tests

Unit

Put your unit tests output here.

Integration

Put your integration tests output here.

Acceptance

Put your acceptance tests output here.

@github-actions github-actions bot added the CDK Connector Development Kit label Aug 10, 2022
"_",
None,
[],
[],
Copy link
Contributor Author

@girarda girarda Aug 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the returned value is [{}] without the fix

@girarda girarda changed the title Handle extracting no records from root 🐛 [low-code-connectors] Handle records with unexpected shape Aug 11, 2022
@girarda girarda marked this pull request as ready for review August 11, 2022 02:35
@girarda girarda requested a review from a team as a code owner August 11, 2022 02:35
@girarda girarda requested a review from sherifnada August 11, 2022 02:35
Copy link
Contributor

@sherifnada sherifnada left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you document this behavior in the record selector docs section and docstrings?

on your PR description note: maybe dpath is really the way to go and we're making this too complicated for ourselves. It seems the contract might more easily just be:

  1. either there is a single JSON returned from the response, in which case wrap it in []
  2. there are many responses returned, in which case point to an array field containing that data

like we discussed though i'd rather wrap up the CDK work for the week and call that change a follow up

@girarda girarda marked this pull request as draft August 11, 2022 14:16
from airbyte_cdk.sources.declarative.interpolation.interpolated_string import InterpolatedString
from airbyte_cdk.sources.declarative.types import Config, Record
from dataclasses_jsonschema import JsonSchemaMixin
from jello import lib as jello_lib


@dataclass
class JelloExtractor(JsonSchemaMixin):
class JelloExtractor(RecordExtractor, JsonSchemaMixin):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can delete this class in a follow up PR

@girarda girarda marked this pull request as ready for review August 11, 2022 15:16
@girarda girarda requested a review from sherifnada August 11, 2022 15:16
Copy link
Contributor

@sherifnada sherifnada left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but Why not make dpath the default?

@@ -50,11 +52,12 @@
InterpolatedString: InterpolatedString,
MinMaxDatetime: MinMaxDatetime,
Paginator: NoPagination,
ParentStreamConfig: ParentStreamConfig,
RecordExtractor: JelloExtractor,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be the Dpath one instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, done

@girarda girarda changed the title 🐛 [low-code-connectors] Handle records with unexpected shape 🐛 [low-code-connectors] Replace JelloExtractor with DpathExtractor Aug 11, 2022
@girarda girarda changed the title 🐛 [low-code-connectors] Replace JelloExtractor with DpathExtractor [low-code-connectors] Replace JelloExtractor with DpathExtractor Aug 11, 2022
@girarda
Copy link
Contributor Author

girarda commented Aug 11, 2022

/publish-cdk dry-run=false

@girarda
Copy link
Contributor Author

girarda commented Aug 11, 2022

/publish-cdk dry-run=false

@girarda
Copy link
Contributor Author

girarda commented Aug 11, 2022

/publish-cdk dry-run=false

🕑 https://github.com/airbytehq/airbyte/actions/runs/2842300489
https://github.com/airbytehq/airbyte/actions/runs/2842300489

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CDK Connector Development Kit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants