Skip to content

Commit 3023989

Browse files
authored
Merge branch 'develop' into patch-2
2 parents d2168c8 + ba3f4f7 commit 3023989

File tree

6 files changed

+43
-18
lines changed

6 files changed

+43
-18
lines changed

doc/docs/zh/opensource-memorial-wall.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,3 +608,15 @@ Nexent开发者加油
608608
祝nexent平台越来越好
609609
:::
610610
通过 Nexent 实现了医学查询架构的完美落地,这套框架非常完美。多智能体编排体验极佳!
611+
612+
::: info zmu.1s - 2025-12-04
613+
打ICT大赛接触到了Nexent平台,祝越来越好!
614+
:::
615+
616+
::: info Papver 01 -2025-12-05
617+
感谢 Nexent 让我踏上了开源之旅!这个项目的文档真的很棒,帮助我快速上手。
618+
:::
619+
620+
::: info user -2025-12-05
621+
通过 Nexent 实现了医学查询架构的完美落地,这套框架非常完美。多智能体编排体验极佳!
622+
:::

frontend/app/[locale]/layout.tsx

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,28 @@ import log from "@/lib/logger";
1616
const inter = Inter({ subsets: ["latin"] });
1717

1818
export async function generateMetadata(props: {
19-
params: Promise<{ locale: string }>;
19+
params: Promise<{ locale?: string }>;
2020
}): Promise<Metadata> {
2121
const { locale } = await props.params;
22+
const resolvedLocale = (["zh", "en"].includes(locale ?? "")
23+
? locale
24+
: "zh") as "zh" | "en";
2225
let messages: any = {};
2326

24-
if (["zh", "en"].includes(locale)) {
27+
if (["zh", "en"].includes(resolvedLocale)) {
2528
try {
2629
const filePath = path.join(
2730
process.cwd(),
2831
"public",
2932
"locales",
30-
locale,
33+
resolvedLocale,
3134
"common.json"
3235
);
3336
const fileContent = await fs.readFile(filePath, "utf8");
3437
messages = JSON.parse(fileContent);
3538
} catch (error) {
3639
log.error(
37-
`Failed to load i18n messages for locale: ${locale}`,
40+
`Failed to load i18n messages for locale: ${resolvedLocale}`,
3841
error
3942
);
4043
}
@@ -54,15 +57,20 @@ export async function generateMetadata(props: {
5457
};
5558
}
5659

57-
export default async function RootLayout(props: {
60+
export default async function RootLayout({
61+
children,
62+
params,
63+
}: {
5864
children: ReactNode;
59-
params: Promise<{ locale: string }>;
65+
params: Promise<{ locale?: string }>;
6066
}) {
61-
const { children, params } = props;
6267
const { locale } = await params;
68+
const resolvedLocale = (["zh", "en"].includes(locale ?? "")
69+
? locale
70+
: "zh") as "zh" | "en";
6371

6472
return (
65-
<html lang={locale} suppressHydrationWarning>
73+
<html lang={resolvedLocale} suppressHydrationWarning>
6674
<body className={inter.className}>
6775
<NextThemesProvider
6876
attribute="class"

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"katex": "^0.16.11",
6262
"lucide-react": "^0.454.0",
6363
"mermaid": "^11.12.0",
64-
"next": "15.4.5",
64+
"next": "15.5.7",
6565
"next-i18next": "^15.4.2",
6666
"next-themes": "^0.4.4",
6767
"react": "18.2.0",
@@ -97,7 +97,7 @@
9797
"@types/react": "18.3.20",
9898
"@types/react-dom": "18.3.6",
9999
"eslint": "^9.34.0",
100-
"eslint-config-next": "15.5.0",
100+
"eslint-config-next": "15.5.7",
101101
"postcss": "^8",
102102
"tailwindcss": "^3.4.17",
103103
"typescript": "5.8.3"

make/web/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN if [ -n "$MIRROR" ]; then npm config set registry "$MIRROR"; fi && \
2222
"start": "NODE_ENV=production HOSTNAME=localhost node server.js"\
2323
},\
2424
"dependencies": {\
25-
"next": "15.4.5",\
25+
"next": "15.5.7",\
2626
"react": "18.2.0",\
2727
"react-dom": "18.2.0",\
2828
"http-proxy": "^1.18.1",\
@@ -46,8 +46,13 @@ LABEL authors="nexent"
4646
RUN if [ "$APK_MIRROR" = "tsinghua" ]; then \
4747
echo "https://mirrors.tuna.tsinghua.edu.cn/alpine/latest-stable/main" > /etc/apk/repositories && \
4848
echo "https://mirrors.tuna.tsinghua.edu.cn/alpine/latest-stable/community" >> /etc/apk/repositories; \
49-
fi && \
50-
apk add --no-cache curl
49+
fi
50+
51+
# Update package index, upgrade busybox first, then install curl
52+
# This avoids trigger script issues in cross-platform builds with QEMU emulation
53+
RUN apk update && \
54+
apk upgrade --no-cache busybox || true && \
55+
apk add --no-cache --no-scripts curl
5156

5257
WORKDIR /opt/frontend-dist
5358

sdk/nexent/core/tools/datamate_search_tool.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def forward(
150150
entity_data = single_search_result.get("entity", {})
151151
metadata = self._parse_metadata(entity_data.get("metadata"))
152152
dataset_id = self._extract_dataset_id(metadata.get("absolute_directory_path", ""))
153-
file_id = entity_data.get("id")
153+
file_id = metadata.get("original_file_id")
154154
download_url = self._build_file_download_url(dataset_id, file_id)
155155

156156
score_details = entity_data.get("scoreDetails", {}) or {}
@@ -162,7 +162,7 @@ def forward(
162162
})
163163

164164
search_result_message = SearchResultTextMessage(
165-
title=metadata.get("file_name", "") or "Untitled",
165+
title=metadata.get("file_name", ""),
166166
text=entity_data.get("text", ""),
167167
source_type="datamate",
168168
url=download_url,
@@ -308,6 +308,6 @@ def _extract_dataset_id(absolute_path: str) -> str:
308308

309309
def _build_file_download_url(self, dataset_id: str, file_id: str) -> str:
310310
"""Build the download URL for a dataset file."""
311-
if not (self.server_ip and dataset_id and file_id):
311+
if not (self.server_base_url and dataset_id and file_id):
312312
return ""
313-
return f"{self.server_ip}/api/data-management/datasets/{dataset_id}/files/{file_id}/download"
313+
return f"{self.server_base_url}/api/data-management/datasets/{dataset_id}/files/{file_id}/download"

test/sdk/core/tools/test_datamate_search_tool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def test_extract_dataset_id(self, datamate_tool: DataMateSearchTool, path, expec
117117
@pytest.mark.parametrize(
118118
"dataset_id, file_id, expected",
119119
[
120-
("ds1", "f1", "127.0.0.1/api/data-management/datasets/ds1/files/f1/download"),
120+
("ds1", "f1", "http://127.0.0.1:8080/api/data-management/datasets/ds1/files/f1/download"),
121121
("", "f1", ""),
122122
("ds1", "", ""),
123123
],

0 commit comments

Comments
 (0)