From 43d55d705d204ebc7ecb05bdaec2b32b6cb9d07f Mon Sep 17 00:00:00 2001 From: sestinj Date: Thu, 10 Aug 2023 01:39:09 -0700 Subject: Remove clientgen, fix windows startup errors --- .vscode/launch.json | 2 +- extension/package.json | 5 +- extension/react-app/src/redux/store.ts | 2 +- extension/scripts/typegen.js | 15 +- extension/src/activation/environmentSetup.ts | 15 +- extension/src/debugPanel.ts | 4 +- extension/src/util/util.ts | 9 +- schema/json/ContextItem.json | 150 +++---- schema/json/FileEdit.json | 124 +++--- schema/json/FileEditWithFullContents.json | 158 +++---- schema/json/FullState.json | 642 +++++++++++++-------------- schema/json/History.json | 320 ++++++------- schema/json/HistoryNode.json | 276 ++++++------ schema/json/Position.json | 46 +- schema/json/Range.json | 80 ++-- schema/json/RangeInFile.json | 114 ++--- schema/json/SessionInfo.json | 56 +-- schema/json/Traceback.json | 124 +++--- schema/json/TracebackFrame.json | 64 +-- 19 files changed, 1107 insertions(+), 1099 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index bbe1fd2e..702544fe 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -52,7 +52,7 @@ ], "preLaunchTask": "vscode-extension:build", "env": { - "CONTINUE_SERVER_URL": "http://localhost:8001" + "CONTINUE_SERVER_URL": "http://localhost:65432" } }, // Has to be run after starting the server (separately or using the compound configuration) diff --git a/extension/package.json b/extension/package.json index 03495830..fb4a2df8 100644 --- a/extension/package.json +++ b/extension/package.json @@ -183,19 +183,18 @@ ] }, "scripts": { - "esbuild-base": "rm -rf ./out && node esbuild.mjs", + "esbuild-base": "node esbuild.mjs", "vscode:prepublish": "npm run esbuild-base -- --minify", "esbuild": "npm run esbuild-base -- --sourcemap", "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch", "tsc": "tsc -p ./", "tsc-watch": "tsc -watch -p ./", "typegen": "node scripts/typegen.js", - "clientgen": "rm -rf src/client/ && npx @openapitools/openapi-generator-cli generate -i ../schema/openapi.json -g typescript-fetch -o src/client/ --additional-properties=supportsES6=true,npmVersion=8.19.2,typescriptThreePlus=true", "rebuild": "electron-rebuild -v 19.1.8 node-pty", "lint": "eslint src --ext ts", "build-test": "tsc && node esbuild.test.mjs", "test": "npm run build-test && node ./out/test-runner/runTestOnVSCodeHost.js", - "package": "npm install && npm run typegen && npm run clientgen && cd react-app && npm install && npm run build && cd .. && mkdir -p ./build && vsce package --out ./build" + "package": "npm install && npm run typegen && cd react-app && npm install && npm run build && cd .. && mkdir -p ./build && vsce package --out ./build" }, "devDependencies": { "@nestjs/common": "^8.4.7", diff --git a/extension/react-app/src/redux/store.ts b/extension/react-app/src/redux/store.ts index 59339060..a9a45ec1 100644 --- a/extension/react-app/src/redux/store.ts +++ b/extension/react-app/src/redux/store.ts @@ -3,8 +3,8 @@ import chatReducer from "./slices/chatSlice"; import configReducer from "./slices/configSlice"; import miscReducer from "./slices/miscSlice"; import uiStateReducer from "./slices/uiStateSlice"; -import { RangeInFile } from "../../../src/client"; import { FullState } from "../../../schema/FullState"; +import { RangeInFile } from "../../../schema/RangeInFile"; import serverStateReducer from "./slices/serverStateReducer"; export interface ChatMessage { diff --git a/extension/scripts/typegen.js b/extension/scripts/typegen.js index 0bbff19e..793eb08d 100644 --- a/extension/scripts/typegen.js +++ b/extension/scripts/typegen.js @@ -4,7 +4,7 @@ const { compile } = require("json-schema-to-typescript"); function generateTypesForFile(inputPath, outputPath) { let schema = JSON.parse(fs.readFileSync(inputPath, "utf8")); - let name = (inputPath.split("/").pop() || inputPath).split(".")[0]; + let name = path.parse(path.basename(inputPath)).name; // This is to solve the issue of json-schema-to-typescript not supporting $ref at the top-level, which is what Pydantic generates for recursive types if ("$ref" in schema) { let temp = schema["$ref"]; @@ -46,8 +46,15 @@ function deleteAllInDir(dir) { }); } -OUTPUT_DIR = "schema"; -INPUT_DIR = "../schema/json"; +const OUTPUT_DIR = path.join("schema"); +const INPUT_DIR = path.join("..", "schema", "json"); +if (!fs.existsSync(INPUT_DIR)) { + throw new Error(`Input directory does not exist: ${INPUT_DIR}`); +} + +if (!fs.existsSync(OUTPUT_DIR)) { + throw new Error(`Output directory does not exist: ${OUTPUT_DIR}`); +} deleteAllInDir(OUTPUT_DIR); -generateAllSchemas(INPUT_DIR, OUTPUT_DIR); +generateAllSchemas(INPUT_DIR, OUTPUT_DIR); \ No newline at end of file diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts index c2ac0b22..f0e41ca9 100644 --- a/extension/src/activation/environmentSetup.ts +++ b/extension/src/activation/environmentSetup.ts @@ -237,10 +237,14 @@ export async function startContinuePythonServer() { }; try { const child = spawn(destination, { - detached: true, - stdio: "ignore", windowsHide: true, }); + child.stdout.on("data", (data: any) => { + console.log(`stdout: ${data}`); + }); + child.stderr.on("data", (data: any) => { + console.log(`stderr: ${data}`); + }); child.on("error", (err: any) => { if (attempts < maxAttempts) { retry(); @@ -248,7 +252,12 @@ export async function startContinuePythonServer() { console.error("Failed to start subprocess.", err); } }); - child.unref(); + child.on("exit", (code: any, signal: any) => { + console.log("Subprocess exited with code", code, signal); + }); + child.on("close", (code: any, signal: any) => { + console.log("Subprocess closed with code", code, signal); + }); } catch (e: any) { console.log("Error starting server:", e); retry(); diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts index e6dade37..61ff455a 100644 --- a/extension/src/debugPanel.ts +++ b/extension/src/debugPanel.ts @@ -5,7 +5,7 @@ import { getNonce, openEditorAndRevealRange, } from "./util/vscode"; -import { RangeInFile } from "./client"; +import { RangeInFile } from "../schema/RangeInFile"; import { setFocusedOnContinueInput } from "./commands"; const WebSocket = require("ws"); @@ -112,7 +112,7 @@ export function setupDebugPanel( } const rangeInFile: RangeInFile = { - range: e.selections[0], + range: e.selections[0] as any, filepath: e.textEditor.document.fileName, }; const filesystem = { diff --git a/extension/src/util/util.ts b/extension/src/util/util.ts index dfc10c90..15b34267 100644 --- a/extension/src/util/util.ts +++ b/extension/src/util/util.ts @@ -1,4 +1,4 @@ -import { RangeInFile, SerializedDebugContext } from "../client"; +import { RangeInFile } from "../../schema/RangeInFile"; import * as fs from "fs"; const os = require("os"); @@ -95,13 +95,6 @@ export function codeSelectionsToVirtualFileSystem( return virtualFileSystem; } -export function addFileSystemToDebugContext( - ctx: SerializedDebugContext -): SerializedDebugContext { - ctx.filesystem = codeSelectionsToVirtualFileSystem(ctx.rangesInFiles); - return ctx; -} - export function debounced(delay: number, fn: Function) { let timerId: NodeJS.Timeout | null; return function (...args: any[]) { diff --git a/schema/json/ContextItem.json b/schema/json/ContextItem.json index 32a214d3..67dfcadc 100644 --- a/schema/json/ContextItem.json +++ b/schema/json/ContextItem.json @@ -1,76 +1,76 @@ -{ - "title": "ContextItem", - "$ref": "#/definitions/src__continuedev__core__main__ContextItem", - "definitions": { - "ContextItemId": { - "title": "ContextItemId", - "description": "A ContextItemId is a unique identifier for a ContextItem.", - "type": "object", - "properties": { - "provider_title": { - "title": "Provider Title", - "type": "string" - }, - "item_id": { - "title": "Item Id", - "type": "string" - } - }, - "required": [ - "provider_title", - "item_id" - ] - }, - "ContextItemDescription": { - "title": "ContextItemDescription", - "description": "A ContextItemDescription is a description of a ContextItem that is displayed to the user when they type '@'.\n\nThe id can be used to retrieve the ContextItem from the ContextManager.", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "description": { - "title": "Description", - "type": "string" - }, - "id": { - "$ref": "#/definitions/ContextItemId" - } - }, - "required": [ - "name", - "description", - "id" - ] - }, - "src__continuedev__core__main__ContextItem": { - "title": "ContextItem", - "description": "A ContextItem is a single item that is stored in the ContextManager.", - "type": "object", - "properties": { - "description": { - "$ref": "#/definitions/ContextItemDescription" - }, - "content": { - "title": "Content", - "type": "string" - }, - "editing": { - "title": "Editing", - "default": false, - "type": "boolean" - }, - "editable": { - "title": "Editable", - "default": false, - "type": "boolean" - } - }, - "required": [ - "description", - "content" - ] - } - } +{ + "title": "ContextItem", + "$ref": "#/definitions/src__continuedev__core__main__ContextItem", + "definitions": { + "ContextItemId": { + "title": "ContextItemId", + "description": "A ContextItemId is a unique identifier for a ContextItem.", + "type": "object", + "properties": { + "provider_title": { + "title": "Provider Title", + "type": "string" + }, + "item_id": { + "title": "Item Id", + "type": "string" + } + }, + "required": [ + "provider_title", + "item_id" + ] + }, + "ContextItemDescription": { + "title": "ContextItemDescription", + "description": "A ContextItemDescription is a description of a ContextItem that is displayed to the user when they type '@'.\n\nThe id can be used to retrieve the ContextItem from the ContextManager.", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "description": { + "title": "Description", + "type": "string" + }, + "id": { + "$ref": "#/definitions/ContextItemId" + } + }, + "required": [ + "name", + "description", + "id" + ] + }, + "src__continuedev__core__main__ContextItem": { + "title": "ContextItem", + "description": "A ContextItem is a single item that is stored in the ContextManager.", + "type": "object", + "properties": { + "description": { + "$ref": "#/definitions/ContextItemDescription" + }, + "content": { + "title": "Content", + "type": "string" + }, + "editing": { + "title": "Editing", + "default": false, + "type": "boolean" + }, + "editable": { + "title": "Editable", + "default": false, + "type": "boolean" + } + }, + "required": [ + "description", + "content" + ] + } + } } \ No newline at end of file diff --git a/schema/json/FileEdit.json b/schema/json/FileEdit.json index 011e0462..4247c096 100644 --- a/schema/json/FileEdit.json +++ b/schema/json/FileEdit.json @@ -1,63 +1,63 @@ -{ - "title": "FileEdit", - "$ref": "#/definitions/src__continuedev__models__filesystem_edit__FileEdit", - "definitions": { - "Position": { - "title": "Position", - "type": "object", - "properties": { - "line": { - "title": "Line", - "type": "integer" - }, - "character": { - "title": "Character", - "type": "integer" - } - }, - "required": [ - "line", - "character" - ] - }, - "Range": { - "title": "Range", - "description": "A range in a file. 0-indexed.", - "type": "object", - "properties": { - "start": { - "$ref": "#/definitions/Position" - }, - "end": { - "$ref": "#/definitions/Position" - } - }, - "required": [ - "start", - "end" - ] - }, - "src__continuedev__models__filesystem_edit__FileEdit": { - "title": "FileEdit", - "type": "object", - "properties": { - "filepath": { - "title": "Filepath", - "type": "string" - }, - "range": { - "$ref": "#/definitions/Range" - }, - "replacement": { - "title": "Replacement", - "type": "string" - } - }, - "required": [ - "filepath", - "range", - "replacement" - ] - } - } +{ + "title": "FileEdit", + "$ref": "#/definitions/src__continuedev__models__filesystem_edit__FileEdit", + "definitions": { + "Position": { + "title": "Position", + "type": "object", + "properties": { + "line": { + "title": "Line", + "type": "integer" + }, + "character": { + "title": "Character", + "type": "integer" + } + }, + "required": [ + "line", + "character" + ] + }, + "Range": { + "title": "Range", + "description": "A range in a file. 0-indexed.", + "type": "object", + "properties": { + "start": { + "$ref": "#/definitions/Position" + }, + "end": { + "$ref": "#/definitions/Position" + } + }, + "required": [ + "start", + "end" + ] + }, + "src__continuedev__models__filesystem_edit__FileEdit": { + "title": "FileEdit", + "type": "object", + "properties": { + "filepath": { + "title": "Filepath", + "type": "string" + }, + "range": { + "$ref": "#/definitions/Range" + }, + "replacement": { + "title": "Replacement", + "type": "string" + } + }, + "required": [ + "filepath", + "range", + "replacement" + ] + } + } } \ No newline at end of file diff --git a/schema/json/FileEditWithFullContents.json b/schema/json/FileEditWithFullContents.json index 2ea75bab..8394af17 100644 --- a/schema/json/FileEditWithFullContents.json +++ b/schema/json/FileEditWithFullContents.json @@ -1,80 +1,80 @@ -{ - "title": "FileEditWithFullContents", - "$ref": "#/definitions/src__continuedev__models__filesystem_edit__FileEditWithFullContents", - "definitions": { - "Position": { - "title": "Position", - "type": "object", - "properties": { - "line": { - "title": "Line", - "type": "integer" - }, - "character": { - "title": "Character", - "type": "integer" - } - }, - "required": [ - "line", - "character" - ] - }, - "Range": { - "title": "Range", - "description": "A range in a file. 0-indexed.", - "type": "object", - "properties": { - "start": { - "$ref": "#/definitions/Position" - }, - "end": { - "$ref": "#/definitions/Position" - } - }, - "required": [ - "start", - "end" - ] - }, - "FileEdit": { - "title": "FileEdit", - "type": "object", - "properties": { - "filepath": { - "title": "Filepath", - "type": "string" - }, - "range": { - "$ref": "#/definitions/Range" - }, - "replacement": { - "title": "Replacement", - "type": "string" - } - }, - "required": [ - "filepath", - "range", - "replacement" - ] - }, - "src__continuedev__models__filesystem_edit__FileEditWithFullContents": { - "title": "FileEditWithFullContents", - "type": "object", - "properties": { - "fileEdit": { - "$ref": "#/definitions/FileEdit" - }, - "fileContents": { - "title": "Filecontents", - "type": "string" - } - }, - "required": [ - "fileEdit", - "fileContents" - ] - } - } +{ + "title": "FileEditWithFullContents", + "$ref": "#/definitions/src__continuedev__models__filesystem_edit__FileEditWithFullContents", + "definitions": { + "Position": { + "title": "Position", + "type": "object", + "properties": { + "line": { + "title": "Line", + "type": "integer" + }, + "character": { + "title": "Character", + "type": "integer" + } + }, + "required": [ + "line", + "character" + ] + }, + "Range": { + "title": "Range", + "description": "A range in a file. 0-indexed.", + "type": "object", + "properties": { + "start": { + "$ref": "#/definitions/Position" + }, + "end": { + "$ref": "#/definitions/Position" + } + }, + "required": [ + "start", + "end" + ] + }, + "FileEdit": { + "title": "FileEdit", + "type": "object", + "properties": { + "filepath": { + "title": "Filepath", + "type": "string" + }, + "range": { + "$ref": "#/definitions/Range" + }, + "replacement": { + "title": "Replacement", + "type": "string" + } + }, + "required": [ + "filepath", + "range", + "replacement" + ] + }, + "src__continuedev__models__filesystem_edit__FileEditWithFullContents": { + "title": "FileEditWithFullContents", + "type": "object", + "properties": { + "fileEdit": { + "$ref": "#/definitions/FileEdit" + }, + "fileContents": { + "title": "Filecontents", + "type": "string" + } + }, + "required": [ + "fileEdit", + "fileContents" + ] + } + } } \ No newline at end of file diff --git a/schema/json/FullState.json b/schema/json/FullState.json index b11ebfe1..707b03db 100644 --- a/schema/json/FullState.json +++ b/schema/json/FullState.json @@ -1,322 +1,322 @@ -{ - "title": "FullState", - "$ref": "#/definitions/src__continuedev__core__main__FullState", - "definitions": { - "FunctionCall": { - "title": "FunctionCall", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "arguments": { - "title": "Arguments", - "type": "string" - } - }, - "required": [ - "name", - "arguments" - ] - }, - "ChatMessage": { - "title": "ChatMessage", - "type": "object", - "properties": { - "role": { - "title": "Role", - "enum": [ - "assistant", - "user", - "system", - "function" - ], - "type": "string" - }, - "content": { - "title": "Content", - "type": "string" - }, - "name": { - "title": "Name", - "type": "string" - }, - "summary": { - "title": "Summary", - "type": "string" - }, - "function_call": { - "$ref": "#/definitions/FunctionCall" - } - }, - "required": [ - "role", - "summary" - ] - }, - "Step": { - "title": "Step", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "hide": { - "title": "Hide", - "default": false, - "type": "boolean" - }, - "description": { - "title": "Description", - "type": "string" - }, - "system_message": { - "title": "System Message", - "type": "string" - }, - "chat_context": { - "title": "Chat Context", - "default": [], - "type": "array", - "items": { - "$ref": "#/definitions/ChatMessage" - } - }, - "manage_own_chat_context": { - "title": "Manage Own Chat Context", - "default": false, - "type": "boolean" - } - } - }, - "Observation": { - "title": "Observation", - "type": "object", - "properties": {} - }, - "HistoryNode": { - "title": "HistoryNode", - "description": "A point in history, a list of which make up History", - "type": "object", - "properties": { - "step": { - "$ref": "#/definitions/Step" - }, - "observation": { - "$ref": "#/definitions/Observation" - }, - "depth": { - "title": "Depth", - "type": "integer" - }, - "deleted": { - "title": "Deleted", - "default": false, - "type": "boolean" - }, - "active": { - "title": "Active", - "default": true, - "type": "boolean" - }, - "logs": { - "title": "Logs", - "default": [], - "type": "array", - "items": { - "type": "string" - } - } - }, - "required": [ - "step", - "depth" - ] - }, - "History": { - "title": "History", - "description": "A history of steps taken and their results", - "type": "object", - "properties": { - "timeline": { - "title": "Timeline", - "type": "array", - "items": { - "$ref": "#/definitions/HistoryNode" - } - }, - "current_index": { - "title": "Current Index", - "type": "integer" - } - }, - "required": [ - "timeline", - "current_index" - ] - }, - "SlashCommandDescription": { - "title": "SlashCommandDescription", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "description": { - "title": "Description", - "type": "string" - } - }, - "required": [ - "name", - "description" - ] - }, - "ContextItemId": { - "title": "ContextItemId", - "description": "A ContextItemId is a unique identifier for a ContextItem.", - "type": "object", - "properties": { - "provider_title": { - "title": "Provider Title", - "type": "string" - }, - "item_id": { - "title": "Item Id", - "type": "string" - } - }, - "required": [ - "provider_title", - "item_id" - ] - }, - "ContextItemDescription": { - "title": "ContextItemDescription", - "description": "A ContextItemDescription is a description of a ContextItem that is displayed to the user when they type '@'.\n\nThe id can be used to retrieve the ContextItem from the ContextManager.", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "description": { - "title": "Description", - "type": "string" - }, - "id": { - "$ref": "#/definitions/ContextItemId" - } - }, - "required": [ - "name", - "description", - "id" - ] - }, - "ContextItem": { - "title": "ContextItem", - "description": "A ContextItem is a single item that is stored in the ContextManager.", - "type": "object", - "properties": { - "description": { - "$ref": "#/definitions/ContextItemDescription" - }, - "content": { - "title": "Content", - "type": "string" - }, - "editing": { - "title": "Editing", - "default": false, - "type": "boolean" - }, - "editable": { - "title": "Editable", - "default": false, - "type": "boolean" - } - }, - "required": [ - "description", - "content" - ] - }, - "SessionInfo": { - "title": "SessionInfo", - "type": "object", - "properties": { - "session_id": { - "title": "Session Id", - "type": "string" - }, - "title": { - "title": "Title", - "type": "string" - }, - "date_created": { - "title": "Date Created", - "type": "string" - } - }, - "required": [ - "session_id", - "title", - "date_created" - ] - }, - "src__continuedev__core__main__FullState": { - "title": "FullState", - "description": "A full state of the program, including the history", - "type": "object", - "properties": { - "history": { - "$ref": "#/definitions/History" - }, - "active": { - "title": "Active", - "type": "boolean" - }, - "user_input_queue": { - "title": "User Input Queue", - "type": "array", - "items": { - "type": "string" - } - }, - "slash_commands": { - "title": "Slash Commands", - "type": "array", - "items": { - "$ref": "#/definitions/SlashCommandDescription" - } - }, - "adding_highlighted_code": { - "title": "Adding Highlighted Code", - "type": "boolean" - }, - "selected_context_items": { - "title": "Selected Context Items", - "type": "array", - "items": { - "$ref": "#/definitions/ContextItem" - } - }, - "session_info": { - "$ref": "#/definitions/SessionInfo" - } - }, - "required": [ - "history", - "active", - "user_input_queue", - "slash_commands", - "adding_highlighted_code", - "selected_context_items" - ] - } - } +{ + "title": "FullState", + "$ref": "#/definitions/src__continuedev__core__main__FullState", + "definitions": { + "FunctionCall": { + "title": "FunctionCall", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "arguments": { + "title": "Arguments", + "type": "string" + } + }, + "required": [ + "name", + "arguments" + ] + }, + "ChatMessage": { + "title": "ChatMessage", + "type": "object", + "properties": { + "role": { + "title": "Role", + "enum": [ + "assistant", + "user", + "system", + "function" + ], + "type": "string" + }, + "content": { + "title": "Content", + "type": "string" + }, + "name": { + "title": "Name", + "type": "string" + }, + "summary": { + "title": "Summary", + "type": "string" + }, + "function_call": { + "$ref": "#/definitions/FunctionCall" + } + }, + "required": [ + "role", + "summary" + ] + }, + "Step": { + "title": "Step", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "hide": { + "title": "Hide", + "default": false, + "type": "boolean" + }, + "description": { + "title": "Description", + "type": "string" + }, + "system_message": { + "title": "System Message", + "type": "string" + }, + "chat_context": { + "title": "Chat Context", + "default": [], + "type": "array", + "items": { + "$ref": "#/definitions/ChatMessage" + } + }, + "manage_own_chat_context": { + "title": "Manage Own Chat Context", + "default": false, + "type": "boolean" + } + } + }, + "Observation": { + "title": "Observation", + "type": "object", + "properties": {} + }, + "HistoryNode": { + "title": "HistoryNode", + "description": "A point in history, a list of which make up History", + "type": "object", + "properties": { + "step": { + "$ref": "#/definitions/Step" + }, + "observation": { + "$ref": "#/definitions/Observation" + }, + "depth": { + "title": "Depth", + "type": "integer" + }, + "deleted": { + "title": "Deleted", + "default": false, + "type": "boolean" + }, + "active": { + "title": "Active", + "default": true, + "type": "boolean" + }, + "logs": { + "title": "Logs", + "default": [], + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "step", + "depth" + ] + }, + "History": { + "title": "History", + "description": "A history of steps taken and their results", + "type": "object", + "properties": { + "timeline": { + "title": "Timeline", + "type": "array", + "items": { + "$ref": "#/definitions/HistoryNode" + } + }, + "current_index": { + "title": "Current Index", + "type": "integer" + } + }, + "required": [ + "timeline", + "current_index" + ] + }, + "SlashCommandDescription": { + "title": "SlashCommandDescription", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "description": { + "title": "Description", + "type": "string" + } + }, + "required": [ + "name", + "description" + ] + }, + "ContextItemId": { + "title": "ContextItemId", + "description": "A ContextItemId is a unique identifier for a ContextItem.", + "type": "object", + "properties": { + "provider_title": { + "title": "Provider Title", + "type": "string" + }, + "item_id": { + "title": "Item Id", + "type": "string" + } + }, + "required": [ + "provider_title", + "item_id" + ] + }, + "ContextItemDescription": { + "title": "ContextItemDescription", + "description": "A ContextItemDescription is a description of a ContextItem that is displayed to the user when they type '@'.\n\nThe id can be used to retrieve the ContextItem from the ContextManager.", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "description": { + "title": "Description", + "type": "string" + }, + "id": { + "$ref": "#/definitions/ContextItemId" + } + }, + "required": [ + "name", + "description", + "id" + ] + }, + "ContextItem": { + "title": "ContextItem", + "description": "A ContextItem is a single item that is stored in the ContextManager.", + "type": "object", + "properties": { + "description": { + "$ref": "#/definitions/ContextItemDescription" + }, + "content": { + "title": "Content", + "type": "string" + }, + "editing": { + "title": "Editing", + "default": false, + "type": "boolean" + }, + "editable": { + "title": "Editable", + "default": false, + "type": "boolean" + } + }, + "required": [ + "description", + "content" + ] + }, + "SessionInfo": { + "title": "SessionInfo", + "type": "object", + "properties": { + "session_id": { + "title": "Session Id", + "type": "string" + }, + "title": { + "title": "Title", + "type": "string" + }, + "date_created": { + "title": "Date Created", + "type": "string" + } + }, + "required": [ + "session_id", + "title", + "date_created" + ] + }, + "src__continuedev__core__main__FullState": { + "title": "FullState", + "description": "A full state of the program, including the history", + "type": "object", + "properties": { + "history": { + "$ref": "#/definitions/History" + }, + "active": { + "title": "Active", + "type": "boolean" + }, + "user_input_queue": { + "title": "User Input Queue", + "type": "array", + "items": { + "type": "string" + } + }, + "slash_commands": { + "title": "Slash Commands", + "type": "array", + "items": { + "$ref": "#/definitions/SlashCommandDescription" + } + }, + "adding_highlighted_code": { + "title": "Adding Highlighted Code", + "type": "boolean" + }, + "selected_context_items": { + "title": "Selected Context Items", + "type": "array", + "items": { + "$ref": "#/definitions/ContextItem" + } + }, + "session_info": { + "$ref": "#/definitions/SessionInfo" + } + }, + "required": [ + "history", + "active", + "user_input_queue", + "slash_commands", + "adding_highlighted_code", + "selected_context_items" + ] + } + } } \ No newline at end of file diff --git a/schema/json/History.json b/schema/json/History.json index 56415520..ea97a2e8 100644 --- a/schema/json/History.json +++ b/schema/json/History.json @@ -1,161 +1,161 @@ -{ - "title": "History", - "$ref": "#/definitions/src__continuedev__core__main__History", - "definitions": { - "FunctionCall": { - "title": "FunctionCall", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "arguments": { - "title": "Arguments", - "type": "string" - } - }, - "required": [ - "name", - "arguments" - ] - }, - "ChatMessage": { - "title": "ChatMessage", - "type": "object", - "properties": { - "role": { - "title": "Role", - "enum": [ - "assistant", - "user", - "system", - "function" - ], - "type": "string" - }, - "content": { - "title": "Content", - "type": "string" - }, - "name": { - "title": "Name", - "type": "string" - }, - "summary": { - "title": "Summary", - "type": "string" - }, - "function_call": { - "$ref": "#/definitions/FunctionCall" - } - }, - "required": [ - "role", - "summary" - ] - }, - "Step": { - "title": "Step", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "hide": { - "title": "Hide", - "default": false, - "type": "boolean" - }, - "description": { - "title": "Description", - "type": "string" - }, - "system_message": { - "title": "System Message", - "type": "string" - }, - "chat_context": { - "title": "Chat Context", - "default": [], - "type": "array", - "items": { - "$ref": "#/definitions/ChatMessage" - } - }, - "manage_own_chat_context": { - "title": "Manage Own Chat Context", - "default": false, - "type": "boolean" - } - } - }, - "Observation": { - "title": "Observation", - "type": "object", - "properties": {} - }, - "HistoryNode": { - "title": "HistoryNode", - "description": "A point in history, a list of which make up History", - "type": "object", - "properties": { - "step": { - "$ref": "#/definitions/Step" - }, - "observation": { - "$ref": "#/definitions/Observation" - }, - "depth": { - "title": "Depth", - "type": "integer" - }, - "deleted": { - "title": "Deleted", - "default": false, - "type": "boolean" - }, - "active": { - "title": "Active", - "default": true, - "type": "boolean" - }, - "logs": { - "title": "Logs", - "default": [], - "type": "array", - "items": { - "type": "string" - } - } - }, - "required": [ - "step", - "depth" - ] - }, - "src__continuedev__core__main__History": { - "title": "History", - "description": "A history of steps taken and their results", - "type": "object", - "properties": { - "timeline": { - "title": "Timeline", - "type": "array", - "items": { - "$ref": "#/definitions/HistoryNode" - } - }, - "current_index": { - "title": "Current Index", - "type": "integer" - } - }, - "required": [ - "timeline", - "current_index" - ] - } - } +{ + "title": "History", + "$ref": "#/definitions/src__continuedev__core__main__History", + "definitions": { + "FunctionCall": { + "title": "FunctionCall", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "arguments": { + "title": "Arguments", + "type": "string" + } + }, + "required": [ + "name", + "arguments" + ] + }, + "ChatMessage": { + "title": "ChatMessage", + "type": "object", + "properties": { + "role": { + "title": "Role", + "enum": [ + "assistant", + "user", + "system", + "function" + ], + "type": "string" + }, + "content": { + "title": "Content", + "type": "string" + }, + "name": { + "title": "Name", + "type": "string" + }, + "summary": { + "title": "Summary", + "type": "string" + }, + "function_call": { + "$ref": "#/definitions/FunctionCall" + } + }, + "required": [ + "role", + "summary" + ] + }, + "Step": { + "title": "Step", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "hide": { + "title": "Hide", + "default": false, + "type": "boolean" + }, + "description": { + "title": "Description", + "type": "string" + }, + "system_message": { + "title": "System Message", + "type": "string" + }, + "chat_context": { + "title": "Chat Context", + "default": [], + "type": "array", + "items": { + "$ref": "#/definitions/ChatMessage" + } + }, + "manage_own_chat_context": { + "title": "Manage Own Chat Context", + "default": false, + "type": "boolean" + } + } + }, + "Observation": { + "title": "Observation", + "type": "object", + "properties": {} + }, + "HistoryNode": { + "title": "HistoryNode", + "description": "A point in history, a list of which make up History", + "type": "object", + "properties": { + "step": { + "$ref": "#/definitions/Step" + }, + "observation": { + "$ref": "#/definitions/Observation" + }, + "depth": { + "title": "Depth", + "type": "integer" + }, + "deleted": { + "title": "Deleted", + "default": false, + "type": "boolean" + }, + "active": { + "title": "Active", + "default": true, + "type": "boolean" + }, + "logs": { + "title": "Logs", + "default": [], + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "step", + "depth" + ] + }, + "src__continuedev__core__main__History": { + "title": "History", + "description": "A history of steps taken and their results", + "type": "object", + "properties": { + "timeline": { + "title": "Timeline", + "type": "array", + "items": { + "$ref": "#/definitions/HistoryNode" + } + }, + "current_index": { + "title": "Current Index", + "type": "integer" + } + }, + "required": [ + "timeline", + "current_index" + ] + } + } } \ No newline at end of file diff --git a/schema/json/HistoryNode.json b/schema/json/HistoryNode.json index 81e239b3..56ab631a 100644 --- a/schema/json/HistoryNode.json +++ b/schema/json/HistoryNode.json @@ -1,139 +1,139 @@ -{ - "title": "HistoryNode", - "$ref": "#/definitions/src__continuedev__core__main__HistoryNode", - "definitions": { - "FunctionCall": { - "title": "FunctionCall", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "arguments": { - "title": "Arguments", - "type": "string" - } - }, - "required": [ - "name", - "arguments" - ] - }, - "ChatMessage": { - "title": "ChatMessage", - "type": "object", - "properties": { - "role": { - "title": "Role", - "enum": [ - "assistant", - "user", - "system", - "function" - ], - "type": "string" - }, - "content": { - "title": "Content", - "type": "string" - }, - "name": { - "title": "Name", - "type": "string" - }, - "summary": { - "title": "Summary", - "type": "string" - }, - "function_call": { - "$ref": "#/definitions/FunctionCall" - } - }, - "required": [ - "role", - "summary" - ] - }, - "Step": { - "title": "Step", - "type": "object", - "properties": { - "name": { - "title": "Name", - "type": "string" - }, - "hide": { - "title": "Hide", - "default": false, - "type": "boolean" - }, - "description": { - "title": "Description", - "type": "string" - }, - "system_message": { - "title": "System Message", - "type": "string" - }, - "chat_context": { - "title": "Chat Context", - "default": [], - "type": "array", - "items": { - "$ref": "#/definitions/ChatMessage" - } - }, - "manage_own_chat_context": { - "title": "Manage Own Chat Context", - "default": false, - "type": "boolean" - } - } - }, - "Observation": { - "title": "Observation", - "type": "object", - "properties": {} - }, - "src__continuedev__core__main__HistoryNode": { - "title": "HistoryNode", - "description": "A point in history, a list of which make up History", - "type": "object", - "properties": { - "step": { - "$ref": "#/definitions/Step" - }, - "observation": { - "$ref": "#/definitions/Observation" - }, - "depth": { - "title": "Depth", - "type": "integer" - }, - "deleted": { - "title": "Deleted", - "default": false, - "type": "boolean" - }, - "active": { - "title": "Active", - "default": true, - "type": "boolean" - }, - "logs": { - "title": "Logs", - "default": [], - "type": "array", - "items": { - "type": "string" - } - } - }, - "required": [ - "step", - "depth" - ] - } - } +{ + "title": "HistoryNode", + "$ref": "#/definitions/src__continuedev__core__main__HistoryNode", + "definitions": { + "FunctionCall": { + "title": "FunctionCall", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "arguments": { + "title": "Arguments", + "type": "string" + } + }, + "required": [ + "name", + "arguments" + ] + }, + "ChatMessage": { + "title": "ChatMessage", + "type": "object", + "properties": { + "role": { + "title": "Role", + "enum": [ + "assistant", + "user", + "system", + "function" + ], + "type": "string" + }, + "content": { + "title": "Content", + "type": "string" + }, + "name": { + "title": "Name", + "type": "string" + }, + "summary": { + "title": "Summary", + "type": "string" + }, + "function_call": { + "$ref": "#/definitions/FunctionCall" + } + }, + "required": [ + "role", + "summary" + ] + }, + "Step": { + "title": "Step", + "type": "object", + "properties": { + "name": { + "title": "Name", + "type": "string" + }, + "hide": { + "title": "Hide", + "default": false, + "type": "boolean" + }, + "description": { + "title": "Description", + "type": "string" + }, + "system_message": { + "title": "System Message", + "type": "string" + }, + "chat_context": { + "title": "Chat Context", + "default": [], + "type": "array", + "items": { + "$ref": "#/definitions/ChatMessage" + } + }, + "manage_own_chat_context": { + "title": "Manage Own Chat Context", + "default": false, + "type": "boolean" + } + } + }, + "Observation": { + "title": "Observation", + "type": "object", + "properties": {} + }, + "src__continuedev__core__main__HistoryNode": { + "title": "HistoryNode", + "description": "A point in history, a list of which make up History", + "type": "object", + "properties": { + "step": { + "$ref": "#/definitions/Step" + }, + "observation": { + "$ref": "#/definitions/Observation" + }, + "depth": { + "title": "Depth", + "type": "integer" + }, + "deleted": { + "title": "Deleted", + "default": false, + "type": "boolean" + }, + "active": { + "title": "Active", + "default": true, + "type": "boolean" + }, + "logs": { + "title": "Logs", + "default": [], + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "step", + "depth" + ] + } + } } \ No newline at end of file diff --git a/schema/json/Position.json b/schema/json/Position.json index 6b272ce7..20a8d4e8 100644 --- a/schema/json/Position.json +++ b/schema/json/Position.json @@ -1,24 +1,24 @@ -{ - "title": "Position", - "$ref": "#/definitions/src__continuedev__models__main__Position", - "definitions": { - "src__continuedev__models__main__Position": { - "title": "Position", - "type": "object", - "properties": { - "line": { - "title": "Line", - "type": "integer" - }, - "character": { - "title": "Character", - "type": "integer" - } - }, - "required": [ - "line", - "character" - ] - } - } +{ + "title": "Position", + "$ref": "#/definitions/src__continuedev__models__main__Position", + "definitions": { + "src__continuedev__models__main__Position": { + "title": "Position", + "type": "object", + "properties": { + "line": { + "title": "Line", + "type": "integer" + }, + "character": { + "title": "Character", + "type": "integer" + } + }, + "required": [ + "line", + "character" + ] + } + } } \ No newline at end of file diff --git a/schema/json/Range.json b/schema/json/Range.json index 75675183..b6867932 100644 --- a/schema/json/Range.json +++ b/schema/json/Range.json @@ -1,41 +1,41 @@ -{ - "title": "Range", - "$ref": "#/definitions/src__continuedev__models__main__Range", - "definitions": { - "Position": { - "title": "Position", - "type": "object", - "properties": { - "line": { - "title": "Line", - "type": "integer" - }, - "character": { - "title": "Character", - "type": "integer" - } - }, - "required": [ - "line", - "character" - ] - }, - "src__continuedev__models__main__Range": { - "title": "Range", - "description": "A range in a file. 0-indexed.", - "type": "object", - "properties": { - "start": { - "$ref": "#/definitions/Position" - }, - "end": { - "$ref": "#/definitions/Position" - } - }, - "required": [ - "start", - "end" - ] - } - } +{ + "title": "Range", + "$ref": "#/definitions/src__continuedev__models__main__Range", + "definitions": { + "Position": { + "title": "Position", + "type": "object", + "properties": { + "line": { + "title": "Line", + "type": "integer" + }, + "character": { + "title": "Character", + "type": "integer" + } + }, + "required": [ + "line", + "character" + ] + }, + "src__continuedev__models__main__Range": { + "title": "Range", + "description": "A range in a file. 0-indexed.", + "type": "object", + "properties": { + "start": { + "$ref": "#/definitions/Position" + }, + "end": { + "$ref": "#/definitions/Position" + } + }, + "required": [ + "start", + "end" + ] + } + } } \ No newline at end of file diff --git a/schema/json/RangeInFile.json b/schema/json/RangeInFile.json index 1f5afaa3..4f6e030d 100644 --- a/schema/json/RangeInFile.json +++ b/schema/json/RangeInFile.json @@ -1,58 +1,58 @@ -{ - "title": "RangeInFile", - "$ref": "#/definitions/src__continuedev__models__filesystem__RangeInFile", - "definitions": { - "Position": { - "title": "Position", - "type": "object", - "properties": { - "line": { - "title": "Line", - "type": "integer" - }, - "character": { - "title": "Character", - "type": "integer" - } - }, - "required": [ - "line", - "character" - ] - }, - "Range": { - "title": "Range", - "description": "A range in a file. 0-indexed.", - "type": "object", - "properties": { - "start": { - "$ref": "#/definitions/Position" - }, - "end": { - "$ref": "#/definitions/Position" - } - }, - "required": [ - "start", - "end" - ] - }, - "src__continuedev__models__filesystem__RangeInFile": { - "title": "RangeInFile", - "type": "object", - "properties": { - "filepath": { - "title": "Filepath", - "type": "string" - }, - "range": { - "$ref": "#/definitions/Range" - } - }, - "required": [ - "filepath", - "range" - ] - } - } +{ + "title": "RangeInFile", + "$ref": "#/definitions/src__continuedev__models__filesystem__RangeInFile", + "definitions": { + "Position": { + "title": "Position", + "type": "object", + "properties": { + "line": { + "title": "Line", + "type": "integer" + }, + "character": { + "title": "Character", + "type": "integer" + } + }, + "required": [ + "line", + "character" + ] + }, + "Range": { + "title": "Range", + "description": "A range in a file. 0-indexed.", + "type": "object", + "properties": { + "start": { + "$ref": "#/definitions/Position" + }, + "end": { + "$ref": "#/definitions/Position" + } + }, + "required": [ + "start", + "end" + ] + }, + "src__continuedev__models__filesystem__RangeInFile": { + "title": "RangeInFile", + "type": "object", + "properties": { + "filepath": { + "title": "Filepath", + "type": "string" + }, + "range": { + "$ref": "#/definitions/Range" + } + }, + "required": [ + "filepath", + "range" + ] + } + } } \ No newline at end of file diff --git a/schema/json/SessionInfo.json b/schema/json/SessionInfo.json index 5857a724..e8d53fa1 100644 --- a/schema/json/SessionInfo.json +++ b/schema/json/SessionInfo.json @@ -1,29 +1,29 @@ -{ - "title": "SessionInfo", - "$ref": "#/definitions/src__continuedev__core__main__SessionInfo", - "definitions": { - "src__continuedev__core__main__SessionInfo": { - "title": "SessionInfo", - "type": "object", - "properties": { - "session_id": { - "title": "Session Id", - "type": "string" - }, - "title": { - "title": "Title", - "type": "string" - }, - "date_created": { - "title": "Date Created", - "type": "string" - } - }, - "required": [ - "session_id", - "title", - "date_created" - ] - } - } +{ + "title": "SessionInfo", + "$ref": "#/definitions/src__continuedev__core__main__SessionInfo", + "definitions": { + "src__continuedev__core__main__SessionInfo": { + "title": "SessionInfo", + "type": "object", + "properties": { + "session_id": { + "title": "Session Id", + "type": "string" + }, + "title": { + "title": "Title", + "type": "string" + }, + "date_created": { + "title": "Date Created", + "type": "string" + } + }, + "required": [ + "session_id", + "title", + "date_created" + ] + } + } } \ No newline at end of file diff --git a/schema/json/Traceback.json b/schema/json/Traceback.json index 45606a2b..b140e104 100644 --- a/schema/json/Traceback.json +++ b/schema/json/Traceback.json @@ -1,63 +1,63 @@ -{ - "title": "Traceback", - "$ref": "#/definitions/src__continuedev__models__main__Traceback", - "definitions": { - "TracebackFrame": { - "title": "TracebackFrame", - "type": "object", - "properties": { - "filepath": { - "title": "Filepath", - "type": "string" - }, - "lineno": { - "title": "Lineno", - "type": "integer" - }, - "function": { - "title": "Function", - "type": "string" - }, - "code": { - "title": "Code", - "type": "string" - } - }, - "required": [ - "filepath", - "lineno", - "function" - ] - }, - "src__continuedev__models__main__Traceback": { - "title": "Traceback", - "type": "object", - "properties": { - "frames": { - "title": "Frames", - "type": "array", - "items": { - "$ref": "#/definitions/TracebackFrame" - } - }, - "message": { - "title": "Message", - "type": "string" - }, - "error_type": { - "title": "Error Type", - "type": "string" - }, - "full_traceback": { - "title": "Full Traceback", - "type": "string" - } - }, - "required": [ - "frames", - "message", - "error_type" - ] - } - } +{ + "title": "Traceback", + "$ref": "#/definitions/src__continuedev__models__main__Traceback", + "definitions": { + "TracebackFrame": { + "title": "TracebackFrame", + "type": "object", + "properties": { + "filepath": { + "title": "Filepath", + "type": "string" + }, + "lineno": { + "title": "Lineno", + "type": "integer" + }, + "function": { + "title": "Function", + "type": "string" + }, + "code": { + "title": "Code", + "type": "string" + } + }, + "required": [ + "filepath", + "lineno", + "function" + ] + }, + "src__continuedev__models__main__Traceback": { + "title": "Traceback", + "type": "object", + "properties": { + "frames": { + "title": "Frames", + "type": "array", + "items": { + "$ref": "#/definitions/TracebackFrame" + } + }, + "message": { + "title": "Message", + "type": "string" + }, + "error_type": { + "title": "Error Type", + "type": "string" + }, + "full_traceback": { + "title": "Full Traceback", + "type": "string" + } + }, + "required": [ + "frames", + "message", + "error_type" + ] + } + } } \ No newline at end of file diff --git a/schema/json/TracebackFrame.json b/schema/json/TracebackFrame.json index 1907430a..2fbd0109 100644 --- a/schema/json/TracebackFrame.json +++ b/schema/json/TracebackFrame.json @@ -1,33 +1,33 @@ -{ - "title": "TracebackFrame", - "$ref": "#/definitions/src__continuedev__models__main__TracebackFrame", - "definitions": { - "src__continuedev__models__main__TracebackFrame": { - "title": "TracebackFrame", - "type": "object", - "properties": { - "filepath": { - "title": "Filepath", - "type": "string" - }, - "lineno": { - "title": "Lineno", - "type": "integer" - }, - "function": { - "title": "Function", - "type": "string" - }, - "code": { - "title": "Code", - "type": "string" - } - }, - "required": [ - "filepath", - "lineno", - "function" - ] - } - } +{ + "title": "TracebackFrame", + "$ref": "#/definitions/src__continuedev__models__main__TracebackFrame", + "definitions": { + "src__continuedev__models__main__TracebackFrame": { + "title": "TracebackFrame", + "type": "object", + "properties": { + "filepath": { + "title": "Filepath", + "type": "string" + }, + "lineno": { + "title": "Lineno", + "type": "integer" + }, + "function": { + "title": "Function", + "type": "string" + }, + "code": { + "title": "Code", + "type": "string" + } + }, + "required": [ + "filepath", + "lineno", + "function" + ] + } + } } \ No newline at end of file -- cgit v1.2.3-70-g09d2