Fix logic wrong current_redis_cache and aio version

Author: ptran1203

.gitignore

@@ -1,3 +1,5 @@
 __pycache__
 *.pyc
-test*.py
+test*.py
+dist
+*.egg-info

examples/basic.py

@@ -4,14 +4,15 @@
 from py_redis_cache import RedisCache
 from py_redis_cache.functional import cache
 
+
 # init redis_cache instance and connection
 redis_cache = RedisCache(
     host="127.0.0.1",
     port=6379,
     verbose=1  # Turn on logging for demonstration, set to 0 for silent caching
 )
 
-@redis_cache.cache(ttl=10)  # Expire after 10 seconds
+@cache(ttl=10)  # Expire after 10 seconds
 def heavy_compute(a: list, b: list):
     length = max(len(a), len(b))
     c = [[]] * length
@@ -26,5 +27,6 @@ def heavy_compute(a: list, b: list):
 
 result =  heavy_compute([1, 2, 3], [4, 5, 6])
 print(result)
+
 # Cache hit, key=redis_cache::11=__main__.heavy_compute(a=[1, 2, 3].b=[4, 5, 6])
 # [4, 10, 18]

py_redis_cache/__init__.py

@@ -24,9 +24,8 @@ def __call__(cls, *args, **kwargs):
         is_aio_redis = isinstance(cls, AsyncRedisCache)
 
         if cls not in cls._instances:
-            
             cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
-            if is_aio_redis:
+            if not is_aio_redis:
                 current_redis_cache = cls._instances[cls]
                 print("SET", current_redis_cache)
             else:
@@ -254,38 +253,3 @@ def wrapper(*args, **kwargs):
                 return data
             return wrapper
         return decorator
-
-
-def cached(
-    cache_instance: RedisCache,
-    tags: Union[list, str] = None,
-    ttl=30
-) -> Callable:
-    """
-    Return a decorator to cache the output of a function.
-    The cache will be invalidated after amount of time defined by
-    `ttl` argument (30 seconds by default)
-
-    Args:
-        tags(list|str, optional): tag of the cache, the tag 
-            will be added to the key for storing data.
-        ttl(int): Time to live of the cache, that mean the cache
-            will be deleted after `ttl` seconds.
-
-    Returns:
-        Decorator function
-    """
-    def decorator(func):
-        def wrapper(*args, **kwargs):
-            key = cache_instance._build_key(tags, func, *args, **kwargs)
-            data = cache_instance.get(key)
-            if data is None:
-                # Cache miss, call function and set result in redis
-                data = func(*args, **kwargs)
-                cache_instance.setex(key, data, ttl=ttl)
-            else:
-                # Cache hit
-                cache_instance.log_info(f"Cache hit, key={key}")
-            return data
-        return wrapper
-    return decorator

py_redis_cache/functional.py

@@ -1,9 +1,11 @@
 
+
 def cache(tags=None, ttl=30):
     from . import current_redis_cache
+    print("Import")
     return current_redis_cache.cache(tags, ttl)
 
 
 def aio_cache(tags=None, ttl=30):
-    from . import current_redis_cache
-    return current_redis_cache.cache(tags, ttl)
+    from . import current_aio_redis_cache
+    return current_aio_redis_cache.cache(tags, ttl)