only_ever_generator 0.5.4 → 0.5.6

package/src/typology_gen/generate_typology.ts

@@ -2,74 +2,82 @@ import { OpenAiService } from "../services/open_ai_service";
 import { returnTypologyData } from "../parse/response_format_typology";
 import { ErrorLogger } from "../logger";
 
-export class GenerateTypology{
-    public openAiService: OpenAiService;
-    public prompt:string = '';
-    public content:string = '';
-    expectedFields: Array<string>;
-    constructor(openAiService: OpenAiService, prompt:string,content:string,expected_fields: Array<string>){
-        this.openAiService = openAiService;
-        this.prompt = prompt;
-        this.content = content;
-        this.expectedFields = expected_fields.map((elem:string)=>elem.toLowerCase());
-    }
-    async generate(){
-      try{
-      const response =  await this.openAiService?.sendRequest(this.prompt,this.content);
-      response['type'] = 'typology';
+export class GenerateTypology {
+  public openAiService: OpenAiService;
+  public prompt: string = "";
+  public content: string = "";
+  expectedFields: Array<string>;
+  constructor(
+    openAiService: OpenAiService,
+    prompt: string,
+    content: string,
+    expected_fields: Array<string>
+  ) {
+    this.openAiService = openAiService;
+    this.prompt = prompt;
+    this.content = content;
+    this.expectedFields = expected_fields.map((elem: string) =>
+      elem.toLowerCase()
+    );
+  }
+  async generate() {
+    try {
+      const response = await this.openAiService?.sendRequest(
+        this.prompt,
+        this.content
+      );
+      response["type"] = "typology";
       response.metadata = {
-        "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,
-        "model": this.openAiService.model
-    };
-      if(response.status_code == 200){
+        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,
+        prompt_tokens_details: response.usage_data?.prompt_tokens_details,
+        model: this.openAiService.model,
+      };
+      if (response.status_code == 200) {
         return this.parseTypologyOnSuccess(response);
       } else {
         response.metadata.err_message = response.message;
         return response;
-      }} catch (e: any){
-        await new ErrorLogger({
-          "type": 'typology_parsing',
-          "data": e.message
-         }).log();
       }
+    } catch (e: any) {
+      await new ErrorLogger({
+        type: "typology_parsing",
+        data: e.message,
+      }).log();
     }
+  }
 
+  parseTypologyOnSuccess(responseData: any) {
+    responseData.metadata.status = "completed";
+    const generatedContent = responseData.generated_content;
+    return {
+      status_code: 200,
+      metadata: responseData.metadata,
+      field: this.parseFields(generatedContent.field),
+      concepts: generatedContent.concepts,
+      facts: generatedContent.facts,
+      generate_cards: generatedContent.generate_cards,
+      summary_cards: generatedContent.summary_cards,
+      type: responseData.type,
+    };
+  }
 
-    parseTypologyOnSuccess(responseData : any){
-        responseData.metadata.status = "completed";
-        const generatedContent = responseData.generated_content;
-        return {
-            status_code: 200,
-            metadata: responseData.metadata,
-            field: this.parseFields(generatedContent.field),
-            concepts: generatedContent.concepts,
-            facts: generatedContent.facts,
-            generate_cards : generatedContent.generate_cards,
-            summary_cards: generatedContent.summary_cards,
-            type: responseData.type
-        }
-    }
-
-    parseFields(fields: Array<string>){
-      const fieldKeys = ['primary_field', 'secondary_field', 'tertiary_field'];
-      return fields.slice(0,3).map((item,index)=> (
-        {
-          [fieldKeys[index]]: item,
-          "reconcile" : !(this.expectedFields.includes(item.toLowerCase()))
-        }
-      ));
-    }
-
-    async parseTypologyOnFailure(responseData:any){
-        responseData.metadata.status = 'failed';
+  parseFields(fields: Array<string>) {
+    const fieldKeys = ["primary_field", "secondary_field", "tertiary_field"];
+    return fields.slice(0, 3).map((item, index) => ({
+      [fieldKeys[index]]: item,
+      reconcile: !this.expectedFields.includes(item.toLowerCase()),
+    }));
+  }
 
-        return {
-            status_code: responseData.status_code,
-            metadata: responseData.metadata,
-        }
-    }
+  async parseTypologyOnFailure(responseData: any) {
+    responseData.metadata.status = "failed";
 
-}
+    return {
+      status_code: responseData.status_code,
+      metadata: responseData.metadata,
+    };
+  }
+}

package/src/utils/generate_args.ts

@@ -1,27 +1,29 @@
-export class GenerateArgs{
-    public generate_card : boolean = false;
-    public generate_typology: boolean = false;
-    public generate_summary: boolean = false;
+export class GenerateArgs {
+  public generate_card: boolean = false;
+  public generate_typology: boolean = false;
+  public generate_summary: boolean = false;
 
-    constructor(generate_card: boolean,generate_typology: boolean, generate_summary: boolean, ){
-        this.generate_card = generate_card;
-        this.generate_typology = generate_typology;
-        this.generate_summary = generate_summary;
+  constructor(
+    generate_card: boolean,
+    generate_typology: boolean,
+    generate_summary: boolean
+  ) {
+    this.generate_card = generate_card;
+    this.generate_typology = generate_typology;
+    this.generate_summary = generate_summary;
+  }
 
+  getWhatNeedsToBeGenerated() {
+    let returnData = [];
+    if (this.generate_typology == true) {
+      returnData.push("generate_tyopology");
     }
-
-    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;    
+    if (this.generate_summary == true) {
+      returnData.push("generate_summary");
     }
-
-}
+    if (this.generate_card == true) {
+      returnData.push("generate_card");
+    }
+    return returnData;
+  }
+}

package/src/utils/parse_openai_response.ts

@@ -1,21 +1,19 @@
-export function parseOpenAiSuccessResponse(responseData: any){
-    let choices =  JSON.parse(responseData.choices[0].message.content);
-    let usuage = responseData.usage;
-    let createdTime = responseData.created;
-    return {
-        'status_code': 200,
-        'usage_data': usuage,
-        'generated_content':choices,
-        'generated_at': new Date(createdTime *1000)
-    }
+export function parseOpenAiSuccessResponse(responseData: any) {
+  let choices = JSON.parse(responseData.choices[0].message.content);
+  let usuage = responseData.usage;
+  let createdTime = responseData.created;
+  return {
+    status_code: 200,
+    usage_data: usuage,
+    generated_content: choices,
+    generated_at: new Date(createdTime * 1000),
+  };
 }
 
-export function parseOpenAiFailureResponse(errorResponse: any){
-    // let statusCode = 
-    return {
-        'status_code': errorResponse.status,
-        'message': errorResponse.data?.error?.code
-
-
-    }
-}
+export function parseOpenAiFailureResponse(errorResponse: any) {
+  // let statusCode =
+  return {
+    status_code: errorResponse.status,
+    message: errorResponse.data?.error?.code,
+  };
+}