ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.45 - объединены три выделенных слоя (NormalizationAttempt + AnalysisAttempt + ResponseAttempt) в один assistantDeepTurnAttemptRuntimeAdapter, после чего в handleMessage остался один вызов вместо трёх

2026-04-10 23:55:11 +03:00
parent fcfcba47b0
commit 5790e25b68
6 changed files with 540 additions and 81 deletions
@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAssistantDeepTurnAttemptRuntime = runAssistantDeepTurnAttemptRuntime;
+const assistantDeepTurnNormalizationRuntimeAdapter_1 = require("./assistantDeepTurnNormalizationRuntimeAdapter");
+const assistantDeepTurnAnalysisAttemptRuntimeAdapter_1 = require("./assistantDeepTurnAnalysisAttemptRuntimeAdapter");
+const assistantDeepTurnResponseAttemptRuntimeAdapter_1 = require("./assistantDeepTurnResponseAttemptRuntimeAdapter");
+async function runAssistantDeepTurnAttemptRuntime(input) {
+    const runDeepTurnNormalizationRuntimeSafe = input.runDeepTurnNormalizationRuntime ?? assistantDeepTurnNormalizationRuntimeAdapter_1.buildAssistantDeepTurnNormalizationRuntime;
+    const runDeepTurnAnalysisAttemptRuntimeSafe = input.runDeepTurnAnalysisAttemptRuntime ?? assistantDeepTurnAnalysisAttemptRuntimeAdapter_1.runAssistantDeepTurnAnalysisAttemptRuntime;
+    const runDeepTurnResponseAttemptRuntimeSafe = input.runDeepTurnResponseAttemptRuntime ?? assistantDeepTurnResponseAttemptRuntimeAdapter_1.runAssistantDeepTurnResponseAttemptRuntime;
+    const normalizationRuntime = await runDeepTurnNormalizationRuntimeSafe({
+        userMessage: input.userMessage,
+        payload: input.payload,
+        featureInvestigationStateV1: input.featureInvestigationStateV1,
+        featureStateFollowupBindingV1: input.featureStateFollowupBindingV1,
+        sessionInvestigationState: input.sessionInvestigationState,
+        buildFollowupStateBinding: input.buildFollowupStateBinding,
+        normalize: input.normalize
+    });
+    const followupBinding = normalizationRuntime.followupBinding;
+    const normalized = normalizationRuntime.normalized;
+    const deepTurnAnalysisRuntime = await runDeepTurnAnalysisAttemptRuntimeSafe({
+        userMessage: input.userMessage,
+        normalizedPayload: normalized.normalized,
+        routeSummary: normalized.route_hint_summary,
+        runtimeAnalysisContext: input.runtimeAnalysisContext,
+        followupUsage: followupBinding.usage,
+        investigationState: input.sessionInvestigationState,
+        featureAnswerPolicyV11: input.featureAnswerPolicyV11,
+        featureProblemCentricAnswerV1: input.featureProblemCentricAnswerV1,
+        featureLifecycleAnswerV1: input.featureLifecycleAnswerV1,
+        resolveBusinessScopeAlignment: input.resolveBusinessScopeAlignment,
+        inferP0DomainFromMessage: input.inferP0DomainFromMessage,
+        resolveBusinessScopeFromLiveContext: input.resolveBusinessScopeFromLiveContext,
+        extractRequirements: input.extractRequirements,
+        toExecutionPlan: input.toExecutionPlan,
+        enforceRbpLiveRoutePlan: input.enforceRbpLiveRoutePlan,
+        enforceFaLiveRoutePlan: input.enforceFaLiveRoutePlan,
+        executeRouteRuntime: input.executeRouteRuntime,
+        mapNoRouteReason: input.mapNoRouteReason,
+        buildSkippedResult: input.buildSkippedResult,
+        evaluateCoverage: input.evaluateCoverage,
+        checkGrounding: input.checkGrounding,
+        collectRbpLiveRouteAudit: input.collectRbpLiveRouteAudit,
+        collectFaLiveRouteAudit: input.collectFaLiveRouteAudit,
+        hasExplicitPeriodAnchor: input.hasExplicitPeriodAnchor
+    });
+    const deepTurnResponseRuntime = runDeepTurnResponseAttemptRuntimeSafe({
+        featureInvestigationStateV1: input.featureInvestigationStateV1,
+        featureContractsV11: input.featureContractsV11,
+        featureAnswerPolicyV11: input.featureAnswerPolicyV11,
+        sessionId: input.sessionId,
+        questionId: input.questionId,
+        userMessage: input.userMessage,
+        normalized: {
+            trace_id: normalized.trace_id,
+            prompt_version: normalized.prompt_version,
+            schema_version: normalized.schema_version,
+            normalized: normalized.normalized
+        },
+        normalizedQuestion: followupBinding.normalizedQuestion,
+        deepTurnAnalysisRuntime,
+        runtimeAnalysisContext: input.runtimeAnalysisContext,
+        followupStateUsage: followupBinding.usage,
+        followupApplied: Boolean(followupBinding.usage?.applied),
+        previousInvestigationState: input.sessionInvestigationState,
+        addressRuntimeMetaForDeep: input.addressRuntimeMetaForDeep,
+        extractDroppedIntentSegments: input.extractDroppedIntentSegments,
+        buildDebugRoutes: input.buildDebugRoutes,
+        extractExecutionState: input.extractExecutionState,
+        sanitizeReply: input.sanitizeReply,
+        persistInvestigationState: input.persistInvestigationState,
+        messageIdFactory: input.messageIdFactory,
+        appendItem: input.appendItem,
+        getSession: input.getSession,
+        persistSession: input.persistSession,
+        cloneConversation: input.cloneConversation,
+        logEvent: input.logEvent,
+        runPackagingRuntime: input.runPackagingRuntime,
+        runFinalizeDeepTurn: input.runFinalizeDeepTurn
+    });
+    return {
+        response: deepTurnResponseRuntime.response,
+        debug: deepTurnResponseRuntime.debug,
+        normalizationRuntime,
+        deepTurnAnalysisRuntime
+    };
+}
@@ -64,9 +64,7 @@ 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 assistantDeepTurnAnalysisAttemptRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnAnalysisAttemptRuntimeAdapter"));
-const assistantDeepTurnNormalizationRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnNormalizationRuntimeAdapter"));
-const assistantDeepTurnResponseAttemptRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnResponseAttemptRuntimeAdapter"));
+const assistantDeepTurnAttemptRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnAttemptRuntimeAdapter"));
 const assistantAddressRuntimeAdapter_1 = __importStar(require("./assistantAddressRuntimeAdapter"));
 const assistantAddressLaneAttemptRuntimeAdapter_1 = __importStar(require("./assistantAddressLaneAttemptRuntimeAdapter"));
 const assistantLivingChatAttemptRuntimeAdapter_1 = __importStar(require("./assistantLivingChatAttemptRuntimeAdapter"));
