@xyo-network/diviner-forecasting-memory 2.64.7 → 2.64.9

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.
@@ -1,11 +1,9 @@
1
1
  import { assertEx } from '@xylabs/assert';
2
2
  import { exists } from '@xylabs/exists';
3
- import { ArchivistWrapper } from '@xyo-network/archivist-wrapper';
4
3
  import { BoundWitnessDivinerQuerySchema } from '@xyo-network/diviner-boundwitness-model';
5
4
  import { AbstractForecastingDiviner } from '@xyo-network/diviner-forecasting-abstract';
6
5
  import { arimaForecastingMethod, seasonalArimaForecastingMethod, } from '@xyo-network/diviner-forecasting-method-arima';
7
6
  import { ForecastingDivinerConfigSchema } from '@xyo-network/diviner-forecasting-model';
8
- import { DivinerWrapper } from '@xyo-network/diviner-wrapper';
9
7
  import { value } from 'jsonpath';
10
8
  const getJsonPathTransformer = (pathExpression) => {
11
9
  const transformer = (x) => {
@@ -43,10 +41,8 @@ export class MemoryForecastingDiviner extends AbstractForecastingDiviner {
43
41
  const addresses = this.config.witnessAddresses;
44
42
  const payload_schemas = [assertEx(this.config.witnessSchema, 'Missing witnessSchema in config')];
45
43
  const payloads = [];
46
- const archivistMod = assertEx(await this.readArchivist(), 'Unable to resolve archivist');
47
- const archivist = ArchivistWrapper.wrap(archivistMod);
48
- const bwDivinerMod = assertEx((await this.upResolver.resolve(this.config.boundWitnessDiviner)).pop(), 'Unable to resolve boundWitnessDiviner');
49
- const bwDiviner = DivinerWrapper.wrap(bwDivinerMod);
44
+ const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist');
45
+ const bwDiviner = assertEx((await this.upResolver.resolve(this.config.boundWitnessDiviner)).pop(), 'Unable to resolve boundWitnessDiviner');
50
46
  const limit = this.batchLimit;
51
47
  const witnessSchema = assertEx(this.config.witnessSchema, 'Missing witnessSchema in config');
52
48
  let timestamp = stopTimestamp;
@@ -71,7 +67,7 @@ export class MemoryForecastingDiviner extends AbstractForecastingDiviner {
71
67
  const hashes = boundWitnesses.map((bw) => bw.payload_hashes[bw.payload_schemas.findIndex((s) => s === witnessSchema)]).filter(exists);
72
68
  // Get the payloads corresponding to the BW hashes from the archivist
73
69
  if (hashes.length !== 0) {
74
- const batchPayloads = await archivist.get(hashes);
70
+ const batchPayloads = (await archivist.get(hashes)).filter(exists);
75
71
  payloads.push(...batchPayloads);
76
72
  }
77
73
  }
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryForecastingDiviner.js","sourceRoot":"","sources":["../../src/MemoryForecastingDiviner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MemoryForecastingDiviner.js","sourceRoot":"","sources":["../../src/MemoryForecastingDiviner.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryForecastingDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryForecastingDiviner.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAA;AAChH,OAAO,EAEL,oBAAoB,EAEpB,4BAA4B,EAC7B,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAAkC,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAEnI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,wBAAwB,GAAG,OAAO,oBAAoB,GAAG,OAAO,4BAA4B,CAAA;AAWxG,qBAAa,wBAAwB,CACnC,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,CACnE,SAAQ,0BAA0B,CAAC,OAAO,CAAC;IAC3C,OAAgB,aAAa,6CAAmC;IAEhE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAGnG;IAED;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,QAAQ;IAGrC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,SAAS;IAE7C,cAAuB,iBAAiB,IAAI,iBAAiB,CAK5D;IAED,cAAuB,WAAW,IAAI,uBAAuB,CAG5D;cAEwB,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA2ChH"}
1
+ {"version":3,"file":"MemoryForecastingDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryForecastingDiviner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAA;AAChH,OAAO,EAEL,oBAAoB,EAEpB,4BAA4B,EAC7B,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAAkC,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAEnI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,MAAM,MAAM,wBAAwB,GAAG,OAAO,oBAAoB,GAAG,OAAO,4BAA4B,CAAA;AAWxG,qBAAa,wBAAwB,CACnC,OAAO,SAAS,wBAAwB,GAAG,wBAAwB,CACnE,SAAQ,0BAA0B,CAAC,OAAO,CAAC;IAC3C,OAAgB,aAAa,6CAAmC;IAEhE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAGnG;IAED;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,QAAQ;IAGrC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,SAAS;IAE7C,cAAuB,iBAAiB,IAAI,iBAAiB,CAK5D;IAED,cAAuB,WAAW,IAAI,uBAAuB,CAG5D;cAEwB,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA4ChH"}
package/package.json CHANGED
@@ -12,20 +12,19 @@
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.9.3",
14
14
  "@xylabs/exists": "^2.9.3",
15
- "@xyo-network/archivist-wrapper": "^2.64.7",
16
- "@xyo-network/boundwitness-model": "^2.64.7",
17
- "@xyo-network/diviner-boundwitness-model": "^2.64.7",
18
- "@xyo-network/diviner-forecasting-abstract": "^2.64.7",
19
- "@xyo-network/diviner-forecasting-method-arima": "^2.64.7",
20
- "@xyo-network/diviner-forecasting-model": "^2.64.7",
21
- "@xyo-network/diviner-wrapper": "^2.64.7",
22
- "@xyo-network/payload-model": "^2.64.7",
15
+ "@xyo-network/boundwitness-model": "^2.64.9",
16
+ "@xyo-network/diviner-boundwitness-model": "^2.64.9",
17
+ "@xyo-network/diviner-forecasting-abstract": "^2.64.9",
18
+ "@xyo-network/diviner-forecasting-method-arima": "^2.64.9",
19
+ "@xyo-network/diviner-forecasting-model": "^2.64.9",
20
+ "@xyo-network/diviner-model": "^2.64.9",
21
+ "@xyo-network/payload-model": "^2.64.9",
23
22
  "jsonpath": "^1.1.1"
24
23
  },
25
24
  "devDependencies": {
26
25
  "@types/jsonpath": "^0.2.0",
27
- "@xylabs/ts-scripts-yarn3": "^2.18.5",
28
- "@xylabs/tsconfig": "^2.18.5",
26
+ "@xylabs/ts-scripts-yarn3": "^2.18.7",
27
+ "@xylabs/tsconfig": "^2.18.7",
29
28
  "typescript": "^5.1.6"
30
29
  },
31
30
  "description": "Primary SDK for using XYO Protocol 2.0",
@@ -61,5 +60,5 @@
61
60
  },
62
61
  "sideEffects": false,
63
62
  "types": "dist/types/index.d.ts",
64
- "version": "2.64.7"
63
+ "version": "2.64.9"
65
64
  }
