Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ export class RemixAIPlugin extends Plugin {
result = await this.remoteInferencer.answer(newPrompt)
}
if (result && params.terminal_output) this.call('terminal', 'log', { type: 'aitypewriterwarning', value: result })

if (prompt.trimStart().startsWith('gpt') || prompt.trimStart().startsWith('sol-gpt')) params.terminal_output = false
return result
}

Expand Down
4 changes: 0 additions & 4 deletions apps/remix-ide/src/app/tabs/locales/en/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,5 @@
"settings.projectID": "PROJECT ID",
"settings.projectSecret": "PROJECT SECRET",
"settings.analyticsInRemix": "Analytics in Remix IDE",
"settings.copilot": "Solidity copilot - Alpha",
"settings.copilot.activate": "Load & Activate copilot",
"settings.copilot.max_new_tokens": "Maximum number of words to generate",
"settings.copilot.temperature": "Temperature",
"settings.enableSaveEnvState": "Save environment state"
}
4 changes: 0 additions & 4 deletions apps/remix-ide/src/app/tabs/locales/it/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,5 @@
"settings.projectID": "ID PROGETTO",
"settings.projectSecret": "SEGRETO DEL PROGETTO",
"settings.analyticsInRemix": "Analytics nella Remix IDE",
"settings.copilot": "Solidity copilot - Alpha",
"settings.copilot.activate": "Carica & Attiva copilot",
"settings.copilot.max_new_tokens": "Numero massimo di parole da generare",
"settings.copilot.temperature": "Temperatura",
"settings.enableSaveEnvState": "Salva lo stato dell'ambiente"
}
6 changes: 1 addition & 5 deletions apps/remix-ide/src/app/tabs/locales/ko/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,5 @@
"settings.port": "포트",
"settings.projectID": "프로젝트 ID",
"settings.projectSecret": "프로젝트 SECRET",
"settings.analyticsInRemix": "Remix IDE에서의 분석",
"settings.copilot": "Solidity copilot - 알파",
"settings.copilot.activate": "Copilot 로드 및 활성화",
"settings.copilot.max_new_tokens": "생성할 최대 단어 수",
"settings.copilot.temperature": "온도"
"settings.analyticsInRemix": "Remix IDE에서의 분석"
}
6 changes: 1 addition & 5 deletions apps/remix-ide/src/app/tabs/locales/ru/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,5 @@
"settings.port": "ПОРТ",
"settings.projectID": "ID ПРОЕКТА",
"settings.projectSecret": "СЕКРЕТ ПРОЕКТА",
"settings.analyticsInRemix": "Аналитика в Remix IDE",
"settings.copilot": "Solidity второй пилот - Альфа",
"settings.copilot.activate": "Загрузка и активация копилота",
"settings.copilot.max_new_tokens": "Максимальное количество слов для генерации",
"settings.copilot.temperature": "Температура"
"settings.analyticsInRemix": "Аналитика в Remix IDE"
}
14 changes: 2 additions & 12 deletions libs/remix-ai-core/src/prompts/promptBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,8 @@ import { ChatHistory } from "./chat"
export const buildChatPrompt = (userPrompt) => {
const history = []
for (const [question, answer] of ChatHistory.getHistory()) {
if (question.startsWith('sol-gpt')) {
history.push({ role:'user', content:question.split('sol-gpt')[1] })
history.push({ role:'assistant' , content: answer })
}
else if (question.startsWith('gpt')) {
history.push({ role:'user', content:question.split('gpt')[1] })
history.push({ role:'assistant' , content: answer })
}
else {
history.push({ role:'user', content: question })
history.push({ role:'assistant' , content: answer })
}
history.push({ role:'user', content: question })
history.push({ role:'assistant' , content: answer })
}
history.push({ role: 'user', content: userPrompt })
return history
Expand Down
52 changes: 0 additions & 52 deletions libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -448,57 +448,6 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
copilotTemperatureValue = 0.9
}

