Merge pull request #61197 from nextcloud/enh/noid/streaming-adjustments

DaphneMuller · web-flow · commit deefec1a595e · 2026-06-12T13:18:13.000+02:00
On behalf of Julien's request
diff --git a/core/Controller/TaskProcessingApiController.php b/core/Controller/TaskProcessingApiController.php
@@ -164,11 +164,13 @@ public function taskTypesExAppEndpoint(): DataResponse {
 	private function handleScheduleTaskInternal(
 		array $input, string $type, string $appId, string $customId = '',
 		?string $webhookUri = null, ?string $webhookMethod = null, bool $includeWatermark = true,
+		bool $preferStreaming = false,
 	): DataResponse {
 		$task = new Task($type, $input, $appId, $this->userId, $customId);
 		$task->setWebhookUri($webhookUri);
 		$task->setWebhookMethod($webhookMethod);
 		$task->setIncludeWatermark($includeWatermark);
+		$task->setPreferStreaming($preferStreaming);
 		try {
 			$this->taskProcessingManager->scheduleTask($task);
 
@@ -202,6 +204,7 @@ private function handleScheduleTaskInternal(
 	 * @param string|null $webhookUri URI to be requested when the task finishes
 	 * @param string|null $webhookMethod Method used for the webhook request (HTTP:GET, HTTP:POST, HTTP:PUT, HTTP:DELETE or AppAPI:APP_ID:GET, AppAPI:APP_ID:POST...)
 	 * @param bool $includeWatermark Whether to include a watermark in the output file or not
+	 * @param bool $preferStreaming Whether to prefer getting a progressive output from the provider or not
 	 * @return DataResponse<Http::STATUS_OK, array{task: CoreTaskProcessingTask}, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_BAD_REQUEST|Http::STATUS_PRECONDITION_FAILED|Http::STATUS_UNAUTHORIZED, array{message: string}, array{}>
 	 *
 	 * 200: Task scheduled successfully
@@ -215,6 +218,7 @@ private function handleScheduleTaskInternal(
 	public function schedule(
 		array $input, string $type, string $appId, string $customId = '',
 		?string $webhookUri = null, ?string $webhookMethod = null, bool $includeWatermark = true,
+		bool $preferStreaming = false,
 	): DataResponse {
 		return $this->handleScheduleTaskInternal(
 			$input,
@@ -224,6 +228,7 @@ public function schedule(
 			$webhookUri,
 			$webhookMethod,
 			$includeWatermark,
+			$preferStreaming,
 		);
 	}
 
@@ -239,6 +244,7 @@ public function schedule(
 	 * @param string|null $webhookUri URI to be requested when the task finishes
 	 * @param string|null $webhookMethod Method used for the webhook request (HTTP:GET, HTTP:POST, HTTP:PUT, HTTP:DELETE or AppAPI:APP_ID:GET, AppAPI:APP_ID:POST...)
 	 * @param bool $includeWatermark Whether to include a watermark in the output file or not
+	 * @param bool $preferStreaming Whether to prefer getting a progressive output from the provider or not
 	 * @return DataResponse<Http::STATUS_OK, array{task: CoreTaskProcessingTask}, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_BAD_REQUEST|Http::STATUS_PRECONDITION_FAILED|Http::STATUS_UNAUTHORIZED, array{message: string}, array{}>
 	 *
 	 * 200: Task scheduled successfully
@@ -251,6 +257,7 @@ public function schedule(
 	public function scheduleExAppEndpoint(
 		array $input, string $type, string $appId, string $customId = '',
 		?string $webhookUri = null, ?string $webhookMethod = null, bool $includeWatermark = true,
+		bool $preferStreaming = false,
 	): DataResponse {
 		return $this->handleScheduleTaskInternal(
 			$input,
@@ -260,6 +267,7 @@ public function scheduleExAppEndpoint(
 			$webhookUri,
 			$webhookMethod,
 			$includeWatermark,
+			$preferStreaming,
 		);
 	}
 
diff --git a/core/Migrations/Version35000Date20260527162338.php b/core/Migrations/Version35000Date20260527162338.php
@@ -39,7 +39,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			if (!$table->hasColumn('prefer_streaming')) {
 				$table->addColumn('prefer_streaming', Types::SMALLINT, [
 					'notnull' => true,
-					'default' => 1,
+					'default' => 0,
 					'unsigned' => true,
 				]);
 				return $schema;
diff --git a/core/openapi-ex_app.json b/core/openapi-ex_app.json
@@ -647,6 +647,11 @@
                                         "type": "boolean",
                                         "default": true,
                                         "description": "Whether to include a watermark in the output file or not"
+                                    },
+                                    "preferStreaming": {
+                                        "type": "boolean",
+                                        "default": false,
+                                        "description": "Whether to prefer getting a progressive output from the provider or not"
                                     }
                                 }
                             }
diff --git a/core/openapi-full.json b/core/openapi-full.json
@@ -5098,6 +5098,11 @@
                                         "type": "boolean",
                                         "default": true,
                                         "description": "Whether to include a watermark in the output file or not"
+                                    },
+                                    "preferStreaming": {
+                                        "type": "boolean",
+                                        "default": false,
+                                        "description": "Whether to prefer getting a progressive output from the provider or not"
                                     }
                                 }
                             }
@@ -10457,6 +10462,11 @@
                                         "type": "boolean",
                                         "default": true,
                                         "description": "Whether to include a watermark in the output file or not"
+                                    },
+                                    "preferStreaming": {
+                                        "type": "boolean",
+                                        "default": false,
+                                        "description": "Whether to prefer getting a progressive output from the provider or not"
                                     }
                                 }
                             }
diff --git a/core/openapi.json b/core/openapi.json
@@ -5098,6 +5098,11 @@
                                         "type": "boolean",
                                         "default": true,
                                         "description": "Whether to include a watermark in the output file or not"
+                                    },
+                                    "preferStreaming": {
+                                        "type": "boolean",
+                                        "default": false,
+                                        "description": "Whether to prefer getting a progressive output from the provider or not"
                                     }
                                 }
                             }
