feat(memory): add base types

Author: dingyi222666

package.json

@@ -18,42 +18,42 @@
         "test:c8": "shx rm -rf coverage && c8 yarn test"
     },
     "devDependencies": {
-        "@langchain/core": "^0.1.25",
+        "@langchain/core": "^0.1.30",
         "@types/chai": "^4.3.11",
         "@types/chai-as-promised": "^7.1.8",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.11.17",
+        "@types/node": "^20.11.19",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "c8": "^9.1.0",
-        "chai": "^5.0.3",
+        "chai": "^5.1.0",
         "chai-as-promised": "^7.1.1",
         "cross-env": "^7.0.3",
-        "esbuild": "^0.20.0",
+        "esbuild": "^0.20.1",
         "eslint": "^8.56.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-mocha": "^10.2.0",
+        "eslint-plugin-mocha": "^10.3.0",
         "eslint-plugin-n": "^16.6.2",
         "eslint-plugin-prettier": "^5.1.3",
         "eslint-plugin-promise": "^6.1.1",
         "faiss-node": "^0.5.1",
         "fetch-socks": "^1.2.0",
-        "https-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4",
         "js-tiktoken": "^1.0.10",
         "js-yaml": "^4.1.0",
         "mocha": "^10.3.0",
         "prettier": "^3.2.5",
         "shx": "^0.3.4",
         "socks-proxy-agent": "^8.0.2",
-        "tsx": "^4.7.0",
+        "tsx": "^4.7.1",
         "typescript": "^5.3.3",
         "undici": "^6.6.2",
         "uuid": "^9.0.1",
         "ws": "^8.16.0",
-        "yakumo": "^1.0.0-beta.6",
-        "yakumo-esbuild": "^1.0.0-beta.2",
+        "yakumo": "^1.0.0-beta.7",
+        "yakumo-esbuild": "^1.0.0-beta.4",
         "yakumo-mocha": "^1.0.0-beta.2",
         "yakumo-tsc": "^1.0.0-beta.3",
         "zod": "^3.22.4",

packages/core/package.json

@@ -94,17 +94,17 @@
         "chatluna"
     ],
     "dependencies": {
-        "@cordisjs/core": "^3.9.2",
-        "@cordisjs/logger": "^0.2.0",
-        "@langchain/core": "^0.1.25",
+        "@cordisjs/core": "^3.11.0",
+        "@cordisjs/logger": "^0.3.1",
+        "@langchain/core": "^0.1.30",
         "fetch-socks": "^1.2.0",
-        "https-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4",
         "js-tiktoken": "^1.0.10",
         "js-yaml": "^4.1.0",
         "ml-distance": "^4.0.1",
         "socks-proxy-agent": "^8.0.2",
         "undici": "^6.6.2",
-        "user-agents": "^2.0.0-alpha.107",
+        "user-agents": "^2.0.0-alpha.118",
         "useragent": "^2.3.0",
         "ws": "^8.16.0",
         "zod": "^3.22.4",
@@ -115,4 +115,4 @@
         "@types/useragent": "^2",
         "proxy": "^2.1.1"
     }
-}
+}

packages/core/src/platform/types.ts

