diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index be58fc148b..b1dba6f5c1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -16,6 +16,8 @@ "source=onyx-devcontainer-local,target=/home/dev/.local,type=volume" ], "containerEnv": { + "COLORTERM": "truecolor", + "GH_TOKEN": "${localEnv:GH_TOKEN}", "MODEL_SERVER_HOST": "inference_model_server", "OPENSEARCH_HOST": "opensearch", "POSTGRES_HOST": "relational_db", diff --git a/.gitignore b/.gitignore index f2282874a7..0cea30f533 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ !/.vscode/env_template.txt !/.vscode/env.web_template.txt !/.vscode/launch.json -!/.vscode/tasks.template.jsonc +!/.vscode/tasks.json .zed .cursor !/.cursor/mcp.json diff --git a/.kanban.toml b/.kanban.toml new file mode 100644 index 0000000000..d7e15ccafa --- /dev/null +++ b/.kanban.toml @@ -0,0 +1,20 @@ +[[task]] +label = "start backend" +container_port = 8080 + +[[task]] +label = "start frontend" +container_port = 3000 + +[[task]] +label = "start frontend (docker backend)" +container_port = 3001 + +[sync] +allow_rebase = true +allow_merge = false + +[merge] +allow_merge_commit = false +allow_squash = true +allow_rebase = false diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000000..97f2f34e71 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,108 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "shell", + "label": "start backend", + "options": { + "cwd": "${workspaceFolder}", + "env": { + "UV_LINK_MODE": "copy" + } + }, + "command": "uv", + "args": ["run", "--with", "onyx-devtools", "ods", "backend", "api"] + }, + { + "type": "shell", + "label": "start frontend", + "options": { + "cwd": "${workspaceFolder}", + "env": { + "UV_LINK_MODE": "copy" + } + }, + "command": "uv", + "args": ["run", "--with", "onyx-devtools", "ods", "web", "dev"] + }, + { + "type": "shell", + "label": "start frontend (docker backend)", + "options": { + "cwd": "${workspaceFolder}", + "env": { + "INTERNAL_URL": "http://api_server:8080", + "PORT": "3001", + "UV_LINK_MODE": "copy" + } + }, + "command": "uv", + "args": ["run", "--with", "onyx-devtools", "ods", "web", "dev"] + }, + { + "type": "shell", + "label": "Generate Onyx OpenAPI Python client", + "cwd": "${workspaceFolder}/backend", + "envFile": "${workspaceFolder}/.env", + "options": { + "cwd": "${workspaceFolder}/backend" + }, + "command": "openapi-generator", + "args": [ + "generate", + "-i", + "generated/openapi.json", + "-g", + "python", + "-o", + "generated/onyx_openapi_client", + "--package-name", + "onyx_openapi_client" + ] + }, + { + "type": "shell", + "label": "Generate Typescript Fetch client (openapi-generator)", + "envFile": "${workspaceFolder}/.env", + "options": { + "cwd": "${workspaceFolder}" + }, + "command": "openapi-generator", + "args": [ + "generate", + "-i", + "backend/generated/openapi.json", + "-g", + "typescript-fetch", + "-o", + "${workspaceFolder}/web/src/lib/generated/onyx_api", + "--additional-properties=disallowAdditionalPropertiesIfNotPresent=false,legacyDiscriminatorBehavior=false,supportsES6=true" + ] + }, + { + "type": "shell", + "label": "Generate TypeScript Client (openapi-ts)", + "envFile": "${workspaceFolder}/.env", + "options": { + "cwd": "${workspaceFolder}/web" + }, + "command": "npx", + "args": [ + "openapi-typescript", + "../backend/generated/openapi.json", + "--output", + "./src/lib/generated/onyx-schema.ts" + ] + }, + { + "type": "shell", + "label": "Generate TypeScript Client (orval)", + "envFile": "${workspaceFolder}/.env", + "options": { + "cwd": "${workspaceFolder}/web" + }, + "command": "npx", + "args": ["orval", "--config", "orval.config.js"] + } + ] +} diff --git a/.vscode/tasks.template.jsonc b/.vscode/tasks.template.jsonc deleted file mode 100644 index 3e9ecbaa31..0000000000 --- a/.vscode/tasks.template.jsonc +++ /dev/null @@ -1,82 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "type": "shell", - "label": "Generate Onyx OpenAPI Python client", - "cwd": "${workspaceFolder}/backend", - "envFile": "${workspaceFolder}/.env", - "options": { - "cwd": "${workspaceFolder}/backend" - }, - "command": [ - "openapi-generator" - ], - "args": [ - "generate", - "-i", - "generated/openapi.json", - "-g", - "python", - "-o", - "generated/onyx_openapi_client", - "--package-name", - "onyx_openapi_client", - ] - }, - { - "type": "shell", - "label": "Generate Typescript Fetch client (openapi-generator)", - "envFile": "${workspaceFolder}/.env", - "options": { - "cwd": "${workspaceFolder}" - }, - "command": [ - "openapi-generator" - ], - "args": [ - "generate", - "-i", - "backend/generated/openapi.json", - "-g", - "typescript-fetch", - "-o", - "${workspaceFolder}/web/src/lib/generated/onyx_api", - "--additional-properties=disallowAdditionalPropertiesIfNotPresent=false,legacyDiscriminatorBehavior=false,supportsES6=true", - ] - }, - { - "type": "shell", - "label": "Generate TypeScript Client (openapi-ts)", - "envFile": "${workspaceFolder}/.env", - "options": { - "cwd": "${workspaceFolder}/web" - }, - "command": [ - "npx" - ], - "args": [ - "openapi-typescript", - "../backend/generated/openapi.json", - "--output", - "./src/lib/generated/onyx-schema.ts", - ] - }, - { - "type": "shell", - "label": "Generate TypeScript Client (orval)", - "envFile": "${workspaceFolder}/.env", - "options": { - "cwd": "${workspaceFolder}/web" - }, - "command": [ - "npx" - ], - "args": [ - "orval", - "--config", - "orval.config.js", - ] - } - ] -}