-
Notifications
You must be signed in to change notification settings - Fork 130
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
remove vscode azure session #692
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -175,6 +175,11 @@ | |
if (!this._azureToken) throw new Error("Azure token not available") | ||
tok.token = "Bearer " + this._azureToken.token | ||
} | ||
if (!tok) { | ||
const { provider } = parseModelIdentifier(modelId) | ||
if (provider === MODEL_PROVIDER_AZURE) | ||
throw new Error("Azure end point not configured") | ||
} | ||
Check failure on line 182 in packages/cli/src/nodehost.ts GitHub Actions / build
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The
|
||
if (!tok && this.clientLanguageModel) { | ||
return <LanguageModelConfiguration>{ | ||
model: modelId, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -363,20 +363,7 @@ | |
} | ||
|
||
// update .env | ||
const { config, model } = dotEnvTemplate(provider, apiType) | ||
let src = config | ||
const current = await tryReadText(DOT_ENV_FILENAME) | ||
if (current) { | ||
if (!current.includes("GENAISCRIPT_DEFAULT_MODEL")) | ||
src = | ||
dedent` | ||
|
||
## GenAIScript defaults | ||
GENAISCRIPT_DEFAULT_MODEL="${model}" | ||
# GENAISCRIPT_DEFAULT_TEMPERATURE=${DEFAULT_TEMPERATURE} | ||
|
||
` + src | ||
src = current + "\n" + src | ||
} | ||
await writeText(DOT_ENV_FILENAME, src) | ||
// const { config } = dotEnvTemplate(provider, apiType) | ||
// const current = await tryReadText(DOT_ENV_FILENAME) | ||
//await writeText(DOT_ENV_FILENAME, config) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is a block of code that has been commented out. If this code is not needed, it is better to remove it to keep the codebase clean and maintainable. π§Ή
|
||
} |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ | |
MODEL_PROVIDER_OPENAI, | ||
MODEL_PROVIDER_CLIENT, | ||
MODEL_PROVIDER_GITHUB, | ||
TOOL_NAME, | ||
} from "../../core/src/constants" | ||
import { APIType } from "../../core/src/host" | ||
import { parseModelIdentifier } from "../../core/src/models" | ||
|
@@ -143,11 +144,9 @@ | |
|
||
if (res.model) return res.model | ||
else { | ||
await vscode.commands.executeCommand( | ||
"genaiscript.connection.configure", | ||
res.provider, | ||
res.apiType | ||
vscode.window.showWarningMessage( | ||
`${TOOL_NAME} - model connection not configured.` | ||
) | ||
Check failure on line 149 in packages/vscode/src/lmaccess.ts GitHub Actions / build
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The function
|
||
return undefined | ||
} | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,17 @@ | ||
import * as vscode from "vscode" | ||
import { createVSPath } from "./vspath" | ||
import { TerminalServerManager } from "./servermanager" | ||
import { AzureManager } from "./azuremanager" | ||
import { Uri } from "vscode" | ||
import { ExtensionState } from "./state" | ||
import { Utils } from "vscode-uri" | ||
import { checkFileExists, readFileText } from "./fs" | ||
import { filterGitIgnore } from "../../core/src/gitignore" | ||
import { | ||
parseDefaultsFromEnv, | ||
parseTokenFromEnv, | ||
} from "../../core/src/connection" | ||
import { parseDefaultsFromEnv } from "../../core/src/connection" | ||
import { | ||
DEFAULT_EMBEDDINGS_MODEL, | ||
DEFAULT_MODEL, | ||
DEFAULT_TEMPERATURE, | ||
DOT_ENV_FILENAME, | ||
MODEL_PROVIDER_AZURE, | ||
} from "../../core/src/constants" | ||
import { dotEnvTryParse } from "../../core/src/dotenv" | ||
import { | ||
|
@@ -26,15 +21,14 @@ import { | |
Host, | ||
} from "../../core/src/host" | ||
import { TraceOptions, AbortSignalOptions } from "../../core/src/trace" | ||
import { arrayify, logVerbose, unique } from "../../core/src/util" | ||
import { arrayify, unique } from "../../core/src/util" | ||
import { LanguageModel } from "../../core/src/chat" | ||
|
||
export class VSCodeHost extends EventTarget implements Host { | ||
dotEnvPath: string = DOT_ENV_FILENAME | ||
userState: any = {} | ||
readonly path = createVSPath() | ||
readonly server: TerminalServerManager | ||
private _azure: AzureManager | ||
readonly defaultModelOptions = { | ||
model: DEFAULT_MODEL, | ||
temperature: DEFAULT_TEMPERATURE, | ||
|
@@ -56,11 +50,6 @@ export class VSCodeHost extends EventTarget implements Host { | |
await parseDefaultsFromEnv(env) | ||
} | ||
|
||
get azure() { | ||
if (!this._azure) this._azure = new AzureManager(this.state) | ||
return this._azure | ||
} | ||
|
||
get context() { | ||
return this.state.context | ||
} | ||
|
@@ -198,20 +187,6 @@ export class VSCodeHost extends EventTarget implements Host { | |
modelId, | ||
options | ||
) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The
|
||
const { token: askToken } = options || {} | ||
if ( | ||
askToken && | ||
tok && | ||
!tok.token && | ||
tok.provider === MODEL_PROVIDER_AZURE | ||
) { | ||
const azureToken = await this.azure.getOpenAIToken() | ||
if (!azureToken) throw new Error("Azure token not available") | ||
tok.token = "Bearer " + azureToken | ||
tok.curlHeaders = { | ||
Authorization: "Bearer ***", | ||
} | ||
} | ||
return tok | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The error "Azure end point not configured" is thrown but not caught. This could lead to unexpected application termination. Consider handling this error to improve the application's robustness. π οΈ