Merge pull request #6353 from ethereum/updatedesktop

fix desktop compilation errors

Author: bunsenstraat

apps/remixdesktop/src/lib/InferenceServerManager.ts

@@ -510,12 +510,12 @@ export class InferenceManager implements ICompletions {
       console.log('model not ready yet')
       return
     }
-    params.chatHistory = params.provider === 'anthropic' ? buildChatPrompt(prompt) : []
+    params.chatHistory = params.provider === 'anthropic' ? buildChatPrompt() : []
 
     if (params.stream_result) {
       return this._streamInferenceRequest('answer', { prompt:userPrompt, ...params })
     } else {
-      return this._makeInferenceRequest('answer', { prompt, ...params }, AIRequestType.GENERAL)
+      return this._makeInferenceRequest('answer', { prompt: userPrompt, ...params }, AIRequestType.GENERAL)
     }
   }
 

apps/remixdesktop/yarn.lock

@@ -74,9 +74,9 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2":
+"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2":
   version "10.2.0-electron.1"
-  resolved "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
+  resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
   dependencies:
     env-paths "^2.2.0"
     exponential-backoff "^3.1.1"

libs/remix-ai-core/src/inferencers/local/ollama.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const _paq = (window._paq = window._paq || [])
+const _paq = (typeof window !== 'undefined' && (window as any)._paq) ? (window as any)._paq : []
 
 // default Ollama ports to check (11434 is the legacy/standard port)
 const OLLAMA_PORTS = [11434, 11435, 11436];

libs/remix-ai-core/src/inferencers/local/ollamaInferencer.ts

@@ -19,7 +19,7 @@ import {
 import axios from "axios";
 import { RemoteInferencer } from "../remote/remoteInference";
 
-const _paq = (window._paq = window._paq || [])
+const _paq = (typeof window !== 'undefined' && (window as any)._paq) ? (window as any)._paq : []
 const defaultErrorMessage = `Unable to get a response from Ollama server`;
 
 export class OllamaInferencer extends RemoteInferencer implements ICompletions, IGeneration {