restrict namespacing to hash name only

Author: 2ykwang

django_redis/client/default.py

@@ -1099,8 +1099,8 @@ def touch(
 
     def hset(
         self,
-        name: str,
-        key: KeyT,
+        name: KeyT,
+        key: str,
         value: EncodableT,
         version: Optional[int] = None,
         client: Optional[Redis] = None,
@@ -1111,14 +1111,15 @@ def hset(
         """
         if client is None:
             client = self.get_client(write=True)
-        nkey = self.make_key(key, version=version)
+
+        name = self.make_key(name, version=version)
         nvalue = self.encode(value)
-        return int(client.hset(name, nkey, nvalue))
+        return int(client.hset(name, key, nvalue))
 
     def hdel(
         self,
-        name: str,
-        key: KeyT,
+        name: KeyT,
+        key: str,
         version: Optional[int] = None,
         client: Optional[Redis] = None,
     ) -> int:
@@ -1128,40 +1129,47 @@ def hdel(
         """
         if client is None:
             client = self.get_client(write=True)
-        nkey = self.make_key(key, version=version)
-        return int(client.hdel(name, nkey))
+
+        name = self.make_key(name, version=version)
+        return int(client.hdel(name, key))
 
     def hlen(
         self,
-        name: str,
+        name: KeyT,
+        version: Optional[int] = None,
         client: Optional[Redis] = None,
     ) -> int:
         """
         Return the number of items in hash name.
         """
         if client is None:
             client = self.get_client(write=False)
+
+        name = self.make_key(name, version=version)
         return int(client.hlen(name))
 
     def hkeys(
         self,
-        name: str,
+        name: KeyT,
+        version: Optional[int] = None,
         client: Optional[Redis] = None,
     ) -> List[Any]:
         """
         Return a list of keys in hash name.
         """
         if client is None:
             client = self.get_client(write=False)
+
+        name = self.make_key(name, version=version)
         try:
-            return [self.reverse_key(k.decode()) for k in client.hkeys(name)]
+            return [k.decode() for k in client.hkeys(name)]
         except _main_exceptions as e:
             raise ConnectionInterrupted(connection=client) from e
 
     def hexists(
         self,
-        name: str,
-        key: KeyT,
+        name: KeyT,
+        key: str,
         version: Optional[int] = None,
         client: Optional[Redis] = None,
     ) -> bool:
@@ -1170,5 +1178,6 @@ def hexists(
         """
         if client is None:
             client = self.get_client(write=False)
-        nkey = self.make_key(key, version=version)
-        return bool(client.hexists(name, nkey))
+
+        name = self.make_key(name, version=version)
+        return bool(client.hexists(name, key))