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

feat(low-code cdk): add interpolation for limit field in Rate #353

Merged
merged 2 commits into from
Feb 20, 2025

Conversation

lazebnyi
Copy link
Contributor

@lazebnyi lazebnyi commented Feb 20, 2025

What

Some connectors allow configuring the call rate limit via a config file. However, this is currently only possible through the manifest.

Fixed: https://github.com/airbytehq/airbyte-internal-issues/issues/11756

How

Enable interpolation for the limit field of the Rate component.

Summary by CodeRabbit

  • New Features

    • Enhanced rate limit configuration to accept both numeric and string values for dynamic, runtime evaluation.
  • Tests

    • Improved test naming for clarity and consistency.

@github-actions github-actions bot added the enhancement New feature or request label Feb 20, 2025
@lazebnyi
Copy link
Contributor Author

lazebnyi commented Feb 20, 2025

/autofix

Auto-Fix Job Info

This job attempts to auto-fix any linting or formating issues. If any fixes are made,
those changes will be automatically committed and pushed back to the PR.

Note: This job can only be run by maintainers. On PRs from forks, this command requires
that the PR author has enabled the Allow edits from maintainers option.

PR auto-fix job started... Check job output.

✅ Changes applied successfully.

Copy link
Contributor

coderabbitai bot commented Feb 20, 2025

📝 Walkthrough

Walkthrough

This pull request updates the definition and handling of the limit property in the Rate component. The YAML schema now allows limit to be either an integer or a string with an interpolation context. Correspondingly, the Python model’s limit type is updated to Union[int, str]. The create_rate method in the component factory now evaluates the limit dynamically via an interpolated string and converts it to an integer at runtime. Additionally, a test function name was corrected for consistent naming.

Changes

File(s) Change Summary
airbyte_cdk/.../declarative_component_schema.yaml
airbyte_cdk/.../models/declarative_component_schema.py
Updated the Rate definition: The limit property now accepts both integer and string types (using anyOf in YAML and Union[int, str] in Python), and an interpolation_context was added to the schema.
airbyte_cdk/.../model_to_component_factory.py Modified the create_rate method to process the limit as an InterpolatedString which is evaluated and converted to an integer at runtime.
unit_tests/.../test_http_requester.py Renamed the test function from test_http_requester_with_mock_apibudget to test_http_requester_with_mock_api_budget to correct a naming inconsistency.

Sequence Diagram(s)

sequenceDiagram
    participant Caller as Component Caller
    participant MTFactory as ModelToComponentFactory
    participant Interp as InterpolatedString Evaluator
    
    Caller->>MTFactory: create_rate(model, config)
    MTFactory->>MTFactory: Extract model.limit (int or str)
    MTFactory->>Interp: Create InterpolatedString from model.limit
    Interp->>MTFactory: Evaluate interpolated string using config
    MTFactory->>MTFactory: Convert result to integer
    MTFactory->>Caller: Return Rate object with evaluated limit
Loading

Possibly related PRs

  • feat(low-code): Add API Budget #314: This PR also introduces changes to the Rate component, modifying the limit property to support both integer and string types along with dynamic evaluation.

Suggested reviewers

  • Would you like to include artem1205 for review?
  • Would you like to include maxi297 for review?
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

‼️ IMPORTANT
Auto-reply has been disabled for this repository in the CodeRabbit settings. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (3)
airbyte_cdk/sources/declarative/models/declarative_component_schema.py (1)

649-653: Consider enhancing the field description to document string interpolation support?

The implementation looks good! Since we're now supporting string interpolation for dynamic configuration, would you like to update the field description to include examples of both integer and interpolated string values? Something like:

    limit: Union[int, str] = Field(
        ...,
-       description="The maximum number of calls allowed within the interval.",
+       description="The maximum number of calls allowed within the interval. Supports both fixed integers and interpolated strings for dynamic configuration.",
+       examples=[100, "{{ config['rate_limit'] }}"],
        title="Limit",
    )

wdyt?

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py (1)

3027-3029: Consider adding type validation for the limit field.

The changes look good for supporting interpolation of the limit field. However, what do you think about adding validation to ensure the interpolated value can be safely converted to an integer? This could help catch configuration errors early. wdyt?

     def create_rate(self, model: RateModel, config: Config, **kwargs: Any) -> Rate:
         interpolated_limit = InterpolatedString.create(str(model.limit), parameters={})