diff --git a/lib/public/TaskProcessing/SynchronousProviderOptions.php b/lib/public/TaskProcessing/SynchronousProviderOptions.php
@@ -22,7 +22,7 @@ class SynchronousProviderOptions {
 	 */
 	public function __construct(
 		private readonly bool $includeWatermarks = false,
-		private readonly bool $preferStreaming = true,
+		private readonly bool $preferStreaming = false,
 		?callable $reportIntermediateOutput = null,
 	) {
 		$this->reportIntermediateOutput = $reportIntermediateOutput !== null
diff --git a/lib/public/TaskProcessing/Task.php b/lib/public/TaskProcessing/Task.php
@@ -51,7 +51,7 @@ final class Task implements \JsonSerializable {
 
 	protected bool $includeWatermark = true;
 
-	protected bool $preferStreaming = true;
+	protected bool $preferStreaming = false;
 
 	/**
 	 * @since 30.0.0
diff --git a/openapi.json b/openapi.json
@@ -8803,6 +8803,11 @@
                                         "type": "boolean",
                                         "default": true,
                                         "description": "Whether to include a watermark in the output file or not"
+                                    },
+                                    "preferStreaming": {
+                                        "type": "boolean",
+                                        "default": false,
+                                        "description": "Whether to prefer getting a progressive output from the provider or not"
                                     }
                                 }
                             }
@@ -14165,6 +14170,11 @@
                                         "type": "boolean",
                                         "default": true,
                                         "description": "Whether to include a watermark in the output file or not"
+                                    },
+                                    "preferStreaming": {
+                                        "type": "boolean",
+                                        "default": false,
+                                        "description": "Whether to prefer getting a progressive output from the provider or not"
                                     }
                                 }
                             }

Original file line number	Diff line number	Diff line change
`@@ -647,6 +647,11 @@`
`647`	`647`	`"type": "boolean",`
`648`	`648`	`"default": true,`
`649`	`649`	`"description": "Whether to include a watermark in the output file or not"`
	`650`	`+ },`
	`651`	`+ "preferStreaming": {`
	`652`	`+ "type": "boolean",`
	`653`	`+ "default": false,`
	`654`	`+ "description": "Whether to prefer getting a progressive output from the provider or not"`
`650`	`655`	`}`
`651`	`656`	`}`
`652`	`657`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5098,6 +5098,11 @@`
`5098`	`5098`	`"type": "boolean",`
`5099`	`5099`	`"default": true,`
`5100`	`5100`	`"description": "Whether to include a watermark in the output file or not"`
	`5101`	`+ },`
	`5102`	`+ "preferStreaming": {`
	`5103`	`+ "type": "boolean",`
	`5104`	`+ "default": false,`
	`5105`	`+ "description": "Whether to prefer getting a progressive output from the provider or not"`
`5101`	`5106`	`}`
`5102`	`5107`	`}`
`5103`	`5108`	`}`
`@@ -10457,6 +10462,11 @@`
`10457`	`10462`	`"type": "boolean",`
`10458`	`10463`	`"default": true,`
`10459`	`10464`	`"description": "Whether to include a watermark in the output file or not"`
	`10465`	`+ },`
	`10466`	`+ "preferStreaming": {`
	`10467`	`+ "type": "boolean",`
	`10468`	`+ "default": false,`
	`10469`	`+ "description": "Whether to prefer getting a progressive output from the provider or not"`
`10460`	`10470`	`}`
`10461`	`10471`	`}`
`10462`	`10472`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8803,6 +8803,11 @@`
`8803`	`8803`	`"type": "boolean",`
`8804`	`8804`	`"default": true,`
`8805`	`8805`	`"description": "Whether to include a watermark in the output file or not"`
	`8806`	`+ },`
	`8807`	`+ "preferStreaming": {`
	`8808`	`+ "type": "boolean",`
	`8809`	`+ "default": false,`
	`8810`	`+ "description": "Whether to prefer getting a progressive output from the provider or not"`
`8806`	`8811`	`}`
`8807`	`8812`	`}`
`8808`	`8813`	`}`
`@@ -14165,6 +14170,11 @@`
`14165`	`14170`	`"type": "boolean",`
`14166`	`14171`	`"default": true,`
`14167`	`14172`	`"description": "Whether to include a watermark in the output file or not"`
	`14173`	`+ },`
	`14174`	`+ "preferStreaming": {`
	`14175`	`+ "type": "boolean",`
	`14176`	`+ "default": false,`
	`14177`	`+ "description": "Whether to prefer getting a progressive output from the provider or not"`
`14168`	`14178`	`}`
`14169`	`14179`	`}`
`14170`	`14180`	`}`