GDB-12346 - replace legacy endpoints and update mappers with new response. Edit test stubs.

GDB-12346 - update payloads and mappers

GDB-12346 - update frontend according to latest BE changes in legacy code

GDB-12346 - revert mapper variable name

GDB-12346 - update test stubs with assistantsInstructions property

Author: DesiBorisova

e2e-tests/fixtures/ttyg/agent/get-agent-defaults.json

@@ -6,7 +6,7 @@
     "topP": 1.0,
     "seed": 0,
     "repositoryId": "test-repository",
-    "instructions": {
+    "assistantsInstructions": {
         "systemInstruction": "",
         "userInstruction": "If you need to write a SPARQL query, use only the classes and properties provided in the schema and don't invent or guess any. Always try to return human-readable names or labels and not only the IRIs. If SPARQL fails to provide the necessary information you can try another tool too."
     },

e2e-tests/fixtures/ttyg/agent/get-agent-list-after-deleted.json

@@ -7,7 +7,7 @@
         "topP": 0.0,
         "seed": null,
         "repositoryId": "Not existing repo",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "string\n\nstring",
             "userInstruction": "string"
         },
@@ -25,7 +25,7 @@
         "topP": 1.0,
         "seed": null,
         "repositoryId": "starwars",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "You are helpful assistant in discovering information regarding diagnostic biomarkers.",
             "userInstruction": null
         },
@@ -43,7 +43,7 @@
         "topP": 1.0,
         "seed": null,
         "repositoryId": "biomarkers",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "You're a helpful assistant in discovering new diagnostic biomarkers for given diseases. I'll submit a set of publication abstracts discussing given disease and your task is to find in the abstracts any potential new biomarkers which are not yet listed in the appropriate databases. Each abstract is preceded by identifier - its PubMed id called for short PMID. \n\nReturn the set of biomarkers listed one per row, each marker followed by the | and PMID of the respective abstract if was mentioned in.\n\nExample: \nInput: 36418457\t[Amyotrophic lateral sclerosis (ALS) is a genetically and phenotypically heterogeneous disease results in the loss of motor neurons. Mounting information points to involvement of other systems including cognitive impairment. However, neither the valid biomarker for diagnosis nor effective therapeutic intervention is available for ALS. The present study is aimed at identifying potentially genetic biomarker that improves the diagnosis and treatment of ALS patients based on the data of the Gene Expression Omnibus. We retrieved datasets and conducted a weighted gene co-expression network analysis (WGCNA) to identify ALS-related co-expression genes. Functional enrichment analysis was performed to determine the features and pathways of the main modules. We then constructed an ALS-related model using the least absolute shrinkage and selection operator (LASSO) regression analysis and verified the model by the receiver operating characteristic (ROC) curve. Besides we screened the non-preserved gene modules in FTD and ALS-mimic disorders to distinct ALS-related genes from disorders with overlapping genes and features. Altogether, 4198 common genes between datasets with the most variation were analyzed and 16 distinct modules were identified through WGCNA. Blue module had the most correlation with ALS and functionally enriched in pathways of neurodegeneration-multiple diseases', 'amyotrophic lateral sclerosis', and 'endocytosis' KEGG terms. Further, some of other modules related to ALS were enriched in 'autophagy' and 'amyotrophic lateral sclerosis'. The 30 top of hub genes were recruited to a LASSO regression model and 5 genes (BCLAF1, GNA13, ARL6IP5, ARGLU1, and YPEL5) were identified as potentially diagnostic ALS biomarkers with validating of the ROC curve and AUC value.]\n\nYour response: BCLAF1|36418457\nGNA13|36418457\nARL6IP5|36418457\nARGLU1|36418457\nYPEL5|36418457",
             "userInstruction": null
         },

e2e-tests/fixtures/ttyg/agent/get-agent-list-autocomplete-query.json

@@ -6,7 +6,7 @@
         "temperature": 0.7,
         "topP": 1.0,
         "repositoryId": "starwars",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": null,
             "userInstruction": null
         },

