([]);
- const fetchAssistant = useCallback(async (serverId: string) => {
- if (!isTauri) return;
- if (!serverId) return;
- platformAdapter
- .commands("assistant_search", {
- serverId,
- })
- .then((res: any) => {
- res = res ? JSON.parse(res) : null;
- console.log("assistant_search", res);
- const assistantList = res?.hits?.hits || [];
- setAssistants(assistantList);
- if (assistantList.length > 0) {
- const assistant = assistantList.find(
- (item: any) => item._id === currentAssistant?._id
- );
- if (assistant) {
- setCurrentAssistant(assistant);
- } else {
- setCurrentAssistant(assistantList[0]);
- }
- }
- })
- .catch((err: any) => {
+ const fetchAssistant = useCallback(async (serverId?: string) => {
+ let response: any;
+ if (isTauri) {
+ if (!serverId) return;
+ try {
+ response = await platformAdapter.commands("assistant_search", {
+ serverId,
+ });
+ response = response ? JSON.parse(response) : null;
+ } catch (err) {
setAssistants([]);
setCurrentAssistant(null);
- console.log("assistant_search", err);
- });
+ console.error("assistant_search", err);
+ }
+ } else {
+ const [error, res] = await Get(`/assistant/_search`);
+ if (error) {
+ setAssistants([]);
+ setCurrentAssistant(null);
+ console.error("assistant_search", error);
+ return;
+ }
+ console.log("/assistant/_search", res);
+ response = res;
+ }
+ console.log("assistant_search", response);
+ let assistantList = response?.hits?.hits || [];
+
+ assistantList = assistantIDs.length > 0
+ ? assistantList.filter((item: any) => assistantIDs.includes(item._id))
+ : assistantList;
+
+ setAssistants(assistantList);
+ if (assistantList.length > 0) {
+ const assistant = assistantList.find(
+ (item: any) => item._id === currentAssistant?._id
+ );
+ if (assistant) {
+ setCurrentAssistant(assistant);
+ } else {
+ setCurrentAssistant(assistantList[0]);
+ }
+ }
}, []);
useEffect(() => {
@@ -98,24 +114,22 @@ export function AssistantList({ showChatHistory = true }: AssistantListProps) {
{currentAssistant?._source?.name || "Coco AI"}
- {showChatHistory && isTauri && (
- {
- setIsOpen(!isOpen);
- }}
- >
-
-
- )}
+ {
+ setIsOpen(!isOpen);
+ }}
+ >
+
+
- {showChatHistory && isTauri && isOpen && (
+ {isOpen && (
{
+ console.log("assistant", assistant);
setCurrentAssistant(assistant);
setIsOpen(false);
}}
diff --git a/src/components/Assistant/Chat.tsx b/src/components/Assistant/Chat.tsx
index 86ac2d80..95765789 100644
--- a/src/components/Assistant/Chat.tsx
+++ b/src/components/Assistant/Chat.tsx
@@ -35,6 +35,7 @@ interface ChatAIProps {
isChatPage?: boolean;
getFileUrl: (path: string) => string;
showChatHistory?: boolean;
+ assistantIDs?: string[];
}
export interface ChatAIRef {
@@ -58,6 +59,7 @@ const ChatAI = memo(
isChatPage = false,
getFileUrl,
showChatHistory,
+ assistantIDs,
},
ref
) => {
@@ -376,6 +378,7 @@ const ChatAI = memo(
isLogin={isLogin}
setIsLogin={setIsLogin}
showChatHistory={showChatHistory}
+ assistantIDs={assistantIDs}
/>
{isLogin ? (
void;
isChatPage?: boolean;
showChatHistory?: boolean;
+ assistantIDs?: string[];
}
export function ChatHeader({
@@ -40,8 +39,8 @@ export function ChatHeader({
setIsLogin,
isChatPage = false,
showChatHistory = true,
+ assistantIDs,
}: ChatHeaderProps) {
-
const isPinned = useAppStore((state) => state.isPinned);
const setIsPinned = useAppStore((state) => state.setIsPinned);
@@ -55,7 +54,7 @@ export function ChatHeader({
const fixedWindow = useShortcutsStore((state) => {
return state.fixedWindow;
});
-
+
const external = useShortcutsStore((state) => state.external);
const togglePin = async () => {
@@ -94,7 +93,7 @@ export function ChatHeader({
)}
-
+
{showChatHistory ? (
@@ -337,7 +330,6 @@ export default function Chat({}: ChatProps) {
openFileDialog={openFileDialog}
getFileMetadata={getFileMetadata}
getFileIcon={getFileIcon}
- hasFeature={hasFeature}
/>
diff --git a/src/pages/main/index.tsx b/src/pages/main/index.tsx
index 358b0228..b3603086 100644
--- a/src/pages/main/index.tsx
+++ b/src/pages/main/index.tsx
@@ -4,7 +4,6 @@ import SearchChat from "@/components/SearchChat";
import platformAdapter from "@/utils/platformAdapter";
import { useAppStore } from "@/stores/appStore";
import { useSyncStore } from "@/hooks/useSyncStore";
-import { useFeatureControl } from "@/hooks/useFeatureControl";
function MainApp() {
const setIsTauri = useAppStore((state) => state.setIsTauri);
@@ -16,18 +15,11 @@ function MainApp() {
useSyncStore();
- const hasFeature = useFeatureControl({
- initialFeatures: ["think", "search"],
- featureToToggle: "think",
- condition: (item) => item?._source?.type === "simple",
- });
-
return (
);
}
diff --git a/src/pages/web/README.md b/src/pages/web/README.md
index 26763fa4..ad10b083 100644
--- a/src/pages/web/README.md
+++ b/src/pages/web/README.md
@@ -32,12 +32,6 @@
- **默认值**: `['search', 'chat']`
- **描述**: 启用的功能模块列表，目前支持 'search' 和 'chat' 模块
-### `hasFeature`
-- **类型**: `string[]`
-- **可选**: 是
-- **默认值**: `['think', 'search', 'think_active', 'search_active']`
-- **描述**: 启用的特性列表，支持 'think'、'search'、'think_active'、'search_active' 特性。其中 'think_active' 表示默认开启深度思考，'search_active' 表示默认开启搜索
-
### `hideCoco`
- **类型**: `() => void`
- **可选**: 是
@@ -87,7 +81,6 @@ function App() {
width={680}
height={590}
hasModules={['search', 'chat']}
- hasFeature={['think', 'search', 'think_active', 'search_active']}
hideCoco={() => console.log('hide')}
theme="dark"
searchPlaceholder=""
diff --git a/src/pages/web/index.tsx b/src/pages/web/index.tsx
index 278f2577..a95f094d 100644
--- a/src/pages/web/index.tsx
+++ b/src/pages/web/index.tsx
@@ -5,7 +5,6 @@ import { useAppStore } from "@/stores/appStore";
import { useShortcutsStore } from "@/stores/shortcutsStore";
import { useIsMobile } from "@/hooks/useIsMobile";
import { useModifierKeyPress } from "@/hooks/useModifierKeyPress";
-import { useFeatureControl } from "@/hooks/useFeatureControl";
import "@/i18n";
import "@/web.css";
@@ -17,7 +16,7 @@ interface WebAppProps {
height?: number;
hasModules?: string[];
defaultModule?: "search" | "chat";
- hasFeature?: string[];
+ assistantIDs?: string[];
hideCoco?: () => void;
theme?: "auto" | "light" | "dark";
searchPlaceholder?: string;
@@ -32,7 +31,7 @@ function WebApp({
height = 590,
headers = {
"X-API-TOKEN":
- "cvvitp6hpceh0ip1q1706byts41c7213k4el22v3bp6f4ta2sar0u29jp4pg08h6xcyxn085x3lq1k7wojof",
+ "cvqt6r02sdb2v3bkgip0x3ixv01f3r2lhnxoz1efbn160wm9og58wtv8t6wrv1ebvnvypuc23dx9pb33aemh",
"APP-INTEGRATION-ID": "cvkm9hmhpcemufsg3vug",
},
// token = "cva1j5ehpcenic3ir7k0h8fb8qtv35iwtywze248oscrej8yoivhb5b1hyovp24xejjk27jy9ddt69ewfi3n", // https://coco.infini.cloud
@@ -42,7 +41,7 @@ function WebApp({
hideCoco = () => {},
hasModules = ["search", "chat"],
defaultModule = "search",
- hasFeature = ["think_active", "search_active"],
+ assistantIDs = [],
theme = "dark",
searchPlaceholder = "",
chatPlaceholder = "",
@@ -71,12 +70,6 @@ function WebApp({
const [isChatMode, setIsChatMode] = useState(false);
- const hasFeatureCopy = useFeatureControl({
- initialFeatures: hasFeature,
- featureToToggle: "think",
- condition: (item) => item?._source?.type === "simple",
- });
-
return (
@@ -110,7 +103,6 @@ function WebApp({
hideCoco={hideCoco}
hasModules={hasModules}
defaultModule={defaultModule}
- hasFeature={hasFeatureCopy}
theme={theme}
searchPlaceholder={searchPlaceholder}
chatPlaceholder={chatPlaceholder}
@@ -118,6 +110,7 @@ function WebApp({
setIsPinned={setIsPinned}
onModeChange={setIsChatMode}
isMobile={isMobile}
+ assistantIDs={assistantIDs}
/>
);
diff --git a/src/utils/platformAdapter.ts b/src/utils/platformAdapter.ts
index 7afb9240..58b014cb 100644
--- a/src/utils/platformAdapter.ts
+++ b/src/utils/platformAdapter.ts
@@ -1,8 +1,8 @@
// manual modification
-//import { createWebAdapter } from './webAdapter';
-import { createTauriAdapter } from "./tauriAdapter";
+import { createWebAdapter } from './webAdapter';
+//import { createTauriAdapter } from "./tauriAdapter";
-let platformAdapter = createTauriAdapter();
-//let platformAdapter = createWebAdapter();
+//let platformAdapter = createTauriAdapter();
+let platformAdapter = createWebAdapter();
export default platformAdapter;
diff --git a/tsup.config.ts b/tsup.config.ts
index 95c6bc4d..60090193 100644
--- a/tsup.config.ts
+++ b/tsup.config.ts
@@ -67,7 +67,7 @@ export default defineConfig({
const packageJson = {
name: "@infinilabs/search-chat",
- version: "1.1.4",
+ version: "1.1.5",
main: "index.js",
module: "index.js",
type: "module",
diff --git a/vite.config.ts b/vite.config.ts
index deca7a97..07b648f6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -61,6 +61,16 @@ export default defineConfig(async () => ({
changeOrigin: true,
secure: false,
},
+ "/assistant": {
+ target: process.env.COCO_SERVER_URL,
+ changeOrigin: true,
+ secure: false,
+ },
+ "/datasource": {
+ target: process.env.COCO_SERVER_URL,
+ changeOrigin: true,
+ secure: false,
+ },
},
},
build: {