Fixed type errors caused by infering JSON values as just object

as-celegen · as-celegen · commit 2d9d6c617166 · 2025-02-19T18:41:07.000+03:00
diff --git a/tests/commands/json/test_arrappend.py b/tests/commands/json/test_arrappend.py
@@ -1,11 +1,13 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
+from typing import List
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_arrappend"
-    value = {"int": 1, "array": [], "object": {"array": [ 1 ]}}
+    value: JSONValueT = {"int": 1, "array": [], "object": {"array": [ 1 ]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
@@ -27,7 +29,7 @@ def test_arrappend_single_element(redis: Redis):
 def test_arrappend_multiple_elements(redis: Redis):
     key = "json_arrappend"
     path = "$.array"
-    new_values = [1, 'new val', 1.5, True, [1], {"key": "value"}]
+    new_values: List[JSONValueT] = [1, 'new val', 1.5, True, [1], {"key": "value"}]
 
     assert redis.json.arrappend(key, path, *new_values) == [6]
     assert redis.json.get(key, path) == [[1, 'new val', 1.5, True, [1], {"key": "value"}]]
diff --git a/tests/commands/json/test_arrindex.py b/tests/commands/json/test_arrindex.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_arrindex"
-    value = {"array": [1, 'test', ['a'], 1.5, {'test': 1}], "int": 1, "object": {"array": [ 0, 1 ]}}
+    value: JSONValueT = {"array": [1, 'test', ['a'], 1.5, {'test': 1}], "int": 1, "object": {"array": [ 0, 1 ]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_arrinsert.py b/tests/commands/json/test_arrinsert.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_arrinsert"
-    value = {"int": 1, "array": [], "object": {"array": [0]}}
+    value: JSONValueT = {"int": 1, "array": [], "object": {"array": [0]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_arrlen.py b/tests/commands/json/test_arrlen.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_arrlen"
-    value = {"array": [1, 2, 3, 4], "int": 1, "object": {"array": [1, 2, 3]}}
+    value: JSONValueT = {"array": [1, 2, 3, 4], "int": 1, "object": {"array": [1, 2, 3]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_arrpop.py b/tests/commands/json/test_arrpop.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_arrpop"
-    value = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [5, 6, 7]}}
+    value: JSONValueT = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [5, 6, 7]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_arrtrim.py b/tests/commands/json/test_arrtrim.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_arrtrim"
-    value = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [5, 6, 7]}}
+    value: JSONValueT = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [5, 6, 7]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_clear.py b/tests/commands/json/test_clear.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_clear"
-    value = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
+    value: JSONValueT = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_delete_json.py b/tests/commands/json/test_delete_json.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_delete"
-    value = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
+    value: JSONValueT = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_forget.py b/tests/commands/json/test_forget.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_forget"
-    value = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
+    value: JSONValueT = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_get_json.py b/tests/commands/json/test_get_json.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_get"
-    value = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
+    value: JSONValueT = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_mget_json.py b/tests/commands/json/test_mget_json.py
@@ -1,12 +1,13 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_keys = ["json_mget_1", "json_mget_2"]
-    value1 = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
-    value2 = {"int": 2, "array": [2, 2, 3, 4], "object": {"array": [2, 2, 3]}}
+    value1: JSONValueT = {"int": 1, "array": [1, 2, 3, 4], "object": {"array": [1, 2, 3]}}
+    value2: JSONValueT = {"int": 2, "array": [2, 2, 3, 4], "object": {"array": [2, 2, 3]}}
     redis.json.set(json_keys[0], "$", value1)
     redis.json.set(json_keys[1], "$", value2)
     yield
diff --git a/tests/commands/json/test_numincrby.py b/tests/commands/json/test_numincrby.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_numincrby"
-    value = {"int": 1, "str": "test", "object": {"int": 2}}
+    value: JSONValueT = {"int": 1, "str": "test", "object": {"int": 2}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_nummultby.py b/tests/commands/json/test_nummultby.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_nummultby"
-    value = {"int": 2, "str": "test", "object": {"int": 3}}
+    value: JSONValueT = {"int": 2, "str": "test", "object": {"int": 3}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_objkeys.py b/tests/commands/json/test_objkeys.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_objkeys"
-    value = {"int": 2, "str": "test", "object": {"int": 3}, "second_object": {"object": {"str": "test", "int": 2}}}
+    value: JSONValueT = {"int": 2, "str": "test", "object": {"int": 3}, "second_object": {"object": {"str": "test", "int": 2}}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
@@ -16,6 +17,8 @@ def test_objkeys(redis: Redis):
     path = "$"
 
     response = redis.json.objkeys(key, path)
+
+    assert not response[0] is None
     response[0].sort()
 
     assert response == [["int", "object", "second_object", "str"]]
@@ -41,6 +44,7 @@ def test_objkeys_wildcard(redis: Redis):
 
     response = redis.json.objkeys(key, path)
     for i in response:
+        assert not i is None
         i.sort()
 
     response.sort()
diff --git a/tests/commands/json/test_objlen.py b/tests/commands/json/test_objlen.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_objlen"
-    value = {"int": 2, "str": "test", "object": {"int": 3}, "second_object": {"object": {"str": "test", "int": 2}}}
+    value: JSONValueT = {"int": 2, "str": "test", "object": {"int": 3}, "second_object": {"object": {"str": "test", "int": 2}}}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/tests/commands/json/test_type_json.py b/tests/commands/json/test_type_json.py
@@ -1,11 +1,12 @@
 import pytest
 from upstash_redis import Redis
+from upstash_redis.typing import JSONValueT
 
 
 @pytest.fixture(autouse=True)
 def setup_json(redis: Redis):
     json_key = "json_type"
-    value = {"number": 1, "array": [1, 2, 3, 4], "object": {"number": 3.1415}, "str": "test", "bool": True, "null": None}
+    value: JSONValueT = {"number": 1, "array": [1, 2, 3, 4], "object": {"number": 3.1415}, "str": "test", "bool": True, "null": None}
     redis.json.set(json_key, "$", value)
     yield
     redis.delete(json_key)
diff --git a/upstash_redis/asyncio/client.py b/upstash_redis/asyncio/client.py
@@ -225,7 +225,7 @@ def __init__(
         self._url = url
         self._token = token
 
-        self._json = AsyncJsonCommands(self)
+        self._json = PipelineJsonCommands(self)
 
         self._allow_telemetry = allow_telemetry
 
diff --git a/upstash_redis/client.py b/upstash_redis/client.py
@@ -215,7 +215,7 @@ def __init__(
         self._url = url
         self._token = token
 
-        self._json = JsonCommands(self)
+        self._json = PipelineJsonCommands(self)
 
         self._allow_telemetry = allow_telemetry
 
diff --git a/upstash_redis/commands.pyi b/upstash_redis/commands.pyi
@@ -1523,7 +1523,7 @@ class JsonCommands:
     def type(self, key: str, path: str = '$') -> List[Literal["string", "integer", "boolean", "object", "array", "number", "null"]]:...
 
 class PipelineJsonCommands:
-    def __init__(self, client: Commands):...
+    def __init__(self, client: PipelineCommands):...
     def arrappend(self, key: str, path: str, *value: JSONValueT) -> PipelineCommands:...
     def arrindex(self, key: str, path: str, value: JSONValueT, start: int = 0, stop: int = 0) -> PipelineCommands:...
     def arrinsert(self, key: str, path: str, index: int, *value: JSONValueT) -> PipelineCommands:...
@@ -1546,7 +1546,7 @@ class PipelineJsonCommands:
     def type(self, key: str, path: str = '$') -> PipelineCommands:...
 
 class AsyncJsonCommands:
-    def __init__(self, client: Commands):...
+    def __init__(self, client: AsyncCommands):...
     async def arrappend(self, key: str, path: str, *value: JSONValueT) -> List[Union[int, None]]:...
     async def arrindex(self, key: str, path: str, value: JSONValueT, start: int = 0, stop: int = 0) -> List[Union[int, None]]:...
     async def arrinsert(self, key: str, path: str, index: int, *value: JSONValueT) -> List[Union[int, None]]:...
