Skip to content

Conversation

@pan-x-c
Copy link
Collaborator

@pan-x-c pan-x-c commented Jul 24, 2025

Description

  • Add advantages and returns to Experience and Experiences
  • Reduce unnecessary whitespace padding in Experience and Experiences
  • Support custom fields in Experiences
  • Move SampleStrategy into Trainer
  • SampleStrategy return Experiences

Checklist

Please check the following items before code is ready to be reviewed.

  • Code has passed all tests
  • Docstrings have been added/updated in Google Style
  • Documentation has been updated
  • Code is ready for review

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @pan-x-c, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly enhances the Experience and Experiences data structures by introducing advantages and returns fields, which are essential for advanced reinforcement learning. Concurrently, I've standardized how logprobs and action_masks are represented, ensuring they consistently pertain only to the generated response, rather than the entire sequence. This change streamlines data handling, improves clarity, and prepares the system for more robust RL algorithm implementations.

Highlights

  • Data Model Enhancement: I've extended the Experience and Experiences data structures to include new fields: advantages and returns. These additions are crucial for supporting more sophisticated reinforcement learning algorithms that rely on these values for policy optimization.
  • Standardized Response-Only Tensors: I've refined the definition and handling of logprobs and action_masks within the Experience and Experiences classes. They now consistently represent only the generated response tokens, excluding the prompt tokens. This simplifies data processing and aligns the data structures with common RL paradigms where prompt and response components are often treated separately.
  • Improved Prompt Length Handling: The prompt_length is now explicitly returned by tokenization utilities (tokenize_and_mask_messages_hf, tokenize_and_mask_messages_default) and is used to correctly slice action_masks and logprobs. This ensures that these tensors accurately reflect only the response portion of the sequence, improving data integrity and consistency.
  • Refined Test Cases and Utilities: I've updated existing test cases in experience_test.py to validate the new advantages and returns fields, as well as the refined handling of logprobs and action_masks. Corresponding utility functions for gathering and batching experiences (gather_action_masks, gather_logprobs, etc.) have been adjusted to accommodate these changes, ensuring correct data aggregation.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments or fill out our survey to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@pan-x-c pan-x-c changed the title Standardize Experience and Sample Strategy [WIP] Standardize Experience and Sample Strategy Jul 24, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

The pull request introduces significant improvements to the Experience and Experiences classes, including the addition of advantages and returns. The review focuses on potential bugs in tensor handling and opportunities for code deduplication to improve maintainability.

@pan-x-c
Copy link
Collaborator Author

pan-x-c commented Jul 24, 2025

/unittest-module-trainer

@github-actions
Copy link

Summary

Tests 📝 Passed ✅ Failed ❌ Skipped ⏭️ Other ❓ Flaky 🍂 Duration ⏱️
9 9 0 0 0 0 715ms

Tests

Test Name Status Flaky Duration
tests/trainer/trainer_test.py::BaseTrainerCase::test_trainer 1ms
tests/trainer/trainer_test.py::TestTrainerCountdown::test_trainer 228ms
tests/trainer/trainer_test.py::TestStepAheadAsyncRL::test_trainer 91ms
tests/trainer/trainer_test.py::TestTrainerGSM8K::test_trainer 55ms
tests/trainer/trainer_test.py::TestTrainerSFTWarmupGSM8K::test_trainer 70ms
tests/trainer/trainer_test.py::TestTrainerDPO::test_trainer 43ms
tests/trainer/trainer_test.py::TestTrainerSFT::test_trainer 38ms
tests/trainer/trainer_test.py::TestFullyAsyncMode::test_fully_async_mode_0_queue 90ms
tests/trainer/trainer_test.py::TestFullyAsyncMode::test_fully_async_mode_1_priority_queue 90ms

Github Test Reporter by CTRF 💚

@pan-x-c pan-x-c changed the title [WIP] Standardize Experience and Sample Strategy Standardize Experience and Sample Strategy Jul 25, 2025
@pan-x-c
Copy link
Collaborator Author

pan-x-c commented Jul 25, 2025

/unittest-all

