解决合并冲突

HydroGest · Jan 25, 2025 · d18ebe1 · d18ebe1
1 parent dfc3678
commit d18ebe1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/packages/core/src/extensions/base.ts b/packages/core/src/extensions/base.ts
@@ -36,9 +36,15 @@ export function getExtensions(ctx: Context, bot: Bot): Extension[] {
   let extensions: Extension[] = [];
 
   fs.readdirSync(__dirname)
+    .filter((file) => file.startsWith("ext_") && !file.endsWith(".d.ts")) // 不指定 .js 是为了兼容dev模式
     .filter((file) => file.startsWith("ext_") && !file.endsWith(".d.ts")) // 不指定 .js 是为了兼容dev模式
     .forEach((file) => {
       try {
+        // @ts-ignore
+        if (!ctx?.memory && file.startsWith("ext_memory")) {
+          ctx.logger.warn(`当前未启用 Memory 模块，跳过扩展：${file}`)
+          return
+        }
         // @ts-ignore
         if (!ctx?.memory && file.startsWith("ext_memory")) {
           ctx.logger.warn(`当前未启用 Memory 模块，跳过扩展：${file}`)

diff --git a/packages/core/src/utils/factory.ts b/packages/core/src/utils/factory.ts
@@ -1,6 +1,9 @@
 import { CloudflareAdapter, CustomAdapter, GeminiAdapter, OllamaAdapter, OpenAIAdapter } from "../adapters";
 import { BaseAdapter } from "../adapters/base";
 import { LLM } from "../adapters/config";
+import { CloudflareAdapter, CustomAdapter, GeminiAdapter, OllamaAdapter, OpenAIAdapter } from "../adapters";
+import { BaseAdapter } from "../adapters/base";
+import { LLM } from "../adapters/config";
 import { Config } from "../config";
 import { CustomEmbedding, OllamaEmbedding, OpenAIEmbedding } from "../embeddings";
 import { EnabledEmbeddingConfig } from "../embeddings/config";
@@ -18,6 +21,8 @@ export function getAdapter(config: LLM, parameters?: Config["Parameters"]): Base
       return new OpenAIAdapter(config, parameters);
     case "Gemini":
       return new GeminiAdapter(config, parameters);
+    case "Gemini":
+      return new GeminiAdapter(config, parameters);
     default:
       throw new Error(`不支持的 API 类型: ${config.APIType}`);
   }

diff --git a/packages/core/src/utils/toolkit.ts b/packages/core/src/utils/toolkit.ts
@@ -38,6 +38,7 @@ export function containsFilter(content: string, FilterList: string[]): boolean {
   //return re.test(content);
 
   for (const filter of FilterList) {
+    if (isEmpty(filter)) continue;
     if (isEmpty(filter)) continue;
     let regex = new RegExp(filter, "gi");
     if (regex.test(content))
@@ -279,6 +280,7 @@ export function downloadFile(url, filePath, debug) {
 };
 
 /**
+ *
  *
  * @param date
  * @returns 2024年12月3日星期二17:34:00