@codeyam/codeyam-cli 0.1.0-staging.323686 → 0.1.0-staging.4057bd2

package/analyzer-template/packages/ai/src/lib/completionCall.ts

@@ -36,7 +36,6 @@ interface CompletionCallProps {
 const queue = new PQueue({
   concurrency: 100,
   timeout: 20 * 60 * 1000, // 20 minutes
-  throwOnTimeout: true,
   autoStart: true,
 });
 
@@ -135,62 +134,63 @@ export default async function completionCall({
   };
   const params = lib.openai.chatRequestToOpenAIChatParams(chatRequest);
 
-  const chatCompletion = await queue.add(
-    () => {
-      queueEndTime = Date.now();
-      return PRetry(
-        async () => {
-          const callStartTime = Date.now();
-          const waitingMessages = [
-            'Waiting for LLM response',
-            'Still waiting for LLM response',
-            'LLM call in progress',
-            'Processing LLM request',
-            'Awaiting LLM completion',
-          ];
-
-          const logInterval = setInterval(() => {
-            const elapsedSeconds = Math.floor(
-              (Date.now() - callStartTime) / 1000,
-            );
-            const messageIndex =
-              Math.floor(elapsedSeconds / 10) % waitingMessages.length;
-            awsLogDebugLevel(
-              1,
-              `${waitingMessages[messageIndex]} [type=${type}, model=${model}, elapsed=${elapsedSeconds}s]`,
-            );
-          }, 10000);
+  const chatCompletionResult = await queue.add(() => {
+    queueEndTime = Date.now();
+    return PRetry(
+      async () => {
+        const callStartTime = Date.now();
+        const waitingMessages = [
+          'Waiting for LLM response',
+          'Still waiting for LLM response',
+          'LLM call in progress',
+          'Processing LLM request',
+          'Awaiting LLM completion',
+        ];
+
+        const logInterval = setInterval(() => {
+          const elapsedSeconds = Math.floor(
+            (Date.now() - callStartTime) / 1000,
+          );
+          const messageIndex =
+            Math.floor(elapsedSeconds / 10) % waitingMessages.length;
+          awsLogDebugLevel(
+            1,
+            `${waitingMessages[messageIndex]} [type=${type}, model=${model}, elapsed=${elapsedSeconds}s]`,
+          );
+        }, 10000);
 
-          try {
-            return await openai.chat.completions.create(params, {
-              timeout: 5 * 60 * 1000, // 5 minute timeout
-            });
-          } finally {
-            clearInterval(logInterval);
-          }
-        },
-        {
-          ...defaultRetryOptions,
-          onFailedAttempt: (error) => {
-            retryCount++;
-            console.log(
-              `CodeYam Error: Completion call failed [model=${model}]`,
-              {
-                error,
-                prompt,
-                systemMessage,
-                attempts,
-                retryCount,
-              },
-            );
-          },
+        try {
+          return await openai.chat.completions.create(params, {
+            timeout: 5 * 60 * 1000, // 5 minute timeout
+          });
+        } finally {
+          clearInterval(logInterval);
+        }
+      },
+      {
+        ...defaultRetryOptions,
+        onFailedAttempt: (error) => {
+          retryCount++;
+          console.log(
+            `CodeYam Error: Completion call failed [model=${model}]`,
+            {
+              error,
+              prompt,
+              systemMessage,
+              attempts,
+              retryCount,
+            },
+          );
         },
-      );
-    },
-    {
-      throwOnTimeout: true,
-    },
-  );
+      },
+    );
+  });
+
+  if (!chatCompletionResult) {
+    throw new Error('Completion call returned no result');
+  }
+
+  const chatCompletion = chatCompletionResult;
   const endTime = Date.now();
 
   const llmCallStats = getLLMCallStats({
@@ -310,65 +310,66 @@ ${completion}
 
 Please provide a corrected version with valid JSON only. Do not include any explanatory text, just the valid JSON object.`;
 
-        const correctionChatCompletion = await queue.add(
-          () => {
-            return PRetry(
-              async () => {
-                const correctionStartTime = Date.now();
-                const waitingMessages = [
-                  'Waiting for LLM correction response',
-                  'Still waiting for LLM correction',
-                  'LLM correction in progress',
-                  'Processing LLM correction request',
-                  'Awaiting LLM correction completion',
-                ];
-
-                const logInterval = setInterval(() => {
-                  const elapsedSeconds = Math.floor(
-                    (Date.now() - correctionStartTime) / 1000,
-                  );
-                  const messageIndex =
-                    Math.floor(elapsedSeconds / 10) % waitingMessages.length;
-                  awsLogDebugLevel(
-                    1,
-                    `${waitingMessages[messageIndex]} [type=${type}, model=${model}, elapsed=${elapsedSeconds}s]`,
-                  );
-                }, 10000);
-
-                try {
-                  return await openai.chat.completions.create(
-                    {
-                      ...params,
-                      messages: [
-                        { role: 'system', content: systemMessage },
-                        { role: 'user', content: prompt },
-                        { role: 'assistant', content: completion },
-                        { role: 'user', content: correctionPrompt },
-                      ],
-                    },
-                    {
-                      timeout: 5 * 60 * 1000,
-                    },
-                  );
-                } finally {
-                  clearInterval(logInterval);
-                }
+        const correctionChatCompletionResult = await queue.add(() => {
+          return PRetry(
+            async () => {
+              const correctionStartTime = Date.now();
+              const waitingMessages = [
+                'Waiting for LLM correction response',
+                'Still waiting for LLM correction',
+                'LLM correction in progress',
+                'Processing LLM correction request',
+                'Awaiting LLM correction completion',
+              ];
+
+              const logInterval = setInterval(() => {
+                const elapsedSeconds = Math.floor(
+                  (Date.now() - correctionStartTime) / 1000,
+                );
+                const messageIndex =
+                  Math.floor(elapsedSeconds / 10) % waitingMessages.length;
+                awsLogDebugLevel(
+                  1,
+                  `${waitingMessages[messageIndex]} [type=${type}, model=${model}, elapsed=${elapsedSeconds}s]`,
+                );
+              }, 10000);
+
+              try {
+                return await openai.chat.completions.create(
+                  {
+                    ...params,
+                    messages: [
+                      { role: 'system', content: systemMessage },
+                      { role: 'user', content: prompt },
+                      { role: 'assistant', content: completion },
+                      { role: 'user', content: correctionPrompt },
+                    ],
+                  },
+                  {
+                    timeout: 5 * 60 * 1000,
+                  },
+                );
+              } finally {
+                clearInterval(logInterval);
+              }
+            },
+            {
+              ...defaultRetryOptions,
+              onFailedAttempt: (error) => {
+                console.log('CodeYam Error: Correction call failed', {
+                  error,
+                  attempts,
+                });
               },
-              {
-                ...defaultRetryOptions,
-                onFailedAttempt: (error) => {
-                  console.log('CodeYam Error: Correction call failed', {
-                    error,
-                    attempts,
-                  });
-                },
-              },
-            );
-          },
-          {
-            throwOnTimeout: true,
-          },
-        );
+            },
+          );
+        });
+
+        if (!correctionChatCompletionResult) {
+          throw new Error('Correction call returned no result');
+        }
+
+        const correctionChatCompletion = correctionChatCompletionResult;
 
         const correctedRawCompletion =
           correctionChatCompletion.choices?.[0]?.message?.content;