Merge pull request #4275 from ethereum/add_matomo_key

add missing matomo keys
ethereum · Nov 29, 2023 · 2675918 · 2675918
2 parents 80c4817 + 23d8aa8
commit 2675918
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/apps/remix-ide/src/app/plugins/openaigpt.tsx b/apps/remix-ide/src/app/plugins/openaigpt.tsx
@@ -38,11 +38,11 @@ export class OpenAIGpt extends Plugin {
     }
 
     if (result && result.choices && result.choices.length) {
-      this.call('terminal', 'log', { type: 'typewritersuccess', value: result.choices[0].message.content })    
+      this.call('terminal', 'log', { type: 'typewriterwarning', value: result.choices[0].message.content })    
     } else if  (result.error) {
-      this.call('terminal', 'log', { type: 'typewritersuccess', value: result.error })
+      this.call('terminal', 'log', { type: 'typewriterwarning', value: result.error })
     } else {
-      this.call('terminal', 'log', { type: 'typewritersuccess', value: 'No response...' })
+      this.call('terminal', 'log', { type: 'typewriterwarning', value: 'No response...' })
     }
     return result.data
   }

diff --git a/apps/remix-ide/src/remixEngine.js b/apps/remix-ide/src/remixEngine.js
@@ -22,6 +22,7 @@ export class RemixEngine extends Engine {
     if (name === 'udapp') return { queueTimeout: 60000 * 4 }
     if (name === 'circuit-compiler') return { queueTimeout: 60000 * 4 }
     if (name === 'filePanel') return { queueTimeout: 60000 * 20 }
+    if (name === 'openaigpt') return { queueTimeout: 60000 * 2 }
     return { queueTimeout: 10000 }
   }
 

diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -20,6 +20,7 @@ import './remix-ui-editor.css'
 import { circomLanguageConfig, circomTokensProvider } from './syntaxes/circom'
 import { IPosition } from 'monaco-editor'
 import { RemixInLineCompletionProvider } from './providers/inlineCompletionProvider'
+const _paq = (window._paq = window._paq || [])
 
 enum MarkerSeverity {
   Hint = 1,
@@ -709,6 +710,7 @@ export const EditorUI = (props: EditorUIProps) => {
         Generate the documentation for the function ${currentFunction.current} using the Doxygen style syntax
         `
         await props.plugin.call('openaigpt', 'message', message)
+        _paq.push(['trackEvent', 'ai', 'openai', 'generateDocumentation'])
       },
     }
 
@@ -727,6 +729,7 @@ export const EditorUI = (props: EditorUIProps) => {
         Explain the function ${currentFunction.current}
         `
         await props.plugin.call('openaigpt', 'message', message)
+        _paq.push(['trackEvent', 'ai', 'openai', 'explainFunction'])
       },
     }
 

diff --git a/libs/remix-ui/renderer/src/lib/renderer.tsx b/libs/remix-ui/renderer/src/lib/renderer.tsx
@@ -78,7 +78,7 @@ export const Renderer = ({message, opt = {}, plugin}: RendererProps) => {
       explain why the error occurred and how to fix it.
       `
       await plugin.call('openaigpt', 'message', message)
-      _paq.push(['trackEvent', 'GPTSupport', 'askGPT'])
+      _paq.push(['trackEvent', 'ai', 'openai', 'explainSolidityError'])
     } catch (err) {
       console.error('unable to askGtp')
       console.error(err)

diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -28,6 +28,7 @@ import RenderKnownTransactions from './components/RenderKnownTransactions' // es
 import parse from 'html-react-parser'
 import { EMPTY_BLOCK, KNOWN_TRANSACTION, RemixUiTerminalProps, UNKNOWN_TRANSACTION } from './types/terminalTypes'
 import { wrapScript } from './utils/wrapScript'
+const _paq = (window._paq = window._paq || [])
 
 /* eslint-disable-next-line */
 export interface ClipboardEvent<T = Element> extends SyntheticEvent<T, any> {
@@ -229,6 +230,10 @@ 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')) {
+        call('terminal', 'log',{ type: 'warn', value: `> ${script}` })
+        await call('openaigpt', 'message', script)
+        _paq.push(['trackEvent', 'ai', 'openai', 'askFromTerminal'])
       } else {
         await call('scriptRunner', 'execute', script)
       }

diff --git a/libs/remix-ui/terminal/src/lib/terminalWelcome.tsx b/libs/remix-ui/terminal/src/lib/terminalWelcome.tsx
@@ -46,15 +46,17 @@ const TerminalWelcomeMessage = ({packageJson, storage}) => {
       <ul className="ml-0 mr-4">
         <li key="web3-152">
           <a target="_blank" href="https://web3js.readthedocs.io/en/1.0/">
-            web3 version 1.5.2
+            web3.js
           </a>
         </li>
         <li key="ethers-console">
           <a target="_blank" href="https://docs.ethers.io">
             ethers.js
           </a>{' '}
         </li>
-        <li key="remix-console">remix</li>
+        <li key="ethers-console">
+          gpt <i>your question</i> {' '}
+        </li>
       </ul>
       <div>
         <FormattedMessage id="terminal.welcomeText10" />.

diff --git a/libs/remix-ui/terminal/src/lib/utils/wrapScript.ts b/libs/remix-ui/terminal/src/lib/utils/wrapScript.ts
@@ -1,5 +1,5 @@
 export const wrapScript = (script) => {
-  const isKnownScript = ['remix.', 'console.', 'git'].some(prefix => script.trim().startsWith(prefix))
+  const isKnownScript = ['remix.', 'console.', 'git', 'gpt'].some(prefix => script.trim().startsWith(prefix))
   if (isKnownScript) return script
   return `
         try {