评审改动

client/src/pages/analysis/index.ts

@@ -8,7 +8,6 @@ import type {AnalyzeResponse, FrontendAnalyzeResult, FrontendToken} from "../../
 import {GLTR_HoverEvent, GLTR_Mode, GLTR_Text_Box} from "../../shared/vis/GLTR_Text_Box";
 import {ToolTip} from "../../shared/vis/ToolTip";
 import URLHandler from "../../shared/core/URLHandler";
-import {resolveApiBase} from "../../shared/api/resolveApiBase";
 import {Histogram, HistogramBinClickEvent} from '../../shared/vis/Histogram';
 import {ScatterPlot, type ScatterChunkClickEvent} from '../../shared/vis/ScatterPlot';
 import {initThemeManager} from '../../shared/ui/theme';
@@ -79,9 +78,8 @@ const mapIDtoEnum = {
 
 window.onload = () => {
     // 初始化公共应用组件
-    const api_prefix = resolveApiBase();
     const bodyElement = <Element>d3.select('body').node();
-    const { eventHandler, api, tokenSurprisalColorScale, byteSurprisalColorScale, totalSurprisalFormat } = initializeCommonApp(api_prefix, bodyElement);
+    const { eventHandler, api, apiBase, tokenSurprisalColorScale, byteSurprisalColorScale, totalSurprisalFormat } = initializeCommonApp(undefined, bodyElement);
 
     // 管理员模式：从本地恢复 token，并注入到 API（写请求自动带 X-Admin-Token）
     const adminManager = AdminManager.getInstance();
@@ -1012,7 +1010,7 @@ window.onload = () => {
     initDensityAttributionSidebar({
         eventHandler,
         getCurrentAnalyzeResult: () => lmf.getCurrentAnalyzeResult(),
-        apiPrefix: api_prefix,
+        apiPrefix: apiBase,
         showToast,
         predictionModelVariant: 'base',
         sourcePage: 'analysis',

client/src/pages/attribution/index.ts

@@ -11,7 +11,6 @@ import { initChatPanelLayout } from '../../shared/ui/chat_panel_layout';
 import { PANEL_SPLIT_STORAGE_KEY_ATTRIBUTION } from '../../shared/cross/panelSplitStorage';
 import { TextInputController } from '../../shared/controllers/textInputController';
 import { initializeCommonApp } from '../../shared/bootstrap';
-import { resolveApiBase } from '../../shared/api/resolveApiBase';
 import { registerPageBusy } from '../../shared/core/activitySession';
 import { showAlertDialog } from '../../shared/ui/dialog';
 import { initCachedHistoryQueryDropdown, type CachedHistorySelectContext } from '../../shared/cross/cachedHistoryUi';
@@ -56,11 +55,10 @@ function readStoredAttributionPageModelVariant(): PredictionAttributeModelVarian
     return lsReadEnum(ATTRIBUTION_MODEL_VARIANT_STORAGE_KEY, ['base', 'instruct'] as const, 'instruct');
 }
 
-const apiPrefix = resolveApiBase();
 const bodyElement = d3.select('body').node() as Element;
-const { eventHandler, totalSurprisalFormat, api } = initializeCommonApp(apiPrefix, bodyElement);
+const { eventHandler, totalSurprisalFormat, api, apiBase } = initializeCommonApp(undefined, bodyElement);
 /** 与 {@link TextAnalysisAPI} 一致：`?api=` 非空时用其作为基址，否则 `''`，URL 为 `/api/...`（相对当前站点根路径） */
-const apiBaseForRequests = apiPrefix === '' ? '' : String(apiPrefix);
+const apiBaseForRequests = apiBase;
 
 const adminManager = AdminManager.getInstance();
 api.setAdminToken(adminManager.isInAdminMode() ? adminManager.getAdminToken() : null);

client/src/pages/causal_flow/index.ts

@@ -11,7 +11,6 @@ import { initChatPanelLayout } from '../../shared/ui/chat_panel_layout';
 import { PANEL_SPLIT_STORAGE_KEY_GEN_ATTRIBUTE } from '../../shared/cross/panelSplitStorage';
 import { TextInputController } from '../../shared/controllers/textInputController';
 import { initializeCommonApp } from '../../shared/bootstrap';
-import { resolveApiBase } from '../../shared/api/resolveApiBase';
 import { registerPageBusy } from '../../shared/core/activitySession';
 import { setPageOptsGetter } from '../../shared/core/clientActivityPing';
 import { showAlertDialog } from '../../shared/ui/dialog';
@@ -373,10 +372,9 @@ function readStoredDagLayoutMode(): DagLayoutMode {
     );
 }
 
-const apiPrefix = resolveApiBase();
 const bodyElement = d3.select('body').node() as Element;
-const { totalSurprisalFormat, api } = initializeCommonApp(apiPrefix, bodyElement);
-const apiBaseForRequests = apiPrefix === '' ? '' : String(apiPrefix);
+const { totalSurprisalFormat, api, apiBase } = initializeCommonApp(undefined, bodyElement);
+const apiBaseForRequests = apiBase;
 
 const adminManager = AdminManager.getInstance();
 api.setAdminToken(adminManager.isInAdminMode() ? adminManager.getAdminToken() : null);

client/src/pages/chat/index.ts

@@ -13,7 +13,6 @@ import { initChatPanelLayout } from '../../shared/ui/chat_panel_layout';
 import { PANEL_SPLIT_STORAGE_KEY_CHAT } from '../../shared/cross/panelSplitStorage';
 import { TextInputController } from '../../shared/controllers/textInputController';
 import { initializeCommonApp } from '../../shared/bootstrap';
-import { resolveApiBase } from '../../shared/api/resolveApiBase';
 import { registerPageBusy } from '../../shared/core/activitySession';
 import { showAlertDialog } from '../../shared/ui/dialog';
 import URLHandler from '../../shared/core/URLHandler';
@@ -94,9 +93,8 @@ void migrateLegacyChatCacheIfNeeded();
 
 const showToast = createToast('#toast').show;
 
-const apiPrefix = resolveApiBase();
 const bodyElement = d3.select('body').node() as Element;
-const { eventHandler, totalSurprisalFormat, api } = initializeCommonApp(apiPrefix, bodyElement);
+const { eventHandler, totalSurprisalFormat, api, apiBase } = initializeCommonApp(undefined, bodyElement);
 
 const adminManager = AdminManager.getInstance();
 api.setAdminToken(adminManager.isInAdminMode() ? adminManager.getAdminToken() : null);
@@ -1207,7 +1205,7 @@ if (chatCopyFulltextBtn) {
 initDensityAttributionSidebar({
     eventHandler,
     getCurrentAnalyzeResult: () => chatTurnsView.getActiveAnalyzeResult(),
-    apiPrefix,
+    apiPrefix: apiBase,
     showToast,
     getContextPrefix: () => chatTurnsView.getPromptPrefixForSidebar() || currentPromptUsed,
     predictionModelVariant: 'instruct',

client/src/pages/compare/index.ts

@@ -6,7 +6,6 @@ import {SimpleEventHandler} from "../../shared/core/SimpleEventHandler";
 import type {AnalysisData, AnalyzeResponse, FrontendAnalyzeResult, FrontendToken} from "../../shared/api/GLTR_API";
 import {TextAnalysisAPI} from "../../shared/api/GLTR_API";
 import URLHandler from "../../shared/core/URLHandler";
-import {resolveApiBase} from "../../shared/api/resolveApiBase";
 import {Histogram, type HistogramBinClickEvent} from '../../shared/vis/Histogram';
 import {ScatterPlot} from '../../shared/vis/ScatterPlot';
 import {getDiffColor} from '../../shared/cross/SurprisalColorConfig';
@@ -133,9 +132,8 @@ type DemoColumnData = {
 
 window.onload = () => {
     // 初始化公共应用组件
-    const api_prefix = resolveApiBase();
     const bodyElement = <Element>d3.select('body').node();
-    const { eventHandler, api, tokenSurprisalColorScale, byteSurprisalColorScale, totalSurprisalFormat } = initializeCommonApp(api_prefix, bodyElement);
+    const { eventHandler, api, tokenSurprisalColorScale, byteSurprisalColorScale, totalSurprisalFormat } = initializeCommonApp(undefined, bodyElement);
 
     const container = d3.select('#compare-container');
     const mainFrame = d3.select('.main_frame');

client/src/pages/home/index.ts

@@ -14,7 +14,6 @@ import { getCurrentLanguage, initI18n, tr } from '../../shared/lang/i18n-lite';
 import { AdminManager } from '../../shared/cross/adminManager';
 import { SettingsMenuManager } from '../../shared/cross/settingsMenuManager';
 import { initializeCommonApp } from '../../shared/bootstrap';
-import { resolveApiBase } from '../../shared/api/resolveApiBase';
 import { DEFAULT_DEMO_URL_PARAM } from '../../shared/cross/contentUrl';
 
 /** 首页轮播三帧 → 打包 demo slug（与 demos/causal_flow/*.json 文件名一致） */
@@ -214,8 +213,7 @@ bindGenAttributeBadgeLink();
 
 const syncGenAttributeCardPreview = initGenAttributeCardCarousel();
 
-const apiPrefix = resolveApiBase();
-const { api } = initializeCommonApp(apiPrefix);
+const { api } = initializeCommonApp();
 const adminManager = AdminManager.getInstance();
 api.setAdminToken(adminManager.isInAdminMode() ? adminManager.getAdminToken() : null);
 

client/src/shared/api/resolveApiBase.ts

@@ -6,9 +6,6 @@ import URLHandler from '../core/URLHandler';
 
 export const INFORADAR_API_BASE_META_NAME = 'inforadar-api-base';
 
-/** 门户 Space 根 URL（GitHub Pages 构建注入 meta 用）。 */
-export const PORTAL_API_BASE = 'https://dqy08-infolens.hf.space';
-
 export function normalizeApiBase(url: string): string {
     const s = url.trim();
     if (!s) return '';

client/src/shared/bootstrap.ts

@@ -19,6 +19,8 @@ import { initFrontendBuildTimeDisplay } from './cross/buildTimeDisplay';
 export interface CommonAppContext {
     eventHandler: SimpleEventHandler;
     api: TextAnalysisAPI;
+    /** 本页 API 根（meta / ?api= / 同源 ''）；与 TextAnalysisAPI 实例一致 */
+    apiBase: string;
     tokenSurprisalColorScale: (value: number) => string;
     byteSurprisalColorScale: (value: number) => string;
     totalSurprisalFormat: (n: number | null) => string;
@@ -46,6 +48,7 @@ export function initializeCommonApp(apiPrefix?: string, element?: Element): Comm
     return {
         eventHandler: new SimpleEventHandler(targetElement),
         api,
+        apiBase: base,
         tokenSurprisalColorScale: (v) => getTokenSurprisalColor(v, HISTOGRAM_MIN_ALPHA),
         byteSurprisalColorScale: (v) => getByteSurprisalColor(v, 1, HISTOGRAM_MIN_ALPHA),
         totalSurprisalFormat: (n: number | null) => n !== null && Number.isFinite(n) ? format(n) : String(n)

client/src/shared/prediction_attribution/core/predictionAttributeClient.ts

@@ -1,3 +1,7 @@
+/**
+ * /api/prediction-attribute 与 /api/tokenize：统一请求与 JSON 解析。
+ * 归因缓存规则见 {@link ./attributionResultCache}。
+ */
 import { apiUrl } from '../../api/resolveApiBase';
 import type { AttributionApiResponse, PredictionAttributeModelVariant } from './attributionResultCache';
 import type { PromptTokenSpan } from '../causal_flow/genAttributeDagPreprocess';

client/src/tests/api/resolveApiBase.test.ts

@@ -5,10 +5,11 @@ import {
     normalizeApiBase,
     resolveApiBaseFromSources,
     apiUrl,
-    PORTAL_API_BASE,
 } from '../../shared/api/resolveApiBase';
 import { resolveDemoFileUrlFromBase } from '../../shared/api/apiConfig';
 
+const PORTAL = 'https://portal.example.test';
+
 let passed = 0;
 let failed = 0;
 
@@ -28,7 +29,7 @@ assert('empty', normalizeApiBase('  '), '');
 
 console.log('resolveApiBaseFromSources');
 assert('meta wins', resolveApiBaseFromSources('http://other', 'https://portal.hf.space'), 'https://portal.hf.space');
-assert('meta wins over empty param', resolveApiBaseFromSources('', PORTAL_API_BASE), PORTAL_API_BASE);
+assert('meta wins over empty param', resolveApiBaseFromSources('', PORTAL), PORTAL);
 assert('?api= when no meta', resolveApiBaseFromSources('http://localhost:5001', null), 'http://localhost:5001');
 assert('same-origin default', resolveApiBaseFromSources(undefined, null), '');
 assert('same-origin when meta empty', resolveApiBaseFromSources(undefined, '  '), '');
@@ -36,8 +37,8 @@ assert('same-origin when meta empty', resolveApiBaseFromSources(undefined, '  ')
 console.log('resolveDemoFileUrlFromBase');
 assert(
     'portal + demo path',
-    resolveDemoFileUrlFromBase(PORTAL_API_BASE, '/quick-start-1.json'),
-    'https://dqy08-infolens.hf.space/demo/quick-start-1.json',
+    resolveDemoFileUrlFromBase(PORTAL, '/quick-start-1.json'),
+    `${PORTAL}/demo/quick-start-1.json`,
 );
 assert(
     'same-origin demo',
@@ -46,7 +47,7 @@ assert(
 );
 
 console.log('apiUrl');
-assert('portal api path', apiUrl('/api/analyze', PORTAL_API_BASE), `${PORTAL_API_BASE}/api/analyze`);
+assert('portal api path', apiUrl('/api/analyze', PORTAL), `${PORTAL}/api/analyze`);
 assert('same-origin api', apiUrl('/api/tokenize', ''), '/api/tokenize');
 assert('empty base explicit', apiUrl('/api/check_admin', ''), '/api/check_admin');