ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.652.68 - сборка входов turn attempt в новый builder: assistantTurnAttemptInputBuilder.ts / адаптер на builder (убрал inline-сборку payload для address/deep): assistantTurnAttemptRuntimeAdapter.ts / сборку followupContext/options для address lane attempt в новый builder: assistantAddressLaneAttemptQueryOptionsBuilder.ts / адаптер на builder для query options: assistantAddressLaneAttemptRuntimeAdapter.ts

llm_normalizer/backend/dist/services/assistantAddressLaneAttemptQueryOptionsBuilder.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAssistantAddressLaneAttemptFollowupContext = resolveAssistantAddressLaneAttemptFollowupContext;
+exports.buildAssistantAddressLaneAttemptQueryOptions = buildAssistantAddressLaneAttemptQueryOptions;
+function resolveAssistantAddressLaneAttemptFollowupContext(carryMeta) {
+    return carryMeta?.followupContext && typeof carryMeta.followupContext === "object"
+        ? carryMeta.followupContext
+        : null;
+}
+function buildAssistantAddressLaneAttemptQueryOptions(input) {
+    if (input.scopedFollowupContext) {
+        return {
+            followupContext: input.scopedFollowupContext,
+            analysisDateHint: input.analysisDateHint
+        };
+    }
+    return {
+        analysisDateHint: input.analysisDateHint
+    };
+}

llm_normalizer/backend/dist/services/assistantAddressLaneAttemptRuntimeAdapter.js

@@ -1,18 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runAssistantAddressLaneAttemptRuntime = runAssistantAddressLaneAttemptRuntime;
+const assistantAddressLaneAttemptQueryOptionsBuilder_1 = require("./assistantAddressLaneAttemptQueryOptionsBuilder");
 async function runAssistantAddressLaneAttemptRuntime(input) {
-    const followupContext = input.carryMeta?.followupContext && typeof input.carryMeta.followupContext === "object"
-        ? input.carryMeta.followupContext
-        : null;
+    const followupContext = (0, assistantAddressLaneAttemptQueryOptionsBuilder_1.resolveAssistantAddressLaneAttemptFollowupContext)(input.carryMeta);
     const scopedFollowupContext = input.mergeFollowupContextWithOrganizationScope(followupContext, input.activeOrganization);
-    if (scopedFollowupContext) {
-        return input.runAddressQueryTryHandle(input.messageUsed, {
-            followupContext: scopedFollowupContext,
-            analysisDateHint: input.analysisDateHint
-        });
-    }
-    return input.runAddressQueryTryHandle(input.messageUsed, {
-        analysisDateHint: input.analysisDateHint
-    });
+    return input.runAddressQueryTryHandle(input.messageUsed, (0, assistantAddressLaneAttemptQueryOptionsBuilder_1.buildAssistantAddressLaneAttemptQueryOptions)({
+        analysisDateHint: input.analysisDateHint,
+        scopedFollowupContext
+    }));
 }

llm_normalizer/backend/dist/services/assistantTurnAttemptInputBuilder.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildAssistantTurnAttemptAddressRuntimeInput = buildAssistantTurnAttemptAddressRuntimeInput;
+exports.buildAssistantTurnAttemptDeepRuntimeInput = buildAssistantTurnAttemptDeepRuntimeInput;
+function buildAssistantTurnAttemptAddressRuntimeInput(input) {
+    return {
+        payload: input.payload,
+        sessionId: input.userTurn.sessionId,
+        userMessage: input.userTurn.userMessage,
+        sessionItems: input.userTurn.session.items,
+        runtimeAnalysisContext: input.userTurn.runtimeAnalysisContext,
+        sessionOrganizationScope: input.sessionOrganizationScope
+    };
+}
+function buildAssistantTurnAttemptDeepRuntimeInput(input) {
+    return {
+        payload: input.payload,
+        sessionId: input.userTurn.sessionId,
+        questionId: input.userTurn.userItem.message_id,
+        userMessage: input.userTurn.userMessage,
+        runtimeAnalysisContext: input.userTurn.runtimeAnalysisContext,
+        sessionInvestigationState: input.userTurn.session.investigation_state,
+        addressRuntimeMetaForDeep: input.addressRuntimeMetaForDeep
+    };
+}

llm_normalizer/backend/dist/services/assistantTurnAttemptRuntimeAdapter.js

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runAssistantTurnAttemptRuntime = runAssistantTurnAttemptRuntime;
+const assistantTurnAttemptInputBuilder_1 = require("./assistantTurnAttemptInputBuilder");
 async function runAssistantTurnAttemptRuntime(input) {
     const userTurn = input.runUserTurnBootstrapRuntime(input.payload);
     const sessionOrganizationScope = input.resolveSessionOrganizationScopeContext(userTurn.userMessage, userTurn.session.items);
-    const addressRuntime = await input.runAddressAttemptRuntime({
+    const addressRuntime = await input.runAddressAttemptRuntime((0, assistantTurnAttemptInputBuilder_1.buildAssistantTurnAttemptAddressRuntimeInput)({
         payload: input.payload,
-        sessionId: userTurn.sessionId,
-        userMessage: userTurn.userMessage,
-        sessionItems: userTurn.session.items,
-        runtimeAnalysisContext: userTurn.runtimeAnalysisContext,
+        userTurn,
         sessionOrganizationScope
-    });
+    }));
     const addressRuntimeMetaForDeep = addressRuntime.addressRuntimeMetaForDeep ?? null;
     if (addressRuntime.handled && addressRuntime.response) {
         return {
@@ -22,15 +20,11 @@ async function runAssistantTurnAttemptRuntime(input) {
             sessionOrganizationScope
         };
     }
-    const deepTurnRuntime = await input.runDeepTurnAttemptRuntime({
+    const deepTurnRuntime = await input.runDeepTurnAttemptRuntime((0, assistantTurnAttemptInputBuilder_1.buildAssistantTurnAttemptDeepRuntimeInput)({
         payload: input.payload,
-        sessionId: userTurn.sessionId,
-        questionId: userTurn.userItem.message_id,
-        userMessage: userTurn.userMessage,
-        runtimeAnalysisContext: userTurn.runtimeAnalysisContext,
-        sessionInvestigationState: userTurn.session.investigation_state,
+        userTurn,
         addressRuntimeMetaForDeep
-    });
+    }));
     return {
         response: deepTurnRuntime.response,
         source: "deep",