API refactor

venv/lib/python3.12/site-packages/redis/commands/json/commands.py

@@ -15,7 +15,7 @@ class JSONCommands:
 
     def arrappend(
         self, name: str, path: Optional[str] = Path.root_path(), *args: List[JsonType]
-    ) -> List[Union[int, None]]:
+    ) -> List[Optional[int]]:
         """Append the objects ``args`` to the array under the
         ``path` in key ``name``.
 
@@ -33,7 +33,7 @@ class JSONCommands:
         scalar: int,
         start: Optional[int] = None,
         stop: Optional[int] = None,
-    ) -> List[Union[int, None]]:
+    ) -> List[Optional[int]]:
         """
         Return the index of ``scalar`` in the JSON array under ``path`` at key
         ``name``.
@@ -49,11 +49,11 @@ class JSONCommands:
             if stop is not None:
                 pieces.append(stop)
 
-        return self.execute_command("JSON.ARRINDEX", *pieces)
+        return self.execute_command("JSON.ARRINDEX", *pieces, keys=[name])
 
     def arrinsert(
         self, name: str, path: str, index: int, *args: List[JsonType]
-    ) -> List[Union[int, None]]:
+    ) -> List[Optional[int]]:
         """Insert the objects ``args`` to the array at index ``index``
         under the ``path` in key ``name``.
 
@@ -66,20 +66,20 @@ class JSONCommands:
 
     def arrlen(
         self, name: str, path: Optional[str] = Path.root_path()
-    ) -> List[Union[int, None]]:
+    ) -> List[Optional[int]]:
         """Return the length of the array JSON value under ``path``
         at key``name``.
 
         For more information see `JSON.ARRLEN <https://redis.io/commands/json.arrlen>`_.
         """  # noqa
-        return self.execute_command("JSON.ARRLEN", name, str(path))
+        return self.execute_command("JSON.ARRLEN", name, str(path), keys=[name])
 
     def arrpop(
         self,
         name: str,
         path: Optional[str] = Path.root_path(),
         index: Optional[int] = -1,
-    ) -> List[Union[str, None]]:
+    ) -> List[Optional[str]]:
         """Pop the element at ``index`` in the array JSON value under
         ``path`` at key ``name``.
 
@@ -89,7 +89,7 @@ class JSONCommands:
 
     def arrtrim(
         self, name: str, path: str, start: int, stop: int
-    ) -> List[Union[int, None]]:
+    ) -> List[Optional[int]]:
         """Trim the array JSON value under ``path`` at key ``name`` to the
         inclusive range given by ``start`` and ``stop``.
 
@@ -102,32 +102,34 @@ class JSONCommands:
 
         For more information see `JSON.TYPE <https://redis.io/commands/json.type>`_.
         """  # noqa
-        return self.execute_command("JSON.TYPE", name, str(path))
+        return self.execute_command("JSON.TYPE", name, str(path), keys=[name])
 
     def resp(self, name: str, path: Optional[str] = Path.root_path()) -> List:
         """Return the JSON value under ``path`` at key ``name``.
 
         For more information see `JSON.RESP <https://redis.io/commands/json.resp>`_.
         """  # noqa
-        return self.execute_command("JSON.RESP", name, str(path))
+        return self.execute_command("JSON.RESP", name, str(path), keys=[name])
 
     def objkeys(
         self, name: str, path: Optional[str] = Path.root_path()
-    ) -> List[Union[List[str], None]]:
+    ) -> List[Optional[List[str]]]:
         """Return the key names in the dictionary JSON value under ``path`` at
         key ``name``.
 
         For more information see `JSON.OBJKEYS <https://redis.io/commands/json.objkeys>`_.
         """  # noqa
-        return self.execute_command("JSON.OBJKEYS", name, str(path))
+        return self.execute_command("JSON.OBJKEYS", name, str(path), keys=[name])
 
-    def objlen(self, name: str, path: Optional[str] = Path.root_path()) -> int:
+    def objlen(
+        self, name: str, path: Optional[str] = Path.root_path()
+    ) -> List[Optional[int]]:
         """Return the length of the dictionary JSON value under ``path`` at key
         ``name``.
 
         For more information see `JSON.OBJLEN <https://redis.io/commands/json.objlen>`_.
         """  # noqa
-        return self.execute_command("JSON.OBJLEN", name, str(path))
+        return self.execute_command("JSON.OBJLEN", name, str(path), keys=[name])
 
     def numincrby(self, name: str, path: str, number: int) -> str:
         """Increment the numeric (integer or floating point) JSON value under
@@ -173,7 +175,7 @@ class JSONCommands:
 
     def get(
         self, name: str, *args, no_escape: Optional[bool] = False
-    ) -> List[JsonType]:
+    ) -> Optional[List[JsonType]]:
         """
         Get the object stored as a JSON value at key ``name``.
 
@@ -197,7 +199,7 @@ class JSONCommands:
         # Handle case where key doesn't exist. The JSONDecoder would raise a
         # TypeError exception since it can't decode None
         try:
-            return self.execute_command("JSON.GET", *pieces)
+            return self.execute_command("JSON.GET", *pieces, keys=[name])
         except TypeError:
             return None
 
@@ -211,7 +213,7 @@ class JSONCommands:
         pieces = []
         pieces += keys
         pieces.append(str(path))
-        return self.execute_command("JSON.MGET", *pieces)
+        return self.execute_command("JSON.MGET", *pieces, keys=keys)
 
     def set(
         self,
@@ -312,7 +314,7 @@ class JSONCommands:
 
         """
 
-        with open(file_name, "r") as fp:
+        with open(file_name) as fp:
             file_content = loads(fp.read())
 
         return self.set(name, path, file_content, nx=nx, xx=xx, decode_keys=decode_keys)
@@ -324,7 +326,7 @@ class JSONCommands:
         nx: Optional[bool] = False,
         xx: Optional[bool] = False,
         decode_keys: Optional[bool] = False,
-    ) -> List[Dict[str, bool]]:
+    ) -> Dict[str, bool]:
         """
         Iterate over ``root_folder`` and set each JSON file to a value
         under ``json_path`` with the file name as the key.
@@ -355,7 +357,7 @@ class JSONCommands:
 
         return set_files_result
 
-    def strlen(self, name: str, path: Optional[str] = None) -> List[Union[int, None]]:
+    def strlen(self, name: str, path: Optional[str] = None) -> List[Optional[int]]:
         """Return the length of the string JSON value under ``path`` at key
         ``name``.
 
@@ -364,7 +366,7 @@ class JSONCommands:
         pieces = [name]
         if path is not None:
             pieces.append(str(path))
-        return self.execute_command("JSON.STRLEN", *pieces)
+        return self.execute_command("JSON.STRLEN", *pieces, keys=[name])
 
     def toggle(
         self, name: str, path: Optional[str] = Path.root_path()
@@ -377,7 +379,7 @@ class JSONCommands:
         return self.execute_command("JSON.TOGGLE", name, str(path))
 
     def strappend(
-        self, name: str, value: str, path: Optional[int] = Path.root_path()
+        self, name: str, value: str, path: Optional[str] = Path.root_path()
     ) -> Union[int, List[Optional[int]]]:
         """Append to the string JSON value. If two options are specified after
         the key name, the path is determined to be the first. If a single