Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use MetaKG from main thread, specs from redis (if avaliable) #183

Merged
merged 6 commits into from
May 21, 2024
Merged

Use MetaKG from main thread, specs from redis (if avaliable) #183

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e72edd0
receive metakg from main thread; receieve specs from redis
rjawesome Mar 8, 2024
fa889e4
filter meta kg when it is sent via options
rjawesome Mar 12, 2024
b0b14d0
Merge branch 'main' of https://github.com/biothings/bte_trapi_query_g…
rjawesome Apr 22, 2024
91e398a
pass specs through thread instead of redis
rjawesome May 16, 2024
5fc04b0
Merge branch 'main' of https://github.com/biothings/bte_trapi_query_g…
tokebe May 16, 2024
505922a
chore: fix types after merge from main
tokebe May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import MetaKG from '@biothings-explorer/smartapi-kg';
import MetaKG, { SmartAPIQueryResult } from '@biothings-explorer/smartapi-kg';
import path from 'path';
import QueryGraph from './query_graph';
import KnowledgeGraph from './graph/knowledge_graph';
Expand Down Expand Up @@ -72,14 +72,21 @@ export default class TRAPIQueryHandler {

async findUnregisteredAPIs() {
const configListAPIs = this.options.apiList['include'];
const smartapiRegistry = await fs.readFile(this.path, { encoding: 'utf8' });

let smartapiRegistry: SmartAPIQueryResult;
if (this.options.smartapi) {
smartapiRegistry = this.options.smartapi;
} else {
const file = await fs.readFile(this.path, "utf-8");
smartapiRegistry = JSON.parse(file);
}

const smartapiIds: string[] = [];
const inforesIds: string[] = [];
const unregisteredAPIs: string[] = [];

// TODO typing for smartapiRegistration
JSON.parse(smartapiRegistry).hits.forEach((smartapiRegistration) => {
smartapiRegistry.hits.forEach((smartapiRegistration) => {
smartapiIds.push(smartapiRegistration._id);
inforesIds.push(smartapiRegistration.info?.['x-translator']?.infores);
});
Expand All @@ -95,14 +102,23 @@ export default class TRAPIQueryHandler {
return unregisteredAPIs;
}

_loadMetaKG(): MetaKG {
const metaKG = new MetaKG(this.path, this.predicatePath);
async _loadMetaKG(): Promise<MetaKG> {
debug(
`Query options are: ${JSON.stringify({
...this.options,
schema: this.options.schema ? this.options.schema.info.version : 'not included',
metakg: "",
smartapi: ""
})}`,
);

if (this.options.metakg) {
const metaKG = new MetaKG(undefined, undefined, (this.options as any).metakg);
metaKG.filterKG(this.options);
return metaKG;
}

const metaKG = new MetaKG(this.path, this.predicatePath);
debug(`SmartAPI Specs read from path: ${this.path}`);
metaKG.constructMetaKGSync(this.includeReasoner, this.options);
return metaKG;
Expand Down Expand Up @@ -611,7 +627,7 @@ export default class TRAPIQueryHandler {
const span1 = Telemetry.startSpan({ description: 'loadMetaKG' });

debug('Start to load metakg.');
const metaKG = this._loadMetaKG();
const metaKG = await this._loadMetaKG();
if (!metaKG.ops.length) {
let error: string;
if (this.options.smartAPIID) {
Expand Down
Loading