Merge pull request #167 from covespace/refactor_topic_method

Refactor topic method

Author: yangbobo2021

src/context/contextManager.ts

@@ -64,7 +64,7 @@ export interface ChatContext {
     async processText(command: string): Promise<string> {
         // 处理所有命令
         for (const contextObj of this.contexts) {
-            if (contextObj.name == command) {
+            if (contextObj.name === command) {
                 return await contextObj.handler();
             }
         }

src/handler/historyMessagesBase.ts

@@ -1,7 +1,7 @@
 
 
 import { TopicManager } from '../topic/topicManager';
-import { LogEntry } from '../toolwrapper/devchat';
+import DevChat, { LogEntry, LogOptions } from '../toolwrapper/devchat';
 import messageHistory from '../util/messageHistory';
 import { ApiKeyManager } from '../util/apiKey';
 import { logger } from '../util/logger';
@@ -63,15 +63,19 @@ export async function isWaitForApiKey() {
 
 export async function loadTopicHistoryLogs() : Promise<Array<LogEntry> | undefined>  {
 	const topicId = TopicManager.getInstance().currentTopicId;
-	let logEntriesFlat: Array<LogEntry> = [];
-	if (topicId) {
-		logEntriesFlat = await TopicManager.getInstance().getTopicHistory(topicId);
+	if (!topicId) {
+		return [];
 	}
 
-	if (topicId !== TopicManager.getInstance().currentTopicId) {
-		logger.channel()?.info(`Current topic changed dure load topic hsitory!`)
-		return undefined;
-	}
+	const devChat = new DevChat();
+	const logOptions: LogOptions = {
+		skip: 0,
+		maxCount: 10000,
+		topic: topicId
+	};
+	const logEntries = await devChat.log(logOptions);
+	const logEntriesFlat = logEntries.flat();
+
 	return logEntriesFlat;
 }
 

src/toolwrapper/devchat.ts

@@ -24,6 +24,7 @@ export interface ChatOptions {
 export interface LogOptions {
 	skip?: number;
 	maxCount?: number;
+	topic?: string;
 }
 
 export interface LogEntry {
@@ -258,6 +259,37 @@ class DevChat {
 		return JSON.parse(stdout.trim()).reverse();
 	}
 
+	async topics(): Promise<LogEntry[]> {
+		const args = ["topic", "-l"];
+		const devChat = this.getDevChatPath();
+		const workspaceDir = UiUtilWrapper.workspaceFoldersFirstPath();
+		
+		logger.channel()?.info(`Running devchat with args: ${args.join(" ")}`);
+		const spawnOptions = {
+			maxBuffer: 10 * 1024 * 1024, // Set maxBuffer to 10 MB
+			cwd: workspaceDir,
+			env: {
+				...process.env
+			},
+		};
+		const { exitCode: code, stdout, stderr } = await this.commandRun.spawnAsync(devChat, args, spawnOptions, undefined, undefined, undefined, undefined);
+
+		logger.channel()?.info(`Finish devchat with args: ${args.join(" ")}`);
+		if (stderr) {
+			logger.channel()?.error(`Error getting log: ${stderr}`);
+			logger.channel()?.show();
+			return [];
+		}
+
+		try {
+			return JSON.parse(stdout.trim()).reverse();
+		} catch (error) {
+			logger.channel()?.error(`Error parsing log: ${error}`);
+			logger.channel()?.show();
+			return [];
+		}
+	}
+
 	private buildLogArgs(options: LogOptions): string[] {
 		let args = ["log"];
 
@@ -271,6 +303,10 @@ class DevChat {
 			args.push('--max-count', `${maxLogCount}`);
 		}
 
+		if (options.topic) {
+			args.push('--topic', `${options.topic}`);
+		}
+
 		return args;
 	}
 

src/topic/loadTopics.ts

@@ -4,7 +4,6 @@ import * as fs from 'fs';
 
 import DevChat, { LogEntry, LogOptions } from '../toolwrapper/devchat';
 
-import { loadTopicList } from './loadTopics';
 import { UiUtilWrapper } from '../util/uiUtil';
 import { logger } from '../util/logger';
 
@@ -231,39 +230,20 @@ export class TopicManager {
 		return deletedTopics.includes(topicId);
 	}
 
-	// loadTopics
-	// 功能：将DevChat日志根据parentHash进行分组，当前条目与该条目parentHash对应条目归属一组，以此类推，直到parentHash为空
-	// 返回值：多个链表，每个链表中当前元素的hash是下一个元素的parentHash
-	async loadLogEntries(): Promise<{ [key: string]: LogEntry[] }> {
-		// 通过DevChat获取日志
-		const devChat = new DevChat();
-		const logOptions: LogOptions = {
-			skip: 0,
-			maxCount: 10000
-		};
-		const logEntries = await devChat.log(logOptions);
-		const logEntriesFlat = logEntries.flat();
-
-		const logTopicLinkedList = loadTopicList(logEntriesFlat);
-		return logTopicLinkedList;
-	}
-
 	async loadTopics(): Promise<void> {
-		// 删除已经加载的topic
-		// 重新构建topic信息
 		this._topics = {};
-		const logEntriesMap = await this.loadLogEntries();
-		for (const logEntriesList of Object.values(logEntriesMap)) {
-			// 使用logEntriesList第一个元素更新topic的firstMessageHash和name
-			// 使用logEntriesList最后一个元素更新topic的lastMessageHash和lastUpdated
-			if (logEntriesList.length === 0) {
-				continue;
-			}
-			const logEntry = logEntriesList[0];
+
+		const devChat = new DevChat();
+		const logEntries: LogEntry[] = await devChat.topics();
+
+		// visite logEntries
+		// for each logEntry
+		let lastData: number = 0;
+		for (const logEntry of logEntries.flat()) {
+			lastData += 1;
 			const name = this.createTopicName(logEntry.request, logEntry.response);
-			const lastLogEntry = logEntriesList[logEntriesList.length - 1];
 			const topic = new Topic(name, logEntry.hash, logEntry.hash, Number(logEntry.date));
-			topic.updateLastMessageHashAndLastUpdated(lastLogEntry.hash, Number(lastLogEntry.date));
+			topic.updateLastMessageHashAndLastUpdated(logEntry.hash, lastData);
 
 			if (topic.firstMessageHash && this.isDeleteTopic(topic.firstMessageHash)) {
 				continue;
@@ -272,27 +252,4 @@ export class TopicManager {
 		}
 		this._notifyReloadTopicsListeners(Object.values(this._topics));
 	}
-	
-
-	async getTopicHistory(topicId: string): Promise<LogEntry[]> {
-		/**
-		 * 获取topic历史聊天记录
-		 */
-		// TOPIC对象中firstMessageHash可以作为日志查询的起始点
-		// 在DevChat日志中，找出第一个hash为firstMessageHash的日志，然后向下遍历，直到找不到parentHash为当前日志hash的日志
-		const topic = this._topics[topicId];
-		if (!topic || !topic.firstMessageHash) {
-			logger.channel()?.info(`Topic ${topicId} not found`);
-			return [];
-		}
-
-		const logEntriesMap = await this.loadLogEntries();
-		if (!logEntriesMap[topic.firstMessageHash!]) {
-			logger.channel()?.info(`Topic ${topicId} not found in logEntriesMap`);
-			return [];
-		}
-
-		const logEntriesFlat = logEntriesMap[topic.firstMessageHash!];
-		return logEntriesFlat;
-	}
 }