zou 0.19.54__py3-none-any.whl → 0.19.55__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.19.54"
+__version__ = "0.19.55"

zou/app/blueprints/index/resources.py

@@ -42,6 +42,7 @@ class BaseStatusResource(Resource):
                 host=config.KEY_VALUE_STORE["host"],
                 port=config.KEY_VALUE_STORE["port"],
                 db=config.AUTH_TOKEN_BLACKLIST_KV_INDEX,
+                password=config.KEY_VALUE_STORE["password"],
                 decode_responses=True,
             )
             store.get("test")
@@ -64,7 +65,11 @@ class BaseStatusResource(Resource):
             host = config.KEY_VALUE_STORE["host"]
             port = config.KEY_VALUE_STORE["port"]
             db = config.KV_JOB_DB_INDEX
-            url = "redis://%s:%s/%s" % (host, port, db)
+            password = config.KEY_VALUE_STORE["password"]
+            if password:
+                url = "redis://:%s@%s:%s/%s" % (password, host, port, db)
+            else:
+                url = "redis://%s:%s/%s" % (host, port, db)
             args = ["rq", "info", "--url", url]
             out = shell.run_command(args)
             is_jq_up = b"0 workers" not in out

zou/app/config.py

@@ -19,6 +19,7 @@ AUTH_STRATEGY = os.getenv("AUTH_STRATEGY", "auth_local_classic")
 KEY_VALUE_STORE = {
     "host": os.getenv("KV_HOST", "localhost"),
     "port": os.getenv("KV_PORT", "6379"),
+    "password": os.getenv("KV_PASSWORD", None),
 }
 AUTH_TOKEN_BLACKLIST_KV_INDEX = 0
 MEMOIZE_DB_INDEX = 1

zou/app/stores/auth_tokens_store.py

@@ -9,6 +9,7 @@ try:
         host=config.KEY_VALUE_STORE["host"],
         port=config.KEY_VALUE_STORE["port"],
         db=config.AUTH_TOKEN_BLACKLIST_KV_INDEX,
+        password=config.KEY_VALUE_STORE["password"],
         decode_responses=True,
     )
     revoked_tokens_store.ping()

zou/app/stores/publisher_store.py

@@ -7,7 +7,11 @@ from zou.app import config
 host = config.KEY_VALUE_STORE["host"]
 port = config.KEY_VALUE_STORE["port"]
 redis_db = config.KV_EVENTS_DB_INDEX
-redis_url = "redis://%s:%s/%s" % (host, port, redis_db)
+password = config.KEY_VALUE_STORE["password"]
+if password:
+    redis_url = "redis://:%s@%s:%s/%s" % (password, host, port, redis_db)
+else:
+    redis_url = "redis://%s:%s/%s" % (host, port, redis_db)
 
 socketio = None
 
@@ -27,7 +31,11 @@ def init():
 
     try:
         publisher_store = redis.StrictRedis(
-            host=host, port=port, db=redis_db, decode_responses=True
+            host=host,
+            port=port,
+            db=redis_db,
+            password=password,
+            decode_responses=True,
         )
         publisher_store.get("test")
         socketio = SocketIO(

zou/app/stores/queue_store.py

@@ -11,6 +11,7 @@ try:
             host=config.KEY_VALUE_STORE["host"],
             port=config.KEY_VALUE_STORE["port"],
             db=config.KV_JOB_DB_INDEX,
+            password=config.KEY_VALUE_STORE["password"],
             decode_responses=True,
         )
         queue_store.get("test")

zou/app/utils/cache.py

@@ -17,6 +17,7 @@ try:
         host=config.KEY_VALUE_STORE["host"],
         port=config.KEY_VALUE_STORE["port"],
         db=config.MEMOIZE_DB_INDEX,
+        password=config.KEY_VALUE_STORE["password"],
         decode_responses=True,
     )
     redis_cache.get("test")
@@ -26,6 +27,7 @@ try:
             "CACHE_REDIS_HOST": config.KEY_VALUE_STORE["host"],
             "CACHE_REDIS_PORT": config.KEY_VALUE_STORE["port"],
             "CACHE_REDIS_DB": config.MEMOIZE_DB_INDEX,
