🐛 fix: fix function apiName length

yangchuang · Dec 16, 2023 · b6f8c16 · b6f8c16
1 parent 3aa8219
commit b6f8c16
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/services/__tests__/chat.test.ts b/src/services/__tests__/chat.test.ts
@@ -57,7 +57,7 @@ describe('ChatService', () => {
 
       expect(getChatCompletionSpy).toHaveBeenCalledWith(
         expect.objectContaining({
-          functions: expect.arrayContaining([{ name: 'plugin1____api1____default' }]),
+          functions: expect.arrayContaining([{ name: 'plugin1____api1' }]),
           messages: expect.anything(),
         }),
         undefined,

diff --git a/src/store/tool/slices/plugin/selectors.test.ts b/src/store/tool/slices/plugin/selectors.test.ts
@@ -27,7 +27,6 @@ const mockState = {
       manifest: {
         identifier: 'plugin-2',
         api: [{ name: 'api-2' }],
-        type: 'default',
       },
       type: 'plugin',
     },
@@ -53,9 +52,29 @@ const mockState = {
 describe('pluginSelectors', () => {
   describe('enabledSchema', () => {
     it('enabledSchema should return correct ChatCompletionFunctions array', () => {
-      const result = pluginSelectors.enabledSchema(['plugin-1'])(mockState);
-      expect(result).toEqual([{ name: 'plugin-1____api-1____default' }]);
+      const result = pluginSelectors.enabledSchema(['plugin-1', 'plugin-2'])(mockState);
+      expect(result).toEqual([{ name: 'plugin-1____api-1' }, { name: 'plugin-2____api-2' }]);
+    });
+
+    it('enabledSchema should return with standalone plugin', () => {
+      const result = pluginSelectors.enabledSchema(['plugin-3'])({
+        ...mockState,
+        installedPlugins: [
+          ...mockState.installedPlugins,
+          {
+            identifier: 'plugin-3',
+            manifest: {
+              identifier: 'plugin-3',
+              api: [{ name: 'api-3' }],
+              type: 'standalone',
+            },
+            type: 'plugin',
+          },
+        ],
+      } as ToolStoreState);
+      expect(result).toEqual([{ name: 'plugin-3____api-3____standalone' }]);
     });
+
     it('enabledSchema should return empty', () => {
       const result = pluginSelectors.enabledSchema([])(mockState);
       expect(result).toEqual([]);

diff --git a/src/store/tool/slices/plugin/selectors.ts b/src/store/tool/slices/plugin/selectors.ts
@@ -91,7 +91,10 @@ const enabledSchema =
       )
       .flatMap((manifest) =>
         manifest.api.map((m) => {
-          const pluginType = manifest.type ? `${PLUGIN_SCHEMA_SEPARATOR + manifest.type}` : '';
+          const pluginType =
+            manifest.type && manifest.type !== 'default'
+              ? `${PLUGIN_SCHEMA_SEPARATOR + manifest.type}`
+              : '';
 
           // 将插件的 identifier 作为前缀，避免重复
           let apiName = manifest.identifier + PLUGIN_SCHEMA_SEPARATOR + m.name + pluginType;