Update data extract handling of Discovery responses

src/services/data-extraction/data-extraction.impl.ts

@@ -1,7 +1,7 @@
 import * as process from "process";
 import {IamAuthenticator, IamTokenManager} from "ibm-cloud-sdk-core";
 import DiscoveryV2 = require("ibm-watson/discovery/v2");
-const striptags = require("striptags");
+const stripTags = require("striptags");
 import axios from "axios";
 
 import {DataExtractionApi} from "./data-extraction.api";
@@ -10,7 +10,7 @@ import {createDiscoveryV2} from "../../utils/discovery-v2";
 import {DataExtractionConfig, DataExtractionCsv} from "./data-extraction.csv";
 import {kycCaseSummaryApi, KycCaseSummaryApi} from "../kyc-case-summary";
 import {DataExtractionResultModel} from "../../models";
-import {first, GenAiModel, GenerativeResponse} from "../../utils";
+import {first, GenAiModel, GenerativeResponse, stripUrls} from "../../utils";
 import PQueue from "../../utils/p-queue";
 
 const concurrency = parseInt(process.env.FIND_PASSAGE_CONCURRENCY || '8')
@@ -146,7 +146,7 @@ export class DataExtractionImpl extends DataExtractionCsv<WatsonBackends, Contex
     async queryDiscovery(customer: string, config: DataExtractionConfig, backends: WatsonBackends): Promise<string> {
         const naturalLanguageQuery = config.question + ' ' + customer;
 
-        const passagesPerDocument = true;
+        const passagesPerDocument: boolean = true;
         const response: DiscoveryV2.Response<DiscoveryV2.QueryResponse> = await backends.discovery.query({
             projectId: this.backendConfig.discoveryProjectId,
             naturalLanguageQuery,
@@ -159,9 +159,7 @@ export class DataExtractionImpl extends DataExtractionCsv<WatsonBackends, Contex
             }
         })
 
-        const passages: string[] = !passagesPerDocument
-            ? this.handleDiscoveryPassages(response.result)
-            : this.handleDiscoveryResult(response.result, customer);
+        const passages: string[] = this.handleDiscoveryResponse(response.result, customer, passagesPerDocument)
 
         console.log('Finding relevant passages')
 
@@ -174,6 +172,16 @@ export class DataExtractionImpl extends DataExtractionCsv<WatsonBackends, Contex
         return text;
     }
 
+    handleDiscoveryResponse(result: DiscoveryV2.QueryResponse, subject: string, passagesPerDocument: boolean): string[] {
+        const passages: string[] = !passagesPerDocument
+            ? this.handleDiscoveryPassages(result)
+            : this.handleDiscoveryResult(result, subject);
+
+        return passages
+            .map(stripTags)
+            .map(stripUrls)
+    }
+
     filterDocuments(result: DiscoveryV2.QueryResponse, subject: string): DiscoveryV2.QueryResult[] {
         return result.results.filter(val => {
             const organizations = extractEntities(val.enriched_text, 'Organization')
@@ -198,7 +206,7 @@ export class DataExtractionImpl extends DataExtractionCsv<WatsonBackends, Contex
     }
 
     async findRelevantPassages(question: string, passages: string[]): Promise<string> {
-        const url = process.env.RELEVANT_PASSAGES_URL || 'https://similarity-check.18xu6cedovu0.us-south.codeengine.appdomain.cloud/api/find_relevant_passage'
+        const url = process.env.RELEVANT_PASSAGES_URL || 'https://similarity-check.18z7sftfb1j5.us-south.codeengine.appdomain.cloud/api/find_relevant_passage'
 
         if (passages.length === 1) {
             return passages[0]
@@ -220,7 +228,7 @@ export class DataExtractionImpl extends DataExtractionCsv<WatsonBackends, Contex
                         .catch(err => {
                             console.error('Error getting relevant passages: ', {err})
 
-                            return striptags(passages.join('\n'))
+                            return passages.join('\n')
                         })
 
                 console.log('Found relevant passage: ', {relevantPassage})

src/utils/index.ts

@@ -5,3 +5,4 @@ export * from './gen-ai-model';
 export * from './stream-to-buffer';
 export * from './url-to-stream';
 export * from './validate-url';
+export * from './strip-urls';

src/utils/p-queue/index.ts

@@ -1,8 +1,8 @@
 import {EventEmitter} from 'eventemitter3';
 import pTimeout, {TimeoutError} from '../p-timeout';
-import {Queue, RunFunction} from './queue.js';
-import PriorityQueue from './priority-queue.js';
-import {QueueAddOptions, Options, TaskOptions} from './options.js';
+import {Queue, RunFunction} from './queue';
+import PriorityQueue from './priority-queue';
+import {QueueAddOptions, Options, TaskOptions} from './options';
 
 type Task<TaskResultType> =
 	| ((options: TaskOptions) => PromiseLike<TaskResultType>)

src/utils/p-queue/options.ts

@@ -1,4 +1,4 @@
-import {Queue, RunFunction} from './queue.js';
+import {Queue, RunFunction} from './queue';
 
 interface TimeoutOptions {
 	/**

src/utils/p-queue/priority-queue.ts

@@ -1,6 +1,6 @@
-import {Queue, RunFunction} from './queue.js';
-import lowerBound from './lower-bound.js';
-import {QueueAddOptions} from './options.js';
+import {Queue, RunFunction} from './queue';
+import lowerBound from './lower-bound';
+import {QueueAddOptions} from './options';
 
 export interface PriorityQueueOptions extends QueueAddOptions {
 	priority?: number;

src/utils/strip-urls/index.ts

@@ -0,0 +1 @@
+export * from './strip-urls'

src/utils/strip-urls/strip-urls.spec.ts

@@ -0,0 +1,37 @@
+import {stripUrls} from "./strip-urls";
+
+describe('strip-urls', () => {
+    describe('Given stripUrls', () => {
+        const url = 'https://host.com/path/to/file.html'
+
+        describe('when "{url}" provided', () => {
+            test('then return ""', () => {
+                expect(stripUrls(url)).toEqual('')
+            })
+        })
+
+        describe('when "http://host.com/path/to/file.html" provided', () => {
+            test('then return ""', () => {
+                expect(stripUrls('http://host.com/path/to/file.html')).toEqual('')
+            })
+        })
+
+        describe('when "This is a test {url}." provided', () => {
+            test('then return "This is a test "', () => {
+                expect(stripUrls(`This is a test ${url}.`)).toEqual('This is a test ')
+            })
+        })
+
+        describe('when "This is a test {url})" provided', () => {
+            test('then return "This is a test "', () => {
+                expect(stripUrls(`This is a test ${url})`)).toEqual('This is a test ')
+            })
+        })
+
+        describe('when "This is a test {url} )" provided', () => {
+            test('then return "This is a test  )"', () => {
+                expect(stripUrls(`This is a test ${url} )`)).toEqual('This is a test  )')
+            })
+        })
+    })
+})

src/utils/strip-urls/strip-urls.ts

@@ -0,0 +1,3 @@
+export const stripUrls = (text: string): string => {
+    return text.replace(/https?:\/\/[\n\S]+/g, '');;
+}