@shenghuabi/llama 1.0.3 → 1.0.4

package/index.js

@@ -39,7 +39,6 @@ __export(llama_exports, {
   LlamaServerDefine: () => LlamaServerDefine,
   LlamaServerSwapItemDefine: () => LlamaServerSwapItemDefine,
   LlamaSwapService: () => LlamaSwapService,
-  OLLAMA_MODEL_URL_TOKEN: () => OLLAMA_MODEL_URL_TOKEN,
   SamplingDefine: () => SamplingDefine
 });
 module.exports = __toCommonJS(llama_exports);
@@ -54,9 +53,6 @@ var import_static_injector = require("static-injector");
 var LLamaConfigToken = new import_static_injector.InjectionToken(
   "LLamaConfig"
 );
-var OLLAMA_MODEL_URL_TOKEN = new import_static_injector.InjectionToken(
-  "OLLAMA_MODEL_URL"
-);
 
 // packages/llama/llama-swap.service.ts
 var v7 = __toESM(require("valibot"), 1);
@@ -2648,45 +2644,7 @@ async function readDir2(dir, level) {
 
 // packages/llama/llama-swap.service.ts
 var import_path2 = require("path");
-
-// packages/llama/download/get-ollama-gguf-file.ts
-function getDownloadFileName(name) {
-  return name;
-}
-async function getOllamaGgufFile(name, options) {
-  name = name.includes("/") ? name : `library/${name}`;
-  const resultUrl = parseName(name);
-  const endpoint = resultUrl.endpoint ?? `https://${options.endpoint}/`;
-  const hff = `${resultUrl.namespace}/${resultUrl.repo}`;
-  const result = await getModelManifest(name, {
-    ...options,
-    endpoint
-  });
-  const rfilename = result.layers.find(
-    (item) => item.mediaType === `application/vnd.ollama.image.model`
-  ).digest;
-  const result2 = getDownloadFileName(rfilename);
-  const fileList = [`${endpoint}v2/${hff}/blobs/${result2}`];
-  return {
-    fileList,
-    fileName: `ollama-${name}`.replace(/\/|:/g, "-")
-  };
-}
-
-// packages/llama/llama-swap.service.ts
 var import_es_toolkit = require("es-toolkit");
-
-// packages/llama/download/auto-check-vendor.ts
-async function autoCheckVendor(repo, options) {
-  try {
-    await getModelManifest(repo, options);
-    return void 0;
-  } catch (error) {
-  }
-  return "ollama";
-}
-
-// packages/llama/llama-swap.service.ts
 var SysMap2 = { win32: "win", linux: "ubuntu" };
 var LlamaPlatform2 = SysMap2[process.platform];
 var remoteArgs = ["hf-repo", "hf-file", "model-url"];
@@ -2705,7 +2663,6 @@ var LlamaSwapService = class extends import_external_call.ExternalCallBaseServic
     return fullPath;
   });
   llamaSwapDir$$ = (0, import_static_injector2.computed)(() => import_vfs2.path.join(this.#config().dir, "llama-swap"));
-  #ollamaModelUrl$$ = (0, import_static_injector2.inject)(OLLAMA_MODEL_URL_TOKEN);
   #hgModelUrl$$ = (0, import_static_injector2.inject)(import_external_call.HUGGINGFACE_URL_TOKEN);
   #downloadConfig$$ = (0, import_static_injector2.inject)(import_external_call.DownloadConfigToken);
   #hgtoken$$ = (0, import_static_injector2.inject)(import_external_call.HUGGINGFACE_TOKEN_TOKEN);
@@ -2926,18 +2883,11 @@ var LlamaSwapService = class extends import_external_call.ExternalCallBaseServic
     let directory;
     const dir = import_vfs2.path.join(this.#config().dir, "models");
     if (modelOptions.repo) {
-      if (modelOptions.vendor) {
-        this.log?.info("使用厂商:", modelOptions.vendor);
-      }
-      const resolveResult = await (modelOptions.vendor === "ollama" ? getOllamaGgufFile(modelOptions.repo, {
-        ...modelOptions,
-        endpoint: this.#ollamaModelUrl$$(),
-        token: modelOptions.token || this.#hgtoken$$()
-      }) : getGgufFile(modelOptions.repo, {
+      const resolveResult = await getGgufFile(modelOptions.repo, {
         ...modelOptions,
         endpoint: this.#hgModelUrl$$(),
         token: modelOptions.token || this.#hgtoken$$()
-      }));
+      });
       this.log?.info("模型文件:", resolveResult);
       const filePath = import_vfs2.path.join(dir, resolveResult.fileName);
       if (fs2.existsSync(filePath)) {
@@ -2991,14 +2941,9 @@ var LlamaSwapService = class extends import_external_call.ExternalCallBaseServic
     );
   }
   async createModelConfig(model, options) {
-    const vendor = await autoCheckVendor(model, {
-      endpoint: `https://${this.#hgModelUrl$$()}/`,
-      token: this.#hgtoken$$()
-    });
     const downloadFilePath = await this.downloadModel(
       {
-        repo: model,
-        vendor
+        repo: model
       },
       options
     );
@@ -3071,7 +3016,6 @@ var LlamaSwapService = class extends import_external_call.ExternalCallBaseServic
   LlamaServerDefine,
   LlamaServerSwapItemDefine,
   LlamaSwapService,
-  OLLAMA_MODEL_URL_TOKEN,
   SamplingDefine
 });
 //# sourceMappingURL=index.js.map