+        try:
+            limit = int(interpolated_limit.eval(config=config))
+        except ValueError as e:
+            raise ValueError(f"Rate limit must be a valid integer. Got: {interpolated_limit.eval(config=config)}") from e
-        return Rate(
-            limit=int(interpolated_limit.eval(config=config)),
+        return Rate(
+            limit=limit,
             interval=parse_duration(model.interval),
         )
airbyte_cdk/sources/declarative/declarative_component_schema.yaml (1)

1490-1498: Enhanced Flexibility for the "limit" Field
The updated "limit" property now accepts either an integer or a string and has an associated interpolation_context with config. This aligns perfectly with the PR objective of enabling dynamic interpolation for configuring the call rate limit. Would you consider adding an example for the string interpolation use case to guide users on how to leverage this new capability? wdyt?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between e1a182c and 5f8f4e6.

📒 Files selected for processing (4)
  • airbyte_cdk/sources/declarative/declarative_component_schema.yaml (1 hunks)
  • airbyte_cdk/sources/declarative/models/declarative_component_schema.py (1 hunks)
  • airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py (1 hunks)
  • unit_tests/sources/declarative/requesters/test_http_requester.py (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • unit_tests/sources/declarative/requesters/test_http_requester.py
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: Check: 'source-pokeapi' (skip=false)
  • GitHub Check: Check: 'source-amplitude' (skip=false)
  • GitHub Check: Check: 'source-shopify' (skip=false)
  • GitHub Check: Check: 'source-hardcoded-records' (skip=false)
  • GitHub Check: Pytest (All, Python 3.11, Ubuntu)
  • GitHub Check: Pytest (Fast)
  • GitHub Check: Pytest (All, Python 3.10, Ubuntu)
  • GitHub Check: Analyze (python)

@lazebnyi lazebnyi requested a review from maxi297 February 20, 2025 03:04
@lazebnyi lazebnyi merged commit 665dc1f into main Feb 20, 2025
24 checks passed
@lazebnyi lazebnyi deleted the lazebnyi/interpolate-limit-in-call-rate-limit branch February 20, 2025 18:19
rpopov added a commit to rpopov/airbyte-python-cdk that referenced this pull request Mar 5, 2025
* main:
  fix: update cryptography package to latest version to address CVE (airbytehq#377)
  fix: (CDK) (HttpRequester) - Make the `HttpRequester.path` optional (airbytehq#370)
  feat: improved custom components handling (airbytehq#350)
  feat: add microseconds timestamp format (airbytehq#373)
  fix: Replace Unidecode with anyascii for permissive license (airbytehq#367)
  feat: add IncrementingCountCursor (airbytehq#346)
  feat: (low-code cdk)  datetime format with milliseconds (airbytehq#369)
  fix: (CDK) (AsyncRetriever) - Improve UX on variable naming and interpolation (airbytehq#368)
  fix: (CDK) (AsyncRetriever) - Add the `request` and `response` to each `async` operations (airbytehq#356)
  fix: (CDK) (ConnectorBuilder) - Add `auxiliary requests` to slice; support `TestRead` for AsyncRetriever (part 1/2) (airbytehq#355)
  feat(concurrent perpartition cursor): Add parent state updates (airbytehq#343)
  fix: update csv parser for builder compatibility (airbytehq#364)
  feat(low-code cdk): add interpolation for limit field in Rate (airbytehq#353)
  feat(low-code cdk): add AbstractStreamFacade processing as concurrent streams in declarative source (airbytehq#347)
  fix: (CDK) (CsvParser) - Fix the `\\` escaping when passing the `delimiter` from Builder's UI (airbytehq#358)
  feat: expose `str_to_datetime` jinja macro (airbytehq#351)
  fix: update CDK migration for 6.34.0 (airbytehq#348)
  feat: Removes `stream_state` interpolation from CDK (airbytehq#320)
  fix(declarative): Pass `extra_fields` in `global_substream_cursor` (airbytehq#195)
  feat(concurrent perpartition cursor): Refactor ConcurrentPerPartitionCursor (airbytehq#331)
  feat(HttpMocker): adding support for PUT requests and bytes responses (airbytehq#342)
  chore: use certified source for manifest-only test (airbytehq#338)
  feat: check for request_option mapping conflicts in individual components (airbytehq#328)
  feat(file-based): sync file acl permissions and identities (airbytehq#260)
  fix: (CDK) (Connector Builder) - refactor the `MessageGrouper` > `TestRead` (airbytehq#332)
  fix(low code): Fix missing cursor for ClientSideIncrementalRecordFilterDecorator (airbytehq#334)
  feat(low-code): Add API Budget (airbytehq#314)
  chore(decoder): clean decoders and make csvdecoder available (airbytehq#326)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants