Update openai.yaml

openai.yaml

@@ -1,9 +1,10 @@
 _id: openai
+title: Open AI
 description: Includes Chat GPT
+version: 1
 readme: The first base version
-title: Open AI
 url: https://huggingface.co/PiperMy/Node-Packages/resolve/main/openai.yaml
-version: 1
+author: Anton Breslavskii | https://github.com/breslavsky
 nodes:
   ask_chat_gpt:
     _id: ask_chat_gpt
@@ -34,6 +35,16 @@ nodes:
         enum:
           - gpt-4o-mini|4o mini
           - gpt-4o|4o
+      answerFormat:
+        order: 3
+        title: en=Answer format;ru=Формат ответа
+        description: Don't forget add instructions for LLM
+        type: string
+        required: true
+        default: text
+        enum:
+          - text|Text
+          - json|JSON
     outputs:
       answer:
         title: en=Answer;ru=Ответ
@@ -43,15 +54,18 @@ nodes:
         type: json
     package: openai
     script: |
-      const OpenAI = require('openai');
+      export async function run({ inputs }) {
 
-      const OPEN_API_KEY = env?.variables?.get('OPEN_API_KEY');
-      if(!OPEN_API_KEY) {
-          error.fatal('Please, set your API key for Open AI');
-      }
+          const { FatalError, NextNode } = DEFINITIONS;
+
+          const OpenAI = require('openai');
+
+          const OPEN_API_KEY = env?.variables?.get('OPEN_API_KEY');
+          if (!OPEN_API_KEY) {
+              throw new FatalError('Please, set your API key for Open AI');
+          }
 
-      (async () => {
-         const { model, question } = inputs;
+          const { question, model, answerFormat } = inputs;
 
           const openai = new OpenAI({
               apiKey: OPEN_API_KEY,
@@ -61,22 +75,28 @@ nodes:
               model: model,
               store: true,
               messages: [
-                  {"role": "user", "content": question},
+                  { "role": "user", "content": question },
               ],
           });
 
           const { content: answer } = result.choices[0].message;
 
-          try {
-              const json = answer.replace(/^\`\`\`json\s*/ig, '').replace(/\`\`\`\s*$/ig, '');
-              return next({outputs: { json: JSON.parse(json) }});
-          } catch(e) {
-              log(e);
-              // plain text
+          switch (answerFormat) {
+              case 'text':
+                  return next({ outputs: { answer } });
+              case 'json':
+                  try {
+                      const json = answer.replace(/^\`\`\`json\s*/ig, '').replace(/\`\`\`\s*$/ig, '');
+                      return NextNode.from({ outputs: { json: JSON.parse(json) } });
+                  } catch (e) {
+                      console.log(e);
+                      message(`Wrong JSON for question \`\`\`text\n${question}\n\`\`\`\nnanswer from LLM\n\`\`\`text${answer}\n\`\`\``, 'defect');
+                      throw new FatalError("Can't parse JSON asnwer from LLM");
+                  }
+              default:
+                  throw new FatalError(`Wrong answer format ${answerFormat}`);
           }
-
-          return next({outputs: { answer }});
-      })();
+      }
     source: catalog
     title: en=Ask Chat GPT;ru=Спросить Chat GPT
     version: 1