@aigne/example-mcp-blocklet 1.9.1 → 1.10.0

package/README.md

@@ -1,6 +1,6 @@
 # MCP Blocklet Demo
 
-This demo demonstrates how to use [AIGNE Framework](https://github.com/AIGNE-io/aigne-framework) and MCP to interact with apps hosted on the [Blocklet platform](https://github.com/blocklet).
+This demo demonstrates how to use [AIGNE Framework](https://github.com/AIGNE-io/aigne-framework) and MCP to interact with apps hosted on the [Blocklet platform](https://github.com/blocklet). The example now supports both one-shot and interactive chat modes, along with customizable model settings and pipeline input/output.
 
 ## Prerequisites
 
@@ -15,7 +15,14 @@ This demo demonstrates how to use [AIGNE Framework](https://github.com/AIGNE-io/
 ```bash
 export OPENAI_API_KEY=YOUR_OPENAI_API_KEY # Set your OpenAI API key
 
-npx -y @aigne/example-mcp-blocklet # Run the example
+# Run in one-shot mode (default)
+npx -y @aigne/example-mcp-blocklet
+
+# Run in interactive chat mode
+npx -y @aigne/example-mcp-blocklet --chat
+
+# Use pipeline input
+echo "What are the features of this blocklet app?" | npx -y @aigne/example-mcp-blocklet
 ```
 
 ## Installation
@@ -46,7 +53,7 @@ BLOCKLET_APP_URL="" # Set your Blocklet app URL here
 ### Run the Example
 
 ```bash
-pnpm start
+pnpm start # Run in one-shot mode (default)
 ```
 
 or
@@ -55,6 +62,34 @@ or
 pnpm start https://your-blocklet-app-url
 ```
 
+### Run Options
+
+The example supports the following command-line parameters:
+
+| Parameter | Description | Default |
+|-----------|-------------|---------|
+| `--chat` | Run in interactive chat mode | Disabled (one-shot mode) |
+| `--model <provider[:model]>` | AI model to use in format 'provider[:model]' where model is optional. Examples: 'openai' or 'openai:gpt-4o-mini' | openai |
+| `--temperature <value>` | Temperature for model generation | Provider default |
+| `--top-p <value>` | Top-p sampling value | Provider default |
+| `--presence-penalty <value>` | Presence penalty value | Provider default |
+| `--frequency-penalty <value>` | Frequency penalty value | Provider default |
+| `--log-level <level>` | Set logging level (ERROR, WARN, INFO, DEBUG, TRACE) | INFO |
+| `--input`, `-i <input>` | Specify input directly | None |
+
+#### Examples
+
+```bash
+# Run in chat mode (interactive)
+pnpm start -- --chat
+
+# Set logging level
+pnpm start -- --log-level DEBUG
+
+# Use pipeline input
+echo "What are the features of this blocklet app?" | pnpm start
+```
+
 ## License
 
 This project is licensed under the MIT License.

package/index.ts

@@ -1,19 +1,13 @@
 #!/usr/bin/env bunwrapper
 
 import assert from "node:assert";
-import { runChatLoopInTerminal } from "@aigne/cli/utils/run-chat-loop.js";
-import { AIAgent, AIGNE, MCPAgent, PromptBuilder } from "@aigne/core";
-import { loadModel } from "@aigne/core/loader/index.js";
-import { logger } from "@aigne/core/utils/logger.js";
+import { runWithAIGNE } from "@aigne/cli/utils/run-with-aigne.js";
+import { AIAgent, MCPAgent, PromptBuilder } from "@aigne/core";
 import { UnauthorizedError, refreshAuthorization } from "@modelcontextprotocol/sdk/client/auth.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-// @ts-ignore
 import JWT from "jsonwebtoken";
-
 import { TerminalOAuthProvider } from "./oauth.js";
 
-logger.enable(`aigne:mcp,${process.env.DEBUG}`);
-
 const rawUrl = process.argv[2] || process.env.BLOCKLET_APP_URL;
 assert(
   rawUrl,
@@ -56,9 +50,12 @@ try {
   let tokens = await provider.tokens();
   if (tokens) {
     let decoded = JWT.decode(tokens.access_token);
-    if (decoded) {
+    if (decoded && typeof decoded === "object") {
+      const exp = decoded.exp;
+      assert(typeof exp === "number", "Invalid access token");
+
       const now = Date.now();
-      const expiresAt = decoded.exp * 1000;
+      const expiresAt = exp * 1000;
       if (now < expiresAt) {
         console.info("Tokens already exist and not expired, skipping authorization");
       } else if (tokens.refresh_token) {
@@ -66,7 +63,7 @@ try {
         decoded = JWT.decode(tokens.refresh_token);
         if (decoded) {
           const now = Date.now();
-          const expiresAt = decoded.exp * 1000;
+          const expiresAt = exp * 1000;
           if (now < expiresAt) {
             console.info("Refresh token already exists and not expired, refreshing authorization");
             try {
@@ -111,34 +108,33 @@ try {
   }
 }
 
-const model = await loadModel();
-
-const blocklet = await MCPAgent.from({
-  url: appUrl.href,
-  transport: "streamableHttp",
-  opts: {
-    authProvider: provider,
+await runWithAIGNE(
+  async () => {
+    const blocklet = await MCPAgent.from({
+      url: appUrl.href,
+      transport: "streamableHttp",
+      opts: {
+        authProvider: provider,
+      },
+    });
+
+    const agent = AIAgent.from({
+      instructions: PromptBuilder.from(
+        "You are a helpful assistant that can help users query and analyze data from the blocklet. You can perform various database queries on the blocklet database, before performing any queries, please try to understand the user's request and generate a query base on the database schema.",
+      ),
+      skills: [blocklet],
+      memory: true,
+    });
+
+    return agent;
   },
-});
-
-const aigne = new AIGNE({
-  model,
-  skills: [blocklet],
-});
-
-const agent = AIAgent.from({
-  instructions: PromptBuilder.from(
-    "You are a helpful assistant that can help users query and analyze data from the blocklet. You can perform various database queries on the blocklet database, before performing any queries, please try to understand the user's request and generate a query base on the database schema.",
-  ),
-  memory: true,
-});
-
-const userAgent = aigne.invoke(agent);
-
-await runChatLoopInTerminal(userAgent, {
-  welcome:
-    "Hello! I'm a chatbot that can help you interact with the blocklet. Try asking me a question about the blocklet!",
-  defaultQuestion: "How many users are there in the database?",
-});
+  {
+    chatLoopOptions: {
+      welcome:
+        "Hello! I'm a chatbot that can help you interact with the blocklet. Try asking me a question about the blocklet!",
+      defaultQuestion: "How many users are there in the database?",
+    },
+  },
+);
 
 process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/example-mcp-blocklet",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "A demonstration of using AIGNE Framework and MCP Server hosted by the Blocklet platform",
   "author": "Arcblock <blocklet@arcblock.io> https://github.com/blocklet",
   "homepage": "https://github.com/AIGNE-io/aigne-framework/tree/main/examples/mcp-blocklet",
@@ -20,11 +20,12 @@
     "jsonwebtoken": "^9.0.2",
     "open": "^10.1.2",
     "zod": "^3.24.4",
-    "@aigne/core": "^1.14.0",
-    "@aigne/cli": "^1.9.0"
+    "@aigne/cli": "^1.10.0",
+    "@aigne/core": "^1.16.0"
   },
   "devDependencies": {
-    "@aigne/test-utils": "^0.2.0"
+    "@types/jsonwebtoken": "^9.0.9",
+    "@aigne/test-utils": "^0.3.0"
   },
   "scripts": {
     "start": "bun run index.ts",