fix

ernie_vilg/module.py

@@ -118,11 +118,36 @@ class ErnieVilG:
         print('task poll start time', time.ctime(start_time))
         process_bar = tqdm(total=100, unit='%')
         results = {}
-        first_iter = True
+        total_time = 60 * len(taskids)
+        
         while True:
+          end_time = time.time()
+          duration = end_time - start_time
+          progress_rate = int((duration) / total_time*100)
+          if not taskids:
+            progress_rate = 100
+          if progress_rate > process_bar.n:
+            if progress_rate >= 100:
+              if not taskids:
+                increase_rate = 100 - process_bar.n
+              else:
+                increase_rate = 0
+            else:
+              increase_rate = progress_rate - process_bar.n
+          else:
+            increase_rate = 0
+          process_bar.update(increase_rate)
+          if duration < 30:
+            time.sleep(5)
+            print('increase_time', end_time - start_time)
+            print('increase_rate', increase_rate, flush=True)
+            continue
+          else:
+            time.sleep(1)
+            print('increase_time', end_time - start_time)
+            print('increase_rate', increase_rate, flush=True)
           if not taskids:
             break
-          total_time = 0
           has_done = []
           for taskid in taskids:
             res = requests.post(get_url, headers={'Content-Type':'application/x-www-form-urlencoded'}, data={'access_token': token,'taskId': {taskid}})
@@ -148,26 +173,16 @@ class ErnieVilG:
                 raise RuntimeError("Token失效重新请求后依然发生错误，请检查输入的参数")
             if res['msg'] == 'success':
               if res['data']['status'] == 1:
+                print('I am finished', flush=True)
                 has_done.append(res['data']['taskId'])
-              results[res['data']['text']] = {
-                  'imgUrls': res['data']['imgUrls'],
-                  'waiting': res['data']['waiting'],
-                  'taskId': res['data']['taskId']
-                }
+                results[res['data']['text']] = {
+                    'imgUrls': res['data']['imgUrls'],
+                    'waiting': res['data']['waiting'],
+                    'taskId': res['data']['taskId']
+                  }
             else:
               print(res['msg'])
               raise RuntimeError(res['msg'])
-            total_time = int(re.match('[0-9]+', str(res['data']['waiting'])).group(0)) * 60
-          end_time = time.time()
-          progress_rate = int(((end_time - start_time) / total_time*100)) if total_time != 0 else 100
-          if progress_rate > process_bar.n:
-            increase_rate = progress_rate - process_bar.n
-            if progress_rate >= 100:
-              increase_rate = 100 - process_bar.n
-          else:
-            increase_rate = 0
-          process_bar.update(increase_rate)
-          time.sleep(5)
           for taskid in has_done:
             taskids.remove(taskid)
         end_time = time.time() #debug code