hacks i did to make demo work

firebase · Nov 8, 2024 · ae136dd · ae136dd
1 parent 4fe843b
commit ae136dd
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 9 deletions.
diff --git a/js/ai/src/tool.ts b/js/ai/src/tool.ts
@@ -120,13 +120,16 @@ export async function lookupToolByName(
   registry: Registry,
   name: string
 ): Promise<ToolAction> {
-  let tool =
-    (await registry.lookupAction(name)) ||
+  await registry.initializeAllPlugins();
+  const tool =
     (await registry.lookupAction(`/tool/${name}`)) ||
+    (await registry.lookupAction(name)) ||
     (await registry.lookupAction(`/prompt/${name}`));
+
   if (!tool) {
     throw new Error(`Tool ${name} not found`);
   }
+  console.log(tool.__action.name, ':', tool.__action.description);
   return tool as ToolAction;
 }
 

diff --git a/js/genkit/src/chat.ts b/js/genkit/src/chat.ts
@@ -79,6 +79,7 @@ export class Chat {
       messages?: MessageData[];
     }
   ) {
+    console.log('Chat CONSTRUCTOR');
     this.sessionId = options.id;
     this.threadName = options.thread;
     this.requestBase = requestBase?.then((rb) => {
@@ -105,9 +106,10 @@ export class Chat {
         }
         requestBase.messages = [...(requestBase.messages ?? []), promptMessage];
       }
+
       requestBase.messages = [
-        ...(options.messages ?? []),
         ...(requestBase.messages ?? []),
+        ...(options.messages?.filter((m) => !m.metadata?.preamble) ?? []),
       ];
       this._messages = requestBase.messages;
       return requestBase;
@@ -121,6 +123,7 @@ export class Chat {
   >(
     options: string | Part[] | ChatGenerateOptions<O, CustomOptions>
   ): Promise<GenerateResponse<z.infer<O>>> {
+    console.log('TOP OF SEND');
     return runWithSession(this.session, () =>
       runInNewSpan({ metadata: { name: 'send' } }, async () => {
         let resolvedOptions;
@@ -140,11 +143,13 @@ export class Chat {
           resolvedOptions = options as ChatGenerateOptions<O, CustomOptions>;
           streamingCallback = resolvedOptions.streamingCallback;
         }
+        console.log('ABOUT TO AWAIT REQUESTBASE');
         let request: GenerateOptions = {
           ...(await this.requestBase),
           messages: this.messages,
           ...resolvedOptions,
         };
+        console.log('REQUEST:', request);
         let response = await this.genkit.generate({
           ...request,
           streamingCallback,
@@ -185,11 +190,15 @@ export class Chat {
           resolvedOptions = options as GenerateStreamOptions<O, CustomOptions>;
         }
 
+        console.log('ABOUT TO CALL GENERATESTREAM');
+        const resolvedRequest = await this.requestBase;
+        console.log('MESSAGES:', this.messages);
         const { response, stream } = await this.genkit.generateStream({
-          ...(await this.requestBase),
+          ...resolvedRequest,
           messages: this.messages,
           ...resolvedOptions,
         });
+        console.log('IT GOT CALLED');
 
         return {
           response: response.finally(async () => {

diff --git a/js/genkit/src/genkit.ts b/js/genkit/src/genkit.ts
@@ -956,7 +956,7 @@ export class Genkit {
    * Create a session for this environment.
    */
   createSession<S = any>(options?: SessionOptions<S>): Session<S> {
-    const sessionId = uuidv4();
+    const sessionId = options?.sessionId || uuidv4();
     const sessionData: SessionData = {
       id: sessionId,
       state: options?.initialState,
@@ -973,12 +973,19 @@ export class Genkit {
    */
   async loadSession(
     sessionId: string,
-    options: SessionOptions
+    options: SessionOptions & { createIfMissing?: boolean }
   ): Promise<Session> {
     if (!options.store) {
       throw new Error('options.store is required');
     }
     const sessionData = await options.store.get(sessionId);
+    if (!sessionData && options.createIfMissing) {
+      return this.createSession({
+        sessionId,
+        initialState: options.initialState,
+        store: options.store,
+      });
+    }
 
     return new Session(this, {
       id: sessionId,

diff --git a/js/plugins/dotprompt/src/metadata.ts b/js/plugins/dotprompt/src/metadata.ts
@@ -86,6 +86,7 @@ export interface PromptMetadata<
  */
 export const PromptFrontmatterSchema = z.object({
   name: z.string().optional(),
+  description: z.string().optional(),
   variant: z.string().optional(),
   model: z.string().optional(),
   tools: z.array(z.string()).optional(),
@@ -135,6 +136,7 @@ export function toMetadata(
   const fm = parseSchema<z.infer<typeof PromptFrontmatterSchema>>(attributes, {
     schema: PromptFrontmatterSchema,
   });
+  console.log('PARSED FM:', fm);
 
   let input: PromptMetadata['input'] | undefined;
   if (fm.input) {
@@ -154,6 +156,7 @@ export function toMetadata(
 
   return stripUndefinedOrNull({
     name: fm.name,
+    description: fm.description,
     variant: fm.variant,
     model: fm.model,
     config: fm.config,
@@ -167,6 +170,7 @@ export function toMetadata(
 export function toFrontmatter(md: PromptMetadata): PromptFrontmatter {
   return stripUndefinedOrNull({
     name: md.name,
+    description: md.description,
     variant: md.variant,
     model: typeof md.model === 'string' ? md.model : md.model?.name,
     config: md.config,

diff --git a/js/plugins/dotprompt/src/prompt.ts b/js/plugins/dotprompt/src/prompt.ts
@@ -193,7 +193,26 @@ export class Dotprompt<I = unknown> implements PromptMetadata<z.ZodTypeAny> {
     return this._render(
       { ...this.input?.default, ...input },
       options,
-      sessionStateData
+      sessionStateData || {
+        state: {
+          parentId: 4112,
+          parentName: 'Francis Example',
+          students: [
+            {
+              id: 3734,
+              name: 'Evelyn Example',
+              grade: 9,
+              activities: ['Choir', 'Drama Club'],
+            },
+            {
+              id: 9433,
+              name: 'Evan Example',
+              grade: 11,
+              activities: ['Chess Club'],
+            },
+          ],
+        },
+      }
     );
   }
 
@@ -206,7 +225,7 @@ export class Dotprompt<I = unknown> implements PromptMetadata<z.ZodTypeAny> {
       this.registry,
       {
         name: registryDefinitionKey(this.name, this.variant, options?.ns),
-        description: options?.description ?? 'Defined by Dotprompt',
+        description: options?.description,
         inputSchema: this.input?.schema,
         inputJsonSchema: this.input?.jsonSchema,
         metadata: {

diff --git a/js/plugins/dotprompt/src/registry.ts b/js/plugins/dotprompt/src/registry.ts
@@ -147,10 +147,12 @@ export function loadPrompt(
     variant = parts[1];
   }
   const source = readFileSync(join(path, filename), 'utf8');
+
+  console.log('LOAD PROMPT:', name);
   const prompt = Dotprompt.parse(registry, name, source);
   if (variant) {
     prompt.variant = variant;
   }
-  prompt.define({ ns: `dotprompt` });
+  prompt.define();
   return prompt;
 }