yesudeep/refactor/fixed flight

.github/workflows/e2e-tests.yml

@@ -24,22 +24,24 @@ jobs:
     name: Run e2e tests
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: pnpm/action-setup@v3
-    - name: Set up node v20
-      uses: actions/setup-node@v4
-      with:
-        node-version: 21.x
-        cache: 'pnpm'
-    - name: Install dependencies
-      run: pnpm install
-    - name: Run build script
-      run: pnpm build
-    - name: Run pack:all script
-      run: pnpm pack:all
-    - name: Run js tests
-      run: pnpm test:js
-    - name: Run e2e tests
-      run: pnpm test:e2e
-    - name: Validate working directory is clean
-      run: .github/workflows/scripts/ensure-clean-working-tree.sh
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v3
+      - name: Set up node v20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: "pnpm"
+      - name: Install dependencies
+        run: pnpm install
+      - name: Run build script
+        run: pnpm build
+      - name: Run pack:all script
+        run: pnpm pack:all
+      - name: Install local Genkit
+        run: pnpm link ./js/genkit
+      - name: Run js tests
+        run: pnpm test:js
+      - name: Run e2e tests
+        run: pnpm test:e2e
+      - name: Validate working directory is clean
+        run: .github/workflows/scripts/ensure-clean-working-tree.sh

README.md

@@ -101,11 +101,13 @@ Want to skip the local setup? Click below to try out Genkit using [Project IDX](
 
 Take a look at some samples of Genkit in use:
 
-- ["AI barista"](https://github.com/firebase/quickstart-nodejs/tree/master/genkit/js-coffee-shop) -- demonstrates simple LLM usage
-- [A simple chatbot with a JavaScript frontend](https://github.com/firebase/quickstart-nodejs/tree/master/genkit/chatbot) -- add history to LLM sessions
-- [Restaurant menu Q&A app](https://github.com/firebase/quickstart-nodejs/tree/master/genkit/js-menu) -- this sample shows progressively
+- ["AI barista"](https://github.com/firebase/genkit/blob/main/samples/js-coffee-shop) -- demonstrates simple LLM usage
+- [A simple chatbot with a JavaScript frontend](https://github.com/firebase/genkit/blob/main/samples/chatbot) -- add history to LLM sessions
+- [Restaurant menu Q&A app](https://github.com/firebase/genkit/blob/main/samples/js-menu) -- this sample shows progressively
   more sophisticated versions of a menu understanding app.
-- [Streaming to an Angular frontend](https://github.com/firebase/quickstart-nodejs/tree/master/genkit/js-angular)
+- [Streaming to an Angular frontend](https://github.com/firebase/genkit/blob/main/samples/js-angular)
+- [js-schoolAgent](https://github.com/firebase/genkit/blob/main/samples/js-schoolAgent/): A simple school assistant system with a routing agent and specialized agents
+- [Prompts](https://github.com/firebase/genkit/blob/main/samples/prompts/): Shows off several prompting techniques
 
 ## Connect with us
 

docs/auth.md

@@ -250,11 +250,12 @@ alongside the native flows. You have two options:
 1.  Use whatever server framework you like, and pass the auth context through via
     the flow call as noted above.
 
-1.  Use the built-in `startFlowsServer()` and provide Express middleware in the
-    flow config:
+1.  Use  `startFlowsServer()` available via `@genkit-ai/express` plugin and provide
+    Express auth middleware in the flow server config:
 
     ```ts
     import { genkit, z } from 'genkit';
+    import { startFlowServer, withAuth } from '@genkit-ai/express';
 
     const ai = genkit({ ... });;
 
@@ -263,32 +264,32 @@ alongside the native flows. You have two options:
         name: 'selfSummaryFlow',
         inputSchema: z.object({ uid: z.string() }),
         outputSchema: z.string(),
-        middleware: [
-          (req, res, next) => {
-            const token = req.headers['authorization'];
-            const user = yourVerificationLibrary(token);
-
-            // Pass auth information to the flow
-            req.auth = user;
-            next();
-          }
-        ],
-        authPolicy: (auth, input) => {
-          if (!auth) {
-            throw new Error('Authorization required.');
-          }
-          if (input.uid !== auth.uid) {
-            throw new Error('You may only summarize your own profile data.');
-          }
-        }
       },
       async (input) => {
         // Flow logic here...
       }
     );
 
-    ai.startFlowServer({
-      flows: [selfSummaryFlow],
+    const authProvider = (req, res, next) => {
+      const token = req.headers['authorization'];
+      const user = yourVerificationLibrary(token);
+
+      // Pass auth information to the flow
+      req.auth = user;
+      next();
+    };
+
+    startFlowServer({
+      flows: [
+        withAuth(selfSummaryFlow, authProvider, ({ auth, action, input, request }) => {
+          if (!auth) {
+            throw new Error('Authorization required.');
+          }
+          if (input.uid !== auth.uid) {
+            throw new Error('You may only summarize your own profile data.');
+          }
+        })
+      ],
     });  // Registers the middleware
     ```
 

docs/cloud-run.md

@@ -55,7 +55,9 @@ endpoints.
 When you make the call, specify the flows you want to serve:
 
 ```ts
-ai.startFlowServer({
+import { startFlowServer } from '@genkit-ai/express';
+
+startFlowServer({
   flows: [menuSuggestionFlow],
 });
 ```

docs/deploy-node.md

@@ -48,6 +48,7 @@ sample flow.
   ```typescript
   import { genkit } from 'genkit';
   import { googleAI, gemini15Flash } from '@genkit-ai/googleai';
+  import { startFlowServer } from '@genkit-ai/express';
 
   const ai = genkit({
     plugins: [googleAI()],
@@ -66,7 +67,7 @@ sample flow.
     }
   );
 
-  ai.startFlowServer({
+  startFlowServer({
     flows: [menuSuggestionFlow],
   });
   ```