Merge remote-tracking branch 'upstream/main' into feature/elasticsearch-connector

surfsense_web/components/chat/ChatInputGroup.tsx

@@ -334,9 +334,13 @@ ResearchModeSelector.displayName = "ResearchModeSelector";
 const LLMSelector = React.memo(() => {
 	const { search_space_id } = useParams();
 	const searchSpaceId = Number(search_space_id);
-	
+
 	const { llmConfigs, loading: llmLoading, error } = useLLMConfigs(searchSpaceId);
-	const { preferences, updatePreferences, loading: preferencesLoading } = useLLMPreferences(searchSpaceId);
+	const {
+		preferences,
+		updatePreferences,
+		loading: preferencesLoading,
+	} = useLLMPreferences(searchSpaceId);
 
 	const isLoading = llmLoading || preferencesLoading;
 

surfsense_web/components/chat/SourceDetailSheet.tsx

@@ -52,7 +52,8 @@ export function SourceDetailSheet({
 	const [summaryOpen, setSummaryOpen] = useState(false);
 
 	// Check if this is a source type that should render directly from node
-	const isDirectRenderSource = sourceType === "TAVILY_API" || sourceType === "LINKUP_API";
+	const isDirectRenderSource =
+		sourceType === "TAVILY_API" || sourceType === "LINKUP_API" || sourceType === "SEARXNG_API";
 
 	useEffect(() => {
 		if (open && chunkId && !isDirectRenderSource) {
@@ -108,7 +109,7 @@ export function SourceDetailSheet({
 					</div>
 				)}
 
-				{/* Direct render for TAVILY_API and LINKUP_API */}
+				{/* Direct render for web search providers */}
 				{isDirectRenderSource && (
 					<ScrollArea className="h-[calc(100vh-10rem)]">
 						<div className="px-6 py-4">

surfsense_web/components/editConnector/types.ts

@@ -30,6 +30,13 @@ export const editConnectorSchema = z.object({
 	NOTION_INTEGRATION_TOKEN: z.string().optional(),
 	SERPER_API_KEY: z.string().optional(),
 	TAVILY_API_KEY: z.string().optional(),
+	SEARXNG_HOST: z.string().optional(),
+	SEARXNG_API_KEY: z.string().optional(),
+	SEARXNG_ENGINES: z.string().optional(),
+	SEARXNG_CATEGORIES: z.string().optional(),
+	SEARXNG_LANGUAGE: z.string().optional(),
+	SEARXNG_SAFESEARCH: z.string().optional(),
+	SEARXNG_VERIFY_SSL: z.string().optional(),
 	LINEAR_API_KEY: z.string().optional(),
 	LINKUP_API_KEY: z.string().optional(),
 	DISCORD_BOT_TOKEN: z.string().optional(),

surfsense_web/components/homepage/navbar.tsx

@@ -86,7 +86,7 @@ const DesktopNav = ({ navItems, isScrolled }: any) => {
 					className="hidden rounded-full px-3 py-2 hover:bg-gray-100 dark:hover:bg-neutral-800 transition-colors md:flex items-center gap-1.5"
 				>
 					<IconBrandGithub className="h-5 w-5 text-neutral-600 dark:text-neutral-300" />
-					<span className="text-sm font-medium text-neutral-600 dark:text-neutral-300">8.3k</span>
+					<span className="text-sm font-medium text-neutral-600 dark:text-neutral-300">9.5k</span>
 				</Link>
 				<ThemeTogglerComponent />
 				<Link
@@ -161,7 +161,7 @@ const MobileNav = ({ navItems, isScrolled }: any) => {
 								>
 									<IconBrandGithub className="h-5 w-5 text-neutral-600 dark:text-neutral-300" />
 									<span className="text-sm font-medium text-neutral-600 dark:text-neutral-300">
-										8.3k
+										9.5k
 									</span>
 								</Link>
 							</div>

surfsense_web/components/inference-params-editor.tsx

@@ -1,138 +1,153 @@
 "use client";
 
-import { useState } from "react";
 import { Plus, Trash2 } from "lucide-react";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
 } from "@/components/ui/select";
 
 interface InferenceParamsEditorProps {
-  params: Record<string, number | string>;
-  setParams: (newParams: Record<string, number | string>) => void;
+	params: Record<string, number | string>;
+	setParams: (newParams: Record<string, number | string>) => void;
 }
 
 const PARAM_KEYS = ["temperature", "max_tokens", "top_k", "top_p"] as const;
 
-export default function InferenceParamsEditor({
-  params,
-  setParams,
-}: InferenceParamsEditorProps) {
-  const [selectedKey, setSelectedKey] = useState<string>("");
-  const [value, setValue] = useState<string>("");
+export default function InferenceParamsEditor({ params, setParams }: InferenceParamsEditorProps) {
+	const [selectedKey, setSelectedKey] = useState<string>("");
+	const [value, setValue] = useState<string>("");
 
-  const handleAdd = () => {
-    if (!selectedKey || value === "") return;
+	const handleAdd = () => {
+		if (!selectedKey || value === "") return;
 
-    if (params[selectedKey]) {
-      alert(`${selectedKey} already exists`);
-      return;
-    }
+		if (params[selectedKey]) {
+			alert(`${selectedKey} already exists`);
+			return;
+		}
 
-    const numericValue = Number(value);
+		const numericValue = Number(value);
 
-    if ((selectedKey === "temperature" || selectedKey === "top_p") && (isNaN(numericValue) || numericValue < 0 || numericValue > 1)) {
-      alert("Value must be a number between 0 and 1");
-      return;
-    }
+		if (
+			(selectedKey === "temperature" || selectedKey === "top_p") &&
+			(isNaN(numericValue) || numericValue < 0 || numericValue > 1)
+		) {
+			alert("Value must be a number between 0 and 1");
+			return;
+		}
 
-    if ((selectedKey === "max_tokens" || selectedKey === "top_k") && (!Number.isInteger(numericValue) || numericValue < 0)) {
-      alert("Value must be a non-negative integer");
-      return;
-    }
+		if (
+			(selectedKey === "max_tokens" || selectedKey === "top_k") &&
+			(!Number.isInteger(numericValue) || numericValue < 0)
+		) {
+			alert("Value must be a non-negative integer");
+			return;
+		}
 
-    setParams({
-      ...params,
-      [selectedKey]: isNaN(numericValue) ? value : numericValue,
-    });
+		setParams({
+			...params,
+			[selectedKey]: isNaN(numericValue) ? value : numericValue,
+		});
 
-    setSelectedKey("");
-    setValue("");
-  };
+		setSelectedKey("");
+		setValue("");
+	};
 
-  const handleDelete = (key: string) => {
-    const newParams = { ...params };
-    delete newParams[key];
-    setParams(newParams);
-  };
+	const handleDelete = (key: string) => {
+		const newParams = { ...params };
+		delete newParams[key];
+		setParams(newParams);
+	};
 
-  return (
-    <div className="space-y-6 p-2 sm:p-0">
-      <div className="grid grid-cols-1 gap-4 md:grid-cols-[1fr_1fr_auto] md:gap-3 items-end">
-        <div className="flex flex-col space-y-1">
-          <Label htmlFor="param-key" className="text-sm font-medium">Parameter Key</Label>
-          <Select value={selectedKey} onValueChange={setSelectedKey}>
-            <SelectTrigger id="param-key" className="w-full">
-              <SelectValue placeholder="Select parameter" />
-            </SelectTrigger>
-            <SelectContent>
-              {PARAM_KEYS.map((key) => (
-                <SelectItem key={key} value={key}>{key}</SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-        </div>
+	return (
+		<div className="space-y-6 p-2 sm:p-0">
+			<div className="grid grid-cols-1 gap-4 md:grid-cols-[1fr_1fr_auto] md:gap-3 items-end">
+				<div className="flex flex-col space-y-1">
+					<Label htmlFor="param-key" className="text-sm font-medium">
+						Parameter Key
+					</Label>
+					<Select value={selectedKey} onValueChange={setSelectedKey}>
+						<SelectTrigger id="param-key" className="w-full">
+							<SelectValue placeholder="Select parameter" />
+						</SelectTrigger>
+						<SelectContent>
+							{PARAM_KEYS.map((key) => (
+								<SelectItem key={key} value={key}>
+									{key}
+								</SelectItem>
+							))}
+						</SelectContent>
+					</Select>
+				</div>
 
-        <div className="flex flex-col space-y-1">
-          <Label htmlFor="param-value" className="text-sm font-medium">Value</Label>
-          <Input
-            id="param-value"
-            placeholder="Enter value (e.g., 0.7 or 512)"
-            value={value}
-            onChange={(e) => setValue(e.target.value)}
-            className="w-full"
-          />
-        </div>
+				<div className="flex flex-col space-y-1">
+					<Label htmlFor="param-value" className="text-sm font-medium">
+						Value
+					</Label>
+					<Input
+						id="param-value"
+						placeholder="Enter value (e.g., 0.7 or 512)"
+						value={value}
+						onChange={(e) => setValue(e.target.value)}
+						className="w-full"
+					/>
+				</div>
 
-        <Button
-          className="w-full md:w-auto h-10 mt-0"
-          onClick={handleAdd}
-          disabled={!selectedKey || value === ""}
-        >
-          <Plus className="w-4 h-4 mr-2" /> Add Parameter
-        </Button>
-      </div>
+				<Button
+					className="w-full md:w-auto h-10 mt-0"
+					onClick={handleAdd}
+					disabled={!selectedKey || value === ""}
+				>
+					<Plus className="w-4 h-4 mr-2" /> Add Parameter
+				</Button>
+			</div>
 
-      <hr className="my-4" />
+			<hr className="my-4" />
 
-      {Object.keys(params).length > 0 && (
-        <div className="border rounded-lg shadow-sm overflow-x-auto">
-          <table className="min-w-full text-left text-sm divide-y divide-gray-200">
-            <thead className="bg-black dark:bg-black">
-              <tr>
-                <th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-gray-600 dark:text-gray-300">Key</th>
-                <th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-gray-600 dark:text-gray-300">Value</th>
-                <th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-gray-600 dark:text-gray-300 sr-only md:not-sr-only">Actions</th>
-              </tr>
-            </thead>
-            <tbody className="divide-y divide-gray-200 bg-black dark:bg-black">
-              {Object.entries(params).map(([key, val]) => (
-                <tr key={key} className="hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors">
-                  <td className="px-4 py-3 font-medium text-gray-900 dark:text-white">{key}</td>
-                  <td className="px-4 py-3 text-gray-700 dark:text-gray-300">{val.toString()}</td>
-                  <td className="px-4 py-3">
-                    <Button
-                      variant="ghost"
-                      size="icon"
-                      className="text-red-600 hover:bg-red-50 dark:hover:bg-red-900/20 hover:text-red-700 dark:text-red-500"
-                      onClick={() => handleDelete(key)}
-                      aria-label={`Delete parameter ${key}`}
-                    >
-                      <Trash2 className="w-4 h-4" />
-                    </Button>
-                  </td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </div>
-      )}
-    </div>
-  );
+			{Object.keys(params).length > 0 && (
+				<div className="border rounded-lg shadow-sm overflow-x-auto">
+					<table className="min-w-full text-left text-sm divide-y divide-gray-200">
+						<thead className="bg-black dark:bg-black">
+							<tr>
+								<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-gray-600 dark:text-gray-300">
+									Key
+								</th>
+								<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-gray-600 dark:text-gray-300">
+									Value
+								</th>
+								<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-gray-600 dark:text-gray-300 sr-only md:not-sr-only">
+									Actions
+								</th>
+							</tr>
+						</thead>
+						<tbody className="divide-y divide-gray-200 bg-black dark:bg-black">
+							{Object.entries(params).map(([key, val]) => (
+								<tr key={key} className="hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors">
+									<td className="px-4 py-3 font-medium text-gray-900 dark:text-white">{key}</td>
+									<td className="px-4 py-3 text-gray-700 dark:text-gray-300">{val.toString()}</td>
+									<td className="px-4 py-3">
+										<Button
+											variant="ghost"
+											size="icon"
+											className="text-red-600 hover:bg-red-50 dark:hover:bg-red-900/20 hover:text-red-700 dark:text-red-500"
+											onClick={() => handleDelete(key)}
+											aria-label={`Delete parameter ${key}`}
+										>
+											<Trash2 className="w-4 h-4" />
+										</Button>
+									</td>
+								</tr>
+							))}
+						</tbody>
+					</table>
+				</div>
+			)}
+		</div>
+	);
 }

surfsense_web/components/onboard/add-provider-step.tsx

@@ -17,6 +17,7 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
+import { LANGUAGES } from "@/contracts/enums/languages";
 import { LLM_PROVIDERS } from "@/contracts/enums/llm-providers";
 import { type CreateLLMConfig, useLLMConfigs } from "@/hooks/use-llm-configs";
 
@@ -42,6 +43,7 @@ export function AddProviderStep({
 		model_name: "",
 		api_key: "",
 		api_base: "",
+		language: "English",
 		litellm_params: {},
 		search_space_id: searchSpaceId,
 	});
@@ -70,6 +72,7 @@ export function AddProviderStep({
 				model_name: "",
 				api_key: "",
 				api_base: "",
+				language: "English",
 				litellm_params: {},
 				search_space_id: searchSpaceId,
 			});
@@ -119,6 +122,7 @@ export function AddProviderStep({
 												</div>
 												<p className="text-sm text-muted-foreground">
 													Model: {config.model_name}
+													{config.language && ` • Language: ${config.language}`}
 													{config.api_base && ` • Base: ${config.api_base}`}
 												</p>
 											</div>
@@ -169,7 +173,7 @@ export function AddProviderStep({
 					</CardHeader>
 					<CardContent>
 						<form onSubmit={handleSubmit} className="space-y-4">
-							<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+							<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
 								<div className="space-y-2">
 									<Label htmlFor="name">Configuration Name *</Label>
 									<Input
@@ -199,6 +203,26 @@ export function AddProviderStep({
 										</SelectContent>
 									</Select>
 								</div>
+
+								{/* language */}
+								<div className="space-y-2">
+									<Label htmlFor="language">Language (Optional)</Label>
+									<Select
+										value={formData.language || "English"}
+										onValueChange={(value) => handleInputChange("language", value)}
+									>
+										<SelectTrigger>
+											<SelectValue placeholder="Select language" />
+										</SelectTrigger>
+										<SelectContent>
+											{LANGUAGES.map((language) => (
+												<SelectItem key={language.value} value={language.value}>
+													{language.label}
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+								</div>
 							</div>
 
 							{formData.provider === "CUSTOM" && (

surfsense_web/components/settings/model-config-manager.tsx

@@ -37,6 +37,7 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
+import { LANGUAGES } from "@/contracts/enums/languages";
 import { LLM_PROVIDERS } from "@/contracts/enums/llm-providers";
 import { type CreateLLMConfig, type LLMConfig, useLLMConfigs } from "@/hooks/use-llm-configs";
 import InferenceParamsEditor from "../inference-params-editor";
@@ -65,6 +66,7 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 		model_name: "",
 		api_key: "",
 		api_base: "",
+		language: "English",
 		litellm_params: {},
 		search_space_id: searchSpaceId,
 	});
@@ -80,6 +82,7 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 				model_name: editingConfig.model_name,
 				api_key: editingConfig.api_key,
 				api_base: editingConfig.api_base || "",
+				language: editingConfig.language || "English",
 				litellm_params: editingConfig.litellm_params || {},
 				search_space_id: searchSpaceId,
 			});
@@ -90,6 +93,17 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 		setFormData((prev) => ({ ...prev, [field]: value }));
 	};
 
+	// Handle provider change with auto-fill API Base URL / 处理 Provider 变更并自动填充 API Base URL
+	const handleProviderChange = (providerValue: string) => {
+		const provider = LLM_PROVIDERS.find((p) => p.value === providerValue);
+		setFormData((prev) => ({
+			...prev,
+			provider: providerValue,
+			// Auto-fill API Base URL if provider has a default / 如果提供商有默认值则自动填充
+			api_base: provider?.apiBase || prev.api_base,
+		}));
+	};
+
 	const handleSubmit = async (e: React.FormEvent) => {
 		e.preventDefault();
 		if (!formData.name || !formData.provider || !formData.model_name || !formData.api_key) {
@@ -118,6 +132,7 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 				model_name: "",
 				api_key: "",
 				api_base: "",
+				language: "English",
 				litellm_params: {},
 				search_space_id: searchSpaceId,
 			});
@@ -323,6 +338,13 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 																	<p className="text-sm text-muted-foreground font-mono">
 																		{config.model_name}
 																	</p>
+																	{config.language && (
+																		<div className="flex items-center gap-2">
+																			<Badge variant="outline" className="text-xs">
+																				{config.language}
+																			</Badge>
+																		</div>
+																	)}
 																</div>
 															</div>
 
@@ -432,6 +454,7 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 							model_name: "",
 							api_key: "",
 							api_base: "",
+							language: "",
 							litellm_params: {},
 							search_space_id: searchSpaceId,
 						});
@@ -466,10 +489,7 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 
 							<div className="space-y-2">
 								<Label htmlFor="provider">Provider *</Label>
-								<Select
-									value={formData.provider}
-									onValueChange={(value) => handleInputChange("provider", value)}
-								>
+								<Select value={formData.provider} onValueChange={handleProviderChange}>
 									<SelectTrigger>
 										<SelectValue placeholder="Select a provider">
 											{formData.provider && (
@@ -524,6 +544,25 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 							)}
 						</div>
 
+						<div className="space-y-2">
+							<Label htmlFor="language">Language (Optional)</Label>
+							<Select
+								value={formData.language || "English"}
+								onValueChange={(value) => handleInputChange("language", value)}
+							>
+								<SelectTrigger>
+									<SelectValue placeholder="Select language" />
+								</SelectTrigger>
+								<SelectContent>
+									{LANGUAGES.map((language) => (
+										<SelectItem key={language.value} value={language.value}>
+											{language.label}
+										</SelectItem>
+									))}
+								</SelectContent>
+							</Select>
+						</div>
+
 						<div className="space-y-2">
 							<Label htmlFor="api_key">API Key *</Label>
 							<Input
@@ -537,13 +576,39 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 						</div>
 
 						<div className="space-y-2">
-							<Label htmlFor="api_base">API Base URL (Optional)</Label>
+							<Label htmlFor="api_base">
+								API Base URL
+								{selectedProvider?.apiBase && (
+									<span className="text-xs font-normal text-muted-foreground ml-2">
+										(Auto-filled for {selectedProvider.label})
+									</span>
+								)}
+							</Label>
 							<Input
 								id="api_base"
-								placeholder="e.g., https://api.openai.com/v1"
+								placeholder={selectedProvider?.apiBase || "e.g., https://api.openai.com/v1"}
 								value={formData.api_base}
 								onChange={(e) => handleInputChange("api_base", e.target.value)}
 							/>
+							{selectedProvider?.apiBase && formData.api_base === selectedProvider.apiBase && (
+								<p className="text-xs text-green-600 flex items-center gap-1">
+									<CheckCircle className="h-3 w-3" />
+									Using recommended API endpoint for {selectedProvider.label}
+								</p>
+							)}
+							{selectedProvider?.apiBase && !formData.api_base && (
+								<p className="text-xs text-amber-600 flex items-center gap-1">
+									<AlertCircle className="h-3 w-3" />
+									⚠️ API Base URL is required for {selectedProvider.label}. Click to auto-fill:
+									<button
+										type="button"
+										className="underline font-medium"
+										onClick={() => handleInputChange("api_base", selectedProvider.apiBase || "")}
+									>
+										{selectedProvider.apiBase}
+									</button>
+								</p>
+							)}
 						</div>
 
 						{/* Optional Inference Parameters */}
@@ -579,6 +644,7 @@ export function ModelConfigManager({ searchSpaceId }: ModelConfigManagerProps) {
 										model_name: "",
 										api_key: "",
 										api_base: "",
+										language: "",
 										litellm_params: {},
 										search_space_id: searchSpaceId,
 									});