only_ever_generator 1.0.0 → 1.0.2

package/src/index.ts

@@ -1,32 +1,26 @@
-// import express from 'express';
-// import {parseResponse} from './parse_response/response_format_card.js';
-// // import { openAIRequest } from './service/open_ai_request.js';
-// import { returnHeadings, returnSourceData } from './constants/source_data.js';
-// import {returnCardGenPrompt} from './constants/prompts/card_gen_prompt.js';
-// import { returnTypologyPrompt } from './constants/prompts/typology_prompt.js';
-// // import { generateTypology } from './typology_gen/generate_typology.ts';
-// import  {OpenAiService}  from './class/services/open_ai_service.js';
-// import config from './config.js';
-// import { generateTypology } from './typology_gen/generate_typology.js';
-// import { OnlyEverGenerator } from './bootstrap/app.js';
+
+import { ParseSourceContent } from "./class/parse/parse_source_content";
+import { OpenAiService } from "./class/services/open_ai_service";
+import { returnCardGenPrompt } from "./constants/prompts/card_gen_prompt";
+import { returnTypologyPrompt } from "./constants/prompts/typology_prompt";
 // const app = express();
 // const port = 3000;
 // let openAiService = new OpenAiService(config.openAIKey);
 
-import { OpenAiService } from "./class/services/open_ai_service";
 
-// let oeGen =  new OnlyEverGenerator(config.openAIKey)
-// app.get('/', async (req, res)  => {
 
-//     let parsedData = parseResponse()
-//     res.send(parsedData);
+// let oeGen =  new OnlyEverGenerator(config.openAIKey, returnSourceData())
+// app.get('/', async (req, res)  => {
+//     let data = oeGen.returnParsedContent();
+//     // let parsedData = parseResponse()
+//     res.send(data);
 // });
 
 // app.get('/openAI', async (req,res)=> {
 //   // let prompt = returnPromt();
   
 //   let prompt = returnCardGenPrompt();
-//     let content = returnSourceData()
+//     let content = returnSourceData().toString()
 //     let headings = returnHeadings();
 //     // let aiRequest = await openAIRequest(prompt,content);
 //     let aiRequest = await oeGen.generateCard(prompt,content);
@@ -36,8 +30,20 @@ import { OpenAiService } from "./class/services/open_ai_service";
 // app.get('/typology', async(req,res)=>{
 //   { 
 //     let typologyPrompt = returnTypologyPrompt();
-//     let content = returnSourceData();
-//     let typologyRequest = await oeGen.generateTypology(typologyPrompt,content);
+//     let cardPrompt = returnCardGenPrompt();
+//     let args = new GenerateArgs(
+//       true,
+//       true,
+//       false,
+//        {
+//         typology_prompt: typologyPrompt,
+//         card_gen_prompt: cardPrompt,
+//         summary_prompt: "",
+//       }
+//     )
+//     let typologyRequest = await oeGen.generate(
+//       args,
+//     );
 //     res.send(typologyRequest);
   
 //   }
@@ -51,20 +57,123 @@ import { OpenAiService } from "./class/services/open_ai_service";
 
 
 