@@ -1,6 +1,5 @@
1
1
  import { assertEx } from '@xylabs/assert'
2
2
  import { exists } from '@xylabs/exists'
3
- import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
4
3
  import { BoundWitness } from '@xyo-network/boundwitness-model'
5
4
  import { BoundWitnessDivinerQueryPayload, BoundWitnessDivinerQuerySchema } from '@xyo-network/diviner-boundwitness-model'
6
5
  import { AbstractForecastingDiviner, ForecastingDivinerParams } from '@xyo-network/diviner-forecasting-abstract'
@@ -11,7 +10,7 @@ import {
11
10
  seasonalArimaForecastingName,
12
11
  } from '@xyo-network/diviner-forecasting-method-arima'
13
12
  import { ForecastingDivinerConfigSchema, ForecastingMethod, PayloadValueTransformer } from '@xyo-network/diviner-forecasting-model'
14
- import { DivinerWrapper } from '@xyo-network/diviner-wrapper'
13
+ import { DivinerModule } from '@xyo-network/diviner-model'
15
14
  import { Payload } from '@xyo-network/payload-model'
16
15
  import { value } from 'jsonpath'
17
16
 
@@ -60,10 +59,11 @@ export class MemoryForecastingDiviner<
60
59
  const addresses = this.config.witnessAddresses
61
60
  const payload_schemas = [assertEx(this.config.witnessSchema, 'Missing witnessSchema in config')]
62
61
  const payloads: Payload[] = []
63
- const archivistMod = assertEx(await this.readArchivist(), 'Unable to resolve archivist')
64
- const archivist = ArchivistWrapper.wrap(archivistMod)
65
- const bwDivinerMod = assertEx((await this.upResolver.resolve(this.config.boundWitnessDiviner)).pop(), 'Unable to resolve boundWitnessDiviner')
66
- const bwDiviner = DivinerWrapper.wrap(bwDivinerMod)
62
+ const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')
63
+ const bwDiviner = assertEx(
64
+ (await this.upResolver.resolve<DivinerModule>(this.config.boundWitnessDiviner)).pop(),
65
+ 'Unable to resolve boundWitnessDiviner',
66
+ )
67
67
  const limit = this.batchLimit
68
68
  const witnessSchema = assertEx(this.config.witnessSchema, 'Missing witnessSchema in config')
69
69
  let timestamp = stopTimestamp
@@ -93,7 +93,7 @@ export class MemoryForecastingDiviner<
93
93
 
94
94
  // Get the payloads corresponding to the BW hashes from the archivist
95
95
  if (hashes.length !== 0) {
96
- const batchPayloads = await archivist.get(hashes)
96
+ const batchPayloads = (await archivist.get(hashes)).filter(exists)
97
97
  payloads.push(...batchPayloads)
98
98
  }
99
99
  }