Handle triple quotes in invalid json responses returned by the model

src/services/ExtractOperationsService.js

@@ -0,0 +1,36 @@
+export class ExtractOperationsService {
+  static call(input) {
+    try {
+      const parsedJSON = JSON.parse(input);
+      return parsedJSON;
+    } catch (error) {
+      return this.tryAgain(input)
+    }
+  }
+
+  static tryAgain(input) {
+    try {
+      // Replace triple double quotes with single double quotes
+      const correctedString = input.replace(/"{3}|'{3}/g, "\"")
+      return JSON.parse(correctedString)
+    } catch (error) {
+      const jsonRegex = /({.*}|\[.*\])/s; // Regular expression to match a JSON object or array
+      const match = input.match(jsonRegex);
+      if (match && match[1]) {
+        console.log('Attemping to extract json:')
+        console.log(match[1])
+        try {
+          const parsed = JSON.parse(match[1]);
+          return parsed;
+        } catch (error) {
+          console.log(error)
+          return null
+        }
+      } else {
+        console.log("There was an error parsing the model's output:")
+        console.log(input)
+        return null
+      }
+    }
+  }
+}

src/services/PromptrService.js

@@ -7,7 +7,7 @@ import RefactorResultProcessor from './RefactorResultProcessor.js'
 import TemplateLoader from './TemplateLoader.js'
 import PromptContext from './PromptContext.js'
 import AutoContext from './AutoContext.js'
-import { extractOperationsFromOutput } from './ExtractOperationsFromOutput.js'
+import { ExtractOperationsService } from './ExtractOperationsService.js'
 
 export default class PromptrService {
 
@@ -54,7 +54,7 @@ export default class PromptrService {
 
     if (this.shouldRefactor(CliState.getTemplatePath())) {
       if (verbose) console.log(`Executing:\n${output}`)
-      const operations = extractOperationsFromOutput(output)
+      const operations = ExtractOperationsService.call(output)
       if (CliState.isDryRun()) {
         console.log(operations)
         return 0
@@ -90,4 +90,4 @@ export default class PromptrService {
     if (CliState.getExecuteFlag()) return true
     return templatePath === "refactor" || !templatePath 
   }
-}
+}

test/ExtractOperationsService.test.js

@@ -0,0 +1,70 @@
+import assert from 'assert'
+import { ExtractOperationsService } from '../src/services/ExtractOperationsService.js'
+
+describe('ExtractOperationsService', () => {
+  describe('call method', () => {
+    const testCases = [
+      {
+        input: '{"key": "value"}',
+        expectedOutput: { key: 'value' },
+        description: 'Simple JSON object'
+      },
+      {
+        input: 'random text {"key": "value"} more text',
+        expectedOutput: { key: 'value' },
+        description: 'JSON object with surrounding text'
+      },
+      {
+        input: '[{"key": "value1"}, {"key": "value2"}]',
+        expectedOutput: [{ key: 'value1' }, { key: 'value2' }],
+        description: 'Simple JSON array'
+      },
+      {
+        input: 'random text [{"key": "value1"}, {"key": "value2"}] more text',
+        expectedOutput: [{ key: 'value1' }, { key: 'value2' }],
+        description: 'JSON array with surrounding text'
+      },
+      {
+        input: 'this is not a JSON object or array',
+        expectedOutput: null,
+        description: 'No JSON object or array in the input string'
+      },
+      {
+        input: '{"key": "value" broken JSON',
+        expectedOutput: null,
+        description: 'Invalid JSON object'
+      }
+    ]
+
+    testCases.forEach((testCase) => {
+      it(testCase.description, () => {
+        const result = ExtractOperationsService.call(testCase.input)
+        assert.deepStrictEqual(result, testCase.expectedOutput)
+      })
+    })
+
+    it('corrects the tripple quote fileContents delimeter issue', () => {
+      const invalidJson = `{
+        "operations": [
+            {
+                "crudOperation": "update",
+                "filePath": "my-script.py",
+                "fileContents": """file content"""
+            }
+        ]
+    }
+    `
+      const expectedOutput = {
+        "operations": [
+          {
+            "crudOperation": "update",
+            "filePath": "my-script.py",
+            "fileContents": "file content"
+          }
+        ]
+      }
+      const result = ExtractOperationsService.call(invalidJson)
+      assert.deepStrictEqual(result, expectedOutput)
+    })
+  })
+})

test/OpenAiGptService.test.js

@@ -35,21 +35,23 @@ describe('OpenAiGptService', () => {
     sinon.assert.calledOnce(openaiStub);
   });
 
-  it('should return null when the response does not contain choices', async () => {
-    const prompt = 'What is the capital of France?';
-    const model = 'gpt-4';
-
-    const configStub = sinon.stub(ConfigService, 'retrieveConfig').resolves({ api: { temperature: 0.5 } });
-    const openaiStub = sinon.stub(OpenAIApi.prototype, 'createChatCompletion').resolves({
-      data: {}
-    });
-
-    const result = await OpenAiGptService.call(prompt, model);
-
-    assert.strictEqual(result, null);
-    sinon.assert.calledOnce(configStub);
-    sinon.assert.calledOnce(openaiStub);
-  });
+  describe('edge cases around OpenAI API responses', () => {
+    it('should return null when the response does not contain choices', async () => {
+      const prompt = 'What is the capital of France?';
+      const model = 'gpt-4';
+
+      const configStub = sinon.stub(ConfigService, 'retrieveConfig').resolves({ api: { temperature: 0.5 } });
+      const openaiStub = sinon.stub(OpenAIApi.prototype, 'createChatCompletion').resolves({
+        data: {}
+      });
+
+      const result = await OpenAiGptService.call(prompt, model);
+
+      assert.strictEqual(result, null);
+      sinon.assert.calledOnce(configStub);
+      sinon.assert.calledOnce(openaiStub);
+    })
+  })
 
   it('should append system messages in the call to openai.createChatCompletion when requestJsonOutput is true', async () => {
     const prompt = 'What is the capital of France?';