New version relased #7

Author: munisisazade

examples/client.py

@@ -3,7 +3,7 @@
 
 # Add REDIS_URI application enviroment
 
-os.environ.setdefault("REDIS_URI", "redis://:PpkJfHHNph9X5hB5@localhost:6379/0")
+os.environ.setdefault("REDIS_URI", "redis://localhost:6379/0")
 
 rpc = RedisRPC("channel_name")  # channel name must be same as server
 square = rpc.send("square", 5)  # send data to spesific event

examples/server.py

@@ -3,20 +3,20 @@
 
 # Add REDIS_URI application enviroment
 
-os.environ.setdefault("REDIS_URI", "redis://:PpkJfHHNph9X5hB5@localhost:6379/0")
+os.environ.setdefault("REDIS_URI", "redis://localhost:6379/0")
 
 rpc = RedisRPC("channel_name")  # rename what you want
 
 
 # event lists
 def calc_square(response):  # `response` is a sender data
-    power_of_number = response ** 2
+    power_of_number = response**2
 
     return power_of_number  # sent to client
 
 
 def calc_cube(response):  # `response` is a sender data
-    cube_of_number = response ** 3
+    cube_of_number = response**3
     return cube_of_number  # sent to client
 
 

redisrpc/__init__.py

@@ -1,10 +1,9 @@
 from redisrpc.base import BasePubSub
 from redisrpc.version import VERSION
+
 __author__ = "munisisazade@gmail.com"
 
 
 RedisRPC = BasePubSub
 
-__all__ = [
-    "VERSION", "RedisRPC"
-]
+__all__ = ["VERSION", "RedisRPC"]

redisrpc/base.py

@@ -9,23 +9,25 @@
 import traceback
 from urllib.parse import urlparse
 from redisrpc.version import VERSION
+from redisrpc.errors import ChannelActiveException
 
 try:
     import redis
-except:
-    pass
+except ImportError:
+    raise ImportError("redis package must be installed")
 
 
 class BasePubSub(object):
     """
-        Base publish–subscribe is a
-        messaging pattern class
+    Base publish–subscribe is a
+    messaging pattern class
     """
 
     def __init__(self, channel_name):
         """
-            Initialize and subscribe channel
+        Initialize and subscribe channel
         """
+        self.validate_env()
         self.rdb = redis.StrictRedis.from_url(os.getenv("REDIS_URI"))
         self.check_connection_redis()
         self.channel = channel_name
@@ -44,7 +46,19 @@ def check_connection_redis(self):
                 f"redis_uri: {os.getenv('REDIS_URI')}"
             )
 
+    def validate_env(self):
+        if not os.getenv("REDIS_URI"):
+            raise ValueError("REDIS_URI environment variable must be set")
+
+    def check_before_connect(self):
+        # Get the list of currently active channels
+        active_channels = self.rdb.pubsub_channels()
+        if self.channel.encode("utf-8") in active_channels:
+            print("Please use different channel name or kill existing channel")
+            raise ChannelActiveException(self.channel)
+
     def listen(self):
+        self.check_before_connect()
         try:
             self.print_start()
             self.log_print("Pubsub is listen...")
@@ -72,20 +86,20 @@ def event_handler(self, event_name, data):
                 response = event(data)
                 if response:
                     self.log_print(f"Success response from {event_name}", "DEBUG")
-                    self.__send_reponse({
-                        "token": self.token,
-                        "event_name": event_name,
-                        "data": response
-                    })
+                    self.__send_reponse(
+                        {
+                            "token": self.token,
+                            "event_name": event_name,
+                            "data": response,
+                        }
+                    )
                 else:
                     self.log_print(f"Empty response from {event_name}", "WARNING")
             except:
                 self.log_print(traceback.format_exc(), "FATAL")
         else:
             self.log_print(f"Can't find `{event_name}` event name", "ERROR")
-            return {
-                "error": f"Can't find `{event_name}` event name"
-            }
+            return {"error": f"Can't find `{event_name}` event name"}
 
     def print_start(self):
         start_text = f"""
@@ -122,10 +136,11 @@ def log_print(self, text, type="INFO"):
     def connection_uri(self):
         uri = urlparse(os.getenv("REDIS_URI"))
         host = uri.netloc
-        paswd = ""
         if ":" in host and "@" in host:
-            paswd = host[host.index(":"):host.index("@")]
-        return os.getenv("REDIS_URI").replace(paswd, "****")
+            paswd = host[host.index(":") : host.index("@")]
+            return os.getenv("REDIS_URI").replace(paswd, "***")
+        else:
+            return os.getenv("REDIS_URI")
 
     def __encode_base64(self, data):
         return base64.b64encode(json.dumps(data).encode("utf-8"))
@@ -153,11 +168,7 @@ def __send_reponse(self, data):
         self.rdb.publish(self.channel, decode)
 
     def send(self, event_name, data, wait_response_time=2):
-        resp = {
-            "token": self.token,
-            "event_name": event_name,
-            "data": data
-        }
+        resp = {"token": self.token, "event_name": event_name, "data": data}
         decode = self.__encode_base64(resp)
         self.rdb.publish(self.channel, decode)
         print("Send")

redisrpc/errors.py

@@ -1,10 +1,13 @@
-
-
 class Handler(Exception):
     def __init__(self, message, errors):
-
         # Call the base class constructor with the parameters it needs
         super().__init__(message)
 
         # Now for your custom code...
         self.errors = errors
+
+
+class ChannelActiveException(Exception):
+    def __init__(self, channel):
+        self.channel = channel
+        super().__init__(f"Channel '{channel}' is currently active.")

redisrpc/version.py

@@ -1,3 +1 @@
-
-
-VERSION = "0.0.6"
+VERSION = "0.0.7"

setup.py

@@ -11,21 +11,23 @@
     description="Redis RPC server for microservices",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    license='MIT',
+    license="MIT",
     url="https://github.com/munisisazade/redis-pub-sub",
     install_requires=["redis"],
-    extras_require={
-        "redis": ["redis"]
-    },
-    platforms=['any'],
+    extras_require={"redis": ["redis"]},
+    platforms=["any"],
     packages=setuptools.find_packages(),
     classifiers=[
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],