Change definition of reset_time to floating point

Truncating reset_time (or start of next window) by
casting to an int was incorrectly providing the wrong
reset_time as there was precision loss in the conversion.

limits/aio/storage/base.py

@@ -103,7 +103,7 @@ async def get(self, key: str) -> int:
         raise NotImplementedError
 
     @abstractmethod
-    async def get_expiry(self, key: str) -> int:
+    async def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """
@@ -169,7 +169,7 @@ async def acquire_entry(
     @abstractmethod
     async def get_moving_window(
         self, key: str, limit: int, expiry: int
-    ) -> Tuple[int, int]:
+    ) -> Tuple[float, int]:
         """
         returns the starting point and the number of entries in the moving
         window

limits/aio/storage/etcd.py

@@ -116,12 +116,12 @@ async def get(self, key: str) -> int:
                 return int(amount)
         return 0
 
-    async def get_expiry(self, key: str) -> int:
+    async def get_expiry(self, key: str) -> float:
         cur = await self.storage.get(self.prefixed_key(key))
         if cur:
             window_end = float(cur.value.split(b":")[1])
-            return int(window_end)
-        return int(time.time())
+            return window_end
+        return time.time()
 
     async def check(self) -> bool:
         try:

limits/aio/storage/memcached.py

@@ -126,14 +126,14 @@ async def incr(
 
         return amount
 
-    async def get_expiry(self, key: str) -> int:
+    async def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """
         storage = await self.get_storage()
         item = await storage.get(f"{key}/expires".encode())
 
-        return int(item and float(item.value) or time.time())
+        return item and float(item.value) or time.time()
 
     async def check(self) -> bool:
         """

limits/aio/storage/memory.py

@@ -128,12 +128,12 @@ async def acquire_entry(
 
             return True
 
-    async def get_expiry(self, key: str) -> int:
+    async def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """
 
-        return int(self.expirations.get(key, time.time()))
+        return self.expirations.get(key, time.time())
 
     async def get_num_acquired(self, key: str, expiry: int) -> int:
         """
@@ -153,7 +153,7 @@ async def get_num_acquired(self, key: str, expiry: int) -> int:
     # FIXME: arg limit is not used
     async def get_moving_window(
         self, key: str, limit: int, expiry: int
-    ) -> Tuple[int, int]:
+    ) -> Tuple[float, int]:
         """
         returns the starting point and the number of entries in the moving
         window
@@ -167,9 +167,9 @@ async def get_moving_window(
 
         for item in self.events.get(key, [])[::-1]:
             if item.atime >= timestamp - expiry:
-                return int(item.atime), acquired
+                return item.atime, acquired
 
-        return int(timestamp), acquired
+        return timestamp, acquired
 
     async def check(self) -> bool:
         """

limits/aio/storage/mongodb.py

@@ -227,7 +227,7 @@ async def check(self) -> bool:
 
     async def get_moving_window(
         self, key: str, limit: int, expiry: int
-    ) -> Tuple[int, int]:
+    ) -> Tuple[float, int]:
         """
         returns the starting point and the number of entries in the moving
         window
@@ -237,7 +237,7 @@ async def get_moving_window(
         :return: (start of window, number of acquired entries)
         """
         timestamp = time.time()