e2e-tests/fixtures/ttyg/agent/get-agent-list-new-agent.json

@@ -7,7 +7,7 @@
         "topP": 0.2,
         "seed": 2,
         "repositoryId": "starwars",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "",
             "userInstruction": ""
         },

e2e-tests/fixtures/ttyg/agent/get-agent-list-with-incompatible-agents.json

@@ -8,7 +8,7 @@
         "seed": null,
         "repositoryId": "starwars",
         "compatibility": "INCOMPATIBLE",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "",
             "userInstruction": ""
         },
@@ -28,7 +28,7 @@
         "seed": null,
         "repositoryId": "Not existing repo",
         "compatibility": "COMPATIBLE",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "string\n\nstring",
             "userInstruction": "string"
         },
@@ -46,7 +46,7 @@
         "topP": 1.0,
         "seed": null,
         "repositoryId": "starwars",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "You are helpful assistant in discovering information regarding diagnostic biomarkers.",
             "userInstruction": null
         },
@@ -65,7 +65,7 @@
         "topP": 1.0,
         "seed": null,
         "repositoryId": "biomarkers",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "You're a helpful assistant in discovering new diagnostic biomarkers for given diseases. I'll submit a set of publication abstracts discussing given disease and your task is to find in the abstracts any potential new biomarkers which are not yet listed in the appropriate databases. Each abstract is preceded by identifier - its PubMed id called for short PMID. \n\nReturn the set of biomarkers listed one per row, each marker followed by the | and PMID of the respective abstract if was mentioned in.\n\nExample: \nInput: 36418457\t[Amyotrophic lateral sclerosis (ALS) is a genetically and phenotypically heterogeneous disease results in the loss of motor neurons. Mounting information points to involvement of other systems including cognitive impairment. However, neither the valid biomarker for diagnosis nor effective therapeutic intervention is available for ALS. The present study is aimed at identifying potentially genetic biomarker that improves the diagnosis and treatment of ALS patients based on the data of the Gene Expression Omnibus. We retrieved datasets and conducted a weighted gene co-expression network analysis (WGCNA) to identify ALS-related co-expression genes. Functional enrichment analysis was performed to determine the features and pathways of the main modules. We then constructed an ALS-related model using the least absolute shrinkage and selection operator (LASSO) regression analysis and verified the model by the receiver operating characteristic (ROC) curve. Besides we screened the non-preserved gene modules in FTD and ALS-mimic disorders to distinct ALS-related genes from disorders with overlapping genes and features. Altogether, 4198 common genes between datasets with the most variation were analyzed and 16 distinct modules were identified through WGCNA. Blue module had the most correlation with ALS and functionally enriched in pathways of neurodegeneration-multiple diseases', 'amyotrophic lateral sclerosis', and 'endocytosis' KEGG terms. Further, some of other modules related to ALS were enriched in 'autophagy' and 'amyotrophic lateral sclerosis'. The 30 top of hub genes were recruited to a LASSO regression model and 5 genes (BCLAF1, GNA13, ARL6IP5, ARGLU1, and YPEL5) were identified as potentially diagnostic ALS biomarkers with validating of the ROC curve and AUC value.]\n\nYour response: BCLAF1|36418457\nGNA13|36418457\nARL6IP5|36418457\nARGLU1|36418457\nYPEL5|36418457",
             "userInstruction": null
         },

e2e-tests/fixtures/ttyg/agent/get-agent-list.json

@@ -7,7 +7,7 @@
         "topP": 0.0,
         "seed": null,
         "repositoryId": "starwars",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "",
             "userInstruction": ""
         },
@@ -26,7 +26,7 @@
         "topP": 0.0,
         "seed": null,
         "repositoryId": "Not existing repo",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "string\n\nstring",
             "userInstruction": "string"
         },