@pan-x-c
Copy link
Collaborator Author

pan-x-c commented Jul 25, 2025

/unittest-all

@pan-x-c pan-x-c requested a review from Copilot July 25, 2025 04:25
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR standardizes the Experience and Sample Strategy components by adding new fields, reducing unnecessary padding, enabling custom fields support, and consolidating sampling logic within the Trainer class.

  • Adds advantages and returns fields to Experience/Experiences classes for better RL algorithm support
  • Moves SampleStrategy from trainer implementations into the base Trainer class for consistency
  • Introduces custom fields support in Experiences for flexible data handling

Reviewed Changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
trinity/common/experience.py Adds advantages/returns fields, CustomField support, and optimizes logprobs/action_mask handling
trinity/trainer/trainer.py Moves SampleStrategy initialization and train_step logic into base Trainer class
trinity/trainer/verl_trainer.py Removes sampling logic and monitoring code, now delegates to base Trainer
trinity/trainer/verl/converter.py New converter module for transforming Experiences to verl DataProto format
trinity/algorithm/sample_strategy/ Updates sample strategies to return Experiences instead of trainer-specific formats
trinity/common/models/ Updates model classes to handle new logprobs format (response-only)
tests/ Updates test cases to match new Experience structure
Comments suppressed due to low confidence (1)

trinity/trainer/verl_trainer.py:272

  • [nitpick] The return type annotation shows Tuple[bool, Dict] but should be more specific like Tuple[bool, Dict[str, Any]] to indicate what the Dict contains (metrics).
    def train_step(self, batch: Experiences) -> Tuple[bool, Dict]:  # noqa C901

@pan-x-c
Copy link
Collaborator Author

pan-x-c commented Jul 25, 2025

/unittest-all

@github-actions
Copy link

Summary

Tests 📝 Passed ✅ Failed ❌ Skipped ⏭️ Other ❓ Flaky 🍂 Duration ⏱️
61 61 0 0 0 0 1.2s

Tests

