Update

app.py

@@ -56,21 +56,24 @@ class Instance:
         self.model_type = 'base'
         self.loaded_model_list = {}
         self.counter = Counter()
-        self.counter['base'] = 0
+        self.global_counter = Counter()
         self.loaded_model_list['base'], self.common_instances = ckpt_load_helper(
             'gligen-generation-text-box',
             is_inpaint=False, is_style=False, common_instances=None
         )
         self.capacity = capacity
 
-    def _log(self, batch_size, instruction, phrase_list):
+    def _log(self, model_type, batch_size, instruction, phrase_list):
+        self.counter[model_type] += 1
+        self.global_counter[model_type] += 1
         current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        print(f'[{current_time}] ' + str(dict(self.counter)), f'samples: {batch_size}', f'prompt: {instruction}', f'phrases: {phrase_list}', sep=', ')
+        print('[{}] Current: {}, All: {}. Samples: {}, prompt: {}, phrases: {}'.format(
+            current_time, dict(self.counter), dict(self.global_counter), batch_size, instruction, phrase_list
+        ))
 
     def get_model(self, model_type, batch_size, instruction, phrase_list):
         if model_type in self.loaded_model_list:
-            self.counter[model_type] += 1
-            self._log(batch_size, instruction, phrase_list)
+            self._log(model_type, batch_size, instruction, phrase_list)
             return self.loaded_model_list[model_type]
 
         if self.capacity == len(self.loaded_model_list):
@@ -80,9 +83,8 @@ class Instance:
             gc.collect()
             torch.cuda.empty_cache()
 
-        self.counter[model_type] = 1
         self.loaded_model_list[model_type] = self._get_model(model_type)
-        self._log(batch_size, instruction, phrase_list)
+        self._log(model_type, batch_size, instruction, phrase_list)
         return self.loaded_model_list[model_type]
 
     def _get_model(self, model_type):
@@ -299,7 +301,8 @@ def generate(task, language_instruction, grounding_texts, sketch_pad,
     if len(boxes) != len(grounding_texts):
         if len(boxes) < len(grounding_texts):
             raise ValueError("""The number of boxes should be equal to the number of grounding objects.
-Number of boxes drawn: {}, number of grounding tokens: {}""".format(len(boxes), len(grounding_texts)))
+Number of boxes drawn: {}, number of grounding tokens: {}.
+Please draw boxes accordingly on the sketch pad.""".format(len(boxes), len(grounding_texts)))
         grounding_texts = grounding_texts + [""] * (len(boxes) - len(grounding_texts))
 
     boxes = (np.asarray(boxes) / 512).tolist()