+
+
+
+
 export class OnlyEverGenerator{
     public api_key: string = '';
     public openAiService: OpenAiService | undefined;
-
-    constructor(apiKey:string){
+    parsedContent: String = '';
+    constructor(apiKey:string, model: String, content: Array<any>){
         this.api_key = apiKey;
-        this.openAiService = new OpenAiService(apiKey);
+        this.openAiService = new OpenAiService(apiKey,model ?? 'gpt-3.5-turbo-1106');
+        this.parsedContent = new ParseSourceContent(content).parse();
     };
 
+    typologyResponse = {};
+    cardgenResponse = {};
+    summarizeResponse = {};
+
+    
+    
+
+    async generate( 
+       generate_card : boolean = false,
+       generate_typology: boolean =false,
+    ): Promise<Array<any>> {
+      let typologyPrompt = returnTypologyPrompt();
+      let cardPrompt = returnCardGenPrompt();
+      let args = new GenerateArgs(
+        generate_card,
+        generate_typology,
+        false,
+        {
+          typology_prompt: typologyPrompt,
+          card_gen_prompt: cardPrompt,
+          summary_prompt: ''
+        },
+        
+      );
+        const responseToReturn = [];
+        const whatNeedsToBeGenerated = args.getWhatNeedsToBeGenerated();
+        for(let elem of whatNeedsToBeGenerated)
+        if(elem == 'generate_tyopology'){
+            this.typologyResponse = await this.generateTypology(args.prompts.typology_prompt ?? '', this.parsedContent);
+            responseToReturn.push(this.typologyResponse);
+        }else if(elem == 'generate_card'){
+
+            this.cardgenResponse =  await this.generateCard(args.prompts.card_gen_prompt ?? '', this.parsedContent +  JSON.stringify(this.typologyResponse));
+            responseToReturn.push(this.cardgenResponse);
+        }else if(elem == 'generate_summary'){
+            this.summarizeResponse = await this.generateSummary(args.prompts.summary_prompt ?? '', this.parsedContent);
+            responseToReturn.push(this.summarizeResponse);
+        }
+
+        return responseToReturn;
+        
+    }
+    
+    _returnParsedContent(){
+        return this.parsedContent;
+    }
+
+
     async generateCard(prompt: String, content: String){
-        return await this.openAiService?.sendRequest(prompt,content);
+        let response =  await this.openAiService?.sendRequest(prompt,this.parsedContent);
+        response['type'] = 'card_gen';
+        return response;
     }
 
     async generateTypology(prompt:String,content:String){
-        return await this.openAiService?.sendRequest(prompt,content);
-    } 
+        let response =  await this.openAiService?.sendRequest(prompt,this.parsedContent);
+        response['type'] = 'typology';
+        return response;
+    }
+
+    async generateSummary(prompt:String,content:String){
+        let response = await this.openAiService?.sendRequest(prompt,this.parsedContent);
+        response['type']= 'summary';
+        return response;
+    }
+    
 }
+
+export class GenerateArgs{
+    public generate_card : boolean = false;
+    public generate_typology: boolean = false;
+    public generate_summary: boolean = false;
+    public prompts = {
+        typology_prompt: '',
+        card_gen_prompt: '',
+        summary_prompt: ''
+    }
+
+    constructor(generate_card: boolean,generate_typology: boolean, generate_summary: boolean, prompts = {
+        typology_prompt: '',
+        card_gen_prompt: '',
+        summary_prompt: ''
+    }){
+        this.generate_card = generate_card;
+        this.generate_typology = generate_typology;
+        this.generate_summary = generate_summary;
+        this.prompts = prompts
+    }
+
+    getWhatNeedsToBeGenerated(){
+        let returnData = [];
+        if(this.generate_typology == true){
+            returnData.push('generate_tyopology')
+        }
+        if(this.generate_summary == true){
+            returnData.push('generate_summary')
+        }
+        if(this.generate_card == true){
+            returnData.push('generate_card');
+        }
+        return returnData;
+        
+        
+    }
+
+}

package/src/service/open_ai_request.ts

@@ -1,9 +1,9 @@
 import axios from "axios";
 import config from "../config.js";
-import { parseOpenAiSuccessResponse } from "../utils/parse_openai_response.js";
+import { parseOpenAiFailureResponse, parseOpenAiSuccessResponse } from "../utils/parse_openai_response.js";
 
 
-export async function openAIRequest(content:String,prompt:String,token:String){
+export async function openAIRequest(content:String,prompt:String,token:String,model: String){
     try{
     let message = [
         {
@@ -17,7 +17,7 @@ export async function openAIRequest(content:String,prompt:String,token:String){
         url,
         //data
         { 
-            "model": "gpt-3.5-turbo-1106",
+            "model": model,
             "messages": message,
             "response_format": {"type": "json_object"},
         },
@@ -40,8 +40,7 @@ export async function openAIRequest(content:String,prompt:String,token:String){
     }else{
         console.log('failed');
         return response.statusText as any;
-    }}catch (err) {
-        console.log(err)
-        throw err;
+    }}catch (err:any) {
+        return parseOpenAiFailureResponse(err.response);
     }
 }

package/src/utils/parse_openai_response.ts

@@ -3,8 +3,19 @@ export function parseOpenAiSuccessResponse(responseData: any){
     let usuage = responseData.usage;
     let createdTime = responseData.created;
     return {
+        'status_code': 200,
         'usage_data': usuage,
         'generated_content':choices,
         'generated_at': createdTime
+    }
+}
+
+export function parseOpenAiFailureResponse(errorResponse: any){
+    let usuage = errorResponse.usuage;
+    // let statusCode = 
+    return {
+        'status_code': errorResponse.status,
+
+
     }
 }