From 4c91a70a70b228f49c9a5ff8cf145fe06fa77b13 Mon Sep 17 00:00:00 2001
From: Werner Van Geit <werner.vangeit@gmail.com>
Date: Thu, 28 Nov 2024 11:39:58 +0100
Subject: [PATCH] Fix less nofworkers in batch (#16)

* Fix a problem when number of input tasks is lower than number of workers

* Bump version
---
 .bumpversion.cfg                                | 2 +-
 .osparc/osparc-meta-parallelrunner/metadata.yml | 2 +-
 Makefile                                        | 2 +-
 docker-compose-local.yml                        | 2 +-
 docker_scripts/parallelrunner.py                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 6c7323e..7422218 100755
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.9
+current_version = 1.1.10
 commit = False
 message = service version: {current_version} → {new_version}
 tag = False
diff --git a/.osparc/osparc-meta-parallelrunner/metadata.yml b/.osparc/osparc-meta-parallelrunner/metadata.yml
index 6149a41..a92b5f9 100755
--- a/.osparc/osparc-meta-parallelrunner/metadata.yml
+++ b/.osparc/osparc-meta-parallelrunner/metadata.yml
@@ -1,7 +1,7 @@
 name: ParallelRunner
 description: "ParallelRunnerService"
 key: simcore/services/dynamic/osparc-meta-parallelrunner
-version: 1.1.9
+version: 1.1.10
 integration-version: 2.0.0
 type: dynamic
 authors:
diff --git a/Makefile b/Makefile
index 56eea9b..fc568bb 100755
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SHELL = /bin/sh
 MAKEFLAGS += -j2
 
 export DOCKER_IMAGE_NAME ?= osparc-meta-parallelrunner
-export DOCKER_IMAGE_TAG ?= 1.1.9
+export DOCKER_IMAGE_TAG ?= 1.1.10
 
 export MASTER_AWS_REGISTRY ?= registry.osparc-master-zmt.click
 export MASTER_REGISTRY ?= registry.osparc-master.speag.com
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index 7e7a075..5ec3edf 100755
--- a/docker-compose-local.yml
+++ b/docker-compose-local.yml
@@ -1,6 +1,6 @@
 services:
   osparc-meta-parallelrunner:
-    image: simcore/services/dynamic/osparc-meta-parallelrunner:1.1.9
+    image: simcore/services/dynamic/osparc-meta-parallelrunner:1.1.10
     ports:
       - "8888:8888"
     environment:
diff --git a/docker_scripts/parallelrunner.py b/docker_scripts/parallelrunner.py
index 01dd684..26142f7 100755
--- a/docker_scripts/parallelrunner.py
+++ b/docker_scripts/parallelrunner.py
@@ -155,7 +155,7 @@ def run_input_tasks(self, input_tasks, tasks_uuid):
         batch_mode = self.settings.batch_mode
 
         if batch_mode:
-            n_of_batches = number_of_workers
+            n_of_batches = min(number_of_workers, len(input_tasks))
         else:
             n_of_batches = len(input_tasks)