Merge pull request #7116 from continuedev/pe/devdata-fixed

fix: standardize dev data schemas and add missing fields

Author: RomneyDa

core/config/types.ts

@@ -387,6 +387,7 @@ declare global {
   
   export interface PromptLog {
     modelTitle: string;
+    modelProvider: string;
     completionOptions: CompletionOptions;
     prompt: string;
     completion: string;

core/data/log.vitest.ts

@@ -34,6 +34,7 @@ const TEST_AGENT_INTERACTION_EVENT: DevDataLogEvent = {
     prompt: "Hello, world!",
     completion: "Hello, world!",
     modelProvider: "openai",
+    modelName: "gpt-4",
     modelTitle: "gpt-4",
     sessionId: "1234",
     tools: ["test-tool1"],

core/edit/recursiveStream.ts

@@ -7,6 +7,7 @@ const INFINITE_STREAM_SAFETY = 0.9;
 
 const DUD_PROMPT_LOG: PromptLog = {
   modelTitle: "",
+  modelProvider: "",
   completionOptions: { model: "" },
   prompt: "",
   completion: "",

core/index.d.ts

@@ -455,6 +455,7 @@ export type FileSymbolMap = Record<string, SymbolWithRange[]>;
 
 export interface PromptLog {
   modelTitle: string;
+  modelProvider: string;
   completionOptions: CompletionOptions;
   prompt: string;
   completion: string;

core/llm/index.ts

@@ -779,6 +779,7 @@ export abstract class BaseLLM implements ILLM {
 
     return {
       modelTitle: this.title ?? completionOptions.model,
+      modelProvider: this.underlyingProviderName,
       prompt,
       completion,
       completionOptions,
@@ -1094,6 +1095,7 @@ export abstract class BaseLLM implements ILLM {
 
     return {
       modelTitle: this.title ?? completionOptions.model,
+      modelProvider: this.underlyingProviderName,
       prompt,
       completion,
       completionOptions,

core/llm/llm-pre-fetch.vitest.ts

@@ -23,6 +23,7 @@ async function dudLLMCall(llm: ILLM, messages: ChatMessage[]) {
         model: "",
       },
       modelTitle: "",
+      modelProvider: "",
       prompt: "",
     });
     abortController.abort();

core/llm/streamChat.ts

@@ -40,6 +40,7 @@ export async function* llmStreamChat(
   // Log to return in case of error
   const errorPromptLog = {
     modelTitle: model?.title ?? model?.model,
+    modelProvider: model?.underlyingProviderName ?? "unknown",
     completion: "",
     prompt: "",
     completionOptions: {

core/nextEdit/context/processNextEditData.ts

@@ -61,6 +61,7 @@ export const processNextEditData = async ({
   //   undefined;
 
   const modelName = "Codestral";
+  const modelProvider = "mistral";
   const maxPromptTokens = randomNumberBetween(500, 12000);
 
   const autocompleteContext = await getAutocompleteContext(
@@ -124,6 +125,9 @@ export const processNextEditData = async ({
         beforeCursorPos: cursorPosBeforeEdit,
         afterCursorPos: cursorPosAfterPrevEdit,
         context: autocompleteContext,
+        modelProvider,
+        modelName,
+        modelTitle: modelName,
       },
     });
   }

extensions/vscode/src/diff/vertical/manager.ts

@@ -536,6 +536,7 @@ export class VerticalDiffManager {
       streamId: EDIT_MODE_STREAM_ID,
       timestamp: new Date().toISOString(),
       modelProvider: model.underlyingProviderName,
+      modelName: model.title ?? "",
       modelTitle: model.title ?? "",
       prompt: stripImages(prompt),
       completion: newCode,

extensions/vscode/src/extension/EditOutcomeTracker.ts

@@ -6,6 +6,7 @@ export interface PendingEditData {
   streamId: string;
   timestamp: string;
   modelProvider: string;
+  modelName: string;
   modelTitle: string;
   prompt: string;
   completion: string;
@@ -56,7 +57,8 @@ class EditOutcomeTracker {
       name: "editOutcome",
       data: {
         modelProvider: pendingEdit.modelProvider,
-        modelTitle: pendingEdit.modelTitle,
+        modelName: pendingEdit.modelName,
+        modelTitle: pendingEdit.modelName,
         prompt: pendingEdit.prompt,
         completion: pendingEdit.completion,
         previousCode: pendingEdit.previousCode,