+            "CACHE_REDIS_PASSWORD": config.KEY_VALUE_STORE["password"],
         }
     )
 

zou/event_stream.py

@@ -86,7 +86,16 @@ def get_redis_url():
     redis_host = config.KEY_VALUE_STORE["host"]
     redis_port = config.KEY_VALUE_STORE["port"]
     db_index = config.KV_EVENTS_DB_INDEX
-    return "redis://%s:%s/%s" % (redis_host, redis_port, db_index)
+    redis_password = config.KEY_VALUE_STORE["password"]
+    if redis_password:
+        return "redis://:%s@%s:%s/%s" % (
+            redis_password,
+            redis_host,
+            redis_port,
+            db_index,
+        )
+    else:
+        return "redis://%s:%s/%s" % (redis_host, redis_port, db_index)
 
 
 # Routes

zou/job_settings.py

@@ -3,3 +3,4 @@ from zou.app import config
 REDIS_HOST = config.KEY_VALUE_STORE["host"]
 REDIS_PORT = config.KEY_VALUE_STORE["port"]
 REDIS_DB = config.KV_JOB_DB_INDEX
+REDIS_PASSWORD = config.KEY_VALUE_STORE["password"]

{zou-0.19.54.dist-info → zou-0.19.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.54
+Version: 0.19.55
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

{zou-0.19.54.dist-info → zou-0.19.55.dist-info}/RECORD

@@ -1,11 +1,11 @@
-zou/__init__.py,sha256=166Pydgqhznfbi3veNYuwTUKwt-iztD4zn5BNG5qvwY,24
+zou/__init__.py,sha256=pSNaoWHlk0o-XtsQy-8olXESh2Tu9_WLaixIhoQCwH4,24
 zou/cli.py,sha256=DHHf4mz33Bi0gGFJ0GdRUpjrMrMSQYyVubJFppHPZlU,18914
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
-zou/event_stream.py,sha256=HXPN79RZlG4Y3dYTqkprm8iJPmOn80W7INULHR6GjC8,8246
-zou/job_settings.py,sha256=WB_RkYxmh4ffQHqg63_wsUDiS0zP3yxiwrxK7DhHG0g,150
+zou/event_stream.py,sha256=_tue9Ry3aqCniZpKGhWJaY1Eo_fd6zOAfnzPvh_mJzU,8489
+zou/job_settings.py,sha256=_aqBhujt2Q8sXRWIbgbDf-LUdXRdBimdtTc-fZbiXoY,202
 zou/app/__init__.py,sha256=AJEGrLTirr5zZmA8DVSjZedtTuDg6eg9rG4kXMimPnQ,6966
 zou/app/api.py,sha256=JTB_IMVO8EOoyqx9KdRkiIix0chOLi0yGDY-verUJXA,5127
-zou/app/config.py,sha256=wA12qGUc7cCVmuD6XNHJ2dJ9mR4-8GnqEFoiS_yJv9s,6544
+zou/app/config.py,sha256=z6fhXvTKuyCXAJDPtLGrnJ7aUie-5JTwN8n_Z_oX0HI,6592
 zou/app/mixin.py,sha256=eYwfS_CUFvNmldaQXrjsN5mK_gX0wYrBFykfx60uUM8,4897
 zou/app/swagger.py,sha256=Jr7zsMqJi0V4FledODOdu-aqqVE02jMFzhqVxHK0_2c,54158
 zou/app/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -83,7 +83,7 @@ zou/app/blueprints/export/csv/time_spents.py,sha256=WHdy9Wf2e-kvviYbNyUFr7xgg49h
 zou/app/blueprints/files/__init__.py,sha256=7Wty30JW2OXIn-tBFXOWWmPuHnsnxPpH3jNtHvvr9tY,3987
 zou/app/blueprints/files/resources.py,sha256=8SIV8kaqv3dxyL8nyqG3QiZmk5ZYIvUxw6k1ic-jhBs,69786
 zou/app/blueprints/index/__init__.py,sha256=Dh3oQiirpg8RCkfVOuk3irIjSvUvuRf0jPxE6oGubz0,828
-zou/app/blueprints/index/resources.py,sha256=N0u0RWxThnRndfb5dMy4o2E45ePc3jxWRDw1e3uZqas,8167
+zou/app/blueprints/index/resources.py,sha256=lGPUGZPla59mjXXsDW4DB04uE_rI4fhMqm8J48Nxf4s,8407
 zou/app/blueprints/news/__init__.py,sha256=HxBXjC15dVbotNAZ0CLf02iwUjxJr20kgf8_kT_9nwM,505
 zou/app/blueprints/news/resources.py,sha256=6e3Ex_Q-djxWDjQQ-eD1fBcylea6XaJphO7Tl9zWKcY,7057
 zou/app/blueprints/persons/__init__.py,sha256=0cnHHw3K_8OEMm0qOi3wKVomSAg9IJSnVjAXabMeHks,3893
@@ -215,14 +215,14 @@ zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6p
 zou/app/services/time_spents_service.py,sha256=H9X-60s6oqtY9rtU-K2jKwUSljfkdGlf_9wMr3iVfIA,15158
 zou/app/services/user_service.py,sha256=BiOhPV7O-vowet7jOksjXk2V4yxZkdqsIyNboJ-Oz_A,46595
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zou/app/stores/auth_tokens_store.py,sha256=adcGe3SxfY4y_tP57HIR2SZbnu_Amqk-dAGVZIcJQ9c,1237
+zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
 zou/app/stores/file_store.py,sha256=yLQDM6mNbj9oe0vsWdBqun7D8Dw-eSjD1yHCCftX0OI,4045
-zou/app/stores/publisher_store.py,sha256=0cD9bwDdF2rOEeumLrxJx7xNPR_xvf_IAAk5JttDsO4,1006
-zou/app/stores/queue_store.py,sha256=Nyh8_nXilC1FHtJvj6nVVm4sNCEtmJcRRVK2cj2G22c,612
+zou/app/stores/publisher_store.py,sha256=-RLHL2VoJEqqPldLczBNpTeJxlAUUJpwRZHYlFN9Hm0,1217
+zou/app/stores/queue_store.py,sha256=udbZSm3Rfwi-zwSRzVz-0qjdrVYbUWA8WwuIsdQikn8,669
 zou/app/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/utils/api.py,sha256=28ys2SMso1wt0q7r-4ohx9Izx-cKHxQhCmxfTvTMeFs,705
 zou/app/utils/auth.py,sha256=DZfZSr1Ulge0UK3hfvOWsMo3_d7RVP_llV118u9BtUI,870
-zou/app/utils/cache.py,sha256=0u5cOefRXoZtdAp3EgW8_Uk_l6G4j02vN8xBJ1Tm2t4,1085
+zou/app/utils/cache.py,sha256=MRluTvGG67ybOkyzgD70B6PGKMdRyFdTc0AYy3dEQe8,1210
 zou/app/utils/chats.py,sha256=ORngxQ3IQQF0QcVFJLxJ-RaU4ksQ9-0M8cmPa0pc0Ho,4302
 zou/app/utils/colors.py,sha256=LaGV17NL_8xY0XSp8snGWz5UMwGnm0KPWXyE5BTMG6w,200
 zou/app/utils/commands.py,sha256=3TxXFOQxsWBT85DG1dVnuqdMbjFp58XJEtgYxhxbhhs,27304
@@ -411,9 +411,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
 zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
 zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/utils/movie.py,sha256=u9LCEOvmkxwm-KiZ6jKNdB9LSC6XXUDwJpVx8LkDwJg,16416
-zou-0.19.54.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.19.54.dist-info/METADATA,sha256=0sFDQwWARVyRbxzBwpRrBqB5t_9d3elr_a0U7jSM99w,6704
-zou-0.19.54.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-zou-0.19.54.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.19.54.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.19.54.dist-info/RECORD,,
+zou-0.19.55.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.19.55.dist-info/METADATA,sha256=TGCMqLcTAkCtOyUVfeWMXRJHhn_IXxV-LPjylqW-0YM,6704
+zou-0.19.55.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+zou-0.19.55.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.19.55.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.19.55.dist-info/RECORD,,