@@ -44,7 +44,7 @@
         "topP": 1.0,
         "seed": null,
         "repositoryId": "starwars",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "You are helpful assistant in discovering information regarding diagnostic biomarkers.",
             "userInstruction": null
         },
@@ -63,7 +63,7 @@
         "topP": 1.0,
         "seed": null,
         "repositoryId": "biomarkers",
-        "instructions": {
+        "assistantsInstructions": {
             "systemInstruction": "You're a helpful assistant in discovering new diagnostic biomarkers for given diseases. I'll submit a set of publication abstracts discussing given disease and your task is to find in the abstracts any potential new biomarkers which are not yet listed in the appropriate databases. Each abstract is preceded by identifier - its PubMed id called for short PMID. \n\nReturn the set of biomarkers listed one per row, each marker followed by the | and PMID of the respective abstract if was mentioned in.\n\nExample: \nInput: 36418457\t[Amyotrophic lateral sclerosis (ALS) is a genetically and phenotypically heterogeneous disease results in the loss of motor neurons. Mounting information points to involvement of other systems including cognitive impairment. However, neither the valid biomarker for diagnosis nor effective therapeutic intervention is available for ALS. The present study is aimed at identifying potentially genetic biomarker that improves the diagnosis and treatment of ALS patients based on the data of the Gene Expression Omnibus. We retrieved datasets and conducted a weighted gene co-expression network analysis (WGCNA) to identify ALS-related co-expression genes. Functional enrichment analysis was performed to determine the features and pathways of the main modules. We then constructed an ALS-related model using the least absolute shrinkage and selection operator (LASSO) regression analysis and verified the model by the receiver operating characteristic (ROC) curve. Besides we screened the non-preserved gene modules in FTD and ALS-mimic disorders to distinct ALS-related genes from disorders with overlapping genes and features. Altogether, 4198 common genes between datasets with the most variation were analyzed and 16 distinct modules were identified through WGCNA. Blue module had the most correlation with ALS and functionally enriched in pathways of neurodegeneration-multiple diseases', 'amyotrophic lateral sclerosis', and 'endocytosis' KEGG terms. Further, some of other modules related to ALS were enriched in 'autophagy' and 'amyotrophic lateral sclerosis'. The 30 top of hub genes were recruited to a LASSO regression model and 5 genes (BCLAF1, GNA13, ARL6IP5, ARGLU1, and YPEL5) were identified as potentially diagnostic ALS biomarkers with validating of the ROC curve and AUC value.]\n\nYour response: BCLAF1|36418457\nGNA13|36418457\nARL6IP5|36418457\nARGLU1|36418457\nYPEL5|36418457",
             "userInstruction": null
         },

e2e-tests/fixtures/ttyg/agent/get-agent.json

@@ -5,7 +5,7 @@
     "temperature": 0.7,
     "topP": 1.0,
     "repositoryId": "starwars",
-    "instructions": {
+    "assistantsInstructions": {
         "systemInstruction": null,
         "userInstruction": null
     },

e2e-tests/stubs/ttyg/ttyg-stubs.js

@@ -2,15 +2,15 @@ import {Stubs} from "../stubs";
 
 export class TTYGStubs extends Stubs {
     static stubChatsListGet(fixture = '/ttyg/chats/get-chat-list.json', delay = 0) {
-        cy.intercept('GET', '/rest/chat/conversations', {
+        cy.intercept('GET', '/rest/ttyg/chats', {
             fixture: fixture,
             statusCode: 200,
             delay: delay
         }).as('get-chat-list');
     }
 
     static stubChatListGetError() {
-        cy.intercept('GET', '/rest/chat/conversations', {
+        cy.intercept('GET', '/rest/ttyg/chats', {
             statusCode: 500,
             response: {
                 error: 'Internal Server Error'
@@ -19,7 +19,7 @@ export class TTYGStubs extends Stubs {
     }
 
     static stubChatsListGetNoResults() {
-        cy.intercept('GET', '/rest/chat/conversations', {
+        cy.intercept('GET', '/rest/ttyg/chats', {
             fixture: '/ttyg/chats/get-chat-list-0.json',
             statusCode: 200
         }).as('get-chat-list');
@@ -34,7 +34,7 @@ export class TTYGStubs extends Stubs {
         cy.fixture('/ttyg/chats/get-chat.json').then((body) => {
             cy.intercept({
                 method: 'GET',
-                url: '/rest/chat/conversations/*'
+                url: '/rest/ttyg/chats/*'
             }, (req) => {
                 const chatId = req.url.split('/').pop();
                 const chat = body[chatId];
@@ -49,7 +49,7 @@ export class TTYGStubs extends Stubs {
     }
 
     static stubChatGet404Error() {
-        cy.intercept('GET', '/rest/chat/conversations/*', {
+        cy.intercept('GET', '/rest/ttyg/chats/*', {
             statusCode: 404,
             response: {
                 error: 'Not Found'
@@ -58,28 +58,28 @@ export class TTYGStubs extends Stubs {
     }
 
     static stubChatUpdate() {
-        cy.intercept('PUT', '/rest/chat/conversations/*', {
+        cy.intercept('PUT', '/rest/ttyg/chats/*', {
             fixture: '/ttyg/chats/renamed-chat.json',
             statusCode: 200
         }).as('update-chat');
     }
 
     static stubChatDelete() {
-        cy.intercept('DELETE', '/rest/chat/conversations/*', {
+        cy.intercept('DELETE', '/rest/ttyg/chats/*', {
             fixture: '/ttyg/chats/deleted-chat.json',
             statusCode: 200
         }).as('delete-chat');
     }
 
     static stubChatExport() {
-        cy.intercept('GET', '/rest/chat/conversations/export/*', {
+        cy.intercept('GET', '/rest/ttyg/chats/export/*', {
             fixture: '/ttyg/chats/export-chat.json',
             statusCode: 200
         }).as('export-chat');
     }
 
     static stubAgentListGet(fixture = '/ttyg/agent/get-agent-list.json', delay = 0) {
-        cy.intercept('GET', '/rest/chat/agents', {
+        cy.intercept('GET', '/rest/ttyg/agents', {
             fixture: fixture,
             statusCode: 200,
             delay: delay
@@ -91,15 +91,15 @@ export class TTYGStubs extends Stubs {
     }
 
     static stubAgentGet(fixture = '/ttyg/agent/get-agent.json', delay = 0) {
-        cy.intercept('GET', '/rest/chat/agents/*', {
+        cy.intercept('GET', '/rest/ttyg/agents/*', {
             fixture: fixture,
             statusCode: 200,
             delay: delay
         }).as('get-agent');
     }
 
     static stubAgentListGetError() {
-        cy.intercept('GET', '/rest/chat/agents', {
+        cy.intercept('GET', '/rest/ttyg/agents', {
             statusCode: 500,
             response: {
                 error: 'Internal Server Error'
@@ -108,7 +108,7 @@ export class TTYGStubs extends Stubs {
     }
 
     static stubAgentCreate(delay = 0) {
-        cy.intercept('POST', '/rest/chat/agents', {
+        cy.intercept('POST', '/rest/ttyg/agents', {
             fixture: '/ttyg/agent/create-agent.json',
             statusCode: 200,
             delay: delay
@@ -118,7 +118,7 @@ export class TTYGStubs extends Stubs {
     static stubAgentEdit() {
         cy.intercept({
             method: 'PUT',
-            url: '/rest/chat/agents'
+            url: '/rest/ttyg/agents'
         }, (req) => {
             const requestBody = req.body;
             req.reply({
@@ -129,21 +129,21 @@ export class TTYGStubs extends Stubs {
     }
 
     static stubAgentDelete(delay = 0) {
-        cy.intercept('DELETE', '/rest/chat/agents/**', {
+        cy.intercept('DELETE', '/rest/ttyg/agents/**', {
             statusCode: 200,
             delay: delay
         }).as('delete-agent');
     }
 
     static stubAgentDefaultsGet() {
-        cy.intercept('GET', '/rest/chat/agents/default', {
+        cy.intercept('GET', '/rest/ttyg/agents/default', {
             fixture: '/ttyg/agent/get-agent-defaults.json',
             statusCode: 200
         }).as('get-agent-defaults');
     }
 
     static stubAnswerQuestion(fixture = '/ttyg/chats/ask-question.json') {
-        cy.intercept('POST', '/rest/chat/conversations', {
+        cy.intercept('POST', '/rest/ttyg/chats', {
             fixture,
             statusCode: 200
         }).as('get-agent-defaults');
@@ -153,7 +153,7 @@ export class TTYGStubs extends Stubs {
         cy.fixture(fixture).then((fixtureData) => {
             const today = Math.floor(Date.now() / 1000) + '';
             const body = JSON.stringify(fixtureData).replace(/"creationDate"/g, today);
-            cy.intercept('POST', '/rest/chat/conversations', {
+            cy.intercept('POST', '/rest/ttyg/chats', {
                 statusCode: 200,
                 body: JSON.parse(body)
             }).as('create-chat');
@@ -162,7 +162,7 @@ export class TTYGStubs extends Stubs {
     }
 
     static stubExplainResponse(fixture = '/ttyg/chats/explain-response-1.json') {
-        cy.intercept('POST', 'rest/chat/conversations/explain', {
+        cy.intercept('POST', 'rest/ttyg/chats/explain', {
             fixture,
             statusCode: 200
         }).as('explain-response');

packages/legacy-workbench/src/js/angular/rest/ttyg.rest.service.js

@@ -6,8 +6,8 @@ angular
 
 TTYGRestService.$inject = ['$http'];
 
-const CONVERSATIONS_ENDPOINT = 'rest/chat/conversations';
-const AGENTS_ENDPOINT = 'rest/chat/agents';
+const CONVERSATIONS_ENDPOINT = 'rest/ttyg/chats';
+const AGENTS_ENDPOINT = 'rest/ttyg/agents';
 const EXPLAIN_RESPONSE_ENDPOINT = `${CONVERSATIONS_ENDPOINT}/explain`;
 
 const DEVELOPMENT = false;

packages/legacy-workbench/src/js/angular/ttyg/services/agents.mapper.js

@@ -175,7 +175,7 @@ export const agentModelMapper = (data, localRepositoryIds) => {
         temperature: data.temperature,
         topP: data.topP,
         seed: data.seed,
-        instructions: agentInstructionsMapper(data.instructions),
+        instructions: agentInstructionsMapper(data.assistantsInstructions),
         assistantExtractionMethods: extractionMethodsMapper(data.assistantExtractionMethods),
         additionalExtractionMethods: additionalExtractionMethodsMapper(data.additionalExtractionMethods),
         compatibility: data.compatibility,
@@ -186,13 +186,15 @@ const extractionMethodsMapper = (data) => {
     if (!data) {
         return;
     }
+
     return data.map((extractionMethod) => extractionMethodMapper(extractionMethod));
 };
 
 const extractionMethodMapper = (data) => {
     if (!data) {
         return;
     }
+
     return new ExtractionMethodModel({
         method: data.method,
         ontologyGraph: data.ontologyGraph,
@@ -204,12 +206,13 @@ const extractionMethodMapper = (data) => {
         queryTemplate: data.queryTemplate,
         retrievalConnectorInstance: data.retrievalConnectorInstance
     });
-};
+}
 
 const additionalExtractionMethodsMapper = (data) => {
     if (!data) {
         return;
     }
+
     return data.map((additionalExtractionMethod) => additionalExtractionMethodMapper(additionalExtractionMethod));
 };
 
@@ -227,7 +230,7 @@ const additionalExtractionMethodMapper = (data) => {
             method: data.method
         });
     }
-};
+}
 
 const agentInstructionsMapper = (data) => {
     if (!data) {