only_ever_generator 0.3.7 → 0.3.9

package/dist/gap_fill/calculate_gap_fill.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gapFilling = void 0;
+exports.gapFilling = gapFilling;
 function isEmpty(obj) {
     return Object.keys(obj).length === 0;
 }
@@ -35,8 +35,11 @@ function gapFilling(typologyResponse, cardgenResponse) {
         remainingFacts = allFacts.filter((item) => !generatedFactsSet.includes(item));
     }
     return {
+        //   allConcepts: allConcepts,
+        //   allFacts: allFacts,
+        //   generatedConcepts: generatedConceptsSet,
+        //   generatedFacts: generatedFactsSet,
         remainingConcepts: remainingConcepts,
         remainingFacts: remainingFacts,
     };
 }
-exports.gapFilling = gapFilling;

package/dist/parse/response_format_card.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseResponse = exports.returnResponse = void 0;
+exports.returnResponse = returnResponse;
+exports.parseResponse = parseResponse;
 const responseData = {
     "flash_cards": [
         {
@@ -142,7 +143,6 @@ const responseData = {
 function returnResponse() {
     return responseData;
 }
-exports.returnResponse = returnResponse;
 function parseResponse() {
     let cardData = [];
     let data = returnResponse();
@@ -162,7 +162,6 @@ function parseResponse() {
     }
     return cardData;
 }
-exports.parseResponse = parseResponse;
 /// takes array of 
 function parseFlashCard(cards) {
     let flashCardData = [];

package/dist/parse/response_format_typology.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.returnTypologyData = void 0;
+exports.returnTypologyData = returnTypologyData;
 const typologyResponse = {
     "usage_data": {
         "prompt_tokens": 11611,
@@ -44,4 +44,3 @@ const typologyResponse = {
 function returnTypologyData() {
     return typologyResponse;
 }
-exports.returnTypologyData = returnTypologyData;

package/dist/typology_gen/generate_typology.js

@@ -22,15 +22,16 @@ class GenerateTypology {
     }
     generate() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             try {
                 const response = yield ((_a = this.openAiService) === null || _a === void 0 ? void 0 : _a.sendRequest(this.prompt, this.content));
                 response['type'] = 'typology';
                 response.metadata = {
-                    "req_time": response.generated_at,
+                    "req_time": (_b = response.generated_at) !== null && _b !== void 0 ? _b : new Date(),
                     "req_type": response.type,
-                    "req_tokens": (_b = response.usage_data) === null || _b === void 0 ? void 0 : _b.prompt_tokens,
-                    "res_tokens": (_c = response.usage_data) === null || _c === void 0 ? void 0 : _c.completion_tokens,
+                    "req_tokens": (_c = response.usage_data) === null || _c === void 0 ? void 0 : _c.prompt_tokens,
+                    "res_tokens": (_d = response.usage_data) === null || _d === void 0 ? void 0 : _d.completion_tokens,
+                    "model": this.openAiService.model
                 };
                 if (response.status_code == 200) {
                     return this.parseTypologyOnSuccess(response);

package/dist/utils/parse_openai_response.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseOpenAiFailureResponse = exports.parseOpenAiSuccessResponse = void 0;
+exports.parseOpenAiSuccessResponse = parseOpenAiSuccessResponse;
+exports.parseOpenAiFailureResponse = parseOpenAiFailureResponse;
 function parseOpenAiSuccessResponse(responseData) {
     let choices = JSON.parse(responseData.choices[0].message.content);
     let usuage = responseData.usage;
@@ -12,14 +13,11 @@ function parseOpenAiSuccessResponse(responseData) {
         'generated_at': new Date(createdTime * 1000)
     };
 }
-exports.parseOpenAiSuccessResponse = parseOpenAiSuccessResponse;
 function parseOpenAiFailureResponse(errorResponse) {
     var _a, _b;
-    let usuage = errorResponse.usuage;
     // let statusCode = 
     return {
         'status_code': errorResponse.status,
         'message': (_b = (_a = errorResponse.data) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.code
     };
 }
-exports.parseOpenAiFailureResponse = parseOpenAiFailureResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "only_ever_generator",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "main": "dist/index.js",
   "scripts": {
     "start": "npm run build && nodemon dist/index.js",
@@ -13,16 +13,16 @@
   "devDependencies": {
     "@types/express": "^4.17.21",
     "@types/node": "^20.14.2",
+    "dotenv": "^16.4.5",
+    "express": "^4.19.2",
     "nodemon": "^3.1.3",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5",
-    "dotenv": "^16.4.5",
-    "express": "^4.19.2"
+    "typescript": "^5.5.4"
   },
   "dependencies": {
-    "axios": "^1.7.2"
- 
-
+    "axios": "^1.7.7",
+    "n": "^10.0.0",
+    "stable": "^0.1.8"
   },
   "eslintConfig": {
     "parser": "typescript-eslint-parser",

package/readme.md

@@ -20,4 +20,16 @@ let oeGenerator = new OnlyEverGenerator(
 let responsesArray = await oeGenerator.generate(true,true);
 
 
+Exposed a new method ```gapFill``` from OnlyEverGenerator
+
+
+  async gapFill(factsMaps: any, aiCards: Array<any>) {}
+    /// factsmap 
+    /// {
+    /// remaining_facts: [],
+     /// remaining_concepts: [],
+    //}
+
+    /// aicards is array of ai cards
+
 ```

package/src/bootstrap/app.ts

@@ -72,17 +72,14 @@ export class OnlyEverGenerator {
         if(this.shouldTheCardBeGeneratedAfterTypologyResponse()){
           this.cardgenResponse =  await this.generateCard(
             this.promptForCardGen,
-            "Here are the facts and concepts on which cards needs to be generate, refrain from generating missing facts , concepts similar to available below : " +JSON.stringify({
-              "facts": this.typologyResponse.facts,
-              "concepts": this.typologyResponse.concepts
-            }),
+            JSON.stringify(this.typologyResponse),
             false,
           )
           responseToReturn.push(this.cardgenResponse);
 
           /// check if gap fill is required ie coverage determination 
           if(this.cardgenResponse.status_code == 200) {
-            this.gapFillResponse = await this.generationForGapFill(this.typologyResponse, this.cardgenResponse);
+            this.gapFillResponse = await this._generationForGapFill(this.typologyResponse, this.cardgenResponse);
             responseToReturn.push(this.gapFillResponse);
           }
 
@@ -102,7 +99,7 @@ export class OnlyEverGenerator {
 
   }
 
-  async generationForGapFill(typologyData: any, cardGenData: any) {
+  async _generationForGapFill(typologyData: any, cardGenData: any) {
       let gapFill = gapFilling(typologyData, cardGenData);
       let response :any ;
       if (
@@ -110,10 +107,11 @@ export class OnlyEverGenerator {
         gapFill.remainingFacts.length !== 0
       ) {
         response = await this.generateCard(
-         this.promptForCardGen ,
-           
-         "Only Generate Cards For the missing concepts and facts given below  \n" +
-         JSON.stringify(gapFill)  + "\n The cards already generated are below, refrain for generating cards similar to these "+ JSON.stringify(cardGenData.cards_data),
+         this.promptForCardGen +
+            "Generate cards only suitable for the given remaining concepts and facts" +
+            JSON.stringify(gapFill) +
+            "Exclude generating  cards with content in the following",
+            JSON.stringify(cardGenData.cards_data),
           true
         );
       }
@@ -147,6 +145,29 @@ export class OnlyEverGenerator {
     return response;
   }
 
+  async gapFill(factsMaps: any, aiCards: Array<any>) {
+    /// factsmap 
+    /// {
+    /// remaining_facts: [],
+     /// remaining_concepts: [],
+    //}
+
+    /// aicards is data
+    let response :any ;
+
+      response = await this.generateCard(
+       this.promptForCardGen +
+          "Generate cards only suitable for the given remaining concepts and facts" +
+          JSON.stringify(factsMaps) +
+          "Exclude generating  cards with content in the following",
+          JSON.stringify(aiCards),
+        true
+      );
+    
+    return response;
+  
+}
+
   
 
 }

package/src/card_gen/generate_cards.ts

@@ -12,11 +12,11 @@ export class GenerateCards {
    // console.log("response to card generation ", response);
     response["type"] = isGapFill ? "gap_fill":"card_gen";
        response.metadata = {
-        "req_time": response.generated_at,
+        "req_time": response.generated_at ?? new Date(),
         "req_type": response.type,
         "req_tokens": response.usage_data?.prompt_tokens,
         "res_tokens": response.usage_data?.completion_tokens,
-       // "created_at":response.created_at,
+        "model": this.openAiService.model
     };
       if(response.status_code == 200){
         response.metadata.status = "completed";
@@ -165,7 +165,7 @@ return question;
 
   parseClozeCard(data: any) {
     let displayTitle = this.generateClozeCardDisplayTitle(
-      data.card_content.text,
+      data.card_content.prompt,
       data.card_content.options
     );
     let clozeCardData = {
@@ -176,7 +176,7 @@ return question;
       heading: data.card_reference,
       displayTitle: displayTitle,
       content: {
-        question: data.card_content.text,
+        question: data.card_content.prompt,
         options: data.card_content.options,
       },
       concepts: data.concepts,