Skip to content

Force upgrade v1 batches to v3 #1676

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

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Force upgrade v1 batches to v3 #1676

merged 2 commits into from
Feb 6, 2025

Conversation

ericallam
Copy link
Member

@ericallam ericallam commented Feb 6, 2025

Summary by CodeRabbit

  • New Features
    • The batch task API now accepts new optional parameters (e.g., for concurrency control, delay, machine specification, and maximum duration) to enhance task scheduling.
    • API responses have been refined to provide clearer task identifiers and simplified run details.
    • Error reporting now delivers more precise feedback during request validation.
    • Configurable processing thresholds improve flexibility and overall performance in batch operations.
  • Bug Fixes
    • Enhanced error handling for validation failures to provide detailed messages.
  • Schema Updates
    • Restructured request body schemas to accommodate new optional fields while maintaining existing functionality.

Copy link

changeset-bot bot commented Feb 6, 2025

⚠️ No Changeset found

Latest commit: 5977e1e

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Feb 6, 2025

Walkthrough

The changes update the API route for batch task requests with new request body transformations and an upgraded service. A conversion function is introduced to translate legacy request bodies to the new format, and error handling is enhanced. In the service layer, a dynamic batch processing size threshold is configured via the constructor. Additionally, the related schemas are restructured with new optional fields and reorganized properties to support these updates.

Changes

File(s) Change Summary
apps/webapp/app/routes/api.v1.tasks…batch.ts • Added new import (BatchTriggerTaskV2RequestBody) and conversion function (convertV1BodyToV2Body) to transform legacy request bodies.
• Updated service instantiation to use BatchTriggerV3Service with parameters for execution mode and max batch size.
• Enhanced error handling and modified response structure (using result.id and run ids).
apps/webapp/app/v3/services…batchTriggerV3.server.ts • Introduced private variable _asyncBatchProcessSizeThreshold and updated constructor to accept asyncBatchProcessSizeThreshold.
• Modified #createAndProcessBatchTaskRun to use the dynamic threshold for deciding processing mode.
packages/core/src/v3/schemas/api.ts • Updated TriggerTaskRequestBody and BatchTriggerTaskItem schemas:
– Added new optional fields (concurrencyKey, delay, machine, maxDuration).
– Reorganized positions of existing fields (parentAttempt, parentBatch, lockToVersion, queue, test, payloadType, ttl, tags).

Sequence Diagram(s)

sequenceDiagram
    participant C as Client
    participant A as API Endpoint
    participant F as convertV1BodyToV2Body
    participant S as BatchTriggerV3Service
    participant DB as Database

    C->>A: Send batch task request
    A->>F: Convert v1 body to v2 format
    F-->>A: Return transformed body
    A->>S: Invoke service with transformed body and parameters
    S->>S: Check asyncBatchProcessSizeThreshold condition
    alt Inline processing
        S->>DB: Process batch task inline
    else Transactional processing
        S->>DB: Process batch task via transaction
    end
    S-->>A: Return result (batchId & run ids)
    A-->>C: Respond with updated response structure
Loading

Possibly related PRs

Suggested reviewers

  • matt-aitken

Poem

I’m a rabbit with a hop and a click,
Seeing new code changes make my day quick.
Batch tasks bounce in a rhythmic array,
Converting old formats in a magical way.
With thresholds and schemas, I cheer with delight 🥕!

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts

Oops! Something went wrong! :(

ESLint: 8.45.0

ESLint couldn't find the config "custom" to extend from. Please check that the name of the config is correct.

The config "custom" was referenced from the config file in "/.eslintrc.js".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.

✨ 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:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • 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: 1

🧹 Nitpick comments (1)
apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts (1)

132-156: Consider enhancing type safety in the conversion function.

The conversion function is well-structured and properly documented. To enhance type safety, consider using the Pick utility type to explicitly define which options should be retained rather than manually unsetting specific options.

Here's a suggested improvement:

 function convertV1BodyToV2Body(
   body: BatchTriggerTaskRequestBody,
   taskIdentifier: string
 ): BatchTriggerTaskV2RequestBody {
   return {
     items: body.items.map((item) => ({
       task: taskIdentifier,
       payload: item.payload,
       context: item.context,
       options: item.options
         ? {
-            ...item.options,
-            dependentBatch: undefined,
-            parentBatch: undefined,
-            dependentAttempt: undefined,
+            ...Pick<typeof item.options, Exclude<keyof typeof item.options, 'dependentBatch' | 'parentBatch' | 'dependentAttempt'>>,
           }
         : undefined,
     })),
     dependentAttempt: body.dependentAttempt,
   };
 }
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 634c39c and 5977e1e.

📒 Files selected for processing (1)
  • apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts (4 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (7)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - npm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)
  • GitHub Check: units / 🧪 Unit Tests
  • GitHub Check: typecheck / typecheck
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (2)
apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts (2)

95-102: LGTM! Well-structured request handling.

The conversion from v1 to v2 body format and the service call are properly implemented with comprehensive error handling and context propagation.


88-88: Configure BatchTriggerV3Service with execution parameters.

According to the AI summary, BatchTriggerV3Service accepts parameters for execution mode and maximum batch size in its constructor. Consider configuring these parameters during initialization.

Let's verify the constructor parameters:

✅ Verification successful

🏁 Script executed:

#!/bin/bash
# Search for BatchTriggerV3Service constructor definition
ast-grep --pattern $'class BatchTriggerV3Service {
  constructor($_) {
    $$$
  }
}'

Length of output: 86


Let's gather more details about the BatchTriggerV3Service definition by searching for its class declaration and constructor using ripgrep. This will help us verify what parameters, if any, the constructor accepts.


🏁 Script executed:

#!/bin/bash
# Search for the class declaration for BatchTriggerV3Service
rg "class BatchTriggerV3Service" -n

# Additionally, search for the constructor definition within files containing the class.
rg "class BatchTriggerV3Service" -n | while read -r line; do
  filename=$(echo "$line" | cut -d: -f1)
  echo "Searching in $filename for constructor details..."
  rg "constructor(" "$filename" -n
done

Length of output: 766


Let's gather more details from the service definition by re-running the search with escaped parentheses to handle the regex error. This will help us confirm if the constructor accepts execution parameters.


🏁 Script executed:

#!/bin/bash
# Re-run regex search with escaped parentheses to avoid regex parse errors
rg -A15 "constructor\\(" apps/webapp/app/v3/services/batchTriggerV3.server.ts

Length of output: 675


Explicitly configure BatchTriggerV3Service with execution parameters.

Our investigation confirms that BatchTriggerV3Service’s constructor accepts parameters—specifically, an optional batchProcessingStrategy (which defaults to "parallel") and asyncBatchProcessSizeThreshold (defaulting to ASYNC_BATCH_PROCESS_SIZE_THRESHOLD)—in addition to a Prisma client that defaults to the prisma instance. Instantiating the service without arguments causes it to rely on these defaults. If the intent is to use custom execution parameters, explicitly configuring them during initialization would improve clarity and maintainability.

@ericallam ericallam merged commit 0b555fa into main Feb 6, 2025
11 checks passed
@ericallam ericallam deleted the ea-branch-17 branch February 6, 2025 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant