Merge origin/master into hermes/hermes-4fd30995

server-rs/crates/api-server/src/custom_world_ai/assets.rs

@@ -1,9 +1,9 @@
-use super::*;
 use super::opening_cg::{
     map_asset_binding_prepare_error, map_asset_object_prepare_error,
     map_custom_world_asset_oss_error, map_custom_world_asset_spacetime_error,
     map_custom_world_generated_image_asset_error,
 };
+use super::*;
 
 pub(super) async fn persist_custom_world_asset(
     state: &AppState,
@@ -36,30 +36,31 @@ pub(super) async fn persist_custom_world_asset(
         .map(|(stem, _)| stem)
         .unwrap_or(file_name.as_str())
         .to_string();
-    let prepared = GeneratedImageAssetAdapter::prepare_put_object(GeneratedImageAssetPersistInput {
-        prefix,
-        path_segments,
-        file_stem,
-        image: GeneratedImageAssetDataUrl {
-            format: normalize_generated_image_asset_mime(content_type.as_str()),
-            bytes: body,
-        },
-        access: OssObjectAccess::Private,
-        metadata: GeneratedImageAssetAdapterMetadata {
-            asset_kind: Some(asset_kind.to_string()),
-            owner_user_id: Some(owner_user_id.to_string()),
-            entity_kind: Some(entity_kind.to_string()),
-            entity_id: Some(entity_id.clone()),
-            slot: Some(slot.to_string()),
-            provider: None,
-            task_id: source_job_id.clone(),
-        },
-        extra_metadata: profile_id
-            .as_ref()
-            .map(|profile_id| BTreeMap::from([("profile_id".to_string(), profile_id.clone())]))
-            .unwrap_or_default(),
-    })
-    .map_err(map_custom_world_generated_image_asset_error)?;
+    let prepared =
+        GeneratedImageAssetAdapter::prepare_put_object(GeneratedImageAssetPersistInput {
+            prefix,
+            path_segments,
+            file_stem,
+            image: GeneratedImageAssetDataUrl {
+                format: normalize_generated_image_asset_mime(content_type.as_str()),
+                bytes: body,
+            },
+            access: OssObjectAccess::Private,
+            metadata: GeneratedImageAssetAdapterMetadata {
+                asset_kind: Some(asset_kind.to_string()),
+                owner_user_id: Some(owner_user_id.to_string()),
+                entity_kind: Some(entity_kind.to_string()),
+                entity_id: Some(entity_id.clone()),
+                slot: Some(slot.to_string()),
+                provider: None,
+                task_id: source_job_id.clone(),
+            },
+            extra_metadata: profile_id
+                .as_ref()
+                .map(|profile_id| BTreeMap::from([("profile_id".to_string(), profile_id.clone())]))
+                .unwrap_or_default(),
+        })
+        .map_err(map_custom_world_generated_image_asset_error)?;
     let persisted_mime_type = prepared.format.mime_type.clone();
     let put_result = oss_client
         .put_object(&http_client, prepared.request)
@@ -119,4 +120,3 @@ pub(super) async fn persist_custom_world_asset(
     response.image_src = put_result.legacy_public_path;
     Ok(response)
 }
-

server-rs/crates/api-server/src/custom_world_ai/opening_cg.rs

@@ -374,4 +374,3 @@ pub(super) fn map_custom_world_asset_spacetime_error(error: SpacetimeClientError
 pub(super) fn map_custom_world_asset_oss_error(error: platform_oss::OssError) -> AppError {
     map_oss_error(error, "aliyun-oss")
 }
-