-
Notifications
You must be signed in to change notification settings - Fork 30
fix: Fix default configs always being disabled #965
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
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 |
|---|---|---|
|
|
@@ -69,12 +69,32 @@ export class LDAIClientImpl implements LDAIClient { | |
| return Mustache.render(template, variables, undefined, { escape: (item: any) => item }); | ||
| } | ||
|
|
||
| private static _toLDFlagValue(defaultValue: LDAIDefaults | LDAIAgentDefaults): { | ||
| _ldMeta: { enabled: boolean }; | ||
| model?: LDModelConfig; | ||
| messages?: LDMessage[]; | ||
| provider?: LDProviderConfig; | ||
| instructions?: string; | ||
| } { | ||
| return { | ||
| _ldMeta: { enabled: defaultValue.enabled ?? false }, | ||
| model: defaultValue.model, | ||
| messages: 'messages' in defaultValue ? defaultValue.messages : undefined, | ||
| provider: defaultValue.provider, | ||
| instructions: 'instructions' in defaultValue ? defaultValue.instructions : undefined, | ||
| }; | ||
| } | ||
|
|
||
| private async _evaluate( | ||
| key: string, | ||
| context: LDContext, | ||
| defaultValue: LDAIDefaults, | ||
| ): Promise<EvaluationResult> { | ||
| const value: VariationContent = await this._ldClient.variation(key, context, defaultValue); | ||
| // Convert default value to LDFlagValue format | ||
| // eslint-disable-next-line no-underscore-dangle | ||
| const ldFlagValue = LDAIClientImpl._toLDFlagValue(defaultValue); | ||
|
|
||
| const value: VariationContent = await this._ldClient.variation(key, context, ldFlagValue); | ||
|
|
||
| const tracker = new LDAIConfigTrackerImpl( | ||
| this._ldClient, | ||
|
|
@@ -109,11 +129,13 @@ export class LDAIClientImpl implements LDAIClient { | |
| defaultValue: LDAIAgentDefaults, | ||
| variables?: Record<string, unknown>, | ||
| ): Promise<LDAIAgent> { | ||
| const { tracker, enabled, model, provider, instructions } = await this._evaluate( | ||
| key, | ||
| context, | ||
| defaultValue, | ||
| ); | ||
| const { | ||
|
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. this is just a consistency formatting change to align with how we format in the config method. |
||
| tracker, | ||
| enabled, | ||
| model, | ||
| provider: configProvider, | ||
| instructions, | ||
| } = await this._evaluate(key, context, defaultValue); | ||
|
|
||
| const agent: LDAIAgent = { | ||
| tracker, | ||
|
|
@@ -126,8 +148,8 @@ export class LDAIClientImpl implements LDAIClient { | |
| agent.model = { ...model }; | ||
| } | ||
|
|
||
| if (provider) { | ||
| agent.provider = { ...provider }; | ||
| if (configProvider) { | ||
| agent.provider = { ...configProvider }; | ||
| } | ||
|
|
||
| const allVariables = { ...variables, ldctx: context }; | ||
|
|
||
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.
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.
This could be static. Does it need to be defined on LDAIClientImpl?
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.
Ideally this would be defined in api/config as a utility method but this could create a circular dependency. I wanted to avoid any breaking changes to the SDK for this.
Current flow:
This creates a cycle: