artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 18:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

extract viewHelpers in cody (#49998)

Browse Source 
These are useful to other clients, not just the VS Code extension.
This commit is contained in:
Quinn Slack 2023-03-26 15:08:07 -07:00 committed by GitHub
parent fb86fe693e
commit e8d679310a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/cody-shared/src/chat/viewHelpers.ts Normal file
View File

@ -0,0 +1,22 @@
// If the bot message ends with some prefix of the `Human:` stop
// sequence, trim if from the end.
const STOP_SEQUENCE_REGEXP = /(H|Hu|Hum|Huma|Human|Human:)$/
export function reformatBotMessage(text: string, prefix: string): string {
let reformattedMessage = prefix + text.trimEnd()
const stopSequenceMatch = reformattedMessage.match(STOP_SEQUENCE_REGEXP)
if (stopSequenceMatch) {
reformattedMessage = reformattedMessage.slice(0, stopSequenceMatch.index)
}
// TODO: Detect if bot sent unformatted code without a markdown block.
return fixOpenMarkdownCodeBlock(reformattedMessage)
}
function fixOpenMarkdownCodeBlock(text: string): string {
const occurances = text.split('```').length - 1
if (occurances % 2 === 1) {
return text + '\n```'
}
return text
}

26
client/cody/src/chat/ChatViewProvider.ts
View File

@ -5,6 +5,7 @@ import { renderMarkdown } from '@sourcegraph/cody-shared/src/chat/markdown'
import { getRecipe } from '@sourcegraph/cody-shared/src/chat/recipes'
import { Transcript } from '@sourcegraph/cody-shared/src/chat/transcript'
import { ChatMessage } from '@sourcegraph/cody-shared/src/chat/transcript/messages'
import { reformatBotMessage } from '@sourcegraph/cody-shared/src/chat/viewHelpers'
import { CodebaseContext } from '@sourcegraph/cody-shared/src/codebase-context'
import { Editor } from '@sourcegraph/cody-shared/src/editor'
import { IntentDetector } from '@sourcegraph/cody-shared/src/intent-detector'
@ -19,10 +20,6 @@ import { configureExternalServices } from '../external-services'
import { getRgPath } from '../rg'
import { TestSupport } from '../test-support'
// If the bot message ends with some prefix of the `Human:` stop
// sequence, trim if from the end.
const STOP_SEQUENCE_REGEXP = /(H|Hu|Hum|Huma|Human|Human:)$/
async function isValidLogin(serverEndpoint: string, accessToken: string): Promise<boolean> {
const client = new SourcegraphGraphQLAPIClient(serverEndpoint, accessToken)
const userId = await client.getCurrentUserId()
@ -136,7 +133,7 @@ export class ChatViewProvider implements vscode.WebviewViewProvider {
this.cancelCompletion()
this.cancelCompletionCallback = this.chat.chat(promptMessages, {
onChange: text => this.onBotMessageChange(this.reformatBotMessage(text, responsePrefix)),
onChange: text => this.onBotMessageChange(reformatBotMessage(text, responsePrefix)),
onComplete: () => {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.onBotMessageComplete()
@ -194,17 +191,6 @@ export class ChatViewProvider implements vscode.WebviewViewProvider {
this.sendPrompt(prompt, interaction.getAssistantMessage().prefix ?? '')
}
private reformatBotMessage(text: string, prefix: string): string {
let reformattedMessage = prefix + text.trimEnd()
const stopSequenceMatch = reformattedMessage.match(STOP_SEQUENCE_REGEXP)
if (stopSequenceMatch) {
reformattedMessage = reformattedMessage.slice(0, stopSequenceMatch.index)
}
// TODO: Detect if bot sent unformatted code without a markdown block.
return fixOpenMarkdownCodeBlock(reformattedMessage)
}
private async onBotMessageChange(text: string): Promise<void> {
this.transcript.addAssistantResponse(text, renderMarkdown(text))
await this.sendTranscript()
@ -309,14 +295,6 @@ export class ChatViewProvider implements vscode.WebviewViewProvider {
}
}
function fixOpenMarkdownCodeBlock(text: string): string {
const occurances = text.split('```').length - 1
if (occurances % 2 === 1) {
return text + '\n```'
}
return text
}
function getNonce(): string {
let text = ''
const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'