hydra-crawler 2.4.0 → 2.4.2
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.
|
@@ -6,11 +6,13 @@ import { IOllamaConfig, OllamaParser } from './ollama.parser';
|
|
|
6
6
|
import { IDataConfig } from './data.parser';
|
|
7
7
|
export interface IOffenceConfig extends IDataConfig {
|
|
8
8
|
model: string;
|
|
9
|
+
permittedDomains: string[];
|
|
9
10
|
}
|
|
10
11
|
export declare function isIOffenceConfig(test: unknown): test is IOffenceConfig;
|
|
11
12
|
export declare class OffenceParser extends OllamaParser<IOllamaConfig> {
|
|
12
13
|
private url?;
|
|
13
14
|
private model;
|
|
15
|
+
private permittedDomains;
|
|
14
16
|
constructor(url?: string | undefined, outcome?: IRequestOutcome, config?: TKeyObject<IParserConfig>);
|
|
15
17
|
protected parseText(database: DatabaseService, text: string): Promise<void>;
|
|
16
18
|
}
|
|
@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
import { commonsTypeHasPropertyString, commonsTypeHasPropertyT } from 'tscommons-es-core';
|
|
10
|
+
import { commonsTypeHasPropertyString, commonsTypeHasPropertyStringArray, commonsTypeHasPropertyT } from 'tscommons-es-core';
|
|
11
11
|
import { commonsOutputDebug, commonsOutputError } from 'nodecommons-es-cli';
|
|
12
12
|
import { RigOffenceScaleService } from '../services/rig-offence-scale.service';
|
|
13
13
|
import { OllamaParser } from './ollama.parser';
|
|
@@ -17,18 +17,22 @@ export function isIOffenceConfig(test) {
|
|
|
17
17
|
return false;
|
|
18
18
|
if (!commonsTypeHasPropertyString(test, 'model'))
|
|
19
19
|
return false;
|
|
20
|
+
if (!commonsTypeHasPropertyStringArray(test, 'permittedDomains'))
|
|
21
|
+
return false;
|
|
20
22
|
return true;
|
|
21
23
|
}
|
|
22
24
|
export class OffenceParser extends OllamaParser {
|
|
23
25
|
constructor(url, outcome, config) {
|
|
24
26
|
super(outcome, config, 'offence');
|
|
25
27
|
this.url = url;
|
|
28
|
+
this.permittedDomains = [];
|
|
26
29
|
if (!config)
|
|
27
30
|
return;
|
|
28
31
|
if (!commonsTypeHasPropertyT(config, 'offence', isIOffenceConfig)) {
|
|
29
32
|
commonsOutputError('Invalid config for OffenceParser');
|
|
30
33
|
}
|
|
31
34
|
this.model = config['offence'].model;
|
|
35
|
+
this.permittedDomains = config['offence'].permittedDomains;
|
|
32
36
|
}
|
|
33
37
|
parseText(database, text) {
|
|
34
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -36,6 +40,9 @@ export class OffenceParser extends OllamaParser {
|
|
|
36
40
|
return;
|
|
37
41
|
if (!this.ollamaUrl || !this.ollamaKey || !this.model)
|
|
38
42
|
return;
|
|
43
|
+
const hostname = new URL(this.url).hostname;
|
|
44
|
+
if (!this.permittedDomains.includes(hostname))
|
|
45
|
+
return;
|
|
39
46
|
if (text.length === 0) {
|
|
40
47
|
yield database.unsetData(this.url, 'offence');
|
|
41
48
|
return;
|
|
@@ -50,7 +57,7 @@ export class OffenceParser extends OllamaParser {
|
|
|
50
57
|
return;
|
|
51
58
|
commonsOutputDebug(`Offence score is: ${score.toString(10)}`);
|
|
52
59
|
yield database.setData(this.url, 'offence', score);
|
|
53
|
-
}));
|
|
60
|
+
}))();
|
|
54
61
|
});
|
|
55
62
|
}
|
|
56
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offence.parser.js","sourceRoot":"","sources":["../../src/parsers/offence.parser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAc,4BAA4B,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"offence.parser.js","sourceRoot":"","sources":["../../src/parsers/offence.parser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAc,4BAA4B,EAAE,iCAAiC,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAEzI,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAK/E,OAAO,EAAiB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAe,aAAa,EAAE,MAAM,eAAe,CAAC;AAM3D,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC7C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvC,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/D,IAAI,CAAC,iCAAiC,CAAC,IAAI,EAAE,kBAAkB,CAAC;QAAE,OAAO,KAAK,CAAC;IAE/E,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,OAAO,aAAc,SAAQ,YAA2B;IAI7D,YACU,GAAY,EACpB,OAAyB,EACzB,MAAkC;QAEnC,KAAK,CACH,OAAO,EACP,MAAM,EACN,SAAS,CACV,CAAC;QARO,QAAG,GAAH,GAAG,CAAS;QAHd,qBAAgB,GAAa,EAAE,CAAC;QAavC,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,IAAI,CAAC,uBAAuB,CAAiB,MAAM,EAAE,SAAS,EAAE,gBAAgB,CAAC,EAAE;YAClF,kBAAkB,CAAC,kCAAkC,CAAC,CAAC;SACvD;QACD,IAAI,CAAC,KAAK,GAAI,MAAM,CAAC,SAAS,CAAoB,CAAC,KAAK,CAAC;QACzD,IAAI,CAAC,gBAAgB,GAAI,MAAM,CAAC,SAAS,CAAoB,CAAC,gBAAgB,CAAC;IAChF,CAAC;IAEe,SAAS,CAAC,QAAyB,EAAE,IAAY;;YAChE,IAAI,CAAC,IAAI,CAAC,GAAG;gBAAE,OAAO;YACtB,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,KAAK;gBAAE,OAAO;YAE9D,MAAM,QAAQ,GAAW,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;YACpD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,OAAO;YAEtD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,MAAM,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBAC9C,OAAO;aACP;YAED,MAAM,iBAAiB,GAA2B,IAAI,sBAAsB,CAC1E,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAK,CACX,CAAC;YAEF,kEAAkE;YAClE,KAAK,CAAC,GAAwB,EAAE;gBAC/B,IAAI,CAAC,IAAI,CAAC,GAAG;oBAAE,OAAO;gBAEtB,MAAM,KAAK,GAAqB,MAAM,iBAAiB,CAAC,oBAAoB,CAC1E,IAAI,EACJ,IAAI,CAAC,eAAe,CACrB,CAAC;gBACF,IAAI,CAAC,KAAK;oBAAE,OAAO;gBAEnB,kBAAkB,CAAC,qBAAqB,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC9D,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YACpD,CAAC,CAAA,CAAC,EAAE,CAAC;QACN,CAAC;KAAA;CACD"}
|