zou 0.19.15__py3-none-any.whl → 0.20.11__py3-none-any.whl

zou/app/blueprints/export/csv/edits.py

@@ -61,7 +61,7 @@ class EditsCsvExport(Resource):
     def build_headers(self, metadata_infos, validation_columns):
         headers = ["Project", "Episode", "Name", "Description", "Time Spent"]
 
-        metadata_headers = [name for (name, _) in metadata_infos]
+        metadata_headers = [name for (name, _, _) in metadata_infos]
 
         validation_assignations_columns = []
         for validation_column in validation_columns:
@@ -94,9 +94,15 @@ class EditsCsvExport(Resource):
                 ]
             )
 
-        for _, field_name in metadata_infos:
-            result_metadata = result.get("data", {}) or {}
-            row.append(result_metadata.get(field_name, ""))
+        result_data = result.get("data", {}) or {}
+        for _, field_name, data_type in metadata_infos:
+            result_metadata = result_data.get(field_name, "")
+            if data_type == "boolean":
+                row.append(
+                    "true" if result_metadata.lower() == "true" else "false"
+                )
+            else:
+                row.append(result_metadata)
 
         for column in validation_columns:
             if column in task_map:
@@ -149,7 +155,11 @@ class EditsCsvExport(Resource):
         ]
 
         columns = [
-            (descriptor["name"], descriptor["field_name"])
+            (
+                descriptor["name"],
+                descriptor["field_name"],
+                descriptor["data_type"],
+            )
             for descriptor in descriptors
         ]
 

zou/app/blueprints/export/csv/playlists.py

@@ -100,7 +100,7 @@ class PlaylistCsvExport(Resource):
 
     def build_row(self, shot):
         entity = entities_service.get_entity(shot["entity_id"])
-        name, _ = names_service.get_full_entity_name(shot["entity_id"])
+        name, _, _ = names_service.get_full_entity_name(shot["entity_id"])
         preview_file = files_service.get_preview_file(shot["preview_file_id"])
         task = tasks_service.get_task(preview_file["task_id"])
         task_type = self.task_type_map[task["task_type_id"]]

zou/app/blueprints/export/csv/shots.py

@@ -76,7 +76,7 @@ class ShotsCsvExport(Resource):
             "FPS",
         ]
 
-        metadata_headers = [name for (name, _) in metadata_infos]
+        metadata_headers = [name for (name, _, _) in metadata_infos]
 
         validation_assignations_columns = []
         for validation_column in validation_columns:
@@ -123,9 +123,15 @@ class ShotsCsvExport(Resource):
                     for person_id in task["assignees"]
                 ]
             )
-
-        for _, field_name in metadata_infos:
-            row.append(result.get("data", {}).get(field_name, ""))
+        result_data = result.get("data", {}) or {}
+        for _, field_name, data_type in metadata_infos:
+            result_metadata = result_data.get(field_name, "")
+            if data_type == "boolean":
+                row.append(
+                    "true" if result_metadata.lower() == "true" else "false"
+                )
+            else:
+                row.append(result_metadata)
 
         for column in validation_columns:
             if column in task_map:
@@ -171,7 +177,11 @@ class ShotsCsvExport(Resource):
         ]
 
         columns = [
-            (descriptor["name"], descriptor["field_name"])
+            (
+                descriptor["name"],
+                descriptor["field_name"],
+                descriptor["data_type"],
+            )
             for descriptor in descriptors
         ]
 

zou/app/blueprints/export/csv/time_spents.py

@@ -72,7 +72,7 @@ class TimeSpentsCsvExport(BaseCsvExport):
             person_last_name,
         ) = time_spent_row
         if entity_type_name == "Shot":
-            entity_name, _ = names_service.get_full_entity_name(entity_id)
+            entity_name, _, _ = names_service.get_full_entity_name(entity_id)
 
         date = ""
         if time_spent.date is not None:

zou/app/blueprints/files/resources.py

