更新

Author: anyshu

tools/server/server-diffusion.cpp

@@ -635,36 +635,38 @@ struct server_task {
                 params.sampling.samplers = defaults.sampling.samplers;
             }
         }
-
-        // Diffusion parameters
-        params.diffusion_steps = json_value(data, "diffusion_steps", params.diffusion_steps);
 
-        // Parse diffusion algorithm from string or int
-        const auto diffusion_alg = data.find("diffusion_algorithm");
-        if (diffusion_alg != data.end()) {
-            if (diffusion_alg->is_string()) {
-                std::string alg_str = diffusion_alg->get<std::string>();
-                if (alg_str == "origin") params.diffusion_algo = ORIGIN;
-                else if (alg_str == "entropy") params.diffusion_algo = ENTROPY_BASED;
-                else if (alg_str == "margin") params.diffusion_algo = MARGIN_BASED;
-                else if (alg_str == "random") params.diffusion_algo = RANDOM;
-                else if (alg_str == "confidence") params.diffusion_algo = CONFIDENCE_BASED;
-            } else if (diffusion_alg->is_number_integer()) {
-                int alg_int = diffusion_alg->get<int>();
-                if (alg_int >= 0 && alg_int <= 4) {
-                    params.diffusion_algo = static_cast<diffusion_algorithm>(alg_int);
+        {
+            // Diffusion parameters
+            params.diffusion_steps = json_value(data, "diffusion_steps", params.diffusion_steps);
+            
+            // Parse diffusion algorithm from string or int
+            const auto diffusion_alg = data.find("diffusion_algorithm");
+            if (diffusion_alg != data.end()) {
+                if (diffusion_alg->is_string()) {
+                    std::string alg_str = diffusion_alg->get<std::string>();
+                    if (alg_str == "origin") params.diffusion_algo = ORIGIN;
+                    else if (alg_str == "entropy") params.diffusion_algo = ENTROPY_BASED;
+                    else if (alg_str == "margin") params.diffusion_algo = MARGIN_BASED;
+                    else if (alg_str == "random") params.diffusion_algo = RANDOM;
+                    else if (alg_str == "confidence") params.diffusion_algo = CONFIDENCE_BASED;
+                } else if (diffusion_alg->is_number_integer()) {
+                    int alg_int = diffusion_alg->get<int>();
+                    if (alg_int >= 0 && alg_int <= 4) {
+                        params.diffusion_algo = static_cast<diffusion_algorithm>(alg_int);
+                    }
                 }
             }
+            
+            params.diffusion_eps = json_value(data, "diffusion_eps", params.diffusion_eps);
+            params.diffusion_block_len = json_value(data, "diffusion_block_length", params.diffusion_block_len);
+            params.diffusion_cfg_scale = json_value(data, "cfg_scale", params.diffusion_cfg_scale);
+            params.diffusion_alg_temp = json_value(data, "diffusion_temperature", params.diffusion_alg_temp);
+            params.diffusion_visual = json_value(data, "visual_mode", params.diffusion_visual);
+            params.diffusion_shift_logits = json_value(data, "shift_logits", params.diffusion_shift_logits);
+            params.diffusion_add_gumbel_noise = json_value(data, "add_gumbel_noise", params.diffusion_add_gumbel_noise);
+            params.diffusion_max_length = json_value(data, "max_length", params.diffusion_max_length);
         }
-        
-        params.diffusion_eps = json_value(data, "diffusion_eps", params.diffusion_eps);
-        params.diffusion_block_len = json_value(data, "diffusion_block_length", params.diffusion_block_len);
-        params.diffusion_cfg_scale = json_value(data, "cfg_scale", params.diffusion_cfg_scale);
-        params.diffusion_alg_temp = json_value(data, "diffusion_temperature", params.diffusion_alg_temp);
-        params.diffusion_visual = json_value(data, "visual_mode", params.diffusion_visual);
-        params.diffusion_shift_logits = json_value(data, "shift_logits", params.diffusion_shift_logits);
-        params.diffusion_add_gumbel_noise = json_value(data, "add_gumbel_noise", params.diffusion_add_gumbel_noise);
-        params.diffusion_max_length = json_value(data, "max_length", params.diffusion_max_length);
 
         std::string model_name = params_base.model_alias.empty() ? DEFAULT_OAICOMPAT_MODEL : params_base.model_alias;
         params.oaicompat_model = json_value(data, "model", model_name);