only_ever_generator 0.5.3 → 0.5.4

package/dist/bootstrap/app.js

@@ -37,6 +37,7 @@ class OnlyEverGenerator {
             title: parsedData.title,
             headings: parsedData.headings,
             content: parsedData.content,
+            taxonomy: parsedData.taxonomy,
         },
             // parsedData.type == 'cards' ? this.typologyResponse = parsedData.taxonomy :  this.typologyResponse = null;
             this.typologyResponse = generationContent.content.taxonomy;
@@ -57,6 +58,11 @@ class OnlyEverGenerator {
                 else if (elem == "generate_card") {
                     /// for cards gen to occur, there must be presence of source taxonomy
                     if (this.shouldTheCardBeGeneratedAfterTypologyResponse()) {
+                        this.parsedContent.taxonomy = {
+                            concepts: this.typologyResponse.concepts,
+                            facts: this.typologyResponse.facts,
+                            generate_cards: this.typologyResponse.generate_cards,
+                        };
                         this.cardgenResponse = yield this.generateCard(this.promptForCardGen, JSON.stringify(this.typologyResponse), false);
                         responseToReturn.push(this.cardgenResponse);
                         /// check if gap fill is required ie coverage determination 
@@ -96,8 +102,7 @@ class OnlyEverGenerator {
     }
     generateCard(prompt, additionalContent, isGapFill) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let generateCardsResp = yield new generate_cards_1.GenerateCards(this.openAiService).generateCards(prompt !== null && prompt !== void 0 ? prompt : "", JSON.stringify(this.parsedContent) + additionalContent, isGapFill, (_a = this.parsedContent.headings) !== null && _a !== void 0 ? _a : []);
+            let generateCardsResp = yield new generate_cards_1.GenerateCards(this.openAiService).generateCards(prompt !== null && prompt !== void 0 ? prompt : "", JSON.stringify(this.parsedContent) + additionalContent, isGapFill, this.parsedContent.taxonomy);
             // let response =  await this.openAiService?.sendRequest(prompt,this.parsedContent);
             // response['type'] = 'card_gen';
             return generateCardsResp;

package/dist/card_gen/generate_cards.js

@@ -15,7 +15,7 @@ class GenerateCards {
     constructor(openAiService) {
         this.openAiService = openAiService;
     }
-    generateCards(prompt, parsedContent, isGapFill, headings) {
+    generateCards(prompt, parsedContent, isGapFill, taxonomy) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
             let response = yield ((_a = this.openAiService) === null || _a === void 0 ? void 0 : _a.sendRequest(prompt, parsedContent));
@@ -30,7 +30,7 @@ class GenerateCards {
             };
             if (response.status_code == 200) {
                 response.metadata.status = "completed";
-                let parseCard = new parse_card_response_1.ParseCardResponse().parse(response, isGapFill);
+                let parseCard = new parse_card_response_1.ParseCardResponse().parse(response, isGapFill, taxonomy);
                 return parseCard;
             }
             else {

package/dist/index.js

@@ -50,7 +50,7 @@ Object.defineProperty(exports, "OnlyEverGenerator", { enumerable: true, get: fun
 //     "res_tokens": cardResp.usage_data?.completion_tokens,
 //     "model": '40-mini'
 // };
-//   let parsedData = new ParseCardResponse().parse(cardResp,false);
+//   let parsedData = new ParseCardResponse().parse(cardResp,false, {});
 //   res.send(parsedData)
 // });
 // app.get("/typology", async (req, res) => {

package/dist/parse/parse_card/parse_cloze_card.js

@@ -24,7 +24,7 @@ class ParseClozeCard {
                     category: "learning",
                     sub_type: data.type,
                 },
-                heading: data.card_reference,
+                heading: "",
                 displayTitle: displayTitle,
                 content: {
                     question: finalQuestion,

package/dist/parse/parse_card/parse_match_card.js

@@ -24,7 +24,7 @@ class ParseMatchCard {
                     category: "learning",
                     sub_type: cardData.type,
                 },
-                heading: cardData.card_content.card_reference,
+                heading: "",
                 content: finalContent,
                 //  content: cardData.card_content,
                 displayTitle: displayTitle,

package/dist/parse/parse_card/parse_mcq_card.js

@@ -21,7 +21,7 @@ class ParseMcqCard {
                     category: "learning",
                     sub_type: data.type,
                 },
-                heading: data.card_reference,
+                heading: "",
                 displayTitle: displayTitle,
                 content: {
                     question: data.card_content.prompt,

package/dist/parse/parse_card_response.js

@@ -6,7 +6,7 @@ const parse_cloze_card_1 = require("./parse_card/parse_cloze_card");
 const parse_match_card_1 = require("./parse_card/parse_match_card");
 const parse_mcq_card_1 = require("./parse_card/parse_mcq_card");
 class ParseCardResponse {
-    parse(generatedData, isGapFill) {
+    parse(generatedData, isGapFill, sourceTaxonomy) {
         let usage_data = generatedData.metadata;
         try {
             const cardData = [];
@@ -17,24 +17,28 @@ class ParseCardResponse {
                     if (elem.type == "flash") {
                         const flashCard = this.parseFlashCard(elem);
                         if (flashCard != null && flashCard) {
+                            flashCard.heading = this._getCardReference(flashCard, sourceTaxonomy);
                             cardData.push(flashCard);
                         }
                     }
                     else if (elem.type == "mcq") {
                         const mcqCard = new parse_mcq_card_1.ParseMcqCard().parse(elem);
                         if (mcqCard != null && mcqCard) {
+                            mcqCard.heading = this._getCardReference(mcqCard, sourceTaxonomy);
                             cardData.push(mcqCard);
                         }
                     }
                     else if (elem.type == "cloze") {
                         const clozeCard = new parse_cloze_card_1.ParseClozeCard().parse(elem);
                         if (clozeCard && clozeCard != null) {
+                            clozeCard.heading = this._getCardReference(clozeCard, sourceTaxonomy);
                             cardData.push(clozeCard);
                         }
                     }
                     else if (elem.type == "match") {
                         const matchCard = new parse_match_card_1.ParseMatchCard().parse(elem);
                         if (matchCard && matchCard != null) {
+                            matchCard.heading = this._getCardReference(matchCard, sourceTaxonomy);
                             cardData.push(matchCard);
                         }
                     }
@@ -78,7 +82,7 @@ class ParseCardResponse {
                     category: "learning",
                     sub_type: data.type,
                 },
-                heading: data.card_reference,
+                heading: "",
                 displayTitle: displayTitle,
                 content: {
                     front_content: data.card_content.front,
@@ -97,5 +101,33 @@ class ParseCardResponse {
     generateFlashCardDisplayTitle(front, back) {
         return `${front} ---- ${back}`;
     }
+    _getCardReference(generatedCardData, sourceTaxonomy) {
+        var _a, _b, _c, _d;
+        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));
+        if (firstMatchedConcept) {
+            return firstMatchedConcept.reference;
+        }
+        else {
+            return "";
+        }
+    }
 }
 exports.ParseCardResponse = ParseCardResponse;

package/package.json

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

package/src/bootstrap/app.ts

@@ -42,6 +42,7 @@ export class OnlyEverGenerator {
       title: parsedData.title,
       headings: parsedData.headings,
       content: parsedData.content,
+      taxonomy: parsedData.taxonomy,
 
     },
     // parsedData.type == 'cards' ? this.typologyResponse = parsedData.taxonomy :  this.typologyResponse = null;
@@ -70,6 +71,11 @@ export class OnlyEverGenerator {
       } else if (elem == "generate_card") {
         /// for cards gen to occur, there must be presence of source taxonomy
         if(this.shouldTheCardBeGeneratedAfterTypologyResponse()){
+          this.parsedContent.taxonomy = {
+            concepts: this.typologyResponse.concepts,
+            facts: this.typologyResponse.facts,
+            generate_cards: this.typologyResponse.generate_cards,
+          };
           this.cardgenResponse =  await this.generateCard(
             this.promptForCardGen,
             JSON.stringify(this.typologyResponse),
@@ -128,7 +134,7 @@ export class OnlyEverGenerator {
       prompt ?? "",
       JSON.stringify(this.parsedContent) + additionalContent,
       isGapFill,
-      this.parsedContent.headings ?? [],
+      this.parsedContent.taxonomy,
     );
   
     // let response =  await this.openAiService?.sendRequest(prompt,this.parsedContent);

package/src/card_gen/generate_cards.ts

@@ -12,7 +12,7 @@ export class GenerateCards {
     prompt: string,
     parsedContent: string,
     isGapFill: boolean,
-    headings: Array<any>
+    taxonomy: any
   ) {
     let response = await this.openAiService?.sendRequest(prompt, parsedContent);
     // console.log("response to card generation ", response);
@@ -26,7 +26,7 @@ export class GenerateCards {
     };
     if (response.status_code == 200) {
       response.metadata.status = "completed";
-      let parseCard = new ParseCardResponse().parse(response,isGapFill);
+      let parseCard = new ParseCardResponse().parse(response,isGapFill, taxonomy);
       return parseCard;
     } else {
       response.metadata.status = "failed";

package/src/index.ts

@@ -57,7 +57,7 @@ import { OnlyEverGenerator } from "./bootstrap/app";
 //     "res_tokens": cardResp.usage_data?.completion_tokens,
 //     "model": '40-mini'
 // };
-//   let parsedData = new ParseCardResponse().parse(cardResp,false);
+//   let parsedData = new ParseCardResponse().parse(cardResp,false, {});
 //   res.send(parsedData)
 // });
 

package/src/parse/parse_card/parse_cloze_card.ts

@@ -21,7 +21,7 @@ export class ParseClozeCard {
           category: "learning",
           sub_type: data.type,
         },
-        heading: data.card_reference,
+        heading:"",
         displayTitle: displayTitle,
         content: {
           question: finalQuestion,

package/src/parse/parse_card/parse_match_card.ts

@@ -22,7 +22,7 @@ export class ParseMatchCard {
           category: "learning",
           sub_type: cardData.type,
         },
-        heading: cardData.card_content.card_reference,
+        heading:"",
         content: finalContent,
         //  content: cardData.card_content,
         displayTitle: displayTitle,

package/src/parse/parse_card/parse_mcq_card.ts

@@ -24,7 +24,7 @@ export class ParseMcqCard {
           category: "learning",
           sub_type: data.type,
         },
-        heading: data.card_reference,
+        heading: "",
         displayTitle: displayTitle,
         content: {
           question: data.card_content.prompt,

package/src/parse/parse_card_response.ts

@@ -4,7 +4,7 @@ import { ParseMatchCard } from "./parse_card/parse_match_card";
 import { ParseMcqCard } from "./parse_card/parse_mcq_card";
 
 export class ParseCardResponse {
-  parse(generatedData: any, isGapFill: boolean) {
+  parse(generatedData: any, isGapFill: boolean, sourceTaxonomy: any) {
     let usage_data = generatedData.metadata;
     try {
       const cardData = [];
@@ -15,21 +15,25 @@ export class ParseCardResponse {
           if (elem.type == "flash") {
             const flashCard = this.parseFlashCard(elem);
             if (flashCard != null && flashCard) {
+              flashCard.heading = this._getCardReference(flashCard, sourceTaxonomy);
               cardData.push(flashCard);
             }
           } else if (elem.type == "mcq") {
             const mcqCard = new ParseMcqCard().parse(elem);
             if (mcqCard != null && mcqCard) {
+              mcqCard.heading = this._getCardReference(mcqCard, sourceTaxonomy);
               cardData.push(mcqCard);
             }
           } else if (elem.type == "cloze") {
             const clozeCard = new ParseClozeCard().parse(elem);
             if (clozeCard && clozeCard != null) {
+              clozeCard.heading = this._getCardReference(clozeCard, sourceTaxonomy);
               cardData.push(clozeCard);
             }
           } else if (elem.type == "match") {
             const matchCard = new ParseMatchCard().parse(elem);
             if (matchCard && matchCard != null) {
+              matchCard.heading = this._getCardReference(matchCard, sourceTaxonomy);
               cardData.push(matchCard);
             }
           }
@@ -77,7 +81,7 @@ export class ParseCardResponse {
           category: "learning",
           sub_type: data.type,
         },
-        heading: data.card_reference,
+        heading : "",
         displayTitle: displayTitle,
         content: {
           front_content: data.card_content.front,
@@ -97,4 +101,36 @@ export class ParseCardResponse {
   generateFlashCardDisplayTitle(front: string, back: string) {
     return `${front} ---- ${back}`;
   }
+
+  _getCardReference(generatedCardData: any, sourceTaxonomy: any) {
+    const cardConcepts = generatedCardData.concepts ?? [];
+    const cardFacts = generatedCardData.facts ?? [];
+    const combinedCardFactsAndConcepts = [...cardConcepts, ...cardFacts];
+
+    const sourceConcepts = sourceTaxonomy.concepts ?? [];
+    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 compinedConceptsAndFacts = [...mappedSourceConcepts, ...mappedSourceFacts];
+    const firstMatchedConcept =  compinedConceptsAndFacts.find((elem: any) => combinedCardFactsAndConcepts.includes(elem.text));
+
+
+    if(firstMatchedConcept){
+      return firstMatchedConcept.reference;
+    }else{
+      return "";
+    }
+  }
 }