@@ -1,4 +1,3 @@
-import datetime
 import os
 
 from flask import request, abort, current_app
@@ -9,7 +8,7 @@ from flask_fs.errors import FileNotFound
 from zou.app import config
 
 from zou.app.mixin import ArgsMixin
-from zou.app.utils import fs
+from zou.app.utils import fs, date_helpers
 from zou.app.stores import file_store
 from zou.app.services import (
     file_tree_service,
@@ -33,7 +32,10 @@ from zou.app.services.exception import (
 
 
 def send_storage_file(
-    working_file_id, as_attachment=False, max_age=config.CLIENT_CACHE_MAX_AGE
+    working_file_id,
+    as_attachment=False,
+    max_age=config.CLIENT_CACHE_MAX_AGE,
+    last_modified=None,
 ):
     """
     Send file from storage. If it's not a local storage, cache the file in
@@ -61,6 +63,7 @@ def send_storage_file(
             as_attachment=as_attachment,
             download_name=download_name,
             max_age=max_age,
+            last_modified=last_modified,
         )
     except IOError as e:
         current_app.logger.error(e)
@@ -88,9 +91,7 @@ class WorkingFileFileResource(Resource):
 
     def check_access(self, working_file_id):
         working_file = files_service.get_working_file(working_file_id)
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         return working_file
 
     def save_uploaded_file_in_temporary_folder(self, working_file_id):
@@ -126,8 +127,13 @@ class WorkingFileFileResource(Resource):
               schema:
                 type: file
         """
-        self.check_access(working_file_id)
-        return send_storage_file(working_file_id)
+        working_file = self.check_access(working_file_id)
+        return send_storage_file(
+            working_file_id,
+            last_modified=date_helpers.get_datetime_from_string(
+                working_file["updated_at"]
+            ),
+        )
 
     @jwt_required()
     def post(self, working_file_id):
@@ -548,10 +554,8 @@ class LastWorkingFilesResource(Resource):
               description: Last working files revision for each file name for given task
         """
         result = {}
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
-        result = files_service.get_last_working_files_for_task(task["id"])
+        user_service.check_task_access(task_id)
+        result = files_service.get_last_working_files_for_task(task_id)
 
         return result
 
@@ -580,10 +584,8 @@ class TaskWorkingFilesResource(Resource):
               description: Last working files revision for each file name for given task
         """
         result = {}
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
-        result = files_service.get_working_files_for_task(task["id"])
+        user_service.check_task_access(task_id)
+        result = files_service.get_working_files_for_task(task_id)
 
         return result
 
@@ -766,11 +768,10 @@ class ModifiedFileResource(Resource):
               description: Working file modification date updated
         """
         working_file = files_service.get_working_file(working_file_id)
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         working_file = files_service.update_working_file(
-            working_file_id, {"updated_at": datetime.datetime.utcnow()}
+            working_file_id,
+            {"updated_at": date_helpers.get_utc_now_datetime()},
         )
         return working_file
 
@@ -818,9 +819,7 @@ class CommentWorkingFileResource(Resource, ArgsMixin):
         )
 
         working_file = files_service.get_working_file(working_file_id)
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         working_file = self.update_comment(working_file_id, args["comment"])
         return working_file
 

zou/app/blueprints/index/resources.py

@@ -1,18 +1,17 @@
 import psutil
 import redis
 import requests
-
-from datetime import datetime
+import datetime
 
 from flask import Response, abort
 from flask_restful import Resource
 from zou import __version__
 
 from zou.app import app, config
-from zou.app.utils import permissions, shell
-from zou.app.services import projects_service, stats_service
-
+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):
@@ -26,7 +25,7 @@ class IndexResource(Resource):
             200:
                 description: API name and version
         """
-        return {"api": app.config["APP_NAME"], "version": __version__}
+        return {"api": config.APP_NAME, "version": __version__}
 
 
 class BaseStatusResource(Resource):
@@ -43,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")
@@ -62,11 +62,12 @@ class BaseStatusResource(Resource):
 
         is_jq_up = True
         try:
-            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)
-            args = ["rq", "info", "--url", url]
+            args = [
+                "rq",
+                "info",
+                "--url",
+                get_redis_url(config.KV_JOB_DB_INDEX),
+            ]
             out = shell.run_command(args)
             is_jq_up = b"0 workers" not in out
         except Exception:
@@ -87,10 +88,8 @@ class BaseStatusResource(Resource):
 
         version = __version__
 
-        api_name = app.config["APP_NAME"]
-
         return (
-            api_name,
+            config.APP_NAME,
             version,
             is_db_up,
             is_kv_up,
@@ -231,8 +230,8 @@ class InfluxStatusResource(BaseStatusResource):
                 description: Status of database, key value, event stream, job queue and time
         """
         (
-            api_name,
-            version,
+            _,
+            _,
             is_db_up,
             is_kv_up,
             is_es_up,
@@ -246,7 +245,9 @@ class InfluxStatusResource(BaseStatusResource):
             "event-stream-up": int(is_es_up),
             "job-queue-up": int(is_jq_up),
             "indexer-up": int(is_indexer_up),
-            "time": datetime.timestamp(datetime.utcnow()),
+            "time": datetime.datetime.timestamp(
+                date_helpers.get_utc_now_datetime()
+            ),
         }
 
 
@@ -272,28 +273,36 @@ class StatsResource(Resource):
 class ConfigResource(Resource):
     def get(self):
         """
-        Get crisp token.
+        Get basic configuration for the current instance.
         ---
         tags:
           - Index
         responses:
             200:
-                description: Crisp token
+                description: Configuration object including self-hosted status,
+                    Crisp token, indexer configuration, SAML status, and dark
+                    theme status.
         """
-        config = {
-            "is_self_hosted": app.config["IS_SELF_HOSTED"],
-            "crisp_token": app.config["CRISP_TOKEN"],
+        organisation = persons_service.get_organisation()
+        conf = {
+            "is_self_hosted": config.IS_SELF_HOSTED,
+            "crisp_token": config.CRISP_TOKEN,
+            "dark_theme_by_default": organisation["dark_theme_by_default"],
             "indexer_configured": (
-                len(app.config["INDEXER"]["key"]) > 0
-                and app.config["INDEXER"]["key"] != "masterkey"
+                len(config.INDEXER["key"]) > 0
+                and config.INDEXER["key"] != "masterkey"
             ),
+            "saml_enabled": config.SAML_ENABLED,
+            "saml_idp_name": config.SAML_IDP_NAME,
+            "default_locale": config.DEFAULT_LOCALE,
+            "default_timezone": config.DEFAULT_TIMEZONE,
         }
-        if app.config["SENTRY_KITSU_ENABLED"]:
-            config["sentry"] = {
-                "dsn": app.config["SENTRY_KITSU_DSN"],
-                "sampleRate": app.config["SENTRY_KITSU_SR"],
+        if config.SENTRY_KITSU_ENABLED:
+            conf["sentry"] = {
+                "dsn": config.SENTRY_KITSU_DSN,
+                "sampleRate": config.SENTRY_KITSU_SR,
             }
-        return config
+        return conf
 
 
 class TestEventsResource(Resource):

zou/app/blueprints/news/resources.py

@@ -1,13 +1,18 @@
-from flask_restful import Resource
+from flask_restful import Resource, inputs
 from flask_jwt_extended import jwt_required
 
 from zou.app.mixin import ArgsMixin
-from zou.app.services import news_service, projects_service, user_service
+from zou.app.services import (
+    news_service,
+    projects_service,
+    user_service,
+    persons_service,
+)
 from zou.app.services.exception import NewsNotFoundException
 from zou.app.utils import permissions
 
 
-class NewsMixin:
+class NewsMixin(ArgsMixin):
     def get_news(self, project_ids=[]):
         (
             only_preview,
@@ -16,12 +21,13 @@ class NewsMixin:
             episode_id,
             person_id,
             page,
-            page_size,
+            limit,
             after,
             before,
         ) = self.get_arguments()
 
-        user_service
+        current_user = persons_service.get_current_user_raw()
+
         after = self.parse_date_parameter(after)
         before = self.parse_date_parameter(before)
         result = news_service.get_last_news_for_project(
@@ -32,18 +38,21 @@ class NewsMixin:
             episode_id=episode_id,
             author_id=person_id,
             page=page,
-            page_size=page_size,
+            limit=limit,
             after=after,
             before=before,
+            current_user=current_user,
         )
         stats = news_service.get_news_stats_for_project(
             project_ids=project_ids,
+            only_preview=only_preview,
             task_type_id=task_type_id,
             task_status_id=task_status_id,
             episode_id=episode_id,
             author_id=person_id,
             after=after,
             before=before,
+            current_user=current_user,
         )
         result["stats"] = stats
         return result
@@ -51,14 +60,19 @@ class NewsMixin:
     def get_arguments(self):
         args = self.get_args(
             [
-                {"name": "only_preview", "default": False, "type": bool},
+                (
+                    "only_preview",
+                    False,
+                    False,
+                    inputs.boolean,
+                ),
                 "task_type_id",
                 "task_status_id",
                 "person_id",
                 "project_id",
                 "episode_id",
                 {"name": "page", "default": 1, "type": int},
-                {"name": "page_size", "default": 50, "type": int},
+                {"name": "limit", "default": 50, "type": int},
                 "after",
                 "before",
             ],
@@ -70,7 +84,7 @@ class NewsMixin:
             args["episode_id"],
             args["person_id"],
             args["page"],
-            args["page_size"],
+            args["limit"],
             args["after"],
             args["before"],
         )
@@ -106,7 +120,7 @@ class ProjectNewsResource(Resource, NewsMixin, ArgsMixin):
             type: integer
             x-example: 1
           - in: query
-            name: page_size
+            name: limit
             type: integer
             x-example: 50
           - in: query
@@ -169,7 +183,7 @@ class NewsResource(Resource, NewsMixin, ArgsMixin):
             type: integer
             x-example: 1
           - in: query
-            name: page_size
+            name: limit
             type: integer
             x-example: 50
           - in: query

zou/app/blueprints/persons/__init__.py

@@ -7,7 +7,6 @@ from zou.app.blueprints.persons.resources import (
     DayOffForMonthResource,
     DesktopLoginsResource,
     InvitePersonResource,
-    NewPersonResource,
     PersonMonthQuotaShotsResource,
     PersonWeekQuotaShotsResource,
     PersonDayQuotaShotsResource,
@@ -17,6 +16,7 @@ from zou.app.blueprints.persons.resources import (
     PersonDayTimeSpentsResource,
     PersonWeekDayOffResource,
     PersonYearDayOffResource,
+    PersonDayOffResource,
     PersonMonthDayOffResource,
     PresenceLogsResource,
     TimeSpentsResource,
@@ -33,7 +33,6 @@ from zou.app.blueprints.persons.resources import (
 )
 
 routes = [
-    ("/data/persons/new", NewPersonResource),
     ("/data/persons/<person_id>/desktop-login-logs", DesktopLoginsResource),
     ("/data/persons/presence-logs/<month_date>", PresenceLogsResource),
     ("/data/persons/<person_id>/time-spents", TimeSpentsResource),
@@ -91,6 +90,10 @@ routes = [
         "/data/persons/<person_id>/day-offs/year/<year>",
         PersonYearDayOffResource,
     ),
+    (
+        "/data/persons/<person_id>/day-offs",
+        PersonDayOffResource,
+    ),
     ("/actions/persons/<person_id>/invite", InvitePersonResource),
     ("/actions/persons/<person_id>/departments/add", AddToDepartmentResource),
     (