only_ever_generator 0.0.7 → 0.0.8

package/src/typology_gen/generate_typology.ts

@@ -1,14 +1,16 @@
-import { OpenAiService } from "../class/services/open_ai_service";
-import { returnTypologyData } from "../parse_response/response_format_typology";
+import { OpenAiService } from "../services/open_ai_service";
+import { returnTypologyData } from "../parse/response_format_typology";
 
 export class GenerateTypology{
     public openAiService: OpenAiService;
     public prompt:string = '';
     public content:string = '';
-    constructor(openAiService: OpenAiService, prompt:string,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(){
       const response =  await this.openAiService?.sendRequest(this.prompt,this.content);
@@ -16,8 +18,8 @@ export class GenerateTypology{
       response.metadata = {
         "req_time": response.generated_at,
         "req_type": response.type,
-        "req_tokens": response.usage_data.prompt_tokens,
-        "res_tokens": response.usage_data.completion_tokens,
+        "req_tokens": response.usage_data?.prompt_tokens,
+        "res_tokens": response.usage_data?.completion_tokens,
     };
       if(response.status_code == 200){
         return this.parseTypologyOnSuccess(response);
@@ -33,15 +35,25 @@ export class GenerateTypology{
         return {
             status_code: 200,
             metadata: responseData.metadata,
-            field: generatedContent.field,
+            field: this.parseFields(generatedContent.field),
             concepts: generatedContent.concepts,
             facts: generatedContent.facts,
             generate_cards : generatedContent.generate_cards,
             summary_cards: generatedContent.summary_cards,
-            type: responseData.type,
+            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';
         return {

package/src/class/services/open_ai_service.ts

@@ -1,18 +0,0 @@
-import { openAIRequest } from "../../service/open_ai_request";
-
-
-export class OpenAiService{
-    public api_key: string;
-    public model: string;
-    
-
-    constructor(apiKey: string, model:string){
-        this.api_key = apiKey;
-        this.model =model
-    }
-
-    async sendRequest(prompt: string,content: string){
-        return await openAIRequest(content,prompt,this.api_key,this.model);
-    } 
-}
-

package/src/service/open_ai_request.ts

@@ -1,46 +0,0 @@
-import axios from "axios";
-import config from "../config.js";
-import { parseOpenAiFailureResponse, parseOpenAiSuccessResponse } from "../utils/parse_openai_response.js";
-
-
-export async function openAIRequest(content:String,prompt:String,token:String,model: String){
-    try{
-    let message = [
-        {
-            "role": "system", "content": prompt
-        },{
-            "role": "user", "content": content
-        }
-    ];
-    const url = 'https://api.openai.com/v1/chat/completions';
-    let response = await axios.post(
-        url,
-        //data
-        { 
-            "model": model,
-            "messages": message,
-            "response_format": {"type": "json_object"},
-        },
-        ///config
-        {
-            headers : {
-                Authorization : "Bearer "+ token,
-                "Content-Type" : ['application/json']
-            },
-            
-        }
-
-    );
-
-    if(response.status == 200){
-        console.log('success');
-        return parseOpenAiSuccessResponse(response.data) as any
-        // return JSON.parse(response.data.choices[0].message.content);
-
-    }else{
-        console.log('failed');
-        return response.statusText as any;
-    }}catch (err:any) {
-        return parseOpenAiFailureResponse(err.response);
-    }
-}