improve

Author: uriva

src/index.test.ts

@@ -11,7 +11,7 @@ Deno.test("basic", async () => {
       [4, false],
     ],
   });
-  await waitAllWrites()
+  await waitAllWrites();
   assertEquals([53, 44].map(f), [true, false]);
 });
 
@@ -22,10 +22,11 @@ Deno.test("complex", async () => {
       ["building", false],
       ["is", true],
       ["growth", false],
+      ["that", true],
     ],
   });
-  await waitAllWrites()
-  assertEquals(["that", "tree"].map(f), [true, false]);
+  await waitAllWrites();
+  assertEquals(["this", "tree"].map(f), [true, false]);
 });
 
 Deno.test("composite output / input", async () => {
@@ -46,7 +47,7 @@ Deno.test("composite output / input", async () => {
       ],
     ],
   });
-  await waitAllWrites()
+  await waitAllWrites();
   assertEquals(
     f([
       { name: "john", age: 99 },

src/index.ts

@@ -1,24 +1,19 @@
-import {
-  ChatCompletion,
-  ChatCompletionOptions,
-  OpenAI,
-} from "https://deno.land/x/openai@1.4.2/mod.ts";
-
+import { OpenAI } from "npm:openai@4.17.5";
 import { cache } from "https://deno.land/x/rmmbr@0.0.19/client/src/index.ts";
 import { equal } from "https://deno.land/std@0.174.0/testing/asserts.ts";
 import { isPureFunction } from "./purity.ts";
 
-const openai = new OpenAI(Deno.env.get("openai_key")!);
+const openai = new OpenAI({ apiKey: Deno.env.get("openai_key")! });
 
 const cachedOpenAI = cache({ cacheId: "createChatCompletion" })(
-  (x: ChatCompletionOptions) => openai.createChatCompletion(x),
+  (x) => openai.chat.completions.create(x),
 );
 
 const doPrompt = (prompt: string) =>
   cachedOpenAI({
     model: "gpt-4",
     messages: [{ role: "user", content: prompt }],
-  }).then(({ choices }: ChatCompletion) => choices[0].message?.content || "");
+  }).then(({ choices }) => choices[0].message?.content || "");
 
 const maxPromptLength = 2400;
 
@@ -30,11 +25,13 @@ const testCaseToString = <Input, Output>([input, output]: TestCase<
 output: ${JSON.stringify(output)}`;
 
 const prefix = `Write a javascript function as dscribed below.
+
 It must be called \`f\`, it must be unary and the variable should be called \`x\`.
+
 No side effects or dependencies are allowed, so no \`console.log\` for example.
 Your answer must start with \`function f(x){\` and must end with \`}\`, bceause it's a single function.
 
-Your answer must be code that compiles only, no other text is allowed. No need to list the test cases.
+Your answer must javascript code that compiles, no other text is allowed. No need to list the test cases.
 
 Please make the code as concise and as readable as you can, no repetitions.
 After the description there are test cases, go over each one and make sure your code works for them.
@@ -93,11 +90,18 @@ type Options<Input, Output> = {
   testCases: TestCase<Input, Output>[];
 };
 
+const cleanSurroundingQuotes = (code: string) =>
+  code.trim().startsWith("```")
+    ? code.trim().replace(/^```javascript/, "").replace(/```$/, "")
+    : code;
+
 export const makeFunction = async <Input, Output>({
   description,
   testCases,
 }: Options<Input, Output>): Promise<(input: Input) => Output> => {
-  const code = await doPrompt(getPrompt(description, testCases));
+  const code = cleanSurroundingQuotes(
+    await doPrompt(getPrompt(description, testCases)),
+  );
   if (!isPureFunction(code)) throw new Error(`impure code detected: ${code}`);
   const f = Function("x", code.slice(14, code.length - 1)) as (
     input: Input,