Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from RooVetGit:main #36

Merged
merged 43 commits into from
Feb 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ea3d384
Fetches all models from gateway during init
Feb 3, 2025
32f91b6
Merged with main branch
Feb 6, 2025
915d173
Reverts changes
Feb 6, 2025
2863863
Updates to prod url
Feb 6, 2025
18f1555
Fixes test file
Feb 6, 2025
26baaf8
Merge branch 'main' into WEB-1756
pugazhendhi-m Feb 7, 2025
5955c01
Removed AutoApproveMenu.test.tsx
Feb 7, 2025
e0417e9
Fixed indentation
Feb 7, 2025
01be038
Fixed indentation
Feb 7, 2025
1268db5
Fixes imports
Feb 7, 2025
7710df8
Fixed warnings
Feb 7, 2025
ddc6b9c
Changed default model to sonnet 3.5
Feb 7, 2025
64a579e
Fixes default model in test file
Feb 7, 2025
4c8577c
Reads unbound model ID from configuration
Feb 7, 2025
121f3ab
Checkpoint service integration
cte Feb 8, 2025
1a527fc
Checkpoint UI tweaks
cte Feb 8, 2025
59ddaa9
Current checkpoint indicator
cte Feb 8, 2025
a0993a3
Remove "Restore" option on current checkpoint
cte Feb 8, 2025
70ed217
Merge branch 'main' into pm/unbound-fetch-models
vigneshsubbiah16 Feb 8, 2025
3c5dde2
Add local eslintrc config to .gitignore to enable local use of additi…
nissa-seru Feb 8, 2025
b6eb80e
Use `rimraf` and `mkdirp` in `vsix` command to avoid misparsing of `-…
nissa-seru Feb 8, 2025
c84551f
Add `lint-fix` command; existing `lint` command is unchanged
nissa-seru Feb 8, 2025
a8f7649
DRYs up model picker for Unbound
vigneshsubbiah16 Feb 8, 2025
987fabb
Typo fix
nissa-seru Feb 8, 2025
c049436
DRYs up read model from cache logic
vigneshsubbiah16 Feb 8, 2025
17f3a31
Changes recommendedModel to be same as default model
vigneshsubbiah16 Feb 8, 2025
68cc942
Merge pull request #871 from nissa-seru/fix-vsix-add-lint-fix
mrubens Feb 8, 2025
d65e9ef
Merge pull request #868 from RooVetGit/cte/current-checkpoint-indicator
mrubens Feb 8, 2025
1d65824
Merge pull request #866 from RooVetGit/cte/checkpoints-ui-tweaks
mrubens Feb 8, 2025
47bdab0
Merge pull request #651 from RooVetGit/cte/use-checkpoints
cte Feb 8, 2025
5995923
Merge branch 'main' into pm/unbound-fetch-models
vigneshsubbiah16 Feb 8, 2025
dab592f
Check in package.lock changes
Feb 8, 2025
fffc9f7
Merge pull request #848 from websentry-ai/pm/unbound-fetch-models
mrubens Feb 8, 2025
c3012e3
Style and copy updates to advanced settings
Feb 8, 2025
b5f568f
Merge pull request #877 from RooVetGit/settings_updates
mrubens Feb 8, 2025
de10c13
changeset version bump
github-actions[bot] Feb 8, 2025
674a50d
Update CHANGELOG.md
mrubens Feb 8, 2025
152c5a0
Remove simple-git debugging
cte Feb 8, 2025
2fa4343
Update CHANGELOG.md
mrubens Feb 8, 2025
e28eac3
Update CHANGELOG.md
mrubens Feb 8, 2025
f83e6a5
Update CHANGELOG.md
mrubens Feb 8, 2025
d1000f2
Merge pull request #861 from RooVetGit/changeset-release/main
mrubens Feb 8, 2025
e70248c
Merge pull request #879 from RooVetGit/cte/remove-checkpoint-debugging
mrubens Feb 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/cyan-insects-marry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/dirty-coins-exist.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/violet-rockets-fetch.md

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ docs/_site/

# Dotenv
.env.integration
.eslintrc.local.json
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Roo Code Changelog

## [3.3.15]

- Improvements to MCP initialization and server restarts (thanks @MuriloFP and @hannesrudolph!)
- Add a copy button to the recent tasks (thanks @hannesrudolph!)
- Improve the user experience for adding a new API profile
- Another significant fix to API profile switching on the settings screen
- Opt-in experimental version of checkpoints in the advanced settings

## [3.3.14]

- Should have skipped floor 13 like an elevator. This fixes the broken 3.3.13 release by reverting some changes to the deployment scripts.
Expand Down
176 changes: 145 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Roo Code (prev. Roo Cline)",
"description": "A VS Code plugin that enhances coding with AI-powered automation, multi-model support, and experimental features.",
"publisher": "RooVeterinaryInc",
"version": "3.3.14",
"version": "3.3.15",
"icon": "assets/icons/rocket.png",
"galleryBanner": {
"color": "#617A91",
Expand Down Expand Up @@ -272,6 +272,7 @@
"compile:integration": "tsc -p tsconfig.integration.json",
"install:all": "npm install && cd webview-ui && npm install",
"lint": "eslint src --ext ts && npm run lint --prefix webview-ui",
"lint-fix": "eslint src --ext ts --fix && npm run lint-fix --prefix webview-ui",
"package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production",
"pretest": "npm run compile && npm run compile:integration",
"dev": "cd webview-ui && npm run dev",
Expand All @@ -283,7 +284,7 @@
"publish": "npm run build && changeset publish && npm install --package-lock-only",
"version-packages": "changeset version && npm install --package-lock-only",
"vscode:prepublish": "npm run package",
"vsix": "mkdir -p bin && npx vsce package --out bin",
"vsix": "rimraf bin && mkdirp bin && npx vsce package --out bin",
"watch": "npm-run-all -p watch:*",
"watch:esbuild": "node esbuild.js --watch",
"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
Expand Down Expand Up @@ -350,6 +351,8 @@
"@vscode/test-cli": "^0.0.9",
"@vscode/test-electron": "^2.4.0",
"esbuild": "^0.24.0",
"mkdirp": "^3.0.1",
"rimraf": "^6.0.1",
"eslint": "^8.57.0",
"husky": "^9.1.7",
"jest": "^29.7.0",
Expand Down
23 changes: 21 additions & 2 deletions src/api/providers/__tests__/unbound.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@ describe("UnboundHandler", () => {
mockOptions = {
apiModelId: "anthropic/claude-3-5-sonnet-20241022",
unboundApiKey: "test-api-key",
unboundModelId: "anthropic/claude-3-5-sonnet-20241022",
unboundModelInfo: {
description: "Anthropic's Claude 3 Sonnet model",
maxTokens: 8192,
contextWindow: 200000,
supportsPromptCache: true,
inputPrice: 0.01,
outputPrice: 0.02,
},
}
handler = new UnboundHandler(mockOptions)
mockCreate.mockClear()
Expand Down Expand Up @@ -205,6 +214,15 @@ describe("UnboundHandler", () => {
const nonAnthropicOptions = {
apiModelId: "openai/gpt-4o",
unboundApiKey: "test-key",
unboundModelId: "openai/gpt-4o",
unboundModelInfo: {
description: "OpenAI's GPT-4",
maxTokens: undefined,
contextWindow: 128000,
supportsPromptCache: true,
inputPrice: 0.01,
outputPrice: 0.03,
},
}
const nonAnthropicHandler = new UnboundHandler(nonAnthropicOptions)

Expand All @@ -230,10 +248,11 @@ describe("UnboundHandler", () => {
it("should return default model when invalid model provided", () => {
const handlerWithInvalidModel = new UnboundHandler({
...mockOptions,
apiModelId: "invalid/model",
unboundModelId: "invalid/model",
unboundModelInfo: undefined,
})
const modelInfo = handlerWithInvalidModel.getModel()
expect(modelInfo.id).toBe("openai/gpt-4o") // Default model
expect(modelInfo.id).toBe("anthropic/claude-3-5-sonnet-20241022") // Default model
expect(modelInfo.info).toBeDefined()
})
})
Expand Down
14 changes: 7 additions & 7 deletions src/api/providers/unbound.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Anthropic } from "@anthropic-ai/sdk"
import OpenAI from "openai"
import { ApiHandler, SingleCompletionHandler } from "../"
import { ApiHandlerOptions, ModelInfo, UnboundModelId, unboundDefaultModelId, unboundModels } from "../../shared/api"
import { ApiHandlerOptions, ModelInfo, unboundDefaultModelId, unboundDefaultModelInfo } from "../../shared/api"
import { convertToOpenAiMessages } from "../transform/openai-format"
import { ApiStream, ApiStreamUsageChunk } from "../transform/stream"

Expand Down Expand Up @@ -129,15 +129,15 @@ export class UnboundHandler implements ApiHandler, SingleCompletionHandler {
}
}

getModel(): { id: UnboundModelId; info: ModelInfo } {
const modelId = this.options.apiModelId
if (modelId && modelId in unboundModels) {
const id = modelId as UnboundModelId
return { id, info: unboundModels[id] }
getModel(): { id: string; info: ModelInfo } {
const modelId = this.options.unboundModelId
const modelInfo = this.options.unboundModelInfo
if (modelId && modelInfo) {
return { id: modelId, info: modelInfo }
}
return {
id: unboundDefaultModelId,
info: unboundModels[unboundDefaultModelId],
info: unboundDefaultModelInfo,
}
}

Expand Down
Loading
Loading