-        result = (
+        if result := (
             await self.database[self.__collection_mapping["windows"]]
             .aggregate(
                 [
@@ -264,12 +264,9 @@ async def get_moving_window(
                 ]
             )
             .to_list(length=1)
-        )
-
-        if result:
-            return (int(result[0]["min"]), result[0]["count"])
-
-        return (int(timestamp), 0)
+        ):
+            return result[0]["min"], result[0]["count"]
+        return timestamp, 0
 
     async def acquire_entry(
         self, key: str, limit: int, expiry: int, amount: int = 1

limits/aio/storage/redis.py

@@ -78,7 +78,7 @@ async def _clear(self, key: str, connection: AsyncRedisClient) -> None:
 
     async def get_moving_window(
         self, key: str, limit: int, expiry: int
-    ) -> Tuple[int, int]:
+    ) -> Tuple[float, int]:
         """
         returns the starting point and the number of entries in the moving
         window
@@ -88,12 +88,12 @@ async def get_moving_window(
         :return: (start of window, number of acquired entries)
         """
         key = self.prefixed_key(key)
-        timestamp = int(time.time())
+        timestamp = time.time()
         window = await self.lua_moving_window.execute(
-            [key], [int(timestamp - expiry), limit]
+            [key], [timestamp - expiry, limit]
         )
         if window:
-            return tuple(window)  # type: ignore
+            return float(window[0]), window[1]  # type: ignore
         return timestamp, 0
 
     async def _acquire_entry(
@@ -118,14 +118,14 @@ async def _acquire_entry(
 
         return bool(acquired)
 
-    async def _get_expiry(self, key: str, connection: AsyncRedisClient) -> int:
+    async def _get_expiry(self, key: str, connection: AsyncRedisClient) -> float:
         """
         :param key: the key to get the expiry for
         :param connection: Redis connection
         """
 
         key = self.prefixed_key(key)
-        return int(max(await connection.ttl(key), 0) + time.time())
+        return max(await connection.ttl(key), 0) + time.time()
 
     async def _check(self, connection: AsyncRedisClient) -> bool:
         """
@@ -261,7 +261,7 @@ async def acquire_entry(
 
         return await super()._acquire_entry(key, limit, expiry, self.storage, amount)
 
-    async def get_expiry(self, key: str) -> int:
+    async def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """
@@ -450,7 +450,7 @@ async def get(self, key: str) -> int:
             key, self.storage_replica if self.use_replicas else self.storage
         )
 
-    async def get_expiry(self, key: str) -> int:
+    async def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """

limits/resources/redis/lua_scripts/moving_window.lua

@@ -16,4 +16,6 @@ for idx=1,#items do
     end
 end
 
-return {oldest, a}
+if oldest then
+    return {tostring(oldest), a}
+end

limits/storage/base.py

@@ -99,7 +99,7 @@ def get(self, key: str) -> int:
         raise NotImplementedError
 
     @abstractmethod
-    def get_expiry(self, key: str) -> int:
+    def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """
@@ -161,7 +161,7 @@ def acquire_entry(self, key: str, limit: int, expiry: int, amount: int = 1) -> b
         raise NotImplementedError
 
     @abstractmethod
-    def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[int, int]:
+    def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[float, int]:
         """
         returns the starting point and the number of entries in the moving
         window

limits/storage/etcd.py

@@ -110,12 +110,11 @@ def get(self, key: str) -> int:
                 return int(amount)
         return 0
 
-    def get_expiry(self, key: str) -> int:
+    def get_expiry(self, key: str) -> float:
         value, _ = self.storage.get(self.prefixed_key(key))
         if value:
-            window_end = float(value.split(b":")[1])
-            return int(window_end)
-        return int(time.time())
+            return float(value.split(b":")[1])
+        return time.time()
 
     def check(self) -> bool:
         try:

limits/storage/memcached.py

@@ -192,12 +192,12 @@ def incr(
 
         return amount
 
-    def get_expiry(self, key: str) -> int:
+    def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """
 
-        return int(float(self.storage.get(key + "/expires") or time.time()))
+        return float(self.storage.get(key + "/expires") or time.time())
 
     def check(self) -> bool:
         """

limits/storage/memory.py

@@ -121,12 +121,12 @@ def acquire_entry(self, key: str, limit: int, expiry: int, amount: int = 1) -> b
             self.events[key][:0] = [LockableEntry(expiry) for _ in range(amount)]
             return True
 
-    def get_expiry(self, key: str) -> int:
+    def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """
 
-        return int(self.expirations.get(key, time.time()))
+        return self.expirations.get(key, time.time())
 
     def get_num_acquired(self, key: str, expiry: int) -> int:
         """
@@ -143,7 +143,7 @@ def get_num_acquired(self, key: str, expiry: int) -> int:
             else 0
         )
 
-    def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[int, int]:
+    def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[float, int]:
         """
         returns the starting point and the number of entries in the moving
         window
@@ -157,9 +157,9 @@ def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[int, int
 
         for item in self.events.get(key, [])[::-1]:
             if item.atime >= timestamp - expiry:
-                return int(item.atime), acquired
+                return item.atime, acquired
 
-        return int(timestamp), acquired
+        return timestamp, acquired
 
     def check(self) -> bool:
         """

limits/storage/mongodb.py

@@ -205,7 +205,7 @@ def check(self) -> bool:
         except:  # noqa: E722
             return False
 
-    def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[int, int]:
+    def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[float, int]:
         """
         returns the starting point and the number of entries in the moving
         window
@@ -243,9 +243,9 @@ def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[int, int
         )
 
         if result:
-            return int(result[0]["min"]), result[0]["count"]
+            return result[0]["min"], result[0]["count"]
 
-        return int(timestamp), 0
+        return timestamp, 0
 
     def acquire_entry(self, key: str, limit: int, expiry: int, amount: int = 1) -> bool:
         """

limits/storage/redis.py

@@ -32,7 +32,7 @@ class RedisInteractor:
     def prefixed_key(self, key: str) -> str:
         return f"{self.PREFIX}:{key}"
 
-    def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[int, int]:
+    def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[float, int]:
         """
         returns the starting point and the number of entries in the moving
         window
@@ -43,9 +43,10 @@ def get_moving_window(self, key: str, limit: int, expiry: int) -> Tuple[int, int
         """
         key = self.prefixed_key(key)
         timestamp = time.time()
-        window = self.lua_moving_window([key], [int(timestamp - expiry), limit])
+        if window := self.lua_moving_window([key], [timestamp - expiry, limit]):
+            return float(window[0]), window[1]
 
-        return window or (int(timestamp), 0)
+        return timestamp, 0
 
     def _incr(
         self,
@@ -109,14 +110,14 @@ def _acquire_entry(
 
         return bool(acquired)
 
-    def _get_expiry(self, key: str, connection: RedisClient) -> int:
+    def _get_expiry(self, key: str, connection: RedisClient) -> float:
         """
         :param key: the key to get the expiry for
         :param connection: Redis connection
         """
 
         key = self.prefixed_key(key)
-        return int(max(connection.ttl(key), 0) + time.time())
+        return max(connection.ttl(key), 0) + time.time()
 
     def _check(self, connection: RedisClient) -> bool:
         """
@@ -232,7 +233,7 @@ def acquire_entry(self, key: str, limit: int, expiry: int, amount: int = 1) -> b
 
         return super()._acquire_entry(key, limit, expiry, self.storage, amount)
 
-    def get_expiry(self, key: str) -> int:
+    def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """

limits/storage/redis_sentinel.py

@@ -101,7 +101,7 @@ def get(self, key: str) -> int:
             key, self.storage_slave if self.use_replicas else self.storage
         )
 
-    def get_expiry(self, key: str) -> int:
+    def get_expiry(self, key: str) -> float:
         """
         :param key: the key to get the expiry for
         """

limits/util.py

@@ -38,7 +38,7 @@ class WindowStats(NamedTuple):
     """
 
     #: Time as seconds since the Epoch when this window will be reset
-    reset_time: int
+    reset_time: float
     #: Quantity remaining in this window
     remaining: int