@xapp/arachne-web-service 0.5.4 → 0.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -21,6 +21,7 @@ const arachne_parsers_1 = require("@xapp/arachne-parsers");
21
21
  const stentor_logger_1 = require("stentor-logger");
22
22
  const stentor_utils_1 = require("stentor-utils");
23
23
  const node_vibrant_1 = __importDefault(require("node-vibrant"));
24
+ const { encode } = require('gpt-3-encoder');
24
25
  const autoScroll_1 = require("./utils/autoScroll");
25
26
  const findBestFaviconURL_1 = require("./utils/findBestFaviconURL");
26
27
  const image_1 = require("./utils/image");
@@ -69,12 +70,13 @@ class ArachneWebService {
69
70
  catch (e) {
70
71
  (0, stentor_logger_1.log)().debug("Could not find chrome-aws-lambda layer, relying on local chrome installation.");
71
72
  }
73
+ const pageHandlerTimeout = typeof (options === null || options === void 0 ? void 0 : options.pageHandlerTimeout) === "number" ? options === null || options === void 0 ? void 0 : options.pageHandlerTimeout : 60000;
72
74
  const crawler = arachne_1.Arachne.crawler({
73
75
  stealth: true,
74
76
  launchOptions,
75
77
  queue,
76
78
  browser,
77
- pageHandlerTimeout: typeof (options === null || options === void 0 ? void 0 : options.pageHandlerTimeout) === "number" ? options === null || options === void 0 ? void 0 : options.pageHandlerTimeout : 60000,
79
+ pageHandlerTimeout,
78
80
  pageHandler: (page, request) => __awaiter(this, void 0, void 0, function* () {
79
81
  const title = yield page.title();
80
82
  (0, stentor_logger_1.log)().info(`Loaded ${request.url} : ${title}`);
@@ -171,10 +173,15 @@ class ArachneWebService {
171
173
  }
172
174
  // Use OpenAI to determine Call To Action
173
175
  if (process.env.OPENAI_API_KEY) {
176
+ (0, stentor_logger_1.log)().info(`Calling OpenAI....`);
174
177
  // Convert to markdown
175
178
  const markdown = new arachne_parsers_1.ArachneHTMLtoText({ stripTags: [...arachne_parsers_1.DEFAULT_STRIP_TAGS, "img"] }).convert(html, true);
176
179
  // inject in the prompt
177
180
  const prompt = `${markdown}\n==========================\nAbove is the markdown for a website found at ${url}. Please print out in JSON format information about the website above with the following keys:\n\n\"organization_name\" - The name of the organization for the website.\n\"phone_numbers\" - An array of phone numbers for the organization. If available, include what they are used for such as \"customer support\" or \"sales\", if unknown then leave it blank. Use an object with keys: number and purpose.\n\"addresses\" - An array of addresses for the organization.\n\"services\" - An array of the top five unique most common services the organization provides, they should be concise and no more than a few words such as \"Roofing\", \"Conversational AI Services\", \"Bathroom Remodelling\"\n\"calls_to_action\" - An array of the top five unique calls to action found on the site and their fully formed URL if they have one. Good examples of calls to actions are \"Request Demo\", \"Get Started\", \"Free Quote\", \"Schedule Consultation\", \"Sign Up\". Bad examples are \"Learn More\" or \"Follow us on Facebook\". Use an object with keys: url & callToAction in the array. For the url please combine it properly with the website's URL.\n\"description\" - A concise description of what the organization does in one sentence, include the name of the organization and their services and their location if available.\n \n{`;
181
+ const tokens = encode(prompt).length;
182
+ const LEFT_FOR_RESPONSE = 500;
183
+ const max_tokens = 4000 - LEFT_FOR_RESPONSE - tokens;
184
+ (0, stentor_logger_1.log)().info(`Prompt is ${tokens} tokens, tetting max_tokens to ${max_tokens}`);
178
185
  const options = {
179
186
  method: 'POST',
180
187
  headers: {
@@ -185,7 +192,7 @@ class ArachneWebService {
185
192
  model: "text-davinci-003",
186
193
  prompt,
187
194
  temperature: 0.25,
188
- max_tokens: 3000,
195
+ max_tokens,
189
196
  top_p: 1,
190
197
  frequency_penalty: 0,
191
198
  presence_penalty: 0
@@ -196,14 +203,19 @@ class ArachneWebService {
196
203
  let status = 999;
197
204
  const openAIResponse = yield fetch('https://api.openai.com/v1/completions', options).then((response) => {
198
205
  status = response.status;
199
- return response.json();
206
+ if (status === 200) {
207
+ return response.json();
208
+ }
209
+ return;
200
210
  }).finally(() => {
201
211
  // eslint-disable-next-line no-console
202
212
  console.timeEnd("open_ai_web");
203
213
  });
204
214
  if (status === 200) {
215
+ const usage = openAIResponse.usage;
216
+ (0, stentor_logger_1.log)().info(`OpenAI token usage: prompt ${usage.prompt_tokens} completion ${usage.completion_tokens} total ${usage.total_tokens}`);
205
217
  // Add the leading { as it is included in the query
206
- const completion = `{\n${openAIResponse.data.choices[0].text}`;
218
+ const completion = `{\n${openAIResponse.choices[0].text}`;
207
219
  const siteData = JSON.parse(completion);
208
220
  // eslint-disable-next-line no-console
209
221
  site.callsToAction = siteData.calls_to_action;
@@ -1 +1 @@
1
- {"version":3,"file":"ArachneWebService.js","sourceRoot":"","sources":["../src/ArachneWebService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ArachneWebService.js","sourceRoot":"","sources":["../src/ArachneWebService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kCAAkC;AAClC,4BAA0B,CAAC,0CAA0C;AACrE,+BAA+B;AAE/B,2CAAyF;AACzF,2DAU+B;AAE/B,mDAAqC;AACrC,iDAA8D;AAG9D,gEAAmC;AAGnC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAG5C,mDAAgD;AAChD,mEAAgE;AAChE,yCAAkE;AAClE,+CAA4C;AAiE5C,MAAa,iBAAiB;IAC1B;;;;;OAKG;IACU,cAAc,CAAC,GAAW,EAAE,OAAkC;;YAEvE,MAAM,IAAI,GAA2B,EAAE,CAAC;YACxC,IAAI,oBAAoB,GAAqB,EAAE,CAAC;YAChD,MAAM,MAAM,GAAkB,EAAE,CAAC;YAEjC,MAAM,KAAK,GAAG,IAAI,4BAAkB,EAAE,CAAC;YACvC,KAAK,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YAE1B,MAAM,aAAa,GAAyE;gBACxF,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAA,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;aAC7E,CAAC;YAEF,MAAM,QAAQ,GAAY,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAA,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;YAC/E,MAAM,YAAY,GAAW,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,KAAI,CAAC,CAAC;YAEpD,IAAI,CAAC,IAAA,mBAAQ,GAAE,EAAE;gBACb,8BAA8B;gBAC9B,aAAa,CAAC,cAAc,GAAG,wBAAwB,CAAC;aAC3D;YAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,EAAE;gBACvB,aAAa,CAAC,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;gBACrD,aAAa,CAAC,IAAI,GAAG,CAAC,iBAAiB,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;aACvG;YAED,IAAI,OAAuD,CAAC;YAE5D,IAAI;gBACA,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBAE7C,8DAA8D;gBAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;gBAEzD,OAAO,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC;oBACtC,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,eAAe,EAAE,QAAQ,CAAC,eAAe;oBACzC,cAAc,EAAE,MAAM,QAAQ,CAAC,cAAc;oBAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,iBAAiB,EAAE,IAAI;iBAC1B,CAAC,CAAC;aACN;YAAC,OAAO,CAAC,EAAE;gBACR,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,+EAA+E,CAAC,CAAC;aAChG;YAED,MAAM,kBAAkB,GAAW,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,CAAA,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC;YAEzH,MAAM,OAAO,GAAG,iBAAO,CAAC,OAAO,CAAC;gBAC5B,OAAO,EAAE,IAAI;gBACb,aAAa;gBACb,KAAK;gBACL,OAAO;gBACP,kBAAkB;gBAClB,WAAW,EAAE,CAAO,IAAiB,EAAE,OAAuB,EAAE,EAAE;oBAE9D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;oBACjC,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,UAAU,OAAO,CAAC,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC;oBAE/C,IAAI,QAAQ,EAAE;wBACV,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,eAAe,YAAY,kCAAkC,CAAC,CAAC;wBAC1E,MAAM,IAAA,uBAAU,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;wBACrC,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;qBACtC;oBAED,mBAAmB;oBACnB,qEAAqE;oBACrE,gFAAgF;oBAChF,kFAAkF;oBAClF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBAElC,MAAM,SAAS,GAAuB;wBAClC,IAAI,8BAAY,CAAC,IAAI,CAAC;wBACtB,IAAI,kCAAgB,CAAC,IAAI,CAAC;qBAC7B,CAAC;oBAEF,oBAAoB,GAAG,IAAI,+BAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;oBAEnE,MAAM,MAAM,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;oBAEnD,IAAI,aAAwC,CAAC;oBAE7C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;wBACxB,IAAI,IAAA,iCAAe,EAAC,KAAK,CAAC,EAAE;4BACxB,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;4BAChD,aAAa,GAAG,KAAK,CAAC;4BACtB,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC;yBAChC;qBACJ;oBAED,8CAA8C;oBAC9C,IAAI,aAAa,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;wBACpD,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC;wBAC7C,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE;4BACvC,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAa,EAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;4BAC1D,IAAI,MAAM,EAAE;gCACR,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,oCAAoC,iBAAiB,EAAE,CAAC,CAAC;gCACrE,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;6BACjC;yBACJ;qBACJ;oBAED,0BAA0B;oBAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;wBACZ,kBAAkB;wBAClB,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;wBAE7C,MAAM,OAAO,GAAG,MAAM,IAAA,uCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;wBAC5D,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,mBAAmB,OAAO,aAAa,CAAC,CAAC;wBACrD,8CAA8C;wBAC9C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;qBACvB;oBAED,uCAAuC;oBACvC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE;wBAC1B,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;wBACrE,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE,GAAG,SAAS,MAAM,CAAC,CAAC;wBACnE,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;wBAE5C,MAAM,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;wBAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;wBAErD,MAAM,IAAI,CAAC,UAAU,CAAC;4BAClB,IAAI;4BACJ,QAAQ;4BACR,qBAAqB;yBACxB,CAAC,CAAC;wBACH,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;wBAElD,MAAM,CAAC,GAAG,IAAI,sBAAO,CAAC,IAAI,CAAC,CAAC;wBAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;wBACrC,IAAI,UAAU,GAAuB,SAAS,CAAC;wBAC/C,IAAI,WAAW,CAAC;wBAChB,IAAI,aAAa,GAAG,EAAE,CAAC;wBAEvB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;4BAC1B,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE;gCACnD,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;gCAChC,IAAI,CAAC,WAAW,EAAE;oCACd,UAAU,GAAG,MAAM,CAAC;oCACpB,WAAW,GAAG,OAAO,CAAC;iCACzB;qCAAM,IAAI,OAAO,IAAI,WAAW,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE;oCAC/D,UAAU,GAAG,MAAM,CAAC;oCACpB,WAAW,GAAG,OAAO,CAAC;iCACzB;gCACD,aAAa,GAAG,GAAG,aAAa,IAAI,MAAM,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EAAE,CAAA;6BAC/D;yBACJ;wBACD,IAAI,UAAU,EAAE;4BACZ,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,uBAAuB,UAAU,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,EAAE,CAAC,CAAC;yBACxE;6BAAM;4BACH,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;yBACxD;wBAED,IAAI,CAAC,YAAY,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC;wBACrC,IAAI,CAAC,cAAc,GAAG,IAAA,0BAAkB,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;wBAC5D,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;wBAC9D,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,6BAA6B,aAAa,EAAE,CAAC,CAAC;qBAC7D;yBAAM;wBACH,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;qBAChG;oBAED,yCAAyC;oBACzC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;wBAE5B,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;wBACjC,sBAAsB;wBACtB,MAAM,QAAQ,GAAG,IAAI,mCAAiB,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,oCAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBAC1G,uBAAuB;wBACvB,MAAM,MAAM,GAAG,GAAG,QAAQ,8EAA8E,GAAG,+yCAA+yC,CAAC;wBAE35C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;wBACrC,MAAM,iBAAiB,GAAG,GAAG,CAAC;wBAC9B,MAAM,UAAU,GAAW,IAAI,GAAG,iBAAiB,GAAG,MAAM,CAAC;wBAE7D,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,aAAa,MAAM,kCAAkC,UAAU,EAAE,CAAC,CAAC;wBAE9E,MAAM,OAAO,GAAgB;4BACzB,MAAM,EAAE,MAAM;4BACd,OAAO,EAAE;gCACL,cAAc,EAAE,kBAAkB;gCAClC,eAAe,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;6BAC1D;4BACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACjB,KAAK,EAAE,kBAAkB;gCACzB,MAAM;gCACN,WAAW,EAAE,IAAI;gCACjB,UAAU;gCACV,KAAK,EAAE,CAAC;gCACR,iBAAiB,EAAE,CAAC;gCACpB,gBAAgB,EAAE,CAAC;6BACtB,CAAC;yBACL,CAAA;wBAED,sCAAsC;wBACtC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC5B,IAAI,MAAM,GAAW,GAAG,CAAC;wBACzB,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,uCAAuC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;4BACnG,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;4BACzB,IAAI,MAAM,KAAK,GAAG,EAAE;gCAChB,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;6BAC1B;4BACD,OAAO;wBACX,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;4BACZ,sCAAsC;4BACtC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;wBACnC,CAAC,CAAC,CAAC;wBAEH,IAAI,MAAM,KAAK,GAAG,EAAE;4BAUhB,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;4BACnC,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,8BAA8B,KAAK,CAAC,aAAa,eAAe,KAAK,CAAC,iBAAiB,UAAU,KAAK,CAAC,YAAY,EAAE,CAAC,CAAA;4BAEjI,mDAAmD;4BACnD,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;4BAC1D,MAAM,QAAQ,GAAc,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;4BACnD,sCAAsC;4BAEtC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,eAAe,CAAC;4BAC9C,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;4BACxC,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC;yBAC9C;6BAAM;4BACH,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,kDAAkD,MAAM,EAAE,CAAC,CAAC;4BACvE,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;yBAC/B;qBACJ;yBAAM;wBACH,uCAAuC;wBACvC,sFAAsF;wBACtF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,mHAAmH,CAAC,CAAC;wBAE9I,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBAElC,sBAAsB;wBACtB,IAAI,OAAO,IAAI,IAAA,iCAAiB,EAAC,OAAO,CAAC,EAAE;4BACvC,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,SAAS,OAAO,CAAC,MAAM,iBAAiB,CAAC,CAAC;4BACtD,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;4BACvC,MAAM,OAAO,GAAW,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAU,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BAC7E,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,cAAc,OAAO,GAAG,CAAC,CAAC;4BACtC,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;yBACpD;qBACJ;gBACL,CAAC,CAAA;gBACD,0BAA0B;aAC7B,CAAC,CAAC;YAEH,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC;YAEpB,OAAO;gBACH,IAAI;gBACJ,oBAAoB;gBACpB,MAAM;aACT,CAAC;QACN,CAAC;KAAA;CACJ;AA7QD,8CA6QC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xapp/arachne-web-service",
3
- "version": "0.5.4",
3
+ "version": "0.5.5",
4
4
  "types": "lib/index",
5
5
  "main": "lib/index",
6
6
  "files": [
@@ -17,7 +17,7 @@
17
17
  "@microsoft/api-extractor": "7.33.7",
18
18
  "@types/chai": "4.3.4",
19
19
  "@types/mocha": "10.0.1",
20
- "@types/node": "18.11.18",
20
+ "@types/node": "18.16.7",
21
21
  "@types/sinon": "10.0.13",
22
22
  "@types/sinon-chai": "3.2.9",
23
23
  "@xapp/config": "0.2.3",
@@ -31,12 +31,12 @@
31
31
  "typescript": "4.8.4"
32
32
  },
33
33
  "dependencies": {
34
- "@xapp/arachne": "0.5.1",
35
- "@xapp/arachne-parsers": "0.5.0",
34
+ "@xapp/arachne": "0.5.5",
35
+ "@xapp/arachne-parsers": "0.5.5",
36
36
  "gpt-3-encoder": "1.1.4",
37
37
  "isomorphic-fetch": "3.0.0",
38
38
  "node-vibrant": "3.2.1-alpha.1",
39
- "schema-dts": "1.1.0",
39
+ "schema-dts": "1.1.2",
40
40
  "sharp": "0.32.0",
41
41
  "stentor-logger": "1.57.116",
42
42
  "stentor-models": "1.57.115",
@@ -48,5 +48,5 @@
48
48
  "clean": "rm -rf ./lib/*",
49
49
  "test:f": "mocha --recursive -r ts-node/register \"./src/**/*.ftest.ts\""
50
50
  },
51
- "gitHead": "bd9e8493ecbdf7af90b66b2f42f73325df05154c"
51
+ "gitHead": "1caffb1fbf01be8e16f4ba83e27c6968535fae3a"
52
52
  }