@@ -4493,27 +4491,22 @@ class AssistantService {
        if (addressRuntime.handled && addressRuntime.response) {
            return addressRuntime.response;
        }
-        const normalizationRuntime = await (0, assistantDeepTurnNormalizationRuntimeAdapter_1.buildAssistantDeepTurnNormalizationRuntime)({
+        const deepTurnRuntime = await (0, assistantDeepTurnAttemptRuntimeAdapter_1.runAssistantDeepTurnAttemptRuntime)({
+            sessionId,
+            questionId: userItem.message_id,
            userMessage,
            payload,
+            runtimeAnalysisContext,
+            sessionInvestigationState: session.investigation_state,
+            addressRuntimeMetaForDeep,
            featureInvestigationStateV1: config_1.FEATURE_ASSISTANT_INVESTIGATION_STATE_V1,
            featureStateFollowupBindingV1: config_1.FEATURE_ASSISTANT_STATE_FOLLOWUP_BINDING_V1,
-            sessionInvestigationState: session.investigation_state,
-            buildFollowupStateBinding,
-            normalize: (normalizePayload) => this.normalizerService.normalize(normalizePayload)
-        });
-        const followupBinding = normalizationRuntime.followupBinding;
-        const normalized = normalizationRuntime.normalized;
-        const deepTurnAnalysisRuntime = await (0, assistantDeepTurnAnalysisAttemptRuntimeAdapter_1.runAssistantDeepTurnAnalysisAttemptRuntime)({
-            userMessage,
-            normalizedPayload: normalized.normalized,
-            routeSummary: normalized.route_hint_summary,
-            runtimeAnalysisContext,
-            followupUsage: followupBinding.usage,
-            investigationState: session.investigation_state,
+            featureContractsV11: config_1.FEATURE_ASSISTANT_CONTRACTS_V11,
            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,
+            buildFollowupStateBinding,
+            normalize: (normalizePayload) => this.normalizerService.normalize(normalizePayload),
            resolveBusinessScopeAlignment,
            inferP0DomainFromMessage,
            resolveBusinessScopeFromLiveContext,
@@ -4528,28 +4521,7 @@ class AssistantService {
            checkGrounding,
            collectRbpLiveRouteAudit,
            collectFaLiveRouteAudit,
-            hasExplicitPeriodAnchor: (normalizedPayload) => hasExplicitPeriodAnchorFromNormalized(normalizedPayload)
-        });
-        const deepTurnResponseRuntime = (0, assistantDeepTurnResponseAttemptRuntimeAdapter_1.runAssistantDeepTurnResponseAttemptRuntime)({
-            featureInvestigationStateV1: config_1.FEATURE_ASSISTANT_INVESTIGATION_STATE_V1,
-            featureContractsV11: config_1.FEATURE_ASSISTANT_CONTRACTS_V11,
-            featureAnswerPolicyV11: config_1.FEATURE_ASSISTANT_ANSWER_POLICY_V11,
-            sessionId,
-            questionId: userItem.message_id,
-            userMessage,
-            normalized: {
-                trace_id: normalized.trace_id,
-                prompt_version: normalized.prompt_version,
-                schema_version: normalized.schema_version,
-                normalized: normalized.normalized
-            },
-            normalizedQuestion: followupBinding.normalizedQuestion,
-            deepTurnAnalysisRuntime,
-            runtimeAnalysisContext,
-            followupStateUsage: followupBinding.usage,
-            followupApplied: Boolean(followupBinding.usage?.applied),
-            previousInvestigationState: session.investigation_state,
-            addressRuntimeMetaForDeep,
+            hasExplicitPeriodAnchor: (normalizedPayload) => hasExplicitPeriodAnchorFromNormalized(normalizedPayload),
            extractDroppedIntentSegments: (normalizedPayload) => extractDiscardedIntentSegments(normalizedPayload),
            buildDebugRoutes: (routeSummary) => toDebugRoutes(routeSummary),
            extractExecutionState: (normalizedPayload) => extractExecutionState(normalizedPayload),
@@ -4562,7 +4534,7 @@ class AssistantService {
            cloneConversation: (items) => cloneItems(items),
            logEvent: (payload) => (0, log_1.logJson)(payload)
        });
-        return deepTurnResponseRuntime.response;
+        return deepTurnRuntime.response;
    }
 }
 exports.AssistantService = AssistantService;