From 1ce0be81c73bedb0c65b02907b56a76c348615f9 Mon Sep 17 00:00:00 2001 From: Philip Love Date: Wed, 1 Dec 2021 22:33:17 -0500 Subject: [PATCH] PM TaskServer plumbing --- .../Bot-Modules/Trading-Bot/TradingSession.js | 7 +++-- .../UI/Function-Libraries/ActionSwitch.js | 16 ++-------- .../UI/Function-Libraries/TaskFunctions.js | 30 ++++++++----------- .../Portfolio-Bot/PortfolioSession.js | 6 ++-- 4 files changed, 23 insertions(+), 36 deletions(-) diff --git a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js index 75c4c36ba..dca2f17d8 100644 --- a/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js +++ b/Projects/Algorithmic-Trading/TS/Bot-Modules/Trading-Bot/TradingSession.js @@ -584,9 +584,10 @@ } function startLiveTrading() { - // Testing: - TS.projects.foundations.globals.processVariables.PM_COMMUNICATION_MODULE.beginListening(); - TS.projects.foundations.globals.processVariables.PM_COMMUNICATION_MODULE.getQuoteAssetBalance(); + /* Testing to be removed @PLUV: */ + /*TS.projects.foundations.globals.processVariables.PM_COMMUNICATION_MODULE.beginListening(); + TS.projects.foundations.globals.processVariables.PM_COMMUNICATION_MODULE.getQuoteAssetBalance();*/ + /* End Testing */ return checkKey() } diff --git a/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js b/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js index 0d00c7e95..6b5d94b46 100644 --- a/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js +++ b/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js @@ -53,18 +53,6 @@ function newFoundationsActionSwitch() { UI.projects.foundations.functionLibraries.taskFunctions.stopAllTaskManagers(action.node) } break - - case 'Run All Portfolio Task Managers': - { - UI.projects.foundations.functionLibraries.taskFunctions.runAllTaskManagers(action.node) - } - break - case 'Stop All Portfolio Task Managers': - { - UI.projects.foundations.functionLibraries.taskFunctions.stopAllTaskManagers(action.node) - } - break - case 'Run All Managed Tasks': { /* Portfolio Task References */ UI.projects.foundations.functionLibraries.taskFunctions.runAllManagedTasks(action.node); @@ -528,7 +516,7 @@ function newFoundationsActionSwitch() { { UI.projects.foundations.functionLibraries.workspaceFunctions.fixMissingReferences(action.rootNodes) } - break + break case 'Switch To Forward Testing': { action.node.type = "Forward Testing Session" @@ -579,7 +567,7 @@ function newFoundationsActionSwitch() { { UI.projects.foundations.functionLibraries.productFunctions.installProduct(action.node, action.rootNodes) } - break + break default: { console.log("[WARN] Action sent to Foundations Action Switch does not belong here. Verify at the App Schema file of the node that triggered this action that the actionProject is pointing to the right project. -> Action = " + action.name + " -> Action Node Name = " + action.node.name) diff --git a/Projects/Foundations/UI/Function-Libraries/TaskFunctions.js b/Projects/Foundations/UI/Function-Libraries/TaskFunctions.js index e596f3aca..34fbf51db 100644 --- a/Projects/Foundations/UI/Function-Libraries/TaskFunctions.js +++ b/Projects/Foundations/UI/Function-Libraries/TaskFunctions.js @@ -131,7 +131,7 @@ function newFoundationsFunctionLibraryTaskFunctions() { } } - let taskLightingPath = '->Portfolio Task->Task->' + + let taskLightingPath = '->Task->' + 'Task Server App Reference->Task Server App->Signing Account->' + 'Portfolio Bot Instance->' + 'Sensor Bot Instance->' + @@ -139,12 +139,12 @@ function newFoundationsFunctionLibraryTaskFunctions() { 'Indicator Bot Instance->' + 'Trading Bot Instance->' + 'Learning Bot Instance->' + - 'Social Trading Bot Reference->Signing Account->' + - 'Sensor Process Instance->Time Frames Filter->API Data Fetcher Process Instance->Indicator Process Instance->Trading Process Instance->Learning Process Instance->' + + 'Social Trading Bot Reference->Signing Account->' + + 'Sensor Process Instance->Time Frames Filter->API Data Fetcher Process Instance->Indicator Process Instance->Trading Process Instance->Portfolio Process Instance->Learning Process Instance->' + 'Social Trading Bot Reference->Social Trading Bot->Signing Account->' + 'Execution Started Event->' + 'Key Reference->Exchange Account Key->' + - 'Task Manager->Portfolio Task Manager->' + + 'Task Manager->' + 'Data Mine Tasks->Trading Mine Tasks->Portfolio Mine Tasks->Learning Mine Tasks->' + 'Market Data Tasks->Market Trading Tasks->Market Portfolio Tasks->Market Learning Tasks->' + 'Exchange Data Tasks->Exchange Trading Tasks->Exchange Portfolio Tasks->Exchange Learning Tasks->' + @@ -206,7 +206,7 @@ function newFoundationsFunctionLibraryTaskFunctions() { 'Exchange Data Tasks->Exchange Trading Tasks->Exchange Portfolio Tasks->Exchange Learning Tasks->Crypto Exchange->' + 'Market Data Tasks->Market Trading Tasks->Market Portfolio Tasks->Market Learning Tasks->Market->' + 'Data Mine Tasks->Trading Mine Tasks->Portfolio Mine Tasks->Learning Mine Tasks->' + - 'Task Manager->Portfolio Task Manager->Portfolio Task->Managed Tasks->Task Reference->Task->' + + 'Task Manager->Managed Tasks->Task Reference->Task->' + 'Indicator Bot Instance->Sensor Bot Instance->API Data Fetcher Bot Instance->Trading Bot Instance->Portfolio Bot Instance->Learning Bot Instance->' + 'Indicator Process Instance->Sensor Process Instance->API Data Fetcher Process Instance->Trading Process Instance->Portfolio Process Instance->Learning Process Instance->' + 'Paper Trading Session->Forward Testing Session->Backtesting Session->Live Trading Session->Live Portfolio Session->Back Learning Session->Live Learning Session->Managed Sessions->' + @@ -216,11 +216,11 @@ function newFoundationsFunctionLibraryTaskFunctions() { let networkDefinition = UI.projects.visualScripting.functionLibraries.protocolNode.getProtocolNode(lanNetworkNode.payload.parentNode, false, true, true, false, false, networkLightingPath) - let managedTasksLightingPath = '->Portfolio Task->Managed Tasks->Portfolio Bot Instance->' + + let managedTasksLightingPath = '->Task->Managed Tasks->Portfolio Bot Instance->' + 'Task Reference->Task->Sensor Bot Instance->API Data Fetcher Bot->Indicator Bot Instance->Trading Bot Instance->Learning Bot Instance->' + 'Sensor Process Instance->Time Frames Filter->API Data Fetcher Process Instance->Indicator Process Instance->Trading Process Instance->Learning Process Instance->' + 'Execution Started Event->Key Reference->Exchange Account Key->' + - 'Task Manager->Portfolio Task Manager->' + + 'Task Manager->' + 'Data Mine Tasks->Trading Mine Tasks->Learning Mine Tasks->Portfolio Mine Tasks->' + 'Market Trading Tasks->Market Data Tasks->Market Learning Tasks->Market Portfolio Tasks->' + 'Market->Exchange Markets->Crypto Exchange->Crypto Exchanges->exchange Markets->Market->' + @@ -372,7 +372,7 @@ function newFoundationsFunctionLibraryTaskFunctions() { } function runAllTasks(taskManager) { - let tasks = (taskManager.type !== 'Portfolio Task Manager') ? taskManager.tasks : taskManager.portfolioTasks; + let tasks = taskManager.tasks; for (let i = 0; i < tasks.length; i++) { let node = tasks[i]; let menu = node.payload.uiObject.menu; @@ -382,7 +382,7 @@ function newFoundationsFunctionLibraryTaskFunctions() { } function stopAllTasks(taskManager) { - let tasks = (taskManager.type !== 'Portfolio Task Manager') ? taskManager.tasks : taskManager.portfolioTasks; + let tasks = taskManager.tasks; for (let i = 0; i < tasks.length; i++) { let node = tasks[i]; let menu = node.payload.uiObject.menu @@ -392,7 +392,7 @@ function newFoundationsFunctionLibraryTaskFunctions() { } function runAllTaskManagers(parent) { - let manager = (parent.type !== 'Portfolio Mine Tasks') ? parent.taskManagers : parent.portfolioTaskManagers; + let manager = parent.taskManagers; for (let i = 0; i < manager.length; i++) { let node = manager[i]; let menu = node.payload.uiObject.menu; @@ -403,7 +403,7 @@ function newFoundationsFunctionLibraryTaskFunctions() { } function stopAllTaskManagers(parent) { - let manager = (parent.type !== 'Portfolio Mine Tasks') ? parent.taskManagers : parent.portfolioTaskManagers; + let manager = parent.taskManagers; for (let i = 0; i < manager.length; i++) { let node = manager[i]; let menu = node.payload.uiObject.menu; @@ -888,9 +888,7 @@ function newFoundationsFunctionLibraryTaskFunctions() { if (node.payload === undefined) { return } if (node.payload.referenceParent === undefined) { return } - let taskManager = (node.type !== 'Portfolio Mine Tasks') ? - UI.projects.visualScripting.functionLibraries.uiObjectsFromNodes.addUIObject(node, 'Task Manager') : - UI.projects.visualScripting.functionLibraries.uiObjectsFromNodes.addUIObject(node, 'Portfolio Task Manager'); + let taskManager = UI.projects.visualScripting.functionLibraries.uiObjectsFromNodes.addUIObject(node, 'Task Manager'); taskManager.name = node.payload.referenceParent.name taskManager.payload.floatingObject.collapseToggle() @@ -1033,9 +1031,7 @@ function newFoundationsFunctionLibraryTaskFunctions() { } function addTask(taskManager) { - let task = (taskManager.type !== 'Portfolio Task Manager') ? - UI.projects.visualScripting.functionLibraries.uiObjectsFromNodes.addUIObject(taskManager, 'Task') : - UI.projects.visualScripting.functionLibraries.uiObjectsFromNodes.addUIObject(taskManager, 'Portfolio Task'); + let task = UI.projects.visualScripting.functionLibraries.uiObjectsFromNodes.addUIObject(taskManager, 'Task'); if (systemNode !== undefined) { task.name = systemNode.name diff --git a/Projects/Portfolio-Management/TS/Bot-Modules/Portfolio-Bot/PortfolioSession.js b/Projects/Portfolio-Management/TS/Bot-Modules/Portfolio-Bot/PortfolioSession.js index b01e9e840..2c6caa4fd 100644 --- a/Projects/Portfolio-Management/TS/Bot-Modules/Portfolio-Bot/PortfolioSession.js +++ b/Projects/Portfolio-Management/TS/Bot-Modules/Portfolio-Bot/PortfolioSession.js @@ -581,9 +581,11 @@ } function startLivePortfolio() { - for (let key of TS.projects.foundations.globals.taskConstants.MANAGED_SESSIONS_MAP.keys()) { + /* Testing to be removed: @PLUV */ + /*for (let key of TS.projects.foundations.globals.taskConstants.MANAGED_SESSIONS_MAP.keys()) { TS.projects.foundations.globals.taskConstants.MANAGED_SESSIONS_MAP.get(key).beginListening(); - } + }*/ + /* End Testing */ return checkKey() }