Concepts and facts into concept array

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;
         }

dist/typology_gen/generate_typology.js

@@ -58,13 +58,26 @@ 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,
+                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;
         return {
             status_code: 200,
             metadata: responseData.metadata,
             field: this.parseFields(generatedContent.field),
-            concepts: generatedContent.concepts,
-            facts: generatedContent.facts,
+            concepts: [...concepts, ...facts],
             generate_cards: generatedContent.generate_cards,
             summary_cards: generatedContent.summary_cards,
             // type: responseData.type,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "only_ever_generator",
-  "version": "0.6.7",
+  "version": "0.7.8",
   "main": "dist/index.js",
   "scripts": {
     "start": "npm run build && nodemon dist/index.js",

src/parse/parse_card_response.ts

@@ -85,26 +85,26 @@ 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 {
         text: elem.concept_text,
         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)
     );
 

src/typology_gen/generate_typology.ts

@@ -57,13 +57,26 @@ 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,
+        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;
     return {
       status_code: 200,
       metadata: responseData.metadata,
       field: this.parseFields(generatedContent.field),
-      concepts: generatedContent.concepts,
-      facts: generatedContent.facts,
+      concepts: [...concepts, ...facts],
       generate_cards: generatedContent.generate_cards,
       summary_cards: generatedContent.summary_cards,
       // type: responseData.type,