@@ -70,6 +70,8 @@ export interface ModelInfo {
     maxTokens?: number
 
     functionCall?: boolean
+
+    costPerToken?: number
 }
 
 export interface CreateVectorStoreParams {

packages/core/src/service/platform.ts

@@ -66,7 +66,7 @@ export class PlatformService extends Service {
 
         const disposable = () => this._unregisterClient(platform)
 
-        return this[Context.current].effect(() => disposable)
+        return this[Context.trace].effect(() => disposable)
     }
 
     registerConfigs(
@@ -103,7 +103,7 @@ export class PlatformService extends Service {
 
         const disposable = () => this._unregisterTool(name)
 
-        return this[Context.current].effect(() => disposable)
+        return this[Context.trace].effect(() => disposable)
     }
 
     private _unregisterTool(name: string) {
@@ -168,7 +168,7 @@ export class PlatformService extends Service {
         this._vectorStore[name] = vectorStoreCreator
         this.ctx.emit('chatluna/vector-store-added', this, name)
         const disposable = () => this._unregisterVectorStore(name)
-        return this[Context.current].effect(() => disposable)
+        return this[Context.trace].effect(() => disposable)
     }
 
     async registerChatChain(
@@ -185,7 +185,7 @@ export class PlatformService extends Service {
         }
         this.ctx.emit('chatluna/chat-chain-added', this, this._chatChains[name])
         const disposable = () => this._unregisterChatChain(name)
-        return this[Context.current].effect(() => disposable)
+        return this[Context.trace].effect(() => disposable)
     }
 
     private _unregisterChatChain(name: string) {
@@ -221,19 +221,9 @@ export class PlatformService extends Service {
     }
 
     getAllModels(type: ModelType) {
-        const allModel: ModelInfo[] = []
-
-        for (const platform in this._models) {
-            const models = this._models[platform]
-
-            for (const model of models) {
-                if (type === ModelType.all || model.type === type) {
-                    allModel.push(model)
-                }
-            }
-        }
-
-        return allModel
+        return Object.values(this._models)
+            .flatMap((f) => f)
+            .filter((m) => m.type === ModelType.all || m.type === type)
     }
 
     get vectorStores() {

packages/memory/package.json

@@ -15,7 +15,11 @@
             "import": "./lib/index.mjs",
             "types": "./lib/index.d.ts"
         },
-
+        "./types": {
+            "require": "./lib/types/index.cjs",
+            "import": "./lib/types/index.mjs",
+            "types": "./lib/types/index.d.ts"
+        },
         "./package.json": "./package.json"
     },
     "engines": {
@@ -45,13 +49,9 @@
         "chatluna"
     ],
     "dependencies": {
-        "@cordisjs/core": "^3.9.2",
-        "@cordisjs/logger": "^0.2.0",
-        "minato": "^3.0.0-alpha.0"
-    },
-    "devDependencies": {
-        "@types/js-yaml": "^4.0.9",
-        "@types/useragent": "^2",
-        "proxy": "^2.1.1"
+        "@cordisjs/core": "^3.11.0",
+        "@cordisjs/logger": "^0.3.1",
+        "minato": "^3.0.0-alpha.0",
+        "@langchain/core": "^0.1.30"
     }
-}
+}

packages/memory/src/index.ts

@@ -1,2 +1,2 @@
-import { Context } from '@cordisjs/core'
+
 

packages/memory/src/types/conversation.ts

@@ -0,0 +1,52 @@
+import { MessageContent, MessageType } from '@langchain/core/messages'
+
+export interface ChatLunaMessage {
+    content: MessageContent
+
+    conversationId?: string
+
+    role: ChatLunaMessageRole
+
+    name?: string
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    additional_kwargs?: Record<string, any>
+
+    parentId?: string
+
+    id: string
+}
+
+export interface ChatLunaConversation {
+    id: string
+    latestMessageId?: string
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    additional_kwargs?: Record<string, any>
+
+    preset: string
+    model: string
+    chatMode: string
+
+    createdTime: number
+    lastUpdatedTime: number
+}
+
+export interface ChatLunaUser {
+    userId: string
+    defaultConversationId?: string
+
+    muteConversations: string[]
+    ownerConversations: string[]
+    joinedConversations: string[]
+
+    excludeModels?: string[]
+    userGroupId?: string[]
+
+    balance?: number
+
+    // userGroup or chat limit
+    chatTimeLimitPerMin?: number
+    lastChatTime?: number
+}
+
+export type ChatLunaMessageRole = MessageType

packages/memory/src/types/index.ts

@@ -0,0 +1,2 @@
+export * from './conversation.ts'
+export * from './user_group.ts'

packages/memory/src/types/user_group.ts

@@ -0,0 +1,19 @@
+export interface ChatLunaUserGroup {
+    name: string
+
+    id: number
+    limitPerMin: number
+    limitPerDay: number
+
+    costPerToken: number
+
+    supportModels: string[]
+}
+
+export interface ChatLunaJoinedUserGroup {
+    userId: string
+
+    lastLimitPerMin: number
+
+    lastLimitPerDay: number
+}