zou 0.20.2__py3-none-any.whl → 0.20.4__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.2"
+__version__ = "0.20.4"

zou/app/blueprints/index/resources.py

@@ -11,6 +11,7 @@ from zou.app import app, config
 from zou.app.utils import permissions, shell, date_helpers
 from zou.app.services import projects_service, stats_service, persons_service
 from flask_jwt_extended import jwt_required
+from zou.app.utils.redis import get_redis_url
 
 
 class IndexResource(Resource):
@@ -61,7 +62,7 @@ class BaseStatusResource(Resource):
 
         is_jq_up = True
         try:
-            args = ["rq", "info", "--url", redis.get_redis_url()]
+            args = ["rq", "info", "--url", get_redis_url()]
             out = shell.run_command(args)
             is_jq_up = b"0 workers" not in out
         except Exception:

zou/app/utils/redis.py

@@ -5,7 +5,8 @@ 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
-    redis_password = config.KEY_VALUE_STORE["password"] or ""
-    if redis_password:
-        redis_password += "@"
+    if config.KEY_VALUE_STORE["password"]:
+        redis_password = f":{config.KEY_VALUE_STORE['password']}@"
+    else:
+        redis_password = ""
     return f"redis://{redis_password}{redis_host}:{redis_port}/{db_index}"

zou/job_settings.py

@@ -0,0 +1,6 @@
+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.20.2.dist-info → zou-0.20.4.dist-info}/METADATA

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

{zou-0.20.2.dist-info → zou-0.20.4.dist-info}/RECORD

@@ -1,7 +1,8 @@
-zou/__init__.py,sha256=WRDggaYcSjn5kcl6mpNUIM5VWOlcd9HZTeEz-I3_kvQ,23
+zou/__init__.py,sha256=8BDEBRu96nHUJh0tYmos3SRV4xNzQNFZYR61tRE85tQ,23
 zou/cli.py,sha256=H18Wg-wqQOsv4F5_bZRDlxskjO-TRwaV1NmQMTH9mdg,18869
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=jqjjU8ZDkQB_6-O3ORj1b1J-NiNMpjMBr3-USD85M5M,7681
+zou/job_settings.py,sha256=_aqBhujt2Q8sXRWIbgbDf-LUdXRdBimdtTc-fZbiXoY,202
 zou/app/__init__.py,sha256=7pRqdA79X-UI_kYt8Sz6lIdleNStBxHnXISr-tePVe8,6962
 zou/app/api.py,sha256=JTB_IMVO8EOoyqx9KdRkiIix0chOLi0yGDY-verUJXA,5127
 zou/app/config.py,sha256=kYbcTVFgcl2sGtf-cpOOVu3_fVh2P1fLcceLjCvsIfc,6700
@@ -82,7 +83,7 @@ zou/app/blueprints/export/csv/time_spents.py,sha256=yYPtilOxfQD5mBwyh9h-PbTQBpab
 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=bJ001pBi9uKaOtfHazzfj_wMpAImT_U7L1EbQOkm-h8,8494
+zou/app/blueprints/index/resources.py,sha256=3gEyZrYMLyjH3WIkOLZls2kSjXp56eLMfX7SP4vtpjE,8534
 zou/app/blueprints/news/__init__.py,sha256=HxBXjC15dVbotNAZ0CLf02iwUjxJr20kgf8_kT_9nwM,505
 zou/app/blueprints/news/resources.py,sha256=HdLq2NgfKyN2d3hIATBhH3dlk4c50I4dhhvEhhB_NY4,7334
 zou/app/blueprints/persons/__init__.py,sha256=0cnHHw3K_8OEMm0qOi3wKVomSAg9IJSnVjAXabMeHks,3893
@@ -240,7 +241,7 @@ zou/app/utils/logs.py,sha256=lB6kyFmeANxCILUULLqGN8fuq9IY5FcbrVWmLdqWs2U,1404
 zou/app/utils/monitoring.py,sha256=xOwyfM-7ZKWNtOxmX2WB1fOav5NpY6k8Tmuhli0nMBs,2082
 zou/app/utils/permissions.py,sha256=Oq91C_lN6aGVCtCVUqQhijMQEjXOiMezbngpjybzzQk,3426
 zou/app/utils/query.py,sha256=q8ETGPAqnz0Pt9xWoQt5o7FFAVYUKVCJiWpwefIr-iU,4592
-zou/app/utils/redis.py,sha256=im7Q6C5qDVKq2RZbF1vYKPgn0rhzR3Ci-VbAnPAUgcQ,377
+zou/app/utils/redis.py,sha256=AAUgFih8lhuTOAV8k7Lz02WTZIjMURydAzLyq5mszzM,410
 zou/app/utils/remote_job.py,sha256=QPxcCWEv-NM1Q4IQawAyJAiSORwkMeOlByQb9OCShEw,2522
 zou/app/utils/saml.py,sha256=m8wt_2RnMEHSrFvqCRGF91U5mwkqC6W-iBcx8N0LAqs,1679
 zou/app/utils/shell.py,sha256=D30NuOzr1D6jsa9OF69JYXyqYNhtIdnfKSVYW4irbz8,405
@@ -413,9 +414,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=d67fIL9dVBKt-E_qCGXRbNNdbJaJR5sHvZeX3hf8ldE,16559
-zou-0.20.2.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.2.dist-info/METADATA,sha256=x35J_KVDGGpKulbt6-TR9SszF6AESVOte8zzxBaR_Lk,6708
-zou-0.20.2.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-zou-0.20.2.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.2.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.2.dist-info/RECORD,,
+zou-0.20.4.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.4.dist-info/METADATA,sha256=asT2EY79t0ASLNnvMyeE8XcFhoAG8hJL_E3U6QfOJio,6708
+zou-0.20.4.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+zou-0.20.4.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.4.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.4.dist-info/RECORD,,