Test Name Status Flaky Duration
tests/algorithm/policy_loss_test.py::VerlPolicyLossTest::test_dpo_policy_loss 1ms
tests/algorithm/policy_loss_test.py::VerlPolicyLossTest::test_mix_policy_loss 1ms
tests/algorithm/policy_loss_test.py::VerlPolicyLossTest::test_opmd_policy_loss 1ms
tests/algorithm/policy_loss_test.py::VerlPolicyLossTest::test_ppo_policy_loss 1ms
tests/algorithm/policy_loss_test.py::VerlPolicyLossTest::test_sft_policy_loss 1ms
tests/buffer/file_test.py::TestFileBuffer::test_file_buffer 3ms
tests/buffer/file_test.py::TestFileBuffer::test_file_reader 1ms
tests/buffer/file_test.py::TestFileBuffer::test_file_writer 2ms
tests/buffer/queue_test.py::TestQueueBuffer::test_priority_queue_buffer_reuse 6ms
tests/buffer/queue_test.py::TestQueueBuffer::test_priority_queue_capacity 2ms
tests/buffer/queue_test.py::TestQueueBuffer::test_queue_buffer_0_queue 4ms
tests/buffer/queue_test.py::TestQueueBuffer::test_queue_buffer_1_priority_queue 5ms
tests/buffer/queue_test.py::TestQueueBuffer::test_queue_buffer_capacity 4ms
tests/buffer/sql_test.py::TestSQLBuffer::test_create_sql_buffer 4ms
tests/common/config_test.py::TestConfig::test_all_examples_are_valid 2ms
tests/common/config_test.py::TestConfig::test_continue_from_checkpoint_is_valid 1ms
tests/common/config_test.py::TestConfig::test_load_default_config 6ms
tests/common/experience_test.py::TestEID::test_eid_properties 1ms
tests/common/experience_test.py::TestExperience::test_action_mask_and_logprobs_type 1ms
tests/common/experience_test.py::TestExperience::test_assertions 1ms
tests/common/experience_test.py::TestExperience::test_dpo_experience 1ms
tests/common/experience_test.py::TestExperience::test_gather 1ms
tests/common/experience_test.py::TestExperience::test_multi_turn_experience 1ms
tests/common/experience_test.py::TestExperience::test_serialize_deserialize 1ms
tests/common/experience_test.py::TestExperience::test_single_turn_experience 1ms
tests/common/experience_test.py::TestExperience::test_to_dict 1ms
tests/common/experience_test.py::TestExperienceConversion::test_batch_conversion 1ms
tests/common/experience_test.py::TestExperienceConversion::test_dpo_experience_batch_conversion 1ms
tests/common/experience_test.py::TestExperienceConversion::test_experience_model_experience_conversion 1ms
tests/common/experience_test.py::TestExperienceConversion::test_multiturn_experience_batch_converstion 1ms
tests/common/vllm_test.py::ModelWrapperTest_0::test_generate 61ms
tests/common/vllm_test.py::TestAPIServer::test_api 30ms
tests/common/vllm_test.py::TestTokenizer::test_assistant_token_mask 1ms
tests/explorer/explorer_test.py::BaseExplorerCase::test_explorer 1ms
tests/explorer/explorer_test.py::TestExplorerCountdownEval::test_explorer 81ms
tests/explorer/explorer_test.py::TestExplorerCountdownNoEval::test_explorer 93ms
tests/explorer/explorer_test.py::TestExplorerWithAddStrategy::test_explorer 53ms
tests/explorer/scheduler_test.py::SchedulerTest::test_concurrent_operations 4ms
tests/explorer/scheduler_test.py::SchedulerTest::test_get_results 19ms
tests/explorer/scheduler_test.py::SchedulerTest::test_scheduler_all_methods 14ms
tests/explorer/scheduler_test.py::SchedulerTest::test_scheduler_restart_after_stop 8ms
tests/explorer/scheduler_test.py::SchedulerTest::test_split_tasks 8ms
tests/explorer/scheduler_test.py::SchedulerTest::test_wait_all 7ms
tests/explorer/scheduler_test.py::SchedulerTest::test_wait_all_timeout_with_multi_batch 13ms
tests/explorer/workflow_test.py::WorkflowTest::test_gsm8k_workflow 1ms
tests/explorer/workflow_test.py::WorkflowTest::test_math_boxed_workflow 1ms
tests/explorer/workflow_test.py::WorkflowTest::test_math_complex_workflow 1ms
tests/explorer/workflow_test.py::WorkflowTest::test_math_fraction_workflow 1ms
tests/explorer/workflow_test.py::WorkflowTest::test_math_workflow 1ms
tests/explorer/workflow_test.py::WorkflowTest::test_rm_gallery_workflow 1ms
tests/explorer/workflow_test.py::WorkflowTest::test_workflow_resettable 1ms
tests/trainer/trainer_test.py::BaseTrainerCase::test_trainer 1ms
tests/trainer/trainer_test.py::TestTrainerCountdown::test_trainer 241ms
tests/trainer/trainer_test.py::TestStepAheadAsyncRL::test_trainer 93ms
tests/trainer/trainer_test.py::TestTrainerGSM8K::test_trainer 56ms
tests/trainer/trainer_test.py::TestTrainerSFTWarmupGSM8K::test_trainer 70ms
tests/trainer/trainer_test.py::TestTrainerDPO::test_trainer 40ms
tests/trainer/trainer_test.py::TestTrainerSFT::test_trainer 37ms
tests/trainer/trainer_test.py::TestFullyAsyncMode::test_fully_async_mode_0_queue 88ms
tests/trainer/trainer_test.py::TestFullyAsyncMode::test_fully_async_mode_1_priority_queue 87ms
tests/utils/plugin_test.py::TestPluginLoader::test_load_plugins 4ms

Github Test Reporter by CTRF 💚

Copy link
Collaborator

@yanxi-chen yanxi-chen left a comment

Choose a reason for hiding this comment

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

lgtm

@pan-x-c pan-x-c merged commit bd235db into modelscope:main Jul 28, 2025
2 checks passed
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.

2 participants