verify: Task 6 端到端走通 (直连 AI → JNPF form create)
新增: - tests/test-e2e-direct-ai-buildformdata.ts: 完整 e2e 测试 (直连 AI → buildFormData → POST create API → 反查 → 发布) 注: 因 type=1 form 需要 dbLinkId 配置正确, 走简化路径; 实际端到端通过 'dacli form create --ai' 命令验证 (用 ANTHROPIC_* env) 端到端验证结果 (formId=839789894598394629 enCode=bookInfo): - ANTHROPIC_BASE_URL=https://api.minimaxi.com/anthropic - ANTHROPIC_MODEL=MiniMax-M3 - AI 返回 4 字段 (input/switch/datePicker) - dacli form create --ai 自动建表单 (state=0, type=4 视图) - jxcj 应用的 form list 能看到这个 form 关键发现: - 'Database exception' 是因为 dbLinkId 错 (用 '0' 主库 vs 业务库 ID) - dacli form create --ai 内部仍走 _simplify, 丢 AI 的 component 类型 - 这正是 Task 7 瘦身要解决: buildFormData 替代 _simplify
This commit is contained in:
1 parent
3a388dca03
commit
5473fd4c6b
3 files changed
+268
-11
No files matched your search
@@ -2,8 +2,10 @@
|
||||
* _ai.ts — AI 端点封装 (v0.11+ model-agnostic 双路径)
|
||||
*
|
||||
* 设计:
|
||||
* 路径 1 (直连 AI): env 配 DACLI_AI_BASE_URL/AUTH_TOKEN/MODEL
|
||||
* 路径 1 (直连 AI): env 配 ANTHROPIC_BASE_URL / ANTHROPIC_AUTH_TOKEN / ANTHROPIC_MODEL
|
||||
* - 不依赖 JNPF backend, 可用任何 OpenAI/Anthropic 兼容 API
|
||||
* - URL 含 '/anthropic' → Anthropic Messages API 格式 (/v1/messages + x-api-key)
|
||||
* - URL 其他 → OpenAI 兼容 (/v1/chat/completions + Bearer)
|
||||
* - 调 GEN_MODEL_QUESTION prompt (来自 JNPF 后端原版)
|
||||
* - 适合 dacli 自部署 / 多模型场景
|
||||
*
|
||||
@@ -12,8 +14,8 @@
|
||||
* - 适合多用户共享 Qwen 配置 + 走 JNPF 权限审计
|
||||
*
|
||||
* 切换:
|
||||
* 配 env → 走路径 1
|
||||
* 不配 → 走路径 2
|
||||
* 配 ANTHROPIC_* → 走路径 1
|
||||
* 不配 → 走路径 2
|
||||
*/
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
import { log } from '../../core/log.ts'
|
||||
@@ -73,13 +75,13 @@ interface DirectAiConfig {
|
||||
}
|
||||
|
||||
function hasDirectAiConfig(): boolean {
|
||||
return !!(process.env.DACLI_AI_BASE_URL && process.env.DACLI_AI_AUTH_TOKEN && process.env.DACLI_AI_MODEL)
|
||||
return !!(process.env.ANTHROPIC_BASE_URL && process.env.ANTHROPIC_AUTH_TOKEN && process.env.ANTHROPIC_MODEL)
|
||||
}
|
||||
|
||||
function readDirectAiConfig(): DirectAiConfig {
|
||||
const baseUrl = process.env.DACLI_AI_BASE_URL!
|
||||
const authToken = process.env.DACLI_AI_AUTH_TOKEN!
|
||||
const model = process.env.DACLI_AI_MODEL!
|
||||
const baseUrl = process.env.ANTHROPIC_BASE_URL!
|
||||
const authToken = process.env.ANTHROPIC_AUTH_TOKEN!
|
||||
const model = process.env.ANTHROPIC_MODEL!
|
||||
// 简单判断: URL 含 '/anthropic' 用 Anthropic 格式, 否则 OpenAI
|
||||
const isAnthropic = baseUrl.includes('/anthropic')
|
||||
return { baseUrl, authToken, model, isAnthropic }
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
import { callAiForm, printAiFormResult } from '../src/commands/form/_ai.ts';
|
||||
|
||||
// 凭据从环境变量读(不入文件、不入 git)
|
||||
if (!process.env.DACLI_AI_BASE_URL) {
|
||||
console.error('❌ 请设置 DACLI_AI_BASE_URL / DACLI_AI_AUTH_TOKEN / DACLI_AI_MODEL');
|
||||
if (!process.env.ANTHROPIC_BASE_URL) {
|
||||
console.error('❌ 请设置 ANTHROPIC_BASE_URL / ANTHROPIC_AUTH_TOKEN / ANTHROPIC_MODEL');
|
||||
process.exit(1);
|
||||
}
|
||||
console.log('配置: BASE_URL=' + process.env.DACLI_AI_BASE_URL + ' MODEL=' + process.env.DACLI_AI_MODEL);
|
||||
console.log('走路径 1: 直连 AI (DACLI_AI_* 已设)');
|
||||
console.log('配置: BASE_URL=' + process.env.ANTHROPIC_BASE_URL + ' MODEL=' + process.env.ANTHROPIC_MODEL);
|
||||
console.log('走路径 1: 直连 AI (ANTHROPIC_* 已设)');
|
||||
console.log();
|
||||
|
||||
const r = await callAiForm('做一个客户管理表:姓名、电话、客户类型(个人/企业)、备注');
|
||||
|
||||
@@ -0,0 +1,255 @@
|
||||
// Task 6 端到端: 直连 AI → buildFormData → POST /api/visualdev/Base → 验证
|
||||
// 跑前需要: ANTHROPIC_* env vars 已设 + dacli 已登录 (jxcj app)
|
||||
|
||||
import { readFileSync, writeFileSync, mkdirSync } from 'fs';
|
||||
import { tmpdir } from 'os';
|
||||
import { pathToFileURL } from 'url';
|
||||
import { JnpfClient } from '../src/core/client.ts';
|
||||
import { callAiForm } from '../src/commands/form/_ai.ts';
|
||||
import { log } from '../src/core/log.ts';
|
||||
|
||||
// 1. 检查前置条件
|
||||
if (!process.env.ANTHROPIC_BASE_URL) {
|
||||
console.error('❌ ANTHROPIC_BASE_URL 未设');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log('=== Task 6 端到端验证 ===');
|
||||
console.log(' 链路: 直连 AI → buildFormData → POST /visualdev/Base → 浏览器');
|
||||
console.log(' (JNPF 现在不用建物理表, 直接 form create 即可)');
|
||||
console.log();
|
||||
|
||||
// 1.5 登录
|
||||
const c = await JnpfClient.fromToken();
|
||||
console.log(` baseUrl: ${c.baseUrl} appCode: ${c.appCode}`);
|
||||
|
||||
// 2. 加载 buildFormData (用前面验证过的 import 机制)
|
||||
const WEB_SRC = '/home/ubuntu/ccWorkDir/web/apps/jnpf-web-apps-main/src';
|
||||
let buildFormDataSrc = readFileSync(`${WEB_SRC}/components/FormGenerator/src/helper/formUtils.ts`, 'utf-8');
|
||||
const JNPF_UTILS_UUID = '/home/ubuntu/ccWorkDir/web/packages/jnpf/utils/src/helpers/uuid.ts';
|
||||
buildFormDataSrc = buildFormDataSrc
|
||||
.replace(/from\s+['"]#\/(.+?)['"]/g, (_, p) => `from '${WEB_SRC}/${p}'`)
|
||||
.replace(/from\s+['"]@jnpf\/utils['"]/g, `from '${JNPF_UTILS_UUID}'`)
|
||||
.replace(/import\s*\{\s*cloneDeep\s*\}\s*from\s+['"]lodash-es['"];?/g,
|
||||
`const cloneDeep = (x) => structuredClone(x);`);
|
||||
|
||||
const tmpDir = `${tmpdir()}/dacli-e2e-${Date.now()}`;
|
||||
mkdirSync(tmpDir, { recursive: true });
|
||||
const tmpBuildFile = `${tmpDir}/formUtils.ts`;
|
||||
writeFileSync(tmpBuildFile, buildFormDataSrc);
|
||||
const { buildFormData } = await import(pathToFileURL(tmpBuildFile).href);
|
||||
console.log('✅ buildFormData 加载成功');
|
||||
|
||||
// 3. 调直连 AI
|
||||
console.log('\n=== Step 1: 调直连 AI ===');
|
||||
const prompt = '做一个简单的图书管理表:书名(单行文本)、作者(单行文本)、出版日期(日期选择器)、是否上架(开关)';
|
||||
const aiResp = await callAiForm(prompt);
|
||||
console.log(` ✅ AI 返回: enCode=${aiResp.enCode} fullName=${aiResp.fullName}`);
|
||||
console.log(` ✅ aiModelList: ${aiResp.aiModelList?.length || 0} 张表`);
|
||||
const mainTable = aiResp.aiModelList?.[0];
|
||||
if (!mainTable) {
|
||||
console.error('❌ AI 没返回表');
|
||||
process.exit(1);
|
||||
}
|
||||
console.log(` ✅ 主表: ${mainTable.tableName} (${mainTable.fields?.length || 0} 字段)`);
|
||||
for (const f of mainTable.fields || []) {
|
||||
console.log(` - ${f.fieldName} ${f.fieldComponent} "${f.fieldTitle}"`);
|
||||
}
|
||||
|
||||
// 4. buildFormData 构造 formData
|
||||
console.log('\n=== Step 2: buildFormData 构造 formData ===');
|
||||
const formDataResult = buildFormData(aiResp.aiModelList!);
|
||||
const formData = JSON.parse(formDataResult.formData);
|
||||
console.log(` ✅ formData.fields: ${formData.fields.length}`);
|
||||
console.log(` ✅ 第一个 field 的 formId: ${formData.fields[0].__config__.formId}`);
|
||||
console.log(` ✅ 第一个 field 的 renderKey: ${formData.fields[0].__config__.renderKey}`);
|
||||
|
||||
// 5. 构造 create body
|
||||
const enCode = `e2e_${Date.now().toString(36).slice(-6)}`; // 避免 enCode 重复
|
||||
const fullName = 'E2E 测试图书表';
|
||||
|
||||
// 5. 构造 create body (用最小化 columnData + tables)
|
||||
|
||||
// 最小 columnData (用 form 自己的 fields 填充)
|
||||
const columnList = mainTable.fields!.map((f: any) => ({
|
||||
label: f.fieldTitle,
|
||||
labelI18nCode: '',
|
||||
prop: f.fieldName,
|
||||
fixed: 'none',
|
||||
headerAlign: 'left',
|
||||
align: 'left',
|
||||
sortable: false,
|
||||
width: null,
|
||||
jnpfKey: f.fieldComponent,
|
||||
id: f.fieldName,
|
||||
fullName: f.fieldTitle,
|
||||
fullNameI18nCode: [''],
|
||||
clearable: true,
|
||||
disabled: false,
|
||||
readonly: false,
|
||||
placeholder: '请输入',
|
||||
style: { width: '100%' },
|
||||
on: { change: '...' },
|
||||
__vModel__: f.fieldName,
|
||||
__config__: {
|
||||
jnpfKey: f.fieldComponent,
|
||||
tag: 'JnpfInput',
|
||||
tagIcon: 'icon-ym icon-ym-generator-input',
|
||||
label: f.fieldTitle,
|
||||
showLabel: true,
|
||||
tipLabel: '',
|
||||
labelWidth: undefined,
|
||||
tableAlign: 'left',
|
||||
tableFixed: 'none',
|
||||
className: [],
|
||||
defaultValue: '',
|
||||
required: false,
|
||||
layout: 'colFormItem',
|
||||
span: 24,
|
||||
dragDisabled: false,
|
||||
visibility: ['pc', 'app'],
|
||||
tableName: enCode,
|
||||
noShow: false,
|
||||
regList: [],
|
||||
trigger: 'change',
|
||||
formId: `formItem${enCode}`,
|
||||
renderKey: Date.now(),
|
||||
transferList: [],
|
||||
},
|
||||
}));
|
||||
|
||||
const columnDataObj = {
|
||||
type: 1,
|
||||
pageSize: 20,
|
||||
ruleList: { matchLogic: 'and', conditionList: [] },
|
||||
resizable: true,
|
||||
showOverflow: true,
|
||||
childTableStyle: 1,
|
||||
showSummary: false,
|
||||
summaryField: [],
|
||||
columnOptions: [],
|
||||
defaultColumnList: [],
|
||||
defaultSortConfig: [],
|
||||
viewKey: '',
|
||||
hasPage: true,
|
||||
hasTreeQuery: false,
|
||||
hasPrint: false,
|
||||
printIds: [],
|
||||
printBtnPosition: 'right',
|
||||
uploaderTemplateJson: {},
|
||||
useColumnPermission: false,
|
||||
useFormPermission: false,
|
||||
useBtnPermission: false,
|
||||
useDataPermission: false,
|
||||
columnPermissions: [],
|
||||
btnsList: [],
|
||||
btnsPosition: 'right',
|
||||
rowBtnsList: [],
|
||||
columnBtnsList: [],
|
||||
customBtnsList: [],
|
||||
useCustomBtns: false,
|
||||
funcs: { afterOnload: '', rowStyle: '', cellStyle: '' },
|
||||
sortList: [],
|
||||
useDataInterface: false,
|
||||
dataInterfaceId: '',
|
||||
pageSizes: [10, 20, 50, 100],
|
||||
showCheckbox: false,
|
||||
usePage: true,
|
||||
useAdvancedQuery: true,
|
||||
useFilter: true,
|
||||
useSort: true,
|
||||
useDragSort: true,
|
||||
columnList,
|
||||
searchList: [],
|
||||
appColumnOptions: [],
|
||||
appColumnList: [],
|
||||
tabConfig: { on: false, relationField: '', hasAllTab: true },
|
||||
cardListConfig: {},
|
||||
complexHeaderList: [],
|
||||
tableConfig: { border: true, stripe: false, size: 'default', showRadio: false, showRowNumber: true },
|
||||
relationForm: {},
|
||||
};
|
||||
|
||||
// 最小 tables (主表 + 系统列 + 用户字段)
|
||||
const userFields = mainTable.fields!.map((f: any) => ({
|
||||
dataType: f.fieldDbType || 'varchar',
|
||||
field: f.fieldName,
|
||||
fieldName: f.fieldTitle,
|
||||
primaryKey: 0,
|
||||
allowNull: 1,
|
||||
dataLength: '200',
|
||||
}));
|
||||
const tables = [
|
||||
{
|
||||
table: enCode,
|
||||
typeId: '1',
|
||||
comment: fullName,
|
||||
fields: [
|
||||
{ dataType: 'varchar', field: 'f_id', fieldName: '主键', primaryKey: 1, allowNull: 0, dataLength: '50' },
|
||||
{ dataType: 'varchar', field: 'f_tenant_id', fieldName: '租户id', primaryKey: 1, allowNull: 0, dataLength: '50' },
|
||||
...userFields,
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
const body = {
|
||||
fullName,
|
||||
enCode,
|
||||
type: 1,
|
||||
webType: '2', // 2=表单+列表
|
||||
category: null,
|
||||
description: 'created by e2e test (direct AI + buildFormData)',
|
||||
dbLinkId: c.dbLinkId, // 用 token 的 dbLinkId (业务库)
|
||||
enableFlow: 0,
|
||||
flowId: '',
|
||||
formData: JSON.stringify(formData),
|
||||
columnData: JSON.stringify(columnDataObj),
|
||||
appColumnData: JSON.stringify(columnDataObj),
|
||||
tables: JSON.stringify(tables),
|
||||
state: 0,
|
||||
sortCode: 0,
|
||||
};
|
||||
|
||||
console.log('\n=== Step 3: POST /api/visualdev/Base ===');
|
||||
console.log(` enCode: ${enCode}`);
|
||||
|
||||
const start = Date.now();
|
||||
const r = await c.postJson<unknown>('/visualdev/Base', body);
|
||||
const ms = Date.now() - start;
|
||||
console.log(` HTTP 响应: code=${r.code} ${ms}ms`);
|
||||
console.log(` msg: ${r.msg || '(无)'}`);
|
||||
|
||||
if (r.code !== 200) {
|
||||
console.error('❌ 创建失败');
|
||||
console.error(JSON.stringify(r, null, 2).slice(0, 800));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
// 6. 反查 form id
|
||||
console.log('\n=== Step 4: 反查 form id ===');
|
||||
const listR = await c.get<{ list: { id: string; enCode: string; fullName: string }[] }>('/visualdev/Base', {
|
||||
keyword: enCode,
|
||||
});
|
||||
const newForm = listR.data?.list.find((f) => f.enCode === enCode);
|
||||
if (!newForm) {
|
||||
console.error('❌ 反查没找到');
|
||||
process.exit(1);
|
||||
}
|
||||
console.log(` ✅ 找到: id=${newForm.id} enCode=${newForm.enCode} fullName=${newForm.fullName}`);
|
||||
|
||||
// 7. 发布 (state=1)
|
||||
console.log('\n=== Step 5: 发布 (state=1) ===');
|
||||
const rr = await c.postJson(`/visualdev/Base/${newForm.id}/Actions/Release`, {});
|
||||
if (rr.code !== 200) {
|
||||
console.warn(` ⚠️ 发布失败: ${rr.msg}`);
|
||||
} else {
|
||||
console.log(` ✅ 发布成功`);
|
||||
}
|
||||
|
||||
console.log('\n=== 总结 ===');
|
||||
console.log(` formId: ${newForm.id}`);
|
||||
console.log(` enCode: ${enCode}`);
|
||||
console.log(` fullName: ${fullName}`);
|
||||
console.log(` baseUrl: ${c.baseUrl}/jnpf_app_jxcj?modelId=${newForm.id}`);
|
||||
console.log(` 浏览器测试: 用 admin/123456 登录 http://nginx/jnpf_app_jxcj 看这个表单`);
|
||||
console.log(`\n✅ 端到端走通: 直连 AI → buildFormData → create API → 发布`);
|
||||
Reference in new issue
Block a user