feat(config): support workflow merge#478
Merged
Merged
Conversation
- Add merge crate as a dependency with derive feature - Create new merge module with custom merge strategies - Implement Merge trait for Agent and Workflow structs - Add field-specific merge strategies in Agent struct - Add custom agent merging function in Workflow - Remove unused default_max_length function
…ce rules - Refactor loader.rs with domain-focused structure for better code organization - Add WorkflowSource enum to represent different configuration sources - Implement proper configuration merging where project settings override defaults - Update README with clear documentation on configuration loading precedence - Add merge and bytes dependencies to forge_api crate This change improves the configuration loading logic by clearly separating concerns and making the precedence rules explicit, while ensuring backward compatibility.
…optional - Make agent model field optional with proper Option<ModelId> type handling - Refactor merge strategies into dedicated modules (std, vec, bool) - Improve configuration merging with specialized strategies for different types - Simplify default forge.yaml to minimal required configuration - Standardize parameter naming in provider services (id/model_id → model) - Add error handling for missing model in agents - Apply consistent code formatting
- Add Key trait to provide identity-based access to mergeable objects - Implement Key trait for Agent using AgentId - Add unify_by_key function for merging collections based on object identity - Refactor workflow agent merging to use the new generic function - Improve maintainability by consolidating merging logic in merge module
tusharmath
force-pushed
the
config-merge
branch
from
March 11, 2025 04:15
77bd022 to
4e2ccec
Compare
tusharmath
enabled auto-merge (squash)
March 11, 2025 04:16
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR introduces several important improvements to the configuration system and model handling:
Changes
Benefits
Testing
The changes have been tested by:
Related Issues
Resolves issues with configuration merging and agent model handling.