-
Notifications
You must be signed in to change notification settings - Fork 151
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
feat(js/ai/prompt): added prepare fn option to definePrompt #1779
Open
pavelgj
wants to merge
3
commits into
main
Choose a base branch
from
pj/promptPrepare
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
3 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 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 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 | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -125,6 +125,7 @@ export interface PromptConfig< | |||||||||||
toolChoice?: ToolChoice; | ||||||||||||
use?: ModelMiddleware[]; | ||||||||||||
context?: ActionContext; | ||||||||||||
prepare?: PromptPrepare<I, O, CustomOptions>; | ||||||||||||
} | ||||||||||||
|
||||||||||||
/** | ||||||||||||
|
@@ -208,6 +209,34 @@ export type DocsResolver<I, S = any> = ( | |||||||||||
} | ||||||||||||
) => DocumentData[] | Promise<DocumentData[]>; | ||||||||||||
|
||||||||||||
/** | ||||||||||||
* A function that can be passes to the prompt that can produce additional propmpt render options | ||||||||||||
* like context, docs, or any other propmpt option really: | ||||||||||||
Comment on lines
+213
to
+214
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
|
||||||||||||
* | ||||||||||||
* ```ts | ||||||||||||
* const ragPrompt = ai.definePrompt({ | ||||||||||||
* prepare: async (input, {context}) => ({ | ||||||||||||
* context: {...context, userInfo: await fetchUserInfo(context.auth.uid)}, | ||||||||||||
* docs: await myRetriever({query: input.query}), | ||||||||||||
* }) | ||||||||||||
* }) | ||||||||||||
* ``` | ||||||||||||
*/ | ||||||||||||
export type PromptPrepare< | ||||||||||||
I extends z.ZodTypeAny = z.ZodTypeAny, | ||||||||||||
O extends z.ZodTypeAny = z.ZodTypeAny, | ||||||||||||
CustomOptions extends z.ZodTypeAny = z.ZodTypeAny, | ||||||||||||
S = any, | ||||||||||||
> = ( | ||||||||||||
input: I, | ||||||||||||
options: { | ||||||||||||
state?: S; | ||||||||||||
context: ActionContext; | ||||||||||||
} | ||||||||||||
) => | ||||||||||||
| PromptGenerateOptions<O, CustomOptions> | ||||||||||||
| PromiseLike<PromptGenerateOptions<O, CustomOptions>>; | ||||||||||||
|
||||||||||||
interface PromptCache { | ||||||||||||
userPrompt?: PromptFunction; | ||||||||||||
system?: PromptFunction; | ||||||||||||
|
@@ -250,10 +279,22 @@ function definePromptAsync< | |||||||||||
renderOptions: PromptGenerateOptions<O, CustomOptions> | undefined | ||||||||||||
): Promise<GenerateOptions> => { | ||||||||||||
const messages: MessageData[] = []; | ||||||||||||
renderOptions = { ...renderOptions }; // make a copy, we will be trimming | ||||||||||||
const session = getCurrentSession(registry); | ||||||||||||
const resolvedOptions = await optionsPromise; | ||||||||||||
|
||||||||||||
// if prepare option is set, invoke it and merge with renderOptions | ||||||||||||
const preparedOptions = resolvedOptions?.prepare | ||||||||||||
? await resolvedOptions?.prepare(input, { | ||||||||||||
state: session?.state, | ||||||||||||
context: renderOptions?.context || getContext(registry) || {}, | ||||||||||||
}) | ||||||||||||
: {}; | ||||||||||||
// make a copy of renderOptions, we will be trimming | ||||||||||||
renderOptions = { | ||||||||||||
...renderOptions, | ||||||||||||
...preparedOptions, | ||||||||||||
}; | ||||||||||||
|
||||||||||||
// order of these matters: | ||||||||||||
await renderSystemPrompt( | ||||||||||||
registry, | ||||||||||||
|
This file contains 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 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.
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.
Maybe we should mark this with
@beta
in docs and add anassertUnstable
to the code that handles it. The main concern I have about marking this stable is that I wonder if it should be allowed to manipulate the input, not just context, and that would cause weirdness with types.