-
-
Notifications
You must be signed in to change notification settings - Fork 366
feat: Allow instance-level customization of tool parameters #572
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
Open
psdaniel
wants to merge
2
commits into
crmne:main
Choose a base branch
from
psdaniel:feature/customizable-tool-parameters
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -62,7 +62,21 @@ def provider_params | |||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| # Initialize with optional instance-level overrides | ||||||||||||||||||||||||||||||||
| # @param name [String, nil] Override the computed tool name (useful for unique identification) | ||||||||||||||||||||||||||||||||
| # @param description [String, nil] Override the class-level description | ||||||||||||||||||||||||||||||||
| # @param parameters [Hash, nil] Override the class-level parameters | ||||||||||||||||||||||||||||||||
| # @param provider_params [Hash, nil] Override the class-level provider_params | ||||||||||||||||||||||||||||||||
| def initialize(name: nil, description: nil, parameters: nil, provider_params: nil) | ||||||||||||||||||||||||||||||||
| @instance_name = name | ||||||||||||||||||||||||||||||||
| @instance_description = description | ||||||||||||||||||||||||||||||||
| @instance_parameters = parameters | ||||||||||||||||||||||||||||||||
| @instance_provider_params = provider_params | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| def name | ||||||||||||||||||||||||||||||||
| return @instance_name if @instance_name | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| klass_name = self.class.name | ||||||||||||||||||||||||||||||||
| normalized = klass_name.to_s.dup.force_encoding('UTF-8').unicode_normalize(:nfkd) | ||||||||||||||||||||||||||||||||
| normalized.encode('ASCII', replace: '') | ||||||||||||||||||||||||||||||||
|
|
@@ -74,18 +88,43 @@ def name | |||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| def description | ||||||||||||||||||||||||||||||||
| self.class.description | ||||||||||||||||||||||||||||||||
| @instance_description || self.class.description | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| def parameters | ||||||||||||||||||||||||||||||||
| self.class.parameters | ||||||||||||||||||||||||||||||||
| @instance_parameters || self.class.parameters | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| def provider_params | ||||||||||||||||||||||||||||||||
| self.class.provider_params | ||||||||||||||||||||||||||||||||
| @instance_provider_params || self.class.provider_params | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| # Instance-level setters for customization after initialization | ||||||||||||||||||||||||||||||||
| def name=(value) | ||||||||||||||||||||||||||||||||
| @instance_name = value | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| def description=(value) | ||||||||||||||||||||||||||||||||
| @instance_description = value | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| def parameters=(value) | ||||||||||||||||||||||||||||||||
| @instance_parameters = value | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| def provider_params=(value) | ||||||||||||||||||||||||||||||||
| @instance_provider_params = value | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| def params_schema | ||||||||||||||||||||||||||||||||
| # If instance parameters are set, generate schema from them (not memoized) | ||||||||||||||||||||||||||||||||
| if @instance_parameters | ||||||||||||||||||||||||||||||||
| return SchemaDefinition.from_parameters(@instance_parameters)&.json_schema if @instance_parameters.any? | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| return nil | ||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||
|
Comment on lines
+121
to
+125
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Line 122 in bd2bb14
we can also just one line it
Suggested change
|
||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| # Otherwise use class-level schema (memoized) | ||||||||||||||||||||||||||||||||
| return @params_schema if defined?(@params_schema) | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
| @params_schema = begin | ||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the current implementation, this would fail without giving a name, as both would have the same name and get overwritten.
I think the current name approach is great, as this won't break the overwriting functionality, but we need to be clear in the docs.