Merge pull request #13404 from rouault/raster_pipeline_info_tile_compare_fixes

gdal raster compare/info/tile: make them work properly in a pipeline …

Author: rouault

apps/gdalalg_pipeline.cpp

@@ -65,6 +65,10 @@ void GDALPipelineStepAlgorithm::AddRasterHiddenInputDatasetArg()
     // GDALAlgorithm must be able to retrieve the input dataset
     AddInputDatasetArg(&m_inputDataset, GDAL_OF_RASTER,
                        /* positionalAndRequired = */ false)
+        .SetMinCount(1)
+        .SetMaxCount(m_constructorOptions.inputDatasetMaxCount)
+        .SetAutoOpenDataset(m_constructorOptions.autoOpenInputDatasets)
+        .SetMetaVar(m_constructorOptions.inputDatasetMetaVar)
         .SetHidden();
 }
 

apps/gdalalg_raster_compare.cpp

@@ -49,7 +49,15 @@ GDALRasterCompareAlgorithm::GDALRasterCompareAlgorithm(bool standaloneStep)
 
     SetAutoCompleteFunctionForFilename(referenceDatasetArg, GDAL_OF_RASTER);
 
-    AddRasterInputArgs(false, !standaloneStep);
+    if (standaloneStep)
+    {
+        AddRasterInputArgs(/* openForMixedRasterVector = */ false,
+                           /* hiddenForCLI = */ false);
+    }
+    else
+    {
+        AddRasterHiddenInputDatasetArg();
+    }
 
     AddArg("skip-all-optional", 0, _("Skip all optional comparisons"),
            &m_skipAllOptional);

apps/gdalalg_raster_info.cpp

@@ -37,7 +37,15 @@ GDALRasterInfoAlgorithm::GDALRasterInfoAlgorithm(bool standaloneStep,
               .SetInputDatasetHelpMsg(_("Input raster dataset"))
               .SetInputDatasetAlias("dataset"))
 {
-    AddRasterInputArgs(openForMixedRasterVector, !standaloneStep);
+    if (standaloneStep)
+    {
+        AddRasterInputArgs(openForMixedRasterVector,
+                           /* hiddenForCLI = */ false);
+    }
+    else
+    {
+        AddRasterHiddenInputDatasetArg();
+    }
 
     AddOutputFormatArg(&m_format).SetChoices("json", "text");
     AddArg("min-max", 0, _("Compute minimum and maximum value"), &m_minMax)

apps/gdalalg_raster_mosaic_stack_common.cpp

@@ -272,11 +272,14 @@ bool GDALRasterMosaicStackCommonAlgorithm::RunImpl(GDALProgressFunc pfnProgress,
         GDALRasterWriteAlgorithm writeAlg;
         for (auto &arg : writeAlg.GetArgs())
         {
-            auto stepArg = GetArg(arg->GetName());
-            if (stepArg && stepArg->IsExplicitlySet())
+            if (!arg->IsHidden())
             {
-                arg->SetSkipIfAlreadySet(true);
-                arg->SetFrom(*stepArg);
+                auto stepArg = GetArg(arg->GetName());
+                if (stepArg && stepArg->IsExplicitlySet())
+                {
+                    arg->SetSkipIfAlreadySet(true);
+                    arg->SetFrom(*stepArg);
+                }
             }
         }
 

apps/gdalalg_raster_tile.cpp

@@ -161,7 +161,15 @@ GDALRasterTileAlgorithm::GDALRasterTileAlgorithm(bool standaloneStep)
         .SetMinValueIncluded(0)
         .SetHidden();  // Used in spawn mode
 
-    AddRasterInputArgs(false, !standaloneStep);
+    if (standaloneStep)
+    {
+        AddRasterInputArgs(/* openForMixedRasterVector = */ false,
+                           /* hiddenForCLI = */ false);
+    }
+    else
+    {
+        AddRasterHiddenInputDatasetArg();
+    }
 
     m_format = "PNG";
     AddOutputFormatArg(&m_format)
@@ -3878,13 +3886,14 @@ static int GenerateTilesForkMethod(CPL_FILE_HANDLE in, CPL_FILE_HANDLE out)
     CPLSetConfigOption("GDAL_NUM_THREADS", "1");
     GDALSetCacheMax64(pWorkStructure->nCacheMaxPerProcess);
 
-    GDALRasterTileAlgorithm alg;
+    GDALRasterTileAlgorithmStandalone alg;
     if (pWorkStructure->poMemSrcDS)
     {
         auto *inputArg = alg.GetArg(GDAL_ARG_NAME_INPUT);
-        auto &val = inputArg->Get<std::vector<GDALArgDatasetValue>>();
+        std::vector<GDALArgDatasetValue> val;
         val.resize(1);
         val[0].Set(pWorkStructure->poMemSrcDS);
+        inputArg->Set(std::move(val));
     }
     return alg.ParseCommandLineArguments(pWorkStructure->aosArgv) && alg.Run()
                ? 0

autotest/utilities/test_gdalalg_raster_compare.py

@@ -1155,3 +1155,12 @@ def my_progress(pct, msg, user_data):
         assert alg["output-string"] == ""
 
     assert tab_pct[0] == 1.0
+
+
+def test_gdalalg_raster_compare_same_file_pipeline():
+
+    with gdal.alg.raster.pipeline(
+        input="../gcore/data/byte.tif",
+        pipeline="read ! compare --reference ../gcore/data/byte.tif",
+    ) as alg:
+        assert alg["output-string"] == ""

autotest/utilities/test_gdalalg_raster_info.py

@@ -175,3 +175,13 @@ def test_gdalalg_raster_info_read_gdalg_with_input_format():
     info["input"] = "../gdrivers/data/gdalg/read_byte.gdalg.json"
     info["input-format"] = "GDALG"
     assert info.Run()
+
+
+def test_gdalalg_raster_info_pipeline():
+
+    with gdal.alg.raster.pipeline(
+        input="../gdrivers/data/small_world.tif",
+        pipeline="read ! info",
+    ) as alg:
+        j = alg.Output()
+        assert len(j["bands"]) == 3

autotest/utilities/test_gdalalg_raster_tile.py

@@ -2251,6 +2251,24 @@ def test_gdalalg_raster_tile_pipeline(tmp_path):
     assert len(gdal.ReadDirRecursive(out_dirname)) == 108
 
 
+def test_gdalalg_raster_tile_pipeline_input_ds(tmp_path):
+
+    out_dirname = tmp_path / "subdir"
+    with gdaltest.config_options(
+        {
+            "GDAL_THRESHOLD_MIN_THREADS_FOR_SPAWN": "1",
+            "GDAL_THRESHOLD_MIN_TILES_PER_JOB": "1",
+        }
+    ):
+        gdal.Run(
+            "raster pipeline",
+            input="../gdrivers/data/small_world.tif",
+            pipeline=f"read ! tile {out_dirname} --min-zoom=0 --max-zoom=3",
+        )
+
+    assert len(gdal.ReadDirRecursive(out_dirname)) == 108
+
+
 @pytest.mark.skipif(_get_effective_cpus() <= 2, reason="needs more than 2 CPUs")
 def test_gdalalg_raster_tile_pipeline_error(tmp_path):