From f99c183cf16dd19665458d3713af1660aa08a6ee Mon Sep 17 00:00:00 2001 From: celenity Date: Wed, 4 Feb 2026 04:27:07 +0000 Subject: [PATCH 29/52] fix: Remove OpenAI backend Removes the OpenAI backend from Mozilla's ML (machine learning) component. Signed-off-by: celenity --- toolkit/components/aboutinference/content/aboutInference.js | 4 ++-- toolkit/components/ml/content/EngineProcess.sys.mjs | 2 +- toolkit/components/ml/content/backends/Pipeline.mjs | 6 +++--- toolkit/components/ml/jar.mn | 4 ++-- toolkit/content/license.html | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolkit/components/aboutinference/content/aboutInference.js b/toolkit/components/aboutinference/content/aboutInference.js index 6672be945f5b..585540f54cd8 100644 --- a/toolkit/components/aboutinference/content/aboutInference.js +++ b/toolkit/components/aboutinference/content/aboutInference.js @@ -379,7 +379,7 @@ const INFERENCE_PAD_PRESETS = { device: "cpu", backend: "onnx", }, - openai: { +/* openai: { inputArgs: [ { role: "system", @@ -398,7 +398,7 @@ const INFERENCE_PAD_PRESETS = { apiKey: "ollama", baseURL: "http://localhost:11434/v1", backend: "openai", - }, + }, */ }; const PREDEFINED = Object.keys(INFERENCE_PAD_PRESETS); diff --git a/toolkit/components/ml/content/EngineProcess.sys.mjs b/toolkit/components/ml/content/EngineProcess.sys.mjs index 03721443f7e0..d0ad4478acd4 100644 --- a/toolkit/components/ml/content/EngineProcess.sys.mjs +++ b/toolkit/components/ml/content/EngineProcess.sys.mjs @@ -34,7 +34,7 @@ export const BACKENDS = Object.freeze({ onnxNative: "onnx-native", llamaCpp: "llama.cpp", bestOnnx: "best-onnx", - openai: "openai", +// openai: "openai", staticEmbeddings: "static-embeddings", }); diff --git a/toolkit/components/ml/content/backends/Pipeline.mjs b/toolkit/components/ml/content/backends/Pipeline.mjs index 1b913af2a39a..30a04a070442 100644 --- a/toolkit/components/ml/content/backends/Pipeline.mjs +++ b/toolkit/components/ml/content/backends/Pipeline.mjs @@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters( LlamaCppPipeline: "chrome://global/content/ml/backends/LlamaCppPipeline.mjs", PipelineOptions: "chrome://global/content/ml/EngineProcess.sys.mjs", - OpenAIPipeline: "chrome://global/content/ml/backends/OpenAIPipeline.mjs", +// OpenAIPipeline: "chrome://global/content/ml/backends/OpenAIPipeline.mjs", StaticEmbeddingsPipeline: "chrome://global/content/ml/backends/StaticEmbeddingsPipeline.mjs", }, @@ -46,9 +46,9 @@ export async function getBackend(consumer, wasm, options) { case "llama.cpp": factory = lazy.LlamaCppPipeline.initialize; break; - case "openai": +/* case "openai": factory = lazy.OpenAIPipeline.initialize; - break; + break; */ case "static-embeddings": factory = lazy.StaticEmbeddingsPipeline.initialize; break; diff --git a/toolkit/components/ml/jar.mn b/toolkit/components/ml/jar.mn index 143e4a0f0bb0..47ba236e18b1 100644 --- a/toolkit/components/ml/jar.mn +++ b/toolkit/components/ml/jar.mn @@ -23,9 +23,9 @@ toolkit.jar: content/global/ml/transformers.js (vendor/transformers.js) content/global/ml/ThomSample.mjs (content/ThomSample.mjs) content/global/ml/backends/LlamaCppPipeline.mjs (content/backends/LlamaCppPipeline.mjs) - content/global/ml/backends/OpenAIPipeline.mjs (content/backends/OpenAIPipeline.mjs) +# content/global/ml/backends/OpenAIPipeline.mjs (content/backends/OpenAIPipeline.mjs) content/global/ml/backends/StaticEmbeddingsPipeline.mjs (content/backends/StaticEmbeddingsPipeline.mjs) - content/global/ml/openai.mjs (vendor/openai/dist/openai.mjs) +# content/global/ml/openai.mjs (vendor/openai/dist/openai.mjs) content/global/ml/MLTelemetry.sys.mjs (MLTelemetry.sys.mjs) content/global/ml/security/ConditionEvaluator.sys.mjs (security/ConditionEvaluator.sys.mjs) content/global/ml/security/DecisionTypes.sys.mjs (security/DecisionTypes.sys.mjs) diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 75cc6317750f..a5a42a43479f 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -1533,7 +1533,7 @@ product.
  • third_party/perfetto/
  • #endif
  • third_party/rust/calendrical_calculations
  • -
  • toolkit/components/ml/vendor/openai/dist/openai.mjs
  • +
  • toolkit/components/ml/vendor/transformers.js
  • #ifdef NIGHTLY_BUILD
  • toolkit/components/ml/vendor/transformers-dev.js
  • -- 2.47.3