ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.43: assistantService переподключен на новый deep-analysis attempt adapter. (с удалением старой громоздкой склейки).
This commit is contained in:
+106
@@ -0,0 +1,106 @@
|
||||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.runAssistantDeepTurnAnalysisAttemptRuntime = runAssistantDeepTurnAnalysisAttemptRuntime;
|
||||
const companyAnchorResolver_1 = require("./companyAnchorResolver");
|
||||
const assistantRuntimeGuards_1 = require("./assistantRuntimeGuards");
|
||||
const assistantClaimBoundEvidence_1 = require("./assistantClaimBoundEvidence");
|
||||
const assistantDeepTurnAnalysisRuntimeAdapter_1 = require("./assistantDeepTurnAnalysisRuntimeAdapter");
|
||||
const assistantDeepTurnContextRuntimeAdapter_1 = require("./assistantDeepTurnContextRuntimeAdapter");
|
||||
const assistantDeepTurnPlanRuntimeAdapter_1 = require("./assistantDeepTurnPlanRuntimeAdapter");
|
||||
const assistantDeepTurnRetrievalRuntimeAdapter_1 = require("./assistantDeepTurnRetrievalRuntimeAdapter");
|
||||
const assistantDeepTurnGuardRuntimeAdapter_1 = require("./assistantDeepTurnGuardRuntimeAdapter");
|
||||
const assistantDeepTurnGroundingRuntimeAdapter_1 = require("./assistantDeepTurnGroundingRuntimeAdapter");
|
||||
const assistantDeepTurnCompositionRuntimeAdapter_1 = require("./assistantDeepTurnCompositionRuntimeAdapter");
|
||||
async function runAssistantDeepTurnAnalysisAttemptRuntime(input) {
|
||||
const runDeepTurnAnalysisRuntimeSafe = input.runDeepTurnAnalysisRuntime ?? assistantDeepTurnAnalysisRuntimeAdapter_1.runAssistantDeepTurnAnalysisRuntime;
|
||||
const runDeepTurnContextRuntimeSafe = input.runDeepTurnContextRuntime ?? assistantDeepTurnContextRuntimeAdapter_1.buildAssistantDeepTurnRuntimeContext;
|
||||
const runDeepTurnPlanRuntimeSafe = input.runDeepTurnPlanRuntime ?? assistantDeepTurnPlanRuntimeAdapter_1.buildAssistantDeepTurnExecutionPlan;
|
||||
const runDeepTurnRetrievalRuntimeSafe = input.runDeepTurnRetrievalRuntime ?? assistantDeepTurnRetrievalRuntimeAdapter_1.executeAssistantDeepTurnRetrievalPlan;
|
||||
const runDeepTurnGuardRuntimeSafe = input.runDeepTurnGuardRuntime ?? assistantDeepTurnGuardRuntimeAdapter_1.applyAssistantDeepTurnRetrievalGuards;
|
||||
const runDeepTurnGroundingRuntimeSafe = input.runDeepTurnGroundingRuntime ?? assistantDeepTurnGroundingRuntimeAdapter_1.runAssistantDeepTurnGroundingRuntime;
|
||||
const runDeepTurnCompositionRuntimeSafe = input.runDeepTurnCompositionRuntime ?? assistantDeepTurnCompositionRuntimeAdapter_1.buildAssistantDeepTurnComposition;
|
||||
return runDeepTurnAnalysisRuntimeSafe({
|
||||
userMessage: input.userMessage,
|
||||
runContextRuntime: () => runDeepTurnContextRuntimeSafe({
|
||||
userMessage: input.userMessage,
|
||||
normalizedPayload: input.normalizedPayload,
|
||||
routeSummary: input.routeSummary,
|
||||
runtimeAnalysisContext: input.runtimeAnalysisContext,
|
||||
followupUsage: input.followupUsage,
|
||||
resolveCompanyAnchors: companyAnchorResolver_1.resolveCompanyAnchors,
|
||||
resolveBusinessScopeAlignment: input.resolveBusinessScopeAlignment,
|
||||
inferP0DomainFromMessage: input.inferP0DomainFromMessage,
|
||||
resolveTemporalGuard: assistantRuntimeGuards_1.resolveTemporalGuard,
|
||||
resolveDomainPolarityGuard: assistantRuntimeGuards_1.resolveDomainPolarityGuard,
|
||||
resolveClaimBoundAnchors: assistantClaimBoundEvidence_1.resolveClaimBoundAnchors,
|
||||
resolveBusinessScopeFromLiveContext: input.resolveBusinessScopeFromLiveContext
|
||||
}),
|
||||
runExecutionPlanRuntime: ({ resolvedRouteSummary, claimAnchorAudit, temporalGuard, domainPolarityGuardInitial }) => runDeepTurnPlanRuntimeSafe({
|
||||
routeSummary: resolvedRouteSummary,
|
||||
normalizedPayload: input.normalizedPayload,
|
||||
userMessage: input.userMessage,
|
||||
claimType: claimAnchorAudit.claim_type,
|
||||
temporalGuard,
|
||||
domainPolarityGuardInitial,
|
||||
extractRequirements: input.extractRequirements,
|
||||
toExecutionPlan: input.toExecutionPlan,
|
||||
enforceRbpLiveRoutePlan: input.enforceRbpLiveRoutePlan,
|
||||
enforceFaLiveRoutePlan: input.enforceFaLiveRoutePlan,
|
||||
applyTemporalHintToExecutionPlan: assistantRuntimeGuards_1.applyTemporalHintToExecutionPlan,
|
||||
applyPolarityHintToExecutionPlan: assistantRuntimeGuards_1.applyPolarityHintToExecutionPlan
|
||||
}),
|
||||
runRetrievalRuntime: ({ executionPlan, liveTemporalHint }) => runDeepTurnRetrievalRuntimeSafe({
|
||||
executionPlan: executionPlan,
|
||||
liveTemporalHint,
|
||||
executeRouteRuntime: input.executeRouteRuntime,
|
||||
mapNoRouteReason: input.mapNoRouteReason,
|
||||
buildSkippedResult: input.buildSkippedResult
|
||||
}),
|
||||
runGuardRuntime: ({ retrievalResults, domainPolarityGuardInitial, claimAnchorAudit, temporalGuard, focusDomainForGuards, companyAnchors, userMessage: runtimeUserMessage }) => runDeepTurnGuardRuntimeSafe({
|
||||
retrievalResults,
|
||||
domainPolarityGuardInitial: domainPolarityGuardInitial,
|
||||
claimAnchorAudit: claimAnchorAudit,
|
||||
temporalGuard: temporalGuard,
|
||||
focusDomainForGuards: focusDomainForGuards,
|
||||
companyAnchors: companyAnchors,
|
||||
userMessage: runtimeUserMessage
|
||||
}),
|
||||
runGroundingRuntime: ({ claimType, retrievalResults, rbpPlanAudit, faPlanAudit, routeSummary, requirementExtraction, temporalGuard, polarityAudit, evidenceAudit, claimAnchorAudit, targetedEvidenceHitRate, businessScopeResolved }) => runDeepTurnGroundingRuntimeSafe({
|
||||
claimType,
|
||||
retrievalResults,
|
||||
rbpPlanAudit,
|
||||
faPlanAudit,
|
||||
routeSummary,
|
||||
normalizedPayload: input.normalizedPayload,
|
||||
userMessage: input.userMessage,
|
||||
requirementExtraction: requirementExtraction,
|
||||
extractRequirements: input.extractRequirements,
|
||||
evaluateCoverage: input.evaluateCoverage,
|
||||
checkGrounding: input.checkGrounding,
|
||||
temporalGuard,
|
||||
polarityAudit,
|
||||
evidenceAudit,
|
||||
claimAnchorAudit,
|
||||
targetedEvidenceHitRate,
|
||||
businessScopeResolved,
|
||||
collectRbpLiveRouteAudit: input.collectRbpLiveRouteAudit,
|
||||
collectFaLiveRouteAudit: input.collectFaLiveRouteAudit
|
||||
}),
|
||||
runCompositionRuntime: ({ resolvedRouteSummary, retrievalResults, requirements, coverageReport, groundingCheck, companyAnchors }) => runDeepTurnCompositionRuntimeSafe({
|
||||
userMessage: input.userMessage,
|
||||
routeSummary: resolvedRouteSummary,
|
||||
retrievalResults,
|
||||
requirements,
|
||||
coverageReport,
|
||||
groundingCheck,
|
||||
followupUsage: input.followupUsage,
|
||||
investigationState: input.investigationState,
|
||||
companyAnchors,
|
||||
normalizedPayload: input.normalizedPayload,
|
||||
featureAnswerPolicyV11: input.featureAnswerPolicyV11,
|
||||
featureProblemCentricAnswerV1: input.featureProblemCentricAnswerV1,
|
||||
featureLifecycleAnswerV1: input.featureLifecycleAnswerV1,
|
||||
hasExplicitPeriodAnchor: input.hasExplicitPeriodAnchor
|
||||
})
|
||||
});
|
||||
}
|
||||
+25
-92
@@ -53,9 +53,6 @@ const assistantDataLayer_1 = __importStar(require("./assistantDataLayer"));
|
||||
const assistantSessionLogger_1 = __importStar(require("./assistantSessionLogger"));
|
||||
const investigationState_1 = __importStar(require("./investigationState"));
|
||||
const retrievalResultNormalizer_1 = __importStar(require("./retrievalResultNormalizer"));
|
||||
const companyAnchorResolver_1 = __importStar(require("./companyAnchorResolver"));
|
||||
const assistantRuntimeGuards_1 = __importStar(require("./assistantRuntimeGuards"));
|
||||
const assistantClaimBoundEvidence_1 = __importStar(require("./assistantClaimBoundEvidence"));
|
||||
const addressQueryService_1 = __importStar(require("./addressQueryService"));
|
||||
const addressQueryClassifier_1 = __importStar(require("./addressQueryClassifier"));
|
||||
const addressIntentResolver_1 = __importStar(require("./addressIntentResolver"));
|
||||
@@ -67,17 +64,11 @@ const capabilitiesRegistry_1 = __importStar(require("./capabilitiesRegistry"));
|
||||
const assistantCanon_1 = __importStar(require("./assistantCanon"));
|
||||
const assistantAddressLaneResponseAttemptRuntimeAdapter_1 = __importStar(require("./assistantAddressLaneResponseAttemptRuntimeAdapter"));
|
||||
const assistantCoverageGrounding_1 = __importStar(require("./assistantCoverageGrounding"));
|
||||
const assistantDeepTurnAnalysisRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnAnalysisRuntimeAdapter"));
|
||||
const assistantDeepTurnCompositionRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnCompositionRuntimeAdapter"));
|
||||
const assistantDeepTurnContextRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnContextRuntimeAdapter"));
|
||||
const assistantDeepTurnAnalysisAttemptRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnAnalysisAttemptRuntimeAdapter"));
|
||||
const assistantDeepTurnFinalizeRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnFinalizeRuntimeAdapter"));
|
||||
const assistantDeepTurnGuardRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnGuardRuntimeAdapter"));
|
||||
const assistantDeepTurnGroundingRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnGroundingRuntimeAdapter"));
|
||||
const assistantDeepTurnPackagingRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnPackagingRuntimeAdapter"));
|
||||
const assistantDeepTurnPlanRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnPlanRuntimeAdapter"));
|
||||
const assistantDeepTurnNormalizationRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnNormalizationRuntimeAdapter"));
|
||||
const assistantDeepTurnResponseRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnResponseRuntimeAdapter"));
|
||||
const assistantDeepTurnRetrievalRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnRetrievalRuntimeAdapter"));
|
||||
const assistantAddressRuntimeAdapter_1 = __importStar(require("./assistantAddressRuntimeAdapter"));
|
||||
const assistantAddressLaneAttemptRuntimeAdapter_1 = __importStar(require("./assistantAddressLaneAttemptRuntimeAdapter"));
|
||||
const assistantLivingChatAttemptRuntimeAdapter_1 = __importStar(require("./assistantLivingChatAttemptRuntimeAdapter"));
|
||||
@@ -4515,89 +4506,31 @@ class AssistantService {
|
||||
});
|
||||
const followupBinding = normalizationRuntime.followupBinding;
|
||||
const normalized = normalizationRuntime.normalized;
|
||||
const deepTurnAnalysisRuntime = await (0, assistantDeepTurnAnalysisRuntimeAdapter_1.runAssistantDeepTurnAnalysisRuntime)({
|
||||
const deepTurnAnalysisRuntime = await (0, assistantDeepTurnAnalysisAttemptRuntimeAdapter_1.runAssistantDeepTurnAnalysisAttemptRuntime)({
|
||||
userMessage,
|
||||
runContextRuntime: () => (0, assistantDeepTurnContextRuntimeAdapter_1.buildAssistantDeepTurnRuntimeContext)({
|
||||
userMessage,
|
||||
normalizedPayload: normalized.normalized,
|
||||
routeSummary: normalized.route_hint_summary,
|
||||
runtimeAnalysisContext,
|
||||
followupUsage: followupBinding.usage,
|
||||
resolveCompanyAnchors: companyAnchorResolver_1.resolveCompanyAnchors,
|
||||
resolveBusinessScopeAlignment,
|
||||
inferP0DomainFromMessage,
|
||||
resolveTemporalGuard: assistantRuntimeGuards_1.resolveTemporalGuard,
|
||||
resolveDomainPolarityGuard: assistantRuntimeGuards_1.resolveDomainPolarityGuard,
|
||||
resolveClaimBoundAnchors: assistantClaimBoundEvidence_1.resolveClaimBoundAnchors,
|
||||
resolveBusinessScopeFromLiveContext
|
||||
}),
|
||||
runExecutionPlanRuntime: ({ resolvedRouteSummary, claimAnchorAudit, temporalGuard, domainPolarityGuardInitial }) => (0, assistantDeepTurnPlanRuntimeAdapter_1.buildAssistantDeepTurnExecutionPlan)({
|
||||
routeSummary: resolvedRouteSummary,
|
||||
normalizedPayload: normalized.normalized,
|
||||
userMessage,
|
||||
claimType: claimAnchorAudit.claim_type,
|
||||
temporalGuard,
|
||||
domainPolarityGuardInitial,
|
||||
extractRequirements,
|
||||
toExecutionPlan,
|
||||
enforceRbpLiveRoutePlan,
|
||||
enforceFaLiveRoutePlan,
|
||||
applyTemporalHintToExecutionPlan: assistantRuntimeGuards_1.applyTemporalHintToExecutionPlan,
|
||||
applyPolarityHintToExecutionPlan: assistantRuntimeGuards_1.applyPolarityHintToExecutionPlan
|
||||
}),
|
||||
runRetrievalRuntime: ({ executionPlan, liveTemporalHint }) => (0, assistantDeepTurnRetrievalRuntimeAdapter_1.executeAssistantDeepTurnRetrievalPlan)({
|
||||
executionPlan: executionPlan,
|
||||
liveTemporalHint,
|
||||
executeRouteRuntime: (route, fragmentText, options) => this.dataLayer.executeRouteRuntime(route, fragmentText, options),
|
||||
mapNoRouteReason,
|
||||
buildSkippedResult
|
||||
}),
|
||||
runGuardRuntime: ({ retrievalResults, domainPolarityGuardInitial, claimAnchorAudit, temporalGuard, focusDomainForGuards, companyAnchors, userMessage: runtimeUserMessage }) => (0, assistantDeepTurnGuardRuntimeAdapter_1.applyAssistantDeepTurnRetrievalGuards)({
|
||||
retrievalResults,
|
||||
domainPolarityGuardInitial,
|
||||
claimAnchorAudit,
|
||||
temporalGuard,
|
||||
focusDomainForGuards,
|
||||
companyAnchors,
|
||||
userMessage: runtimeUserMessage
|
||||
}),
|
||||
runGroundingRuntime: ({ claimType, retrievalResults, rbpPlanAudit, faPlanAudit, routeSummary, requirementExtraction, temporalGuard, polarityAudit, evidenceAudit, claimAnchorAudit, targetedEvidenceHitRate, businessScopeResolved }) => (0, assistantDeepTurnGroundingRuntimeAdapter_1.runAssistantDeepTurnGroundingRuntime)({
|
||||
claimType,
|
||||
retrievalResults,
|
||||
rbpPlanAudit,
|
||||
faPlanAudit,
|
||||
routeSummary,
|
||||
normalizedPayload: normalized.normalized,
|
||||
userMessage,
|
||||
requirementExtraction,
|
||||
extractRequirements,
|
||||
evaluateCoverage,
|
||||
checkGrounding,
|
||||
temporalGuard,
|
||||
polarityAudit,
|
||||
evidenceAudit,
|
||||
claimAnchorAudit,
|
||||
targetedEvidenceHitRate,
|
||||
businessScopeResolved,
|
||||
collectRbpLiveRouteAudit,
|
||||
collectFaLiveRouteAudit
|
||||
}),
|
||||
runCompositionRuntime: ({ resolvedRouteSummary, retrievalResults, requirements, coverageReport, groundingCheck, companyAnchors }) => (0, assistantDeepTurnCompositionRuntimeAdapter_1.buildAssistantDeepTurnComposition)({
|
||||
userMessage,
|
||||
routeSummary: resolvedRouteSummary,
|
||||
retrievalResults,
|
||||
requirements,
|
||||
coverageReport,
|
||||
groundingCheck,
|
||||
followupUsage: followupBinding.usage,
|
||||
investigationState: session.investigation_state,
|
||||
companyAnchors,
|
||||
normalizedPayload: normalized.normalized,
|
||||
featureAnswerPolicyV11: config_1.FEATURE_ASSISTANT_ANSWER_POLICY_V11,
|
||||
featureProblemCentricAnswerV1: config_1.FEATURE_ASSISTANT_PROBLEM_CENTRIC_ANSWER_V1,
|
||||
featureLifecycleAnswerV1: config_1.FEATURE_ASSISTANT_LIFECYCLE_ANSWER_V1,
|
||||
hasExplicitPeriodAnchor: (normalizedPayload) => hasExplicitPeriodAnchorFromNormalized(normalizedPayload)
|
||||
})
|
||||
normalizedPayload: normalized.normalized,
|
||||
routeSummary: normalized.route_hint_summary,
|
||||
runtimeAnalysisContext,
|
||||
followupUsage: followupBinding.usage,
|
||||
investigationState: session.investigation_state,
|
||||
featureAnswerPolicyV11: config_1.FEATURE_ASSISTANT_ANSWER_POLICY_V11,
|
||||
featureProblemCentricAnswerV1: config_1.FEATURE_ASSISTANT_PROBLEM_CENTRIC_ANSWER_V1,
|
||||
featureLifecycleAnswerV1: config_1.FEATURE_ASSISTANT_LIFECYCLE_ANSWER_V1,
|
||||
resolveBusinessScopeAlignment,
|
||||
inferP0DomainFromMessage,
|
||||
resolveBusinessScopeFromLiveContext,
|
||||
extractRequirements,
|
||||
toExecutionPlan,
|
||||
enforceRbpLiveRoutePlan,
|
||||
enforceFaLiveRoutePlan,
|
||||
executeRouteRuntime: (route, fragmentText, options) => this.dataLayer.executeRouteRuntime(route, fragmentText, options),
|
||||
mapNoRouteReason,
|
||||
buildSkippedResult,
|
||||
evaluateCoverage,
|
||||
checkGrounding,
|
||||
collectRbpLiveRouteAudit,
|
||||
collectFaLiveRouteAudit,
|
||||
hasExplicitPeriodAnchor: (normalizedPayload) => hasExplicitPeriodAnchorFromNormalized(normalizedPayload)
|
||||
});
|
||||
const companyAnchors = deepTurnAnalysisRuntime.companyAnchors;
|
||||
const temporalGuard = deepTurnAnalysisRuntime.temporalGuard;
|
||||
|
||||
Reference in New Issue
Block a user