@2515097216/jimeng-free-api 0.8.11 → 0.8.12

package/dist/{chunk-YJIZUPUG.js → chunk-FKUVCAUE.js}

@@ -2406,7 +2406,7 @@ async function generateImageComposition(_model, prompt, imageUrls, {
         submit_id: submitId,
         metrics_extra: JSON.stringify({
           promptSource: "custom",
-          generateCount: finalTargetImageCount,
+          generateCount: 1,
           enterFrom: "click",
           sceneOptions: JSON.stringify([sceneOption]),
           generateId: submitId,
@@ -2643,12 +2643,12 @@ async function generateMultiImages(_model, prompt, {
   const model = getModel(_model);
   const resolutionResult = resolveResolution(resolution, ratio);
   const { width, height, imageRatio, resolutionType } = resolutionResult;
-  const finalTargetImageCount2 = _13.clamp(
+  const finalTargetImageCount = _13.clamp(
     targetImageCount ?? (prompt.match(/(\d+)张/) ? parseInt(prompt.match(/(\d+)张/)[1]) : 4),
     1,
     10
   );
-  logger_default.info(`\u4F7F\u7528 ${_model} \u591A\u56FE\u751F\u6210: ${finalTargetImageCount2}\u5F20\u56FE\u7247 ${width}x${height} (${ratio}@${resolution}) \u7CBE\u7EC6\u5EA6: ${sampleStrength}`);
+  logger_default.info(`\u4F7F\u7528 ${_model} \u591A\u56FE\u751F\u6210: ${finalTargetImageCount}\u5F20\u56FE\u7247 ${width}x${height} (${ratio}@${resolution}) \u7CBE\u7EC6\u5EA6: ${sampleStrength}`);
   const componentId = util_default.uuid();
   const submitId = util_default.uuid();
   const sceneOption = {
@@ -2737,7 +2737,7 @@ async function generateMultiImages(_model, prompt, {
                   gen_option: {
                     type: "",
                     id: util_default.uuid(),
-                    generate_all: finalTargetImageCount2 > 1
+                    generate_all: finalTargetImageCount > 1
                   }
                 }
               }
@@ -2753,7 +2753,7 @@ async function generateMultiImages(_model, prompt, {
   const historyId = aigc_data == null ? void 0 : aigc_data.history_record_id;
   if (!historyId)
     throw new APIException(exceptions_default.API_IMAGE_GENERATION_FAILED, "\u8BB0\u5F55ID\u4E0D\u5B58\u5728");
-  logger_default.info(`\u591A\u56FE\u751F\u6210\u4EFB\u52A1\u5DF2\u63D0\u4EA4\uFF0Csubmit_id: ${submitId}, history_id: ${historyId}\uFF0C\u7B49\u5F85\u751F\u6210 ${finalTargetImageCount2} \u5F20\u56FE\u7247...`);
+  logger_default.info(`\u591A\u56FE\u751F\u6210\u4EFB\u52A1\u5DF2\u63D0\u4EA4\uFF0Csubmit_id: ${submitId}, history_id: ${historyId}\uFF0C\u7B49\u5F85\u751F\u6210 ${finalTargetImageCount} \u5F20\u56FE\u7247...`);
   let status = 20, failCode, item_list = [];
   let pollCount = 0;
   let missingRecordCount = 0;
@@ -2762,7 +2762,7 @@ async function generateMultiImages(_model, prompt, {
     await new Promise((resolve) => setTimeout(resolve, 1e3));
     pollCount++;
     if (pollCount % 30 === 0) {
-      logger_default.info(`\u591A\u56FE\u751F\u6210\u8FDB\u5EA6: \u7B2C ${pollCount} \u6B21\u8F6E\u8BE2 (history_id: ${historyId})\uFF0C\u5F53\u524D\u72B6\u6001: ${status}\uFF0C\u5DF2\u751F\u6210: ${item_list.length}/${finalTargetImageCount2} \u5F20\u56FE\u7247...`);
+      logger_default.info(`\u591A\u56FE\u751F\u6210\u8FDB\u5EA6: \u7B2C ${pollCount} \u6B21\u8F6E\u8BE2 (history_id: ${historyId})\uFF0C\u5F53\u524D\u72B6\u6001: ${status}\uFF0C\u5DF2\u751F\u6210: ${item_list.length}/${finalTargetImageCount} \u5F20\u56FE\u7247...`);
     }
     const result = await request("post", "/mweb/v1/get_history_by_ids", refreshToken, {
       data: {
@@ -2854,15 +2854,15 @@ async function generateMultiImages(_model, prompt, {
     status = result[historyId].status;
     failCode = result[historyId].fail_code;
     item_list = result[historyId].item_list || [];
-    if (item_list.length >= finalTargetImageCount2) {
+    if (item_list.length >= finalTargetImageCount) {
       logger_default.info(`\u591A\u56FE\u751F\u6210\u5B8C\u6210: \u72B6\u6001=${status}, \u5DF2\u751F\u6210 ${item_list.length} \u5F20\u56FE\u7247`);
       break;
     }
     if (pollCount % 60 === 0) {
       logger_default.info(`jimeng-4.0 \u8BE6\u7EC6\u72B6\u6001: status=${status}, item_list.length=${item_list.length}, failCode=${failCode || "none"}`);
     }
-    if (status === 10 && item_list.length < finalTargetImageCount2 && pollCount % 30 === 0) {
-      logger_default.info(`jimeng-4.0 \u72B6\u6001\u5DF2\u5B8C\u6210\u4F46\u56FE\u7247\u6570\u91CF\u4E0D\u8DB3: \u72B6\u6001=${status}, \u5DF2\u751F\u6210 ${item_list.length}/${finalTargetImageCount2} \u5F20\u56FE\u7247\uFF0C\u7EE7\u7EED\u7B49\u5F85...`);
+    if (status === 10 && item_list.length < finalTargetImageCount && pollCount % 30 === 0) {
+      logger_default.info(`jimeng-4.0 \u72B6\u6001\u5DF2\u5B8C\u6210\u4F46\u56FE\u7247\u6570\u91CF\u4E0D\u8DB3: \u72B6\u6001=${status}, \u5DF2\u751F\u6210 ${item_list.length}/${finalTargetImageCount} \u5F20\u56FE\u7247\uFF0C\u7EE7\u7EED\u7B49\u5F85...`);
     }
   }
   if (pollCount >= maxPollCount) {
@@ -2879,7 +2879,7 @@ async function generateMultiImages(_model, prompt, {
     if (!((_c = (_b = (_a = item == null ? void 0 : item.image) == null ? void 0 : _a.large_images) == null ? void 0 : _b[0]) == null ? void 0 : _c.image_url))
       return ((_d = item == null ? void 0 : item.common_attr) == null ? void 0 : _d.cover_url) || null;
     return item.image.large_images[0].image_url;
-  }).filter((url) => url !== null).slice(0, finalTargetImageCount2);
+  }).filter((url) => url !== null).slice(0, finalTargetImageCount);
   logger_default.info(`\u591A\u56FE\u751F\u6210\u7ED3\u679C: \u6210\u529F\u751F\u6210 ${imageUrls.length} \u5F20\u56FE\u7247`);
   return imageUrls;
 }
@@ -3186,6 +3186,13 @@ function buildPublicBaseUrl(headers = {}) {
   return `${protocol}://${host}${normalizePrefix(config_default.service.urlPrefix)}`;
 }
 async function saveRemoteAssetToLocalUrl(remoteUrl, assetType = "images", publicBaseUrl) {
+  const { relativePath } = await saveRemoteAssetToLocalPath(remoteUrl, assetType);
+  const baseUrl = publicBaseUrl || `${config_default.service.publicDirUrl.replace(/\/public$/, "")}${normalizePrefix(config_default.service.urlPrefix)}`;
+  const localUrl = `${baseUrl}/public/${relativePath}`;
+  logger_default.info(`asset localized: ${remoteUrl} -> ${localUrl}`);
+  return localUrl;
+}
+async function saveRemoteAssetToLocalPath(remoteUrl, assetType = "images") {
   const response = await axios3.get(remoteUrl, {
     responseType: "arraybuffer",
     timeout: 12e4
@@ -3200,14 +3207,14 @@ async function saveRemoteAssetToLocalUrl(remoteUrl, assetType = "images", public
   const outputPath = path6.join(config_default.system.publicDirPath, ...relativePath.split("/"));
   await fs6.ensureDir(path6.dirname(outputPath));
   await fs6.writeFile(outputPath, response.data);
-  const baseUrl = publicBaseUrl || `${config_default.service.publicDirUrl.replace(/\/public$/, "")}${normalizePrefix(config_default.service.urlPrefix)}`;
-  const localUrl = `${baseUrl}/public/${relativePath}`;
-  logger_default.info(`asset localized: ${remoteUrl} -> ${localUrl}`);
-  return localUrl;
+  return { outputPath, relativePath };
 }
 async function saveRemoteAssetsToLocalUrls(remoteUrls, assetType = "images", publicBaseUrl) {
   return Promise.all(remoteUrls.map((url) => saveRemoteAssetToLocalUrl(url, assetType, publicBaseUrl)));
 }
+async function saveRemoteAssetsToLocalPaths(remoteUrls, assetType = "images") {
+  return Promise.all(remoteUrls.map((url) => saveRemoteAssetToLocalPath(url, assetType)));
+}
 
 // src/api/routes/images.ts
 var images_default = {
@@ -5721,9 +5728,11 @@ export {
   DEFAULT_MODEL,
   generateImageComposition,
   generateImages,
+  saveRemoteAssetToLocalPath,
+  saveRemoteAssetsToLocalPaths,
   DEFAULT_MODEL2,
   generateVideo,
   generateSeedanceVideo,
   routes_default
 };
-//# sourceMappingURL=chunk-YJIZUPUG.js.map
+//# sourceMappingURL=chunk-FKUVCAUE.js.map