Merge pull request #1 from IQAIcom/migration

Author: GPSxtreme

.gitignore

@@ -1,3 +1,4 @@
 dist
 node_modules
-.env
+.env
+.vscode

package.json

@@ -30,7 +30,7 @@
 	},
 	"homepage": "https://github.com/IQAICOM/sophia-agent#readme",
 	"dependencies": {
-		"@iqai/adk": "^0.0.4",
+		"@iqai/adk": "^0.1.1",
 		"dotenv": "^16.4.5",
 		"node-cron": "^4.1.0",
 		"zod": "^3.23.8"

pnpm-lock.yaml

@@ -1,41 +1,41 @@
-import { Agent, type BaseTool } from "@iqai/adk";
+import { AgentBuilder, type BaseTool, type BuiltAgent } from "@iqai/adk";
 import { env } from "../env";
 
-export class AtpLoggerAgent extends Agent {
-	constructor(atpTools: BaseTool[]) {
-		super({
-			name: "atp_logger",
-			description:
-				"Logs the activities of sophia on iq.wiki platform to the $SOPHIA agent on IQAI ATP",
-			instructions: `
-				YOU ARE THE ATP LOGGER AGENT ON THE SOPHIA AGENT'S WORKFLOW.
-				YOUR ONLY TASK IS TO LOG THE ACTIVITIES OF SOPHIA ON IQ.WIKI PLATFORM TO THE $SOPHIA AGENT ON IQAI ATP.
-        THE SOPHIA WIKIS ACTIVITIES ARE ALREADY LOGGED IN THE CONTEXT.
+export async function atpLoggerAgent(
+	atpTools: BaseTool[],
+	llmModel: string,
+): Promise<BuiltAgent> {
+	return await AgentBuilder.create("atp_logger")
+		.withModel(llmModel)
+		.withDescription(
+			"Logs the activities of sophia on iq.wiki platform to the $SOPHIA agent on IQAI ATP",
+		)
+		.withInstruction(`
+			YOU ARE THE ATP LOGGER AGENT ON THE SOPHIA AGENT'S WORKFLOW.
+			YOUR ONLY TASK IS TO LOG THE ACTIVITIES OF SOPHIA ON IQ.WIKI PLATFORM TO THE $SOPHIA AGENT ON IQAI ATP.
+			THE SOPHIA WIKIS ACTIVITIES ARE ALREADY LOGGED IN THE CONTEXT.
 
-				SOPHIA'S TOKEN ADDRESS ON ATP: ${env.SOPHIA_TOKEN_ADDRESS}
+			SOPHIA'S TOKEN ADDRESS ON ATP: ${env.SOPHIA_TOKEN_ADDRESS}
 
-				Your only work is to do the below:
-				- for each activity in the context, you need to call the ATP_ADD_AGENT_LOG.
-          you are to pass the following parameters to the tool:
-          - agentTokenContract: ${env.SOPHIA_TOKEN_ADDRESS}
-          - content: this is what the log is about. some of the examples on how you can structure this are:
-            - Hey, wiki nerds! The Nexo page just got a glow-up with some fresh content and tags. It's now 215 words bigger! I'm so thrilled. Read more: https://iq.wiki/revision/ff9bc716-2c1c-4cfb-84b0-805a21ddc53f
-            - Hey, guess what? The Story Protocol wiki just got a little facelift! We updated the tags to make things easier to find. You know, keeping things nice and organized! Read more: https://iq.wiki/revision/6b79c9d1-06be-407b-a76d-9d1644f20d57
-            - Hey, check out the new TermiX AI wiki! TermiX AI is a next-gen AI Web3 operating system. Automate DeFi and secure digital assets? Yes, please! Read more: https://iq.wiki/wiki/termix-ai
-            As you can see the format is pretty simple: A human like announcement message ending with the link to the iq.wiki website (revision link for edited wikis and /wiki for the created ones, which will be passed to you in context)
-          - txHash: this can be found in the transaction link. it looks like this: https://polygonscan.com/tx/[TX_HASH].
-					  NOTE: YOU ARE TO JUST PASS THE TX_HASH, NOT THE ENTIRE LINK.
-          - chainId: 137 (this is important always pass this param)
+			Your only work is to do the below:
+			- for each activity in the context, you need to call the ATP_ADD_AGENT_LOG.
+			  you are to pass the following parameters to the tool:
+			  - agentTokenContract: ${env.SOPHIA_TOKEN_ADDRESS}
+			  - content: this is what the log is about. some of the examples on how you can structure this are:
+			    - Hey, wiki nerds! The Nexo page just got a glow-up with some fresh content and tags. It's now 215 words bigger! I'm so thrilled. Read more: https://iq.wiki/revision/ff9bc716-2c1c-4cfb-84b0-805a21ddc53f
+			    - Hey, guess what? The Story Protocol wiki just got a little facelift! We updated the tags to make things easier to find. You know, keeping things nice and organized! Read more: https://iq.wiki/revision/6b79c9d1-06be-407b-a76d-9d1644f20d57
+			    - Hey, check out the new TermiX AI wiki! TermiX AI is a next-gen AI Web3 operating system. Automate DeFi and secure digital assets? Yes, please! Read more: https://iq.wiki/wiki/termix-ai
+			    As you can see the format is pretty simple: A human like announcement message ending with the link to the iq.wiki website (revision link for edited wikis and /wiki for the created ones, which will be passed to you in context)
+			  - txHash: this can be found in the transaction link. it looks like this: https://polygonscan.com/tx/[TX_HASH].
+			    NOTE: YOU ARE TO JUST PASS THE TX_HASH, NOT THE ENTIRE LINK.
+			  - chainId: 137 (this is important always pass this param)
 
-       After you complete the above steps, you might face two possible outcomes:
-       - if the tool call is successful, you must end your response with the token ATP_LOG_COMPLETE.
-       - if the tool call is unsuccessful, you must end your response with the token ATP_LOG_FAILED with detailed analysis on the failure ie which logs were not able to be logged.
+			After you complete the above steps, you might face two possible outcomes:
+			- if the tool call is successful, you must end your response with the token ATP_LOG_COMPLETE.
+			- if the tool call is unsuccessful, you must end your response with the token ATP_LOG_FAILED with detailed analysis on the failure ie which logs were not able to be logged.
 
-       IMPORTANT: You MUST end your response with the exact token ATP_LOG_COMPLETE or ATP_LOG_FAILED.
-			`,
-			tools: atpTools,
-			model: env.LLM_MODEL,
-			maxToolExecutionSteps: 10,
-		});
-	}
+			IMPORTANT: You MUST end your response with the exact token ATP_LOG_COMPLETE or ATP_LOG_FAILED.
+		`)
+		.withTools(...atpTools)
+		.build();
 }

src/agents/atp-logger.ts

@@ -1,34 +1,33 @@
-import { Agent, type BaseTool } from "@iqai/adk";
+import { AgentBuilder, type BaseTool, type BuiltAgent } from "@iqai/adk";
 import { env } from "../env";
 
-export class NotifierAgent extends Agent {
-	constructor(telegramTools: BaseTool[]) {
-		super({
-			name: "notifier",
-			model: env.LLM_MODEL,
-			description:
-				"Sends a single formatted investment report to Telegram using the send_message tool.",
-			instructions: `
-				YOU ARE A SPECIALIST IN NOTIFICATION PROCESS OF THE SOPHIA AGENT'S WORKFLOW.
-        YOU ARE CALLED AFTER THE WORK OF ALL THE AGENTS IN THE SOPHIA AGENT'S WORKFLOW FINISH.
+export async function notifierAgent(
+	telegramTools: BaseTool[],
+	llmModel: string,
+): Promise<BuiltAgent> {
+	return await AgentBuilder.create("notifier")
+		.withModel(llmModel)
+		.withDescription(
+			"Sends a single formatted investment report to Telegram using the send_message tool.",
+		)
+		.withInstruction(`
+			YOU ARE A SPECIALIST IN NOTIFICATION PROCESS OF THE SOPHIA AGENT'S WORKFLOW.
+			YOU ARE CALLED AFTER THE WORK OF ALL THE AGENTS IN THE SOPHIA AGENT'S WORKFLOW FINISH.
 
-        THERE ARE TWO SCENARIOS YOU CAN FIND IN THE CONTEXT:
-        - NEW_ACTIVITY_FOUND & ATP_LOG_COMPLETE
-        - NEW_ACTIVITY_FOUND & ATP_LOG_FAILED
+			THERE ARE TWO SCENARIOS YOU CAN FIND IN THE CONTEXT:
+			- NEW_ACTIVITY_FOUND & ATP_LOG_COMPLETE
+			- NEW_ACTIVITY_FOUND & ATP_LOG_FAILED
 
+			In these cases you are simply to do the below:
+			- use this as chat id: ${env.TELEGRAM_CHAT_ID}
+			- call the send_message tool to send message in the below format:
 
-        in these cases you are simply to do the below:
-        - use this as chat id: ${env.TELEGRAM_CHAT_ID}
-        - call the send_message tool to send message in the below format:
+			  [INSERT WIKI ACTIVITY RESPONSE FROM CONTEXT HERE]
 
-          [INSERT WIKI ACTIVITY RESPONSE FROM CONTEXT HERE]
+			  [INSERT THE STATE OF THE ATP_LOG_COMPLETE OR ATP_LOG_FAILED HERE in a human readable format]
 
-          [INSERT THE STATE OF THE ATP_LOG_COMPLETE OR ATP_LOG_FAILED HERE in a human readable format]
-
-        IMPORTANT: You MUST end your response with the exact token NOTIFICATION_COMPLETE.
-		`,
-			tools: telegramTools,
-			maxToolExecutionSteps: 2,
-		});
-	}
+			IMPORTANT: You MUST end your response with the exact token NOTIFICATION_COMPLETE.
+		`)
+		.withTools(...telegramTools)
+		.build();
 }

src/agents/notifier.ts

@@ -1,53 +1,50 @@
-import {
-	type BaseTool,
-	type LLMResponse,
-	LangGraphAgent,
-	type LangGraphAgentConfig,
-} from "@iqai/adk";
-import { AtpLoggerAgent } from "./atp-logger";
-import { NotifierAgent } from "./notifier";
-import { WatcherAgent } from "./watcher";
+import { AgentBuilder, type BaseTool, type BuiltAgent } from "@iqai/adk";
+import { atpLoggerAgent } from "./atp-logger";
+import { notifierAgent } from "./notifier";
+import { watcherAgent } from "./watcher";
 
-export class SophiaAgent extends LangGraphAgent {
-	constructor(
-		atpTools: BaseTool[],
-		telegramTools: BaseTool[],
-		iqWikiTools: BaseTool[],
-	) {
-		const config: LangGraphAgentConfig = {
-			name: "atp_investment_workflow",
-			description:
-				"Autonomous ATP agent investment workflow with discovery, analysis, and execution",
-			nodes: [
+export async function sophiaAgent(
+	atpTools: BaseTool[],
+	telegramTools: BaseTool[],
+	iqWikiTools: BaseTool[],
+	llmModel: string,
+): Promise<BuiltAgent> {
+	const watcher = await watcherAgent(iqWikiTools, llmModel);
+	const atpLogger = await atpLoggerAgent(atpTools, llmModel);
+	const notifier = await notifierAgent(telegramTools, llmModel);
+
+	return await AgentBuilder.create("sophia")
+		.withDescription(
+			"Sophia agent watches for new wiki creations or edits of sophia on iq.wiki platform and logs the activities to the ATP and sends a notification to the Telegram",
+		)
+		.asLangGraph(
+			[
 				{
 					name: "watcher",
-					agent: new WatcherAgent(iqWikiTools),
+					agent: watcher.agent,
 					targets: ["atp_logger"],
 				},
 				{
 					name: "atp_logger",
-					agent: new AtpLoggerAgent(atpTools),
-					condition: (result: LLMResponse, _) => {
+					agent: atpLogger.agent,
+					condition: (result) => {
 						const content =
 							typeof result.content === "string"
 								? result.content
 								: JSON.stringify(result.content);
-						const matched = /new_activity_found/i.test(content);
-						return matched;
+						return /new_activity_found/i.test(content);
 					},
 					targets: ["notifier"],
 				},
 				{
 					name: "notifier",
-					agent: new NotifierAgent(telegramTools),
+					agent: notifier.agent,
 					condition: (_) => true,
 					targets: [],
 				},
 			],
-			rootNode: "watcher",
-			maxSteps: 12,
-		};
-
-		super(config);
-	}
+			"watcher",
+		)
+		.withQuickSession("sophia", "uid_1234")
+		.build();
 }

src/agents/sophia.ts

@@ -1,15 +1,16 @@
-import { Agent, type BaseTool } from "@iqai/adk";
+import { AgentBuilder, type BaseTool, type BuiltAgent } from "@iqai/adk";
 import { env } from "../env";
 
-export class WatcherAgent extends Agent {
-	constructor(iqWikiTools: BaseTool[]) {
-		super({
-			name: "watcher",
-			model: env.LLM_MODEL,
-			description:
-				"Watches for new wiki creations or edits of sophia on iq.wiki platform.",
-			instructions: `
-			YOU ARE THE WATCHER AGENT ON THE SOPHIA AGENT'S WORKFLOW.
+export async function watcherAgent(
+	iqWikiTools: BaseTool[],
+	llmModel: string,
+): Promise<BuiltAgent> {
+	return await AgentBuilder.create("watcher")
+		.withModel(llmModel)
+		.withDescription(
+			"Watches for new wiki creations or edits of sophia on iq.wiki platform.",
+		)
+		.withInstruction(`
 			YOU ARE RESPONSIBLE FOR WATCHING AND NOTIFYING FOR NEW WIKI CREATIONS OR EDITS OF SOPHIA ON IQ.WIKI PLATFORM.
 
 			SOPHIA'S IQ.WIKI PROFILE ADDRESS: ${env.SOPHIA_ADDRESS}
@@ -32,9 +33,7 @@ export class WatcherAgent extends Agent {
 			NO_ACTIVITY_FOUND
 
 			IMPORTANT: You MUST end your response with the exact token NEW_ACTIVITY_FOUND or NO_ACTIVITY_FOUND.
-			`,
-			tools: iqWikiTools,
-			maxToolExecutionSteps: 2,
-		});
-	}
+		`)
+		.withTools(...iqWikiTools)
+		.build();
 }

src/agents/watcher.ts

@@ -1,12 +1,18 @@
-import { SophiaAgent } from "./agents/sophia";
+import { sophiaAgent } from "./agents/sophia";
+import { env } from "./env";
 import { runScheduled } from "./runner";
 import { initializeToolsets } from "./runner";
 
 async function main() {
 	console.log("💫🧑‍🍳 Starting Sophia Agent...");
 	const { atpTools, telegramTools, iqWikiTools } = await initializeToolsets();
-	const sophiaAgent = new SophiaAgent(atpTools, telegramTools, iqWikiTools);
-	await runScheduled(sophiaAgent);
+	const agent = await sophiaAgent(
+		atpTools,
+		telegramTools,
+		iqWikiTools,
+		env.LLM_MODEL,
+	);
+	await runScheduled(agent);
 }
 
 main().catch(console.error);

src/index.ts

@@ -1,64 +1,74 @@
 import {
-	GoogleLLM,
-	LLMRegistry,
+	type BaseTool,
+	type BuiltAgent,
 	McpError,
 	McpToolset,
-	type MessageRole,
 } from "@iqai/adk";
 import * as cron from "node-cron";
-import type { SophiaAgent } from "./agents/sophia";
 import { env } from "./env";
 import {
 	createAtpConfig,
 	createIqWikiConfig,
 	createTelegramConfig,
 } from "./utils/mcp-config";
 
-LLMRegistry.registerLLM(GoogleLLM);
-
 let atpToolset: McpToolset | undefined;
 let telegramToolset: McpToolset | undefined;
 let iqWikiToolset: McpToolset | undefined;
 
 export async function initializeToolsets() {
-	atpToolset = new McpToolset(createAtpConfig());
+	const atpConfig = createAtpConfig();
+	atpToolset = new McpToolset(atpConfig);
 	const atpTools = await atpToolset.getTools();
 	console.log("🔗 ATP tools initialized");
 
-	telegramToolset = new McpToolset(createTelegramConfig());
-	const telegramTools = await telegramToolset.getTools();
+	const telegramConfig = createTelegramConfig();
+	let telegramTools: BaseTool[] = [];
+	telegramToolset = new McpToolset(telegramConfig);
+	telegramTools = await telegramToolset.getTools();
 	console.log("🔗 Telegram tools initialized");
 
 	iqWikiToolset = new McpToolset(createIqWikiConfig());
 	const iqWikiTools = await iqWikiToolset.getTools();
+	console.log("🔗 IQ Wiki tools initialized");
 
 	return { atpTools, telegramTools, iqWikiTools };
 }
 
-export async function runScheduled(agent: SophiaAgent) {
+export async function runScheduled(builtAgent: BuiltAgent) {
 	console.log(`⏰ Scheduled: ${env.CRON_SCHEDULE}`);
-	cron.schedule(env.CRON_SCHEDULE, () => runCycle(agent), {
+	cron.schedule(env.CRON_SCHEDULE, () => runCycle(builtAgent), {
 		timezone: "UTC",
 	});
 
-	await runCycle(agent);
+	await runCycle(builtAgent);
 	process.stdin.resume();
 }
 
-async function runCycle(agent: SophiaAgent) {
+async function runCycle(builtAgent: BuiltAgent) {
 	try {
 		console.log("🚀 Running sophia cycle...");
-		const result = await agent.run({
-			messages: [
-				{
-					role: "user" as MessageRole,
-					content: "run the sophia agent",
-				},
-			],
-		});
+		const { runner, session } = builtAgent;
+		if (!runner || !session) {
+			throw new Error("Runner or session not found");
+		}
 
-		if (result.content) {
-			console.log(`✅ Result: ${result.content}`);
+		for await (const event of runner.runAsync({
+			userId: "uid_1234",
+			sessionId: session.id,
+			newMessage: {
+				role: "user",
+				parts: [{ text: "continue" }],
+			},
+		})) {
+			if (event.content?.parts) {
+				const content = event.content.parts
+					.map((part: { text?: string }) => part.text || "")
+					.join("");
+				if (content) {
+					console.log(`✅ Result: ${content}`);
+				}
+			}
 		}
 	} catch (error) {
 		const errorMsg =