zou 0.19.54__py3-none-any.whl → 0.19.56__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- zou/__init__.py +1 -1
- zou/app/blueprints/index/resources.py +6 -1
- zou/app/config.py +1 -0
- zou/app/stores/auth_tokens_store.py +1 -0
- zou/app/stores/publisher_store.py +10 -2
- zou/app/stores/queue_store.py +1 -0
- zou/app/utils/cache.py +2 -0
- zou/event_stream.py +10 -1
- zou/job_settings.py +1 -0
- {zou-0.19.54.dist-info → zou-0.19.56.dist-info}/METADATA +9 -9
- {zou-0.19.54.dist-info → zou-0.19.56.dist-info}/RECORD +15 -15
- {zou-0.19.54.dist-info → zou-0.19.56.dist-info}/LICENSE +0 -0
- {zou-0.19.54.dist-info → zou-0.19.56.dist-info}/WHEEL +0 -0
- {zou-0.19.54.dist-info → zou-0.19.56.dist-info}/entry_points.txt +0 -0
- {zou-0.19.54.dist-info → zou-0.19.56.dist-info}/top_level.txt +0 -0
zou/__init__.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
__version__ = "0.19.
|
|
1
|
+
__version__ = "0.19.56"
|
|
@@ -42,6 +42,7 @@ class BaseStatusResource(Resource):
|
|
|
42
42
|
host=config.KEY_VALUE_STORE["host"],
|
|
43
43
|
port=config.KEY_VALUE_STORE["port"],
|
|
44
44
|
db=config.AUTH_TOKEN_BLACKLIST_KV_INDEX,
|
|
45
|
+
password=config.KEY_VALUE_STORE["password"],
|
|
45
46
|
decode_responses=True,
|
|
46
47
|
)
|
|
47
48
|
store.get("test")
|
|
@@ -64,7 +65,11 @@ class BaseStatusResource(Resource):
|
|
|
64
65
|
host = config.KEY_VALUE_STORE["host"]
|
|
65
66
|
port = config.KEY_VALUE_STORE["port"]
|
|
66
67
|
db = config.KV_JOB_DB_INDEX
|
|
67
|
-
|
|
68
|
+
password = config.KEY_VALUE_STORE["password"]
|
|
69
|
+
if password:
|
|
70
|
+
url = "redis://:%s@%s:%s/%s" % (password, host, port, db)
|
|
71
|
+
else:
|
|
72
|
+
url = "redis://%s:%s/%s" % (host, port, db)
|
|
68
73
|
args = ["rq", "info", "--url", url]
|
|
69
74
|
out = shell.run_command(args)
|
|
70
75
|
is_jq_up = b"0 workers" not in out
|
zou/app/config.py
CHANGED
|
@@ -19,6 +19,7 @@ AUTH_STRATEGY = os.getenv("AUTH_STRATEGY", "auth_local_classic")
|
|
|
19
19
|
KEY_VALUE_STORE = {
|
|
20
20
|
"host": os.getenv("KV_HOST", "localhost"),
|
|
21
21
|
"port": os.getenv("KV_PORT", "6379"),
|
|
22
|
+
"password": os.getenv("KV_PASSWORD", None),
|
|
22
23
|
}
|
|
23
24
|
AUTH_TOKEN_BLACKLIST_KV_INDEX = 0
|
|
24
25
|
MEMOIZE_DB_INDEX = 1
|
|
@@ -7,7 +7,11 @@ from zou.app import config
|
|
|
7
7
|
host = config.KEY_VALUE_STORE["host"]
|
|
8
8
|
port = config.KEY_VALUE_STORE["port"]
|
|
9
9
|
redis_db = config.KV_EVENTS_DB_INDEX
|
|
10
|
-
|
|
10
|
+
password = config.KEY_VALUE_STORE["password"]
|
|
11
|
+
if password:
|
|
12
|
+
redis_url = "redis://:%s@%s:%s/%s" % (password, host, port, redis_db)
|
|
13
|
+
else:
|
|
14
|
+
redis_url = "redis://%s:%s/%s" % (host, port, redis_db)
|
|
11
15
|
|
|
12
16
|
socketio = None
|
|
13
17
|
|
|
@@ -27,7 +31,11 @@ def init():
|
|
|
27
31
|
|
|
28
32
|
try:
|
|
29
33
|
publisher_store = redis.StrictRedis(
|
|
30
|
-
host=host,
|
|
34
|
+
host=host,
|
|
35
|
+
port=port,
|
|
36
|
+
db=redis_db,
|
|
37
|
+
password=password,
|
|
38
|
+
decode_responses=True,
|
|
31
39
|
)
|
|
32
40
|
publisher_store.get("test")
|
|
33
41
|
socketio = SocketIO(
|
zou/app/stores/queue_store.py
CHANGED
zou/app/utils/cache.py
CHANGED
|
@@ -17,6 +17,7 @@ try:
|
|
|
17
17
|
host=config.KEY_VALUE_STORE["host"],
|
|
18
18
|
port=config.KEY_VALUE_STORE["port"],
|
|
19
19
|
db=config.MEMOIZE_DB_INDEX,
|
|
20
|
+
password=config.KEY_VALUE_STORE["password"],
|
|
20
21
|
decode_responses=True,
|
|
21
22
|
)
|
|
22
23
|
redis_cache.get("test")
|
|
@@ -26,6 +27,7 @@ try:
|
|
|
26
27
|
"CACHE_REDIS_HOST": config.KEY_VALUE_STORE["host"],
|
|
27
28
|
"CACHE_REDIS_PORT": config.KEY_VALUE_STORE["port"],
|
|
28
29
|
"CACHE_REDIS_DB": config.MEMOIZE_DB_INDEX,
|
|
30
|
+
"CACHE_REDIS_PASSWORD": config.KEY_VALUE_STORE["password"],
|
|
29
31
|
}
|
|
30
32
|
)
|
|
31
33
|
|
zou/event_stream.py
CHANGED
|
@@ -86,7 +86,16 @@ def get_redis_url():
|
|
|
86
86
|
redis_host = config.KEY_VALUE_STORE["host"]
|
|
87
87
|
redis_port = config.KEY_VALUE_STORE["port"]
|
|
88
88
|
db_index = config.KV_EVENTS_DB_INDEX
|
|
89
|
-
|
|
89
|
+
redis_password = config.KEY_VALUE_STORE["password"]
|
|
90
|
+
if redis_password:
|
|
91
|
+
return "redis://:%s@%s:%s/%s" % (
|
|
92
|
+
redis_password,
|
|
93
|
+
redis_host,
|
|
94
|
+
redis_port,
|
|
95
|
+
db_index,
|
|
96
|
+
)
|
|
97
|
+
else:
|
|
98
|
+
return "redis://%s:%s/%s" % (redis_host, redis_port, db_index)
|
|
90
99
|
|
|
91
100
|
|
|
92
101
|
# Routes
|
zou/job_settings.py
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: zou
|
|
3
|
-
Version: 0.19.
|
|
3
|
+
Version: 0.19.56
|
|
4
4
|
Summary: API to store and manage the data of your animation production
|
|
5
5
|
Home-page: https://zou.cg-wire.com
|
|
6
6
|
Author: CG Wire
|
|
@@ -37,7 +37,7 @@ Requires-Dist: flask-sqlalchemy ==3.1.1
|
|
|
37
37
|
Requires-Dist: flask-fs2[s3,swift] ==0.7.27
|
|
38
38
|
Requires-Dist: flask-jwt-extended ==4.6.0
|
|
39
39
|
Requires-Dist: flask-migrate ==4.0.7
|
|
40
|
-
Requires-Dist: flask-socketio ==5.
|
|
40
|
+
Requires-Dist: flask-socketio ==5.4.0
|
|
41
41
|
Requires-Dist: flask ==3.0.3
|
|
42
42
|
Requires-Dist: gazu ==0.10.15
|
|
43
43
|
Requires-Dist: gevent-websocket ==0.10.1
|
|
@@ -55,19 +55,19 @@ Requires-Dist: OpenTimelineIO-Plugins ==0.17.0
|
|
|
55
55
|
Requires-Dist: orjson ==3.10.7
|
|
56
56
|
Requires-Dist: pillow ==10.4.0
|
|
57
57
|
Requires-Dist: psutil ==6.0.0
|
|
58
|
-
Requires-Dist: psycopg[binary] ==3.2.
|
|
58
|
+
Requires-Dist: psycopg[binary] ==3.2.3
|
|
59
59
|
Requires-Dist: pyotp ==2.9.0
|
|
60
60
|
Requires-Dist: pysaml2 ==7.5.0
|
|
61
61
|
Requires-Dist: python-nomad ==2.0.1
|
|
62
62
|
Requires-Dist: python-slugify ==8.0.4
|
|
63
63
|
Requires-Dist: python-socketio ==5.11.4
|
|
64
|
-
Requires-Dist: pytz ==2024.
|
|
65
|
-
Requires-Dist: redis ==5.0
|
|
64
|
+
Requires-Dist: pytz ==2024.2
|
|
65
|
+
Requires-Dist: redis ==5.1.0
|
|
66
66
|
Requires-Dist: requests ==2.32.3
|
|
67
67
|
Requires-Dist: rq ==1.16.2
|
|
68
68
|
Requires-Dist: slackclient ==2.9.4
|
|
69
69
|
Requires-Dist: sqlalchemy-utils ==0.41.2
|
|
70
|
-
Requires-Dist: sqlalchemy ==2.0.
|
|
70
|
+
Requires-Dist: sqlalchemy ==2.0.35
|
|
71
71
|
Requires-Dist: ua-parser ==0.18.0
|
|
72
72
|
Requires-Dist: werkzeug ==3.0.4
|
|
73
73
|
Requires-Dist: numpy ==2.0.1 ; python_version == "3.9"
|
|
@@ -81,15 +81,15 @@ Requires-Dist: pre-commit ==3.8.0 ; (python_version >= "3.9") and extra == 'lint
|
|
|
81
81
|
Provides-Extra: monitoring
|
|
82
82
|
Requires-Dist: prometheus-flask-exporter ==0.23.1 ; extra == 'monitoring'
|
|
83
83
|
Requires-Dist: pygelf ==0.4.2 ; extra == 'monitoring'
|
|
84
|
-
Requires-Dist: sentry-sdk ==2.
|
|
84
|
+
Requires-Dist: sentry-sdk ==2.14.0 ; extra == 'monitoring'
|
|
85
85
|
Provides-Extra: prod
|
|
86
86
|
Requires-Dist: gunicorn ; extra == 'prod'
|
|
87
87
|
Requires-Dist: gevent ; extra == 'prod'
|
|
88
88
|
Provides-Extra: test
|
|
89
|
-
Requires-Dist: fakeredis ==2.
|
|
89
|
+
Requires-Dist: fakeredis ==2.25.1 ; extra == 'test'
|
|
90
90
|
Requires-Dist: mixer ==7.2.2 ; extra == 'test'
|
|
91
91
|
Requires-Dist: pytest-cov ==5.0.0 ; extra == 'test'
|
|
92
|
-
Requires-Dist: pytest ==8.3.
|
|
92
|
+
Requires-Dist: pytest ==8.3.3 ; extra == 'test'
|
|
93
93
|
|
|
94
94
|
.. figure:: https://zou.cg-wire.com/kitsu.png
|
|
95
95
|
:alt: Kitsu Logo
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
zou/__init__.py,sha256=
|
|
1
|
+
zou/__init__.py,sha256=kzG3JsHeLCQ0MevBipa9oFToO5W7JnVZonkGAy6XOLQ,24
|
|
2
2
|
zou/cli.py,sha256=DHHf4mz33Bi0gGFJ0GdRUpjrMrMSQYyVubJFppHPZlU,18914
|
|
3
3
|
zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
|
|
4
|
-
zou/event_stream.py,sha256=
|
|
5
|
-
zou/job_settings.py,sha256=
|
|
4
|
+
zou/event_stream.py,sha256=_tue9Ry3aqCniZpKGhWJaY1Eo_fd6zOAfnzPvh_mJzU,8489
|
|
5
|
+
zou/job_settings.py,sha256=_aqBhujt2Q8sXRWIbgbDf-LUdXRdBimdtTc-fZbiXoY,202
|
|
6
6
|
zou/app/__init__.py,sha256=AJEGrLTirr5zZmA8DVSjZedtTuDg6eg9rG4kXMimPnQ,6966
|
|
7
7
|
zou/app/api.py,sha256=JTB_IMVO8EOoyqx9KdRkiIix0chOLi0yGDY-verUJXA,5127
|
|
8
|
-
zou/app/config.py,sha256=
|
|
8
|
+
zou/app/config.py,sha256=z6fhXvTKuyCXAJDPtLGrnJ7aUie-5JTwN8n_Z_oX0HI,6592
|
|
9
9
|
zou/app/mixin.py,sha256=eYwfS_CUFvNmldaQXrjsN5mK_gX0wYrBFykfx60uUM8,4897
|
|
10
10
|
zou/app/swagger.py,sha256=Jr7zsMqJi0V4FledODOdu-aqqVE02jMFzhqVxHK0_2c,54158
|
|
11
11
|
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
|
|
|
83
83
|
zou/app/blueprints/files/__init__.py,sha256=7Wty30JW2OXIn-tBFXOWWmPuHnsnxPpH3jNtHvvr9tY,3987
|
|
84
84
|
zou/app/blueprints/files/resources.py,sha256=8SIV8kaqv3dxyL8nyqG3QiZmk5ZYIvUxw6k1ic-jhBs,69786
|
|
85
85
|
zou/app/blueprints/index/__init__.py,sha256=Dh3oQiirpg8RCkfVOuk3irIjSvUvuRf0jPxE6oGubz0,828
|
|
86
|
-
zou/app/blueprints/index/resources.py,sha256=
|
|
86
|
+
zou/app/blueprints/index/resources.py,sha256=lGPUGZPla59mjXXsDW4DB04uE_rI4fhMqm8J48Nxf4s,8407
|
|
87
87
|
zou/app/blueprints/news/__init__.py,sha256=HxBXjC15dVbotNAZ0CLf02iwUjxJr20kgf8_kT_9nwM,505
|
|
88
88
|
zou/app/blueprints/news/resources.py,sha256=6e3Ex_Q-djxWDjQQ-eD1fBcylea6XaJphO7Tl9zWKcY,7057
|
|
89
89
|
zou/app/blueprints/persons/__init__.py,sha256=0cnHHw3K_8OEMm0qOi3wKVomSAg9IJSnVjAXabMeHks,3893
|
|
@@ -215,14 +215,14 @@ zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6p
|
|
|
215
215
|
zou/app/services/time_spents_service.py,sha256=H9X-60s6oqtY9rtU-K2jKwUSljfkdGlf_9wMr3iVfIA,15158
|
|
216
216
|
zou/app/services/user_service.py,sha256=BiOhPV7O-vowet7jOksjXk2V4yxZkdqsIyNboJ-Oz_A,46595
|
|
217
217
|
zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
218
|
-
zou/app/stores/auth_tokens_store.py,sha256
|
|
218
|
+
zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
|
|
219
219
|
zou/app/stores/file_store.py,sha256=yLQDM6mNbj9oe0vsWdBqun7D8Dw-eSjD1yHCCftX0OI,4045
|
|
220
|
-
zou/app/stores/publisher_store.py,sha256
|
|
221
|
-
zou/app/stores/queue_store.py,sha256=
|
|
220
|
+
zou/app/stores/publisher_store.py,sha256=-RLHL2VoJEqqPldLczBNpTeJxlAUUJpwRZHYlFN9Hm0,1217
|
|
221
|
+
zou/app/stores/queue_store.py,sha256=udbZSm3Rfwi-zwSRzVz-0qjdrVYbUWA8WwuIsdQikn8,669
|
|
222
222
|
zou/app/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
223
223
|
zou/app/utils/api.py,sha256=28ys2SMso1wt0q7r-4ohx9Izx-cKHxQhCmxfTvTMeFs,705
|
|
224
224
|
zou/app/utils/auth.py,sha256=DZfZSr1Ulge0UK3hfvOWsMo3_d7RVP_llV118u9BtUI,870
|
|
225
|
-
zou/app/utils/cache.py,sha256=
|
|
225
|
+
zou/app/utils/cache.py,sha256=MRluTvGG67ybOkyzgD70B6PGKMdRyFdTc0AYy3dEQe8,1210
|
|
226
226
|
zou/app/utils/chats.py,sha256=ORngxQ3IQQF0QcVFJLxJ-RaU4ksQ9-0M8cmPa0pc0Ho,4302
|
|
227
227
|
zou/app/utils/colors.py,sha256=LaGV17NL_8xY0XSp8snGWz5UMwGnm0KPWXyE5BTMG6w,200
|
|
228
228
|
zou/app/utils/commands.py,sha256=3TxXFOQxsWBT85DG1dVnuqdMbjFp58XJEtgYxhxbhhs,27304
|
|
@@ -411,9 +411,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
|
|
|
411
411
|
zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
|
|
412
412
|
zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
413
413
|
zou/utils/movie.py,sha256=u9LCEOvmkxwm-KiZ6jKNdB9LSC6XXUDwJpVx8LkDwJg,16416
|
|
414
|
-
zou-0.19.
|
|
415
|
-
zou-0.19.
|
|
416
|
-
zou-0.19.
|
|
417
|
-
zou-0.19.
|
|
418
|
-
zou-0.19.
|
|
419
|
-
zou-0.19.
|
|
414
|
+
zou-0.19.56.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
|
|
415
|
+
zou-0.19.56.dist-info/METADATA,sha256=KaGK9Zr0paHLZgZG_u6l8CG8jQTUVKp2wQODdreL4Tc,6704
|
|
416
|
+
zou-0.19.56.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
|
|
417
|
+
zou-0.19.56.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
|
|
418
|
+
zou-0.19.56.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
|
|
419
|
+
zou-0.19.56.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|