const copilotSettings = () => (
<div className="border-top">
<div className="card-body pt-3 pb-2">
<h6 className="card-title d-inline">
<FormattedMessage id="settings.copilot" />
</h6>
<CustomTooltip placement="bottom" tooltipId="overlay-tooltip-aiDocumentation" tooltipText={<FormattedMessage id="remixUiTabs.tooltipText8" />}>
<span
data-id="remix_ai_docs"
id="remix_ai_docs"
className="btn pl-2 pr-0 py-0 d-inline ai-docs text-dark"
role='link'
onClick={()=>{
window.open("https://remix-ide.readthedocs.io/en/latest/ai.html")
_paq.push(['trackEvent', 'ai', 'remixAI', 'documentation'])
}}
>
<i aria-hidden="true" className="fas fa-book"></i>
</span>
</CustomTooltip>

<div className="pt-2 mb-0">
<div className="text-secondary mb-0 h6">
<div>
<div className="mb-1">
<label className={`form-check-label align-middle ${getTextClass('settings/copilot/suggest/max_new_tokens')}`} htmlFor="copilot-activate">
<FormattedMessage id="settings.copilot.max_new_tokens" /> - <span>{copilotMaxnewToken}</span>
</label>
<input onChange={onchangeCopilotMaxNewToken} id="copilot-max-new-token" value={copilotMaxnewToken} min='1' max='150' type="range" className="custom-range" />
</div>
</div>
</div>
</div>

<div className="pt-2 mb-0">
<div className="text-secondary mb-0 h6">
<div>
<div className="mb-1">
<label className={`form-check-label align-middle ${getTextClass('settings/copilot/suggest/temperature')}`} htmlFor="copilot-activate">
<FormattedMessage id="settings.copilot.temperature" /> - <span>{copilotTemperatureValue / 100}</span>
</label>
<input onChange={onchangeCopilotTemperature} id="copilot-temperature" value={copilotTemperatureValue} min='0' max='100' type="range" className="custom-range" />
</div>
</div>
</div>
</div>

</div>
</div>
)

const ipfsSettings = () => (
<div className="border-top">
<div className="card-body pt-3 pb-2">
Expand Down Expand Up @@ -577,7 +526,6 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
<div>
{state.message ? <Toaster message={state.message} /> : null}
{generalConfig()}
{copilotSettings()}
<GithubSettings
saveToken={(githubToken: string, githubUserName: string, githubEmail: string) => {
saveTokenToast(props.config, dispatchToast, githubToken, 'gist-access-token')
Expand Down
4 changes: 0 additions & 4 deletions libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
try {
if (script.trim().startsWith('git')) {
// await this.call('git', 'execute', script) code might be used in the future
} else if (script.trim().startsWith('gpt') || script.trim().startsWith('sol-gpt')) {
call('terminal', 'log',{ type: 'warn', value: `> ${script}` })
await call('remixAI', 'answer', script) // No streaming supported in terminal
_paq.push(['trackEvent', 'ai', 'remixAI', 'askFromTerminal'])
} else {
await call('scriptRunnerBridge', 'execute', script)
}
Expand Down
3 changes: 0 additions & 3 deletions libs/remix-ui/terminal/src/lib/terminalWelcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ const TerminalWelcomeMessage = ({ packageJson, storage }) => {
ethers.js
</a>{' '}
</li>
<li key="sol-gpt">
sol-gpt <i>&lt;your Solidity question here&gt;</i> {' '}
</li>
</ul>
<div>
<FormattedMessage id="terminal.welcomeText10" />.
Expand Down
2 changes: 1 addition & 1 deletion libs/remix-ui/terminal/src/lib/utils/wrapScript.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const wrapScript = (script) => {
const isKnownScript = ['remix.', 'console.', 'git', 'gpt', 'sol-gpt'].some(prefix => script.trim().startsWith(prefix))
const isKnownScript = ['remix.', 'console.', 'git'].some(prefix => script.trim().startsWith(prefix))
if (isKnownScript) return script
return `
try {
Expand Down