zou 0.20.45__tar.gz → 0.20.47__tar.gz

{zou-0.20.45/zou.egg-info → zou-0.20.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.45
+Version: 0.20.47
 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.47/zou/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.20.47"

{zou-0.20.45 → zou-0.20.47}/zou/app/blueprints/crud/person.py

@@ -101,6 +101,13 @@ class PersonsResource(BaseModelsResource):
                 raise
             except:
                 raise WrongParameterException("Expiration date is not valid.")
+
+        if "email" in data:
+            try:
+                data["email"] = auth.validate_email(data["email"])
+            except auth.EmailNotValidException as e:
+                raise WrongParameterException(str(e))
+
         return data
 
     def update_data(self, data):
@@ -184,6 +191,13 @@ class PersonResource(BaseModelResource, ArgsMixin):
                 raise
             except:
                 raise WrongParameterException("Expiration date is not valid.")
+
+        if "email" in data:
+            try:
+                data["email"] = auth.validate_email(data["email"])
+            except auth.EmailNotValidException as e:
+                raise WrongParameterException(str(e))
+
         return data
 
     def check_delete_permissions(self, instance_dict):

{zou-0.20.45 → zou-0.20.47}/zou/app/blueprints/projects/__init__.py

@@ -30,6 +30,7 @@ from zou.app.blueprints.projects.resources import (
     ProductionBudgetResource,
     ProductionBudgetEntriesResource,
     ProductionBudgetEntryResource,
+    ProductionMonthTimeSpentsResource,
 )
 
 routes = [
@@ -127,6 +128,10 @@ routes = [
         "/data/projects/<project_id>/budgets/<budget_id>/entries/<entry_id>",
         ProductionBudgetEntryResource,
     ),
+    (
+        "/data/projects/<project_id>/budgets/time-spents",
+        ProductionMonthTimeSpentsResource,
+    ),
 ]
 
 blueprint = Blueprint("projects", "projects")

{zou-0.20.45 → zou-0.20.47}/zou/app/blueprints/projects/resources.py

@@ -5,9 +5,11 @@ from flask_jwt_extended import jwt_required
 from zou.app.services import budget_service
 from zou.app.mixin import ArgsMixin
 from zou.app.services import (
+    persons_service,
     projects_service,
     schedule_service,
     tasks_service,
+    time_spents_service,
     user_service,
 )
 from zou.app.utils import permissions
@@ -1494,3 +1496,33 @@ class ProductionBudgetEntryResource(Resource, ArgsMixin):
         user_service.check_manager_project_access(project_id)
         budget_service.delete_budget_entry(entry_id)
         return "", 204
+
+
+class ProductionMonthTimeSpentsResource(Resource, ArgsMixin):
+
+    @jwt_required()
+    def get(self, project_id):
+        """
+        Get aggregated time spents by month for given project.
+        ---
+        tags:
+        - Projects
+        parameters:
+        - in: path
+            name: project_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: Aggregated time spents for given person and month
+            400:
+                description: Wrong ID format
+        """
+        permissions.check_admin_permissions()
+        self.check_id_parameter(project_id)
+        user = persons_service.get_current_user()
+        return time_spents_service.get_project_month_time_spents(
+            project_id, user["timezone"]
+        )

{zou-0.20.45 → zou-0.20.47}/zou/app/config.py

@@ -88,6 +88,7 @@ MAIL_USE_SSL = envtobool("MAIL_USE_SSL", False)
 MAIL_DEFAULT_SENDER = os.getenv(
     "MAIL_DEFAULT_SENDER", "no-reply@your-studio.com"
 )
+MAIL_CHECK_DELIVERABILITY = envtobool("MAIL_CHECK_DELIVERABILITY", True)
 DOMAIN_NAME = os.getenv("DOMAIN_NAME", "localhost:8080")
 DOMAIN_PROTOCOL = os.getenv("DOMAIN_PROTOCOL", "https")
 

{zou-0.20.45 → zou-0.20.47}/zou/app/services/time_spents_service.py

@@ -7,6 +7,7 @@ from sqlalchemy.exc import DataError
 from sqlalchemy.orm import aliased
 
 from zou.app.models.day_off import DayOff
+from zou.app.models.department import Department
 from zou.app.models.project import Project
 from zou.app.models.task import Task
 from zou.app.models.task_type import TaskType
@@ -535,3 +536,38 @@ def get_timezoned_interval(start, end):
     """
     timezone = user_service.get_timezone()
     return date_helpers.get_timezoned_interval(start, end, timezone)
+
+
+def get_project_month_time_spents(project_id, timezone=None):
+    """
+    Get aggregated time spents by department by person by month for given
+    project.
+    """
+    data = {}
+    query = (
+        TimeSpent.query
+        .join(Task)
+        .join(TaskType, TaskType.id == Task.task_type_id)
+        .join(Department, Department.id == TaskType.department_id)
+        .filter(Task.project_id == project_id)
+        .add_columns(Department.id)
+        .order_by(TimeSpent.date)
+    )
+
+    for time_spent, department_id in query.all():
+        date_key = date_helpers.get_simple_string_with_timezone_from_date(
+            time_spent.date, timezone
+        )[0:7]
+        if department_id not in data:
+            data[department_id] = { "total": 0 }
+        if time_spent.person_id not in data[department_id]:
+            data[department_id][time_spent.person_id] = { "total": 0 }
+        if date_key not in data[department_id][time_spent.person_id]:
+            data[department_id][time_spent.person_id][date_key] = 0
+
+        data[department_id][time_spent.person_id][date_key] += \
+            time_spent.duration
+        data[department_id]["total"] += time_spent.duration
+        data[department_id][time_spent.person_id]["total"] += \
+            time_spent.duration
+    return data

{zou-0.20.45 → zou-0.20.47}/zou/app/utils/auth.py

@@ -23,9 +23,13 @@ def encrypt_password(password):
     return flask_bcrypt.generate_password_hash(password)
 
 
-def validate_email(email):
+def validate_email(
+    email, check_deliverability=config.MAIL_CHECK_DELIVERABILITY
+):
     try:
-        return email_validator.validate_email(email).normalized
+        return email_validator.validate_email(
+            email, check_deliverability=check_deliverability
+        ).normalized
     except email_validator.EmailNotValidError as e:
         raise EmailNotValidException(str(e))
 

{zou-0.20.45 → zou-0.20.47}/zou/cli.py

@@ -195,8 +195,8 @@ def create_admin(email, password):
             except auth.PasswordTooShortException:
                 print("Password is too short.")
                 sys.exit(1)
-            except auth.EmailNotValidException:
-                print("Email is not valid.")
+            except auth.EmailNotValidException as e:
+                print(f"Email is not valid: {e}")
                 sys.exit(1)
             except IsUserLimitReachedException:
                 print(f"User limit reached (limit {config.USER_LIMIT}).")

{zou-0.20.45 → zou-0.20.47}/zou/migrations/versions/d80f02824047_add_plugin_revision.py

@@ -8,6 +8,12 @@ Create Date: 2025-05-02 16:08:57.078114
 
 from alembic import op
 import sqlalchemy as sa
+from alembic import op
+import sqlalchemy as sa
+from zou.migrations.utils.base import BaseMixin
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm.session import Session
 
 
 # revision identifiers, used by Alembic.
@@ -16,6 +22,37 @@ down_revision = "e7e633bd6fa2"
 branch_labels = None
 depends_on = None
 
+base = declarative_base()
+
+
+class Task(base, BaseMixin):
+    """
+    Describes a task done by a CG artist on an entity of the CG production.
+    The task has a state and assigned to people. It handles notion of time like
+    duration, start date and end date.
+    """
+
+    __tablename__ = "task"
+    name = sa.Column(sa.String(80), nullable=False)
+    description = sa.Column(sa.Text())
+
+    priority = sa.Column(sa.Integer, default=0)
+    difficulty = sa.Column(sa.Integer, default=3, nullable=False)
+    duration = sa.Column(sa.Float, default=0)
+    estimation = sa.Column(sa.Float, default=0)
+    completion_rate = sa.Column(sa.Integer, default=0)
+    retake_count = sa.Column(sa.Integer, default=0)
+    sort_order = sa.Column(sa.Integer, default=0)
+    start_date = sa.Column(sa.DateTime)
+    due_date = sa.Column(sa.DateTime)
+    real_start_date = sa.Column(sa.DateTime)
+    end_date = sa.Column(sa.DateTime)
+    done_date = sa.Column(sa.DateTime)
+    last_comment_date = sa.Column(sa.DateTime)
+    nb_assets_ready = sa.Column(sa.Integer, default=0)
+    data = sa.Column(JSONB)
+    nb_drawings = sa.Column(sa.Integer, default=0)
+
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
@@ -33,6 +70,13 @@ def upgrade():
         )
 
     with op.batch_alter_table("task", schema=None) as batch_op:
+        session = Session(bind=op.get_bind())
+        session.query(Task).where(Task.difficulty == None).update(
+            {
+                Task.difficulty: 3,
+            }
+        )
+        session.commit()
         batch_op.alter_column(
             "difficulty",
             existing_type=sa.INTEGER(),

{zou-0.20.45 → zou-0.20.47}/zou/migrations/versions/e7e633bd6fa2_add_exceptions_to_budget_entries.py

@@ -32,8 +32,6 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("task", schema=None) as batch_op:
-        batch_op.alter_column(
-            "difficulty", existing_type=sa.INTEGER(), nullable=True
-        )
+    with op.batch_alter_table("budget_entry", schema=None) as batch_op:
+        batch_op.drop_column("exceptions")
     # ### end Alembic commands ###

{zou-0.20.45 → zou-0.20.47/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.45
+Version: 0.20.47
 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.45/zou/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.20.45"