From ea891f66a3f7c4f4dec5ec446bc327d2d8b1388c Mon Sep 17 00:00:00 2001 From: rohel04 Date: Thu, 10 Apr 2025 14:33:42 +0545 Subject: [PATCH 1/2] Concepts and facts into concept array --- dist/typology_gen/generate_typology.js | 8 +++++++- package.json | 2 +- src/typology_gen/generate_typology.ts | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dist/typology_gen/generate_typology.js b/dist/typology_gen/generate_typology.js index 596e181..deb031d 100644 --- a/dist/typology_gen/generate_typology.js +++ b/dist/typology_gen/generate_typology.js @@ -58,12 +58,18 @@ class GenerateTypology { } parseTypologyOnSuccess(responseData) { responseData.metadata.status = "completed"; + const facts = responseData.generated_content.facts.map((fact) => { + return { + concept_text: fact.fact_text, + reference: fact.reference, + }; + }); const generatedContent = responseData.generated_content; return { status_code: 200, metadata: responseData.metadata, field: this.parseFields(generatedContent.field), - concepts: generatedContent.concepts, + concepts: [...generatedContent.concepts, ...facts], facts: generatedContent.facts, generate_cards: generatedContent.generate_cards, summary_cards: generatedContent.summary_cards, diff --git a/package.json b/package.json index 12dbcd7..8fc9777 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "only_ever_generator", - "version": "0.6.7", + "version": "0.7.4", "main": "dist/index.js", "scripts": { "start": "npm run build && nodemon dist/index.js", diff --git a/src/typology_gen/generate_typology.ts b/src/typology_gen/generate_typology.ts index 9e285cb..307891e 100644 --- a/src/typology_gen/generate_typology.ts +++ b/src/typology_gen/generate_typology.ts @@ -57,12 +57,18 @@ export class GenerateTypology { parseTypologyOnSuccess(responseData: any) { responseData.metadata.status = "completed"; + const facts = responseData.generated_content.facts.map((fact: any) => { + return { + concept_text: fact.fact_text, + reference: fact.reference, + }; + }); const generatedContent = responseData.generated_content; return { status_code: 200, metadata: responseData.metadata, field: this.parseFields(generatedContent.field), - concepts: generatedContent.concepts, + concepts: [...generatedContent.concepts, ...facts], facts: generatedContent.facts, generate_cards: generatedContent.generate_cards, summary_cards: generatedContent.summary_cards, From 1f97f63657fe9568f33382f7ae9319866197cc4f Mon Sep 17 00:00:00 2001 From: rohel04 Date: Wed, 16 Apr 2025 17:31:06 +0545 Subject: [PATCH 2/2] Added type variable on concept for typlogy parse and adding reference on card response parse --- dist/parse/parse_card_response.js | 15 ++------------- dist/typology_gen/generate_typology.js | 11 +++++++++-- package.json | 2 +- src/parse/parse_card_response.ts | 24 ++++++++++++------------ src/typology_gen/generate_typology.ts | 11 +++++++++-- 5 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dist/parse/parse_card_response.js b/dist/parse/parse_card_response.js index 5aa18e8..70f3ee6 100644 --- a/dist/parse/parse_card_response.js +++ b/dist/parse/parse_card_response.js @@ -76,29 +76,18 @@ class ParseCardResponse { } } _getCardReference(generatedCardData, sourceTaxonomy) { - var _a, _b, _c, _d; + var _a, _b, _c; const cardConcepts = (_a = generatedCardData.concepts) !== null && _a !== void 0 ? _a : []; const cardFacts = (_b = generatedCardData.facts) !== null && _b !== void 0 ? _b : []; const combinedCardFactsAndConcepts = [...cardConcepts, ...cardFacts]; const sourceConcepts = (_c = sourceTaxonomy.concepts) !== null && _c !== void 0 ? _c : []; - const sourceFacts = (_d = sourceTaxonomy.facts) !== null && _d !== void 0 ? _d : []; const mappedSourceConcepts = sourceConcepts.map((elem) => { return { text: elem.concept_text, reference: elem.reference, }; }); - const mappedSourceFacts = sourceFacts.map((elem) => { - return { - text: elem.fact_text, - reference: elem.reference, - }; - }); - const compinedConceptsAndFacts = [ - ...mappedSourceConcepts, - ...mappedSourceFacts, - ]; - const firstMatchedConcept = compinedConceptsAndFacts.find((elem) => combinedCardFactsAndConcepts.includes(elem.text)); + const firstMatchedConcept = sourceConcepts.find((elem) => combinedCardFactsAndConcepts.includes(elem.text)); if (firstMatchedConcept) { return firstMatchedConcept.reference; } diff --git a/dist/typology_gen/generate_typology.js b/dist/typology_gen/generate_typology.js index deb031d..ed725c3 100644 --- a/dist/typology_gen/generate_typology.js +++ b/dist/typology_gen/generate_typology.js @@ -62,6 +62,14 @@ class GenerateTypology { return { concept_text: fact.fact_text, reference: fact.reference, + type: "fact", + }; + }); + const concepts = responseData.generated_content.concepts.map((concept) => { + return { + concept_text: concept.concept_text, + reference: concept.reference, + type: "concept", }; }); const generatedContent = responseData.generated_content; @@ -69,8 +77,7 @@ class GenerateTypology { status_code: 200, metadata: responseData.metadata, field: this.parseFields(generatedContent.field), - concepts: [...generatedContent.concepts, ...facts], - facts: generatedContent.facts, + concepts: [...concepts, ...facts], generate_cards: generatedContent.generate_cards, summary_cards: generatedContent.summary_cards, // type: responseData.type, diff --git a/package.json b/package.json index 8fc9777..b817f25 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "only_ever_generator", - "version": "0.7.4", + "version": "0.7.8", "main": "dist/index.js", "scripts": { "start": "npm run build && nodemon dist/index.js", diff --git a/src/parse/parse_card_response.ts b/src/parse/parse_card_response.ts index ff229e9..82e9ee7 100644 --- a/src/parse/parse_card_response.ts +++ b/src/parse/parse_card_response.ts @@ -85,7 +85,7 @@ export class ParseCardResponse { const combinedCardFactsAndConcepts = [...cardConcepts, ...cardFacts]; const sourceConcepts = sourceTaxonomy.concepts ?? []; - const sourceFacts = sourceTaxonomy.facts ?? []; + // const sourceFacts = sourceTaxonomy.facts ?? []; const mappedSourceConcepts = sourceConcepts.map((elem: any) => { return { @@ -93,18 +93,18 @@ export class ParseCardResponse { reference: elem.reference, }; }); - const mappedSourceFacts = sourceFacts.map((elem: any) => { - return { - text: elem.fact_text, - reference: elem.reference, - }; - }); + // const mappedSourceFacts = sourceFacts.map((elem: any) => { + // return { + // text: elem.fact_text, + // reference: elem.reference, + // }; + // }); - const compinedConceptsAndFacts = [ - ...mappedSourceConcepts, - ...mappedSourceFacts, - ]; - const firstMatchedConcept = compinedConceptsAndFacts.find((elem: any) => + // const compinedConceptsAndFacts = [ + // ...mappedSourceConcepts, + // ...mappedSourceFacts, + // ]; + const firstMatchedConcept = mappedSourceConcepts.find((elem: any) => combinedCardFactsAndConcepts.includes(elem.text) ); diff --git a/src/typology_gen/generate_typology.ts b/src/typology_gen/generate_typology.ts index 307891e..596cce5 100644 --- a/src/typology_gen/generate_typology.ts +++ b/src/typology_gen/generate_typology.ts @@ -61,6 +61,14 @@ export class GenerateTypology { return { concept_text: fact.fact_text, reference: fact.reference, + type: "fact", + }; + }); + const concepts = responseData.generated_content.concepts.map((concept: any) => { + return { + concept_text: concept.concept_text, + reference: concept.reference, + type: "concept", }; }); const generatedContent = responseData.generated_content; @@ -68,8 +76,7 @@ export class GenerateTypology { status_code: 200, metadata: responseData.metadata, field: this.parseFields(generatedContent.field), - concepts: [...generatedContent.concepts, ...facts], - facts: generatedContent.facts, + concepts: [...concepts, ...facts], generate_cards: generatedContent.generate_cards, summary_cards: generatedContent.summary_cards, // type: responseData.type,