diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx index 51c4cea85db..57f4353e153 100644 --- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx +++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx @@ -3,10 +3,10 @@ import { ViewPlugin } from '@remixproject/engine-web' import { Plugin } from '@remixproject/engine'; import { RemixAITab, ChatApi } from '@remix-ui/remix-ai' import React, { useCallback } from 'react'; -import { ICompletions, IModel, RemoteInferencer, IRemoteModel, IParams, GenerationParams, CodeExplainAgent, SecurityAgent } from '@remix/remix-ai-core'; +import { ICompletions, IModel, RemoteInferencer, IRemoteModel, IParams, GenerationParams, AssistantParams, CodeExplainAgent, SecurityAgent } from '@remix/remix-ai-core'; import { CustomRemixApi } from '@remix-api' import { PluginViewWrapper } from '@remix-ui/helper' -import { CodeCompletionAgent } from '@remix/remix-ai-core'; +import { CodeCompletionAgent, ContractAgent } from '@remix/remix-ai-core'; const _paq = (window._paq = window._paq || []) type chatRequestBufferT = { @@ -18,7 +18,7 @@ const profile = { displayName: 'RemixAI', methods: ['code_generation', 'code_completion', "solidity_answer", "code_explaining", - "code_insertion", "error_explaining", "vulnerability_check", + "code_insertion", "error_explaining", "vulnerability_check", 'generate', "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending'], events: [], icon: 'assets/img/remix-logo-blue.png', @@ -40,6 +40,8 @@ export class RemixAIPlugin extends ViewPlugin { chatRequestBuffer: chatRequestBufferT = null codeExpAgent: CodeExplainAgent securityAgent: SecurityAgent + contractor: ContractAgent + assistantProvider: string = 'openai' useRemoteInferencer:boolean = false dispatch: any completionAgent: CodeCompletionAgent @@ -47,7 +49,6 @@ export class RemixAIPlugin extends ViewPlugin { constructor(inDesktop:boolean) { super(profile) this.isOnDesktop = inDesktop - this.codeExpAgent = new CodeExplainAgent(this) // user machine dont use ressource for remote inferencing } @@ -66,6 +67,8 @@ export class RemixAIPlugin extends ViewPlugin { } this.completionAgent = new CodeCompletionAgent(this) this.securityAgent = new SecurityAgent(this) + this.codeExpAgent = new CodeExplainAgent(this) + this.contractor = ContractAgent.getInstance(this) } async initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean){ @@ -174,6 +177,22 @@ export class RemixAIPlugin extends ViewPlugin { return this.securityAgent.getReport(file) } + async generate(userPrompt: string, params: IParams=AssistantParams, newThreadID:string=""): Promise { + params.stream_result = false // enforce no stream result + params.threadId = newThreadID + params.provider = this.assistantProvider + console.log('Generating code for prompt:', userPrompt, 'and threadID:', newThreadID) + + let result + if (this.isOnDesktop && !this.useRemoteInferencer) { + result = await this.call(this.remixDesktopPluginName, 'generate', userPrompt, params) + } else { + result = await this.remoteInferencer.generate(userPrompt, params) + } + + return this.contractor.writeContracts(result, userPrompt) + } + async code_insertion(msg_pfx: string, msg_sfx: string): Promise { if (this.completionAgent.indexer == null || this.completionAgent.indexer == undefined) await this.completionAgent.indexWorkspace() diff --git a/apps/remixdesktop/src/lib/InferenceServerManager.ts b/apps/remixdesktop/src/lib/InferenceServerManager.ts index 4ae69100134..565446607ed 100644 --- a/apps/remixdesktop/src/lib/InferenceServerManager.ts +++ b/apps/remixdesktop/src/lib/InferenceServerManager.ts @@ -526,4 +526,10 @@ export class InferenceManager implements ICompletions { } } + async generate(userPrompt, options:IParams=GenerationParams): Promise { + const payload = { prompt: userPrompt, "endpoint":"generate", ...options } + if (options.stream_result) return this._streamInferenceRequest(payload, AIRequestType.GENERAL) + else return this._makeRequest(payload, AIRequestType.GENERAL) + } + } diff --git a/apps/remixdesktop/src/plugins/remixAIDektop.ts b/apps/remixdesktop/src/plugins/remixAIDektop.ts index e8b11199694..9dbb35d1384 100644 --- a/apps/remixdesktop/src/plugins/remixAIDektop.ts +++ b/apps/remixdesktop/src/plugins/remixAIDektop.ts @@ -32,7 +32,7 @@ const clientProfile: Profile = { description: 'RemixAI provides AI services to Remix IDE Desktop.', kind: '', documentation: 'https://remix-ide.readthedocs.io/en/latest/ai.html', - methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer'] + methods: ['initializeModelBackend', 'code_completion', 'code_insertion', 'code_generation', 'code_explaining', 'error_explaining', 'solidity_answer', 'generate'] } class RemixAIDesktopPluginClient extends ElectronBasePluginClient { @@ -107,6 +107,10 @@ class RemixAIDesktopPluginClient extends ElectronBasePluginClient { return this.desktopInferencer.solidity_answer(prompt) } + async generate(userPrompt): Promise { + return this.desktopInferencer.generate(userPrompt) + } + changemodel(newModel: any){ /// dereference the current static inference object /// set new one diff --git a/libs/remix-ai-core/src/agents/contractAgent.ts b/libs/remix-ai-core/src/agents/contractAgent.ts new file mode 100644 index 00000000000..ac9cf797cbc --- /dev/null +++ b/libs/remix-ai-core/src/agents/contractAgent.ts @@ -0,0 +1,147 @@ +import { parse } from "path"; +import { AssistantParams } from "../types/models"; + +const compilationParams = { + optimize: false, + evmVersion: null, + language: 'Solidity', + version: '0.8.28+commit.7893614a' +} + +interface CompilationResult { + compilationSucceeded: boolean + errors: string +} + +export class ContractAgent { + plugin: any; + readonly generationAttempts: number = 3 + nAttempts: number = 0 + generationThreadID: string= '' + workspaceName: string = '' + contracts: any = {} + performCompile: boolean = true + static instance + + private constructor(props) { + this.plugin = props; + AssistantParams.provider = this.plugin.assistantProvider + } + + public static getInstance(props) { + if (ContractAgent.instance) return ContractAgent.instance + ContractAgent.instance = new ContractAgent(props) + return ContractAgent.instance + } + + async writeContracts(payload, userPrompt) { + console.log('payload', payload) + const currentWorkspace = await this.plugin.call('filePanel', 'getCurrentWorkspace') + try { + this.nAttempts += 1 + if (this.nAttempts > this.generationAttempts) { + this.performCompile = false + return ('Failed to generate the code. Number of attemps exceeded') + } + + if (payload === undefined) { + payload = await this.plugin.call('remixAI', 'generate', userPrompt, AssistantParams) + } + this.contracts = {} + const parsedFiles = payload + this.generationThreadID = parsedFiles['threadID'] + this.workspaceName = parsedFiles['projectName'] + + for (const file of parsedFiles.files) { + if (file.fileName.endsWith('.sol')) { + const result:CompilationResult = await this.compilecontracts(file.fileName, file.content) + console.log('compilation result', result) + if (!result.compilationSucceeded && this.performCompile) { + // nasty recursion + console.log('compilation failed', file.fileName, "reusind the same thread", this.generationThreadID) + const newPrompt = `The contract ${file.fileName} does not compile. Here is the error message; ${result.errors}. Try again with the same formatting!` + return await this.plugin.generate(newPrompt, AssistantParams, this.generationThreadID); // reuse the same thread + //throw new Error("Failed to generate secure code on this prompt ```" + userPrompt + "```") + } + } + } + + console.log('All source files might compile') + await this.createWorkspace(this.workspaceName) + await this.plugin.call('filePanel', 'switchToWorkspace', { name: this.workspaceName, isLocalHost: false }) + const dirCreated = [] + for (const file of parsedFiles.files) { + const dir = file.fileName.split('/').slice(0, -1).join('/') + if (!dirCreated.includes(dir) && dir) { + await this.plugin.call('fileManager', 'mkdir', dir) + dirCreated.push(dir) + } + await this.plugin.call('fileManager', 'writeFile', file.fileName, file.content) + await this.plugin.call('codeFormatter', 'format', file.fileName) + // recompile to have it in the workspace + // await this.plugin.call('solidity' as any, 'setCompilerConfig', compilationParams) + // await this.plugin.call('solidity' as any, 'compile', file.fileName) + } + this.nAttempts = 0 + this.performCompile = true + return "New workspace created: **" + this.workspaceName + "**\nUse the Hamburger menu to select it!" + } catch (error) { + this.deleteWorkspace(this.workspaceName ) + this.nAttempts = 0 + this.performCompile = true + await this.plugin.call('filePanel', 'switchToWorkspace', currentWorkspace) + return "Failed to generate secure code on this prompt ```" + userPrompt + "```" + } + + } + + async createWorkspace(workspaceName) { + // create random workspace surfixed with timestamp + const timestamp = new Date().getTime() + const wsp_name = workspaceName + '-' + timestamp + await this.plugin.call('filePanel', 'createWorkspace', wsp_name, true) + this.workspaceName = wsp_name + } + + deleteWorkspace(workspaceName) { + this.plugin.call('filePanel', 'deleteWorkspace', workspaceName) + } + + async compilecontracts(fileName, fileContent): Promise { + // do not compile tests files + if (fileName.includes('tests/')) return { compilationSucceeded: true, errors: null } + + this.contracts[fileName] = { content : fileContent } + const result = await this.plugin.call('solidity' as any, 'compileWithParameters', this.contracts, compilationParams) + const data = result.data + let error = false + + if (data.errors) { + error = data.errors.find((error) => error.type !== 'Warning') + } + if (data.errors && data.errors.length && error) { + const msg = ` + - Compilation errors: ${data.errors.map((e) => e.formattedMessage)}. + ` + return { compilationSucceeded: false, errors: msg } + } + + return { compilationSucceeded: true, errors: null } + } + + extractImportPaths(text) { + // eslint-disable-next-line no-useless-escape + const regex = /import\s*\"([^\"]+)\"\s*;/g; + const paths = []; + let match; + + // Use the regex to find all matches in the text + while ((match = regex.exec(text)) !== null) { + // Push the captured path to the paths array + paths.push(match[1]); + } + + return paths; + } + +} \ No newline at end of file diff --git a/libs/remix-ai-core/src/helpers/streamHandler.ts b/libs/remix-ai-core/src/helpers/streamHandler.ts index 5d585195688..fd218f31b69 100644 --- a/libs/remix-ai-core/src/helpers/streamHandler.ts +++ b/libs/remix-ai-core/src/helpers/streamHandler.ts @@ -62,3 +62,16 @@ export const HandleStreamResponse = async (streamResponse, export const UpdateChatHistory = (userPrompt: string, AIAnswer: string) => { ChatHistory.pushHistory(userPrompt, AIAnswer) } + +export const parseUserInput = (input: string) => { + if (input.trimStart().startsWith('/generate')) return [true, input.replace('/generate', '').trimStart()] + else return [false, input] +} + +export const setProvider = (userPrompt: string) => { + if (userPrompt.trimStart().startsWith('/setProvider')) { + const provider = userPrompt.replace('/setProvider', '').trimStart() + return [true, provider] + } + return [false, ''] +} \ No newline at end of file diff --git a/libs/remix-ai-core/src/index.ts b/libs/remix-ai-core/src/index.ts index d24ac6abae6..d13541bd7cc 100644 --- a/libs/remix-ai-core/src/index.ts +++ b/libs/remix-ai-core/src/index.ts @@ -4,7 +4,7 @@ import { IModel, IModelResponse, IModelRequest, InferenceModel, ICompletions, IParams, ChatEntry, AIRequestType, IRemoteModel, RemoteBackendOPModel, IStreamResponse } from './types/types' import { ModelType } from './types/constants' -import { DefaultModels, InsertionParams, CompletionParams, GenerationParams } from './types/models' +import { DefaultModels, InsertionParams, CompletionParams, GenerationParams, AssistantParams } from './types/models' import { getCompletionPrompt, getInsertionPrompt } from './prompts/completionPrompts' import { buildSolgptPrompt, PromptBuilder } from './prompts/promptBuilder' import { RemoteInferencer } from './inferencers/remote/remoteInference' @@ -15,7 +15,7 @@ export { IModel, IModelResponse, IModelRequest, InferenceModel, ModelType, DefaultModels, ICompletions, IParams, IRemoteModel, getCompletionPrompt, getInsertionPrompt, IStreamResponse, buildSolgptPrompt, - RemoteInferencer, InsertionParams, CompletionParams, GenerationParams, + RemoteInferencer, InsertionParams, CompletionParams, GenerationParams, AssistantParams, ChatEntry, AIRequestType, RemoteBackendOPModel, ChatHistory, downloadLatestReleaseExecutable } @@ -24,3 +24,4 @@ export * from './helpers/streamHandler' export * from './agents/codeExplainAgent' export * from './agents/completionAgent' export * from './agents/securityAgent' +export * from './agents/contractAgent' diff --git a/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts b/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts index a8fa702fc71..6375c328de7 100644 --- a/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts +++ b/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts @@ -152,4 +152,10 @@ export class RemoteInferencer implements ICompletions { if (options.stream_result) return this._streamInferenceRequest(payload, AIRequestType.GENERAL) else return this._makeRequest(payload, AIRequestType.GENERAL) } + + async generate(userPrompt, options:IParams=GenerationParams): Promise { + const payload = { prompt: userPrompt, "endpoint":"generate", ...options } + if (options.stream_result) return this._streamInferenceRequest(payload, AIRequestType.GENERAL) + else return this._makeRequest(payload, AIRequestType.GENERAL) + } } diff --git a/libs/remix-ai-core/src/types/models.ts b/libs/remix-ai-core/src/types/models.ts index af64d2cb7ed..28d2e18aedc 100644 --- a/libs/remix-ai-core/src/types/models.ts +++ b/libs/remix-ai-core/src/types/models.ts @@ -82,4 +82,7 @@ const GenerationParams:IParams = { terminal_output: false, } -export { DefaultModels, CompletionParams, InsertionParams, GenerationParams } +const AssistantParams:IParams = GenerationParams +AssistantParams.provider = 'openai' + +export { DefaultModels, CompletionParams, InsertionParams, GenerationParams, AssistantParams } diff --git a/libs/remix-ai-core/src/types/types.ts b/libs/remix-ai-core/src/types/types.ts index 3e0417031f8..ecc1177cda9 100644 --- a/libs/remix-ai-core/src/types/types.ts +++ b/libs/remix-ai-core/src/types/types.ts @@ -73,6 +73,8 @@ export interface IParams { temp?: number; return_stream_response?: boolean; terminal_output?: boolean; + threadId?: string; + provider?: string; } export enum AIRequestType { diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx index cf7e023a3fb..07328b5c27b 100644 --- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx +++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx @@ -9,7 +9,6 @@ import { solidityTokensProvider, solidityLanguageConfig } from './syntaxes/solid import { cairoTokensProvider, cairoLanguageConfig } from './syntaxes/cairo' import { zokratesTokensProvider, zokratesLanguageConfig } from './syntaxes/zokrates' import { moveTokenProvider, moveLanguageConfig } from './syntaxes/move' -import { vyperTokenProvider, vyperLanguageConfig } from './syntaxes/vyper' import { tomlLanguageConfig, tomlTokenProvider } from './syntaxes/toml' import { monacoTypes } from '@remix-ui/editor' import { loadTypes } from './web-types' @@ -370,8 +369,6 @@ export const EditorUI = (props: EditorUIProps) => { monacoRef.current.editor.setModelLanguage(file.model, 'remix-toml') } else if (file.language === 'noir') { monacoRef.current.editor.setModelLanguage(file.model, 'remix-noir') - } else if (file.language === 'python') { - monacoRef.current.editor.setModelLanguage(file.model, 'remix-vyper') } }, [props.currentFile, props.isDiff]) @@ -994,7 +991,6 @@ export const EditorUI = (props: EditorUIProps) => { monacoRef.current.languages.register({ id: 'remix-zokrates' }) monacoRef.current.languages.register({ id: 'remix-move' }) monacoRef.current.languages.register({ id: 'remix-circom' }) - monacoRef.current.languages.register({ id: 'remix-vyper' }) monacoRef.current.languages.register({ id: 'remix-toml' }) monacoRef.current.languages.register({ id: 'remix-noir' }) @@ -1019,7 +1015,6 @@ export const EditorUI = (props: EditorUIProps) => { monacoRef.current.languages.setMonarchTokensProvider('remix-circom', circomTokensProvider as any) monacoRef.current.languages.setLanguageConfiguration('remix-circom', circomLanguageConfig(monacoRef.current) as any) - monacoRef.current.languages.registerInlineCompletionsProvider('remix-circom', inlineCompletionProvider) monacoRef.current.languages.setMonarchTokensProvider('remix-toml', tomlTokenProvider as any) monacoRef.current.languages.setLanguageConfiguration('remix-toml', tomlLanguageConfig as any) @@ -1035,11 +1030,6 @@ export const EditorUI = (props: EditorUIProps) => { monacoRef.current.languages.registerInlineCompletionsProvider('remix-solidity', inlineCompletionProvider) monaco.languages.registerCodeActionProvider('remix-solidity', new RemixCodeActionProvider(props, monaco)) - monacoRef.current.languages.setMonarchTokensProvider('remix-vyper', vyperTokenProvider as any) - monacoRef.current.languages.setLanguageConfiguration('remix-vyper', vyperLanguageConfig as any) - monacoRef.current.languages.registerCompletionItemProvider('remix-vyper', new RemixCompletionProvider(props, monaco)) - monacoRef.current.languages.registerInlineCompletionsProvider('remix-vyper', inlineCompletionProvider) - loadTypes(monacoRef.current) } diff --git a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx index b18d42bfdd0..f9c20b0de85 100644 --- a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx +++ b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react' import '../remix-ai.css' -import { DefaultModels, GenerationParams, ChatHistory, HandleStreamResponse } from '@remix/remix-ai-core'; +import { DefaultModels, GenerationParams, ChatHistory, HandleStreamResponse, parseUserInput, setProvider } from '@remix/remix-ai-core'; import { ConversationStarter, StreamSend, StreamingAdapterObserver, useAiChatApi } from '@nlux/react'; import { AiChat, useAsStreamAdapter, ChatItem } from '@nlux/react'; import { user, assistantAvatar } from './personas'; @@ -8,6 +8,7 @@ import { highlighter } from '@nlux/highlighter' import './color.css' import '@nlux/themes/unstyled.css'; import copy from 'copy-to-clipboard' +import { set } from 'lodash'; export let ChatApi = null @@ -39,13 +40,34 @@ export const Default = (props) => { prompt: string, observer: StreamingAdapterObserver, ) => { + + const command = setProvider(prompt) + const isProvidercmd = command[0] + const provider = command[1] + if (isProvidercmd) { + if (provider === 'openai' || provider === 'mistralai' || provider === 'anthropic') { + props.plugin.assistantProvider = provider + observer.next("AI Provider set to `" + provider + "`") + observer.complete() + } else { observer.complete()} + return + } + GenerationParams.stream_result = true setIS_streaming(true) GenerationParams.return_stream_response = GenerationParams.stream_result + const userInput = parseUserInput(prompt) + const isGeneratePrompt = userInput[0] + const newprompt = userInput[1] + let response = null if (await props.plugin.call('remixAI', 'isChatRequestPending')){ response = await props.plugin.call('remixAI', 'ProcessChatRequestBuffer', GenerationParams); + } else if (isGeneratePrompt) { + GenerationParams.return_stream_response = false + GenerationParams.stream_result = false + response = await props.plugin.call('remixAI', 'generate', newprompt, GenerationParams); } else { response = await props.plugin.call('remixAI', 'solidity_answer', prompt, GenerationParams); } diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx index 683b938fb4e..d573719e950 100644 --- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx +++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx @@ -304,7 +304,7 @@ export const TabsUI = (props: TabsUIProps) => { data-id="remix_ai_switch" id='remix_ai_switch' className="btn ai-switch text-ai pl-2 pr-0 py-0" - disabled={!((tabsState.currentExt === 'sol') || (tabsState.currentExt === 'vy') || (tabsState.currentExt === 'circom') )} + disabled={!(tabsState.currentExt === 'sol')} onClick={async () => { await props.plugin.call('settings', 'updateCopilotChoice', !ai_switch) setAI_switch(!ai_switch)