Skip to content

Commit 1c51cf4

Browse files
committed
show setting window when no default api key
1 parent 75f4146 commit 1c51cf4

File tree

5 files changed

+16
-49
lines changed

5 files changed

+16
-49
lines changed

ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"zustand": "^4.1.3"
7171
},
7272
"scripts": {
73-
"generate": "chmod -R 777 /root && rm -rf ./src/proto && npx buf generate --output ./src/",
73+
"generate": "chmod 777 /root && rm -rf ./src/proto && npx buf generate --output ./src/",
7474
"dev": "react-app-rewired start",
7575
"build": "react-app-rewired build --max_old_space_size=4096",
7676
"test": "react-app-rewired test",

ui/src/components/SettingDialog.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ export function SettingDialog({ open = false }: SettingDiagProps) {
7676
} catch (e) {
7777
setStatus("error");
7878
setMessage((e as Error).message || "Unknown error");
79-
console.log(
80-
(e as Error).message === undefined,
81-
(e as Error).message === ""
82-
);
8379
setInfoShow(true);
8480
return;
8581
}
@@ -92,7 +88,11 @@ export function SettingDialog({ open = false }: SettingDiagProps) {
9288
<DialogContentText>
9389
The AI code auto completion is powered by{" "}
9490
<Link href="https://codeium.com/" target="_blank" rel="noreferrer">
95-
Codeium <LaunchIcon fontSize="small" />
91+
Codeium{" "}
92+
<LaunchIcon
93+
fontSize="small"
94+
sx={{ marginBottom: -0.5, marginLeft: -0.5 }}
95+
/>
9696
</Link>{" "}
9797
You can also use your own token instead of our default API keys, which
9898
records your own activities of using Codeium.

ui/src/components/Sidebar.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import RefreshIcon from "@mui/icons-material/Refresh";
1010
import CloudUploadIcon from "@mui/icons-material/CloudUpload";
1111
import Drawer from "@mui/material/Drawer";
1212
import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
13-
import Grid from "@mui/material/Grid";
1413
import ChevronRightIcon from "@mui/icons-material/ChevronRight";
1514
import RestartAltIcon from "@mui/icons-material/RestartAlt";
1615
import HelpOutlineOutlinedIcon from "@mui/icons-material/HelpOutlineOutlined";
@@ -79,14 +78,14 @@ function SidebarSettings() {
7978
const setSettingOpen = useStore(store, (state) => state.setSettingOpen);
8079

8180
useEffect(() => {
82-
console.log("apiKey", apiKey);
83-
if (autoCompletion) {
81+
if (autoCompletion && apiKey) {
8482
const dispose = registerCompletion(apiKey);
8583
if (dispose !== null) {
8684
return dispose;
8785
}
8886
}
8987
}, [autoCompletion, apiKey]);
88+
9089
return (
9190
<Box>
9291
<Box>
@@ -189,11 +188,15 @@ function SidebarSettings() {
189188
<FormControlLabel
190189
control={
191190
<Switch
192-
checked={autoCompletion}
191+
checked={(apiKey && autoCompletion) as boolean}
193192
size="small"
194193
color="warning"
195194
onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
196-
setAutoCompletion(event.target.checked);
195+
if (apiKey) {
196+
setAutoCompletion(event.target.checked);
197+
} else {
198+
setSettingOpen(true);
199+
}
197200
}}
198201
/>
199202
}

ui/src/lib/monacoCompletionProvider.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ function createInlineCompletionItem(
8585
document.getOffsetAt(selection.getPosition()) + deltaCursorOffset
8686
);
8787
editor.setSelection(new MonacoRange(newPosition, newPosition));
88-
// editor._commandService.executeCommand(
89-
// "editor.action.inlineSuggest.trigger"
90-
// );
9188
};
9289
}
9390

ui/src/lib/notebook.ts

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -106,42 +106,9 @@ export function computeTextAndOffsets<T>(
106106
maybeNotebook.currentTextModel,
107107
undefined
108108
);
109-
// const modelIsMarkdown = modelLanguage === Language.MARKDOWN;
110-
// const modelIsExpected = isAllowedLanguage(modelLanguage);
111-
// const relevantDocumentTexts: string[] = [];
109+
112110
let additionalUtf8ByteOffset = 0;
113-
// let found = false;
114-
// for (const [idx, previousModel] of textModels.entries()) {
115-
// if (modelIsExpected && maybeNotebook.currentTextModel === previousModel) {
116-
// // There is an offset for all previous cells and the \n\n spacing after each one.
117-
// additionalUtf8ByteOffset =
118-
// relevantDocumentTexts
119-
// .map((el) => numCodeUnitsToNumUtf8Bytes(el))
120-
// .reduce((a, b) => a + b, 0) +
121-
// '\n\n'.length * relevantDocumentTexts.length;
122-
// found = true;
123-
// }
124-
// const previousModelLanguage = maybeNotebook.getLanguage(previousModel, idx);
125-
// if (modelIsExpected && !modelIsMarkdown) {
126-
// // Don't use markdown in the Python prompt construction.
127-
// // TODO(prem): Consider adding as comments.
128-
// if (previousModelLanguage === Language.MARKDOWN) {
129-
// continue;
130-
// } else if (previousModelLanguage === modelLanguage) {
131-
// relevantDocumentTexts.push(maybeNotebook.getText(previousModel));
132-
// }
133-
// } else if (modelIsMarkdown) {
134-
// if (previousModelLanguage === Language.MARKDOWN) {
135-
// relevantDocumentTexts.push(maybeNotebook.getText(previousModel));
136-
// } else if (isAllowedLanguage(previousModelLanguage)) {
137-
// relevantDocumentTexts.push(
138-
// `\`\`\`${
139-
// NOTEBOOK_LANGUAGES[previousModelLanguage as AllowedLanguages]
140-
// }\n${maybeNotebook.getText(previousModel)}\n\`\`\``
141-
// );
142-
// }
143-
// }
144-
// }
111+
145112
const currentModelText = maybeNotebook.getText(
146113
maybeNotebook.currentTextModel
147114
);

0 commit comments

Comments
 (0)