simplify counting and waiting logic

rate_limiter.py

@@ -16,27 +16,17 @@ class RateLimiter:
         self.calls_per_wait = calls_per_wait
         self.seconds_to_wait = seconds_to_wait
 
-        self.successful_calls = 0 # APIの呼び出し成功回数
-        self.failed_calls = 0 # APIの呼び出し失敗回数
-        
-    def increment_successful_calls(self, kwargs, completion_obj, start_time, end_time):
-        """API呼び出しが成功したときに、呼び出し成功回数を1増やす。"""
-        self.successful_calls += 1
-        self.sleep_if_needed()
-
-    def increment_failed_calls(self, kwargs, completion_obj, start_time, end_time):
-        """API呼び出しが失敗したときに、呼び出し失敗回数を1増やす。"""
-        self.failed_calls += 1
-        self.sleep_if_needed()
+        self._call_count = 0 # 呼び出し回数
 
     def sleep_if_needed(self):
         """
         呼び出し回数が`calls_per_wait`を超えていたら、
         APIの呼び出し回数をリセットして`seconds_to_wait`秒待機する
+        その後、呼び出し回数を1増やす
         """
-        if (self.successful_calls + self.failed_calls) >= self.calls_per_wait:
-            self.successful_calls = 0
-            self.failed_calls = 0
-    
+        if self._call_count >= self.calls_per_wait:    
             print(f"呼び出し回数がf{self.calls_per_wait}回を超えたので、f{self.seconds_to_wait}秒待機します")
-            time.sleep(self.seconds_to_wait)
+            time.sleep(self.seconds_to_wait)
+            self._call_count = 0
+            
+        self._call_count += 1