ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.522.55 - Перевод finalizeAddressLaneResponse на builder вместо inline-сборки в assistantAddressAttemptRuntimeAdapter.ts \ Добавлен builder для lane-attempt input: assistantAddressLaneAttemptInputBuilder.ts. \ Добавлен builder для финального address-runtime input: assistantAddressRuntimeInputBuilder.ts.

2026-04-11 01:09:53 +03:00
parent b612615219
commit c849eb5f5b
12 changed files with 504 additions and 67 deletions
@@ -11,11 +11,14 @@ import {
  runAssistantAddressLaneResponseAttemptRuntime,
  type RunAssistantAddressLaneResponseAttemptRuntimeInput
 } from "./assistantAddressLaneResponseAttemptRuntimeAdapter";
+import { buildAssistantAddressLaneResponseAttemptRuntimeInput } from "./assistantAddressLaneResponseAttemptInputBuilder";
 import {
  runAssistantLivingChatAttemptRuntime,
  type RunAssistantLivingChatAttemptRuntimeInput
 } from "./assistantLivingChatAttemptRuntimeAdapter";
 import { buildAssistantLivingChatAttemptRuntimeInput } from "./assistantLivingChatAttemptInputBuilder";
+import { buildAssistantAddressLaneAttemptRuntimeInput } from "./assistantAddressLaneAttemptInputBuilder";
+import { buildAssistantAddressRuntimeInput } from "./assistantAddressRuntimeInputBuilder";

 interface AddressAttemptPayload {
  llmProvider?: unknown;
@@ -110,27 +113,29 @@ export async function runAssistantAddressAttemptRuntime<ResponseType = unknown>(
    carryoverMeta = null,
    llmPreDecomposeMeta = null
  ) =>
-    runAddressLaneResponseAttemptRuntimeSafe({
-      sessionId: input.sessionId,
-      userMessage: input.userMessage,
-      effectiveAddressUserMessage,
-      addressLane,
-      carryoverMeta,
-      llmPreDecomposeMeta,
-      knownOrganizations: input.sessionScope.knownOrganizations,
-      activeOrganization: input.sessionScope.activeOrganization,
-      sanitizeOutgoingAssistantText: input.sanitizeOutgoingAssistantText,
-      buildAddressDebugPayload: input.buildAddressDebugPayload,
-      buildAddressFollowupOffer: input.buildAddressFollowupOffer,
-      mergeKnownOrganizations: input.mergeKnownOrganizations as any,
-      toNonEmptyString: input.toNonEmptyString,
-      appendItem: input.appendItem,
-      getSession: input.getSession,
-      persistSession: input.persistSession,
-      cloneConversation: input.cloneConversation,
-      logEvent: input.logEvent,
-      messageIdFactory: input.messageIdFactory
-    } as RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>);
+    runAddressLaneResponseAttemptRuntimeSafe(
+      buildAssistantAddressLaneResponseAttemptRuntimeInput({
+        sessionId: input.sessionId,
+        userMessage: input.userMessage,
+        effectiveAddressUserMessage,
+        addressLane,
+        carryoverMeta,
+        llmPreDecomposeMeta,
+        knownOrganizations: input.sessionScope.knownOrganizations,
+        activeOrganization: input.sessionScope.activeOrganization,
+        sanitizeOutgoingAssistantText: input.sanitizeOutgoingAssistantText,
+        buildAddressDebugPayload: input.buildAddressDebugPayload,
+        buildAddressFollowupOffer: input.buildAddressFollowupOffer,
+        mergeKnownOrganizations: input.mergeKnownOrganizations,
+        toNonEmptyString: input.toNonEmptyString,
+        appendItem: input.appendItem,
+        getSession: input.getSession,
+        persistSession: input.persistSession,
+        cloneConversation: input.cloneConversation,
+        logEvent: input.logEvent,
+        messageIdFactory: input.messageIdFactory
+      })
+    );

  const tryHandleLivingChat: RunAssistantAddressRuntimeInput<ResponseType>["tryHandleLivingChat"] = async (
    modeDecision,
@@ -190,41 +195,43 @@ export async function runAssistantAddressAttemptRuntime<ResponseType = unknown>(
    carryMeta,
    analysisDateHint
  ) =>
-    runAddressLaneAttemptRuntimeSafe({
-      messageUsed,
-      carryMeta,
-      analysisDateHint,
-      activeOrganization: input.sessionScope.activeOrganization,
-      mergeFollowupContextWithOrganizationScope: input.mergeFollowupContextWithOrganizationScope,
-      runAddressQueryTryHandle: input.runAddressQueryTryHandle
-    });
+    runAddressLaneAttemptRuntimeSafe(
+      buildAssistantAddressLaneAttemptRuntimeInput({
+        messageUsed,
+        carryMeta,
+        analysisDateHint,
+        activeOrganization: input.sessionScope.activeOrganization,
+        mergeFollowupContextWithOrganizationScope: input.mergeFollowupContextWithOrganizationScope,
+        runAddressQueryTryHandle: input.runAddressQueryTryHandle
+      })
+    );

-  return runAddressRuntimeSafe({
-    featureAssistantAddressQueryV1: input.featureAssistantAddressQueryV1,
-    sessionId: input.sessionId,
-    userMessage: input.userMessage,
-    sessionItems: input.sessionItems,
-    llmProvider: input.payload.llmProvider,
-    useMock: Boolean(input.payload.useMock),
-    featureAddressLlmPredecomposeV1: input.featureAddressLlmPredecomposeV1,
-    runAddressLlmPreDecompose: input.runAddressLlmPreDecompose,
-    buildAddressLlmPredecomposeContractV1: input.buildAddressLlmPredecomposeContractV1,
-    sanitizeAddressMessageForFallback: input.sanitizeAddressMessageForFallback,
-    toNonEmptyString: input.toNonEmptyString,
-    resolveAddressFollowupCarryoverContext: input.resolveAddressFollowupCarryoverContext,
-    resolveAssistantOrchestrationDecision: input.resolveAssistantOrchestrationDecision,
-    buildAddressDialogContinuationContractV2: input.buildAddressDialogContinuationContractV2,
-    runtimeAnalysisContextAsOfDate: input.runtimeAnalysisContextAsOfDate,
-    payloadContextPeriodHint: input.payload?.context?.period_hint,
-    compactWhitespace: input.compactWhitespace,
-    runAddressLaneAttempt,
-    isRetryableAddressLimitedResult: input.isRetryableAddressLimitedResult,
-    finalizeAddressLaneResponse,
-    tryHandleLivingChat,
-    logEvent: input.logEvent,
-    nowIso: input.nowIso,
-    runAddressOrchestrationRuntime: input.runAddressOrchestrationRuntime,
-    runAddressToolGateRuntime: input.runAddressToolGateRuntime,
-    runAddressLaneRuntime: input.runAddressLaneRuntime
-  });
+  return runAddressRuntimeSafe(
+    buildAssistantAddressRuntimeInput({
+      featureAssistantAddressQueryV1: input.featureAssistantAddressQueryV1,
+      sessionId: input.sessionId,
+      userMessage: input.userMessage,
+      sessionItems: input.sessionItems,
+      payload: input.payload,
+      featureAddressLlmPredecomposeV1: input.featureAddressLlmPredecomposeV1,
+      runAddressLlmPreDecompose: input.runAddressLlmPreDecompose,
+      buildAddressLlmPredecomposeContractV1: input.buildAddressLlmPredecomposeContractV1,
+      sanitizeAddressMessageForFallback: input.sanitizeAddressMessageForFallback,
+      toNonEmptyString: input.toNonEmptyString,
+      resolveAddressFollowupCarryoverContext: input.resolveAddressFollowupCarryoverContext,
+      resolveAssistantOrchestrationDecision: input.resolveAssistantOrchestrationDecision,
+      buildAddressDialogContinuationContractV2: input.buildAddressDialogContinuationContractV2,
+      runtimeAnalysisContextAsOfDate: input.runtimeAnalysisContextAsOfDate,
+      compactWhitespace: input.compactWhitespace,
+      runAddressLaneAttempt,
+      isRetryableAddressLimitedResult: input.isRetryableAddressLimitedResult,
+      finalizeAddressLaneResponse,
+      tryHandleLivingChat,
+      logEvent: input.logEvent,
+      nowIso: input.nowIso,
+      runAddressOrchestrationRuntime: input.runAddressOrchestrationRuntime,
+      runAddressToolGateRuntime: input.runAddressToolGateRuntime,
+      runAddressLaneRuntime: input.runAddressLaneRuntime
+    })
+  );
 }