zou 0.20.46__py3-none-any.whl → 0.20.48__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.46"
+__version__ = "0.20.48"

zou/app/blueprints/projects/resources.py

@@ -1509,20 +1509,20 @@ class ProductionMonthTimeSpentsResource(Resource, ArgsMixin):
         - Projects
         parameters:
         - in: path
-            name: project_id
-            required: True
-            type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          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
+          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/app/services/time_spents_service.py

@@ -545,8 +545,7 @@ def get_project_month_time_spents(project_id, timezone=None):
     """
     data = {}
     query = (
-        TimeSpent.query
-        .join(Task)
+        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)
@@ -559,15 +558,17 @@ def get_project_month_time_spents(project_id, timezone=None):
             time_spent.date, timezone
         )[0:7]
         if department_id not in data:
-            data[department_id] = { "total": 0 }
+            data[department_id] = {"total": 0}
         if time_spent.person_id not in data[department_id]:
-            data[department_id][time_spent.person_id] = { "total": 0 }
+            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][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
+        data[department_id][time_spent.person_id][
+            "total"
+        ] += time_spent.duration
+    return data

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/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.46.dist-info → zou-0.20.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.46
+Version: 0.20.48
 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.46.dist-info → zou-0.20.48.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=nTukW1EMVbcsuCfvx3b13auDCAZFwK7mzCLf3SiMFJc,24
+zou/__init__.py,sha256=RQqWrS8U7caHh_fxxsIrLsmJXWIM0hPnKDjsOfhUWfg,24
 zou/cli.py,sha256=8YdBqJKEulAZ_1ohTdmpt_lf8EMjDmYiH8l0jVNlfG0,22397
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=yTU1Z3r55SiYm8Y5twtJIo5kTnhbBK-XKc8apdgvzNw,8291
@@ -97,7 +97,7 @@ zou/app/blueprints/playlists/resources.py,sha256=mF3gmlWpe9YKyyKVRUXYtvTCk7OguWI
 zou/app/blueprints/previews/__init__.py,sha256=ihC6OQ9AUjnZ2JeMnjRh_tKGO0UmAjOwhZnOivc3BnQ,4460
 zou/app/blueprints/previews/resources.py,sha256=uyjfW3vyE2a1PPXO8MsHP8-3jhuVKHt3oi2pYsq-ZIw,53376
 zou/app/blueprints/projects/__init__.py,sha256=KhzIn5HvemfvsP5yJBMImdsEuTA_P806kRpoNbAdfIs,4643
-zou/app/blueprints/projects/resources.py,sha256=7WAJU0Y7-IzDvsybsPk826yGEQZA84nbGy0xfn-_d8g,44955
+zou/app/blueprints/projects/resources.py,sha256=Z0UfzCzP9n8YBIH4_2cFaP9tIHCn-jQI7NqtQouCTiY,44938
 zou/app/blueprints/search/__init__.py,sha256=QCjQIY_85l_orhdEiqav_GifjReuwsjZggN3V0GeUVY,356
 zou/app/blueprints/search/resources.py,sha256=_QgRlUuxCPgY-ip5r2lGFtXNcGSE579JsCSrVf8ajVU,3093
 zou/app/blueprints/shots/__init__.py,sha256=EcG9qmAchlucqg1M6-RqWGfuKpa5Kq6RgyLZNSsjUr4,4225
@@ -222,7 +222,7 @@ zou/app/services/status_automations_service.py,sha256=tVio7Sj7inhvKS4UOyRhcdpwr_
 zou/app/services/sync_service.py,sha256=iWxx1kOGEXympHmSBBQWtDZWNtumdxp8kppee0OefMo,41811
 zou/app/services/tasks_service.py,sha256=D-u-8W3rIg00Nqp7MuG1WSOcPANE4XXliKpVwm5NbVU,69815
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
-zou/app/services/time_spents_service.py,sha256=sjyDqQKDpnmDm-lPLCd2FxYBE6pOVZEgommwZcAjGk8,16498
+zou/app/services/time_spents_service.py,sha256=8sYnepgeo4yohNFRNiEedqFfL2vuJ78GZSHOpRmp52Q,16502
 zou/app/services/user_service.py,sha256=rvo_e_JkPdTqIOE3FETXlUXnuS8n0lLyovTpwApyt8I,51470
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
@@ -407,7 +407,7 @@ zou/migrations/versions/cf3d365de164_add_entity_version_model.py,sha256=n3k3ojRQ
 zou/migrations/versions/cf6cec6d6bf5_add_status_field_to_preview_file.py,sha256=0c8_OghAaaM0R6bKbs7MADvOkZ1sFE3SVp_nNB2ACgQ,950
 zou/migrations/versions/d25118cddcaa_modify_salary_scale_model.py,sha256=hjrfR0tnxAAfVgAG_Fqi2He4PqDyoqX6pOaj5TrmEJc,3814
 zou/migrations/versions/d80267806131_task_status_new_column_is_default.py,sha256=7HtK0bfBUh9MrJIbpUgz6S-Ye_R_4DbHILpODMBVVwE,2610
-zou/migrations/versions/d80f02824047_add_plugin_revision.py,sha256=xaVdA7_a3MXXu1McNqpBstN_HF1oyp9i2RO4rYBbkSs,1944
+zou/migrations/versions/d80f02824047_add_plugin_revision.py,sha256=p_OYtHamUwSiWJxY00UwOVWoiCuqIac73nW6nVNBdXw,3534
 zou/migrations/versions/d8dcd5196d57_add_casting_label.py,sha256=TO4dlWblBzwAcs9Vx4fJVoMsdy2XuF7OncFn8N6BSe8,687
 zou/migrations/versions/de8a3de227ef_.py,sha256=3spU6b2kSApcMi9NomIRQGmoNtYos137krVrmdJWLCQ,1319
 zou/migrations/versions/deeacd38d373_for_projecttaskstatuslink_set_default_.py,sha256=eJsmrxTv1AP47_M0wXzUxIUf3xr904WY05MNYmnCcCg,1821
@@ -416,7 +416,7 @@ zou/migrations/versions/df9f8a147e80_change_file_size_to_big_integer.py,sha256=o
 zou/migrations/versions/e1ef93f40d3d_.py,sha256=6qs4bZPzh9pBM8MgAtogz1pXqjrvyBpwkNr-1w4RzRo,708
 zou/migrations/versions/e29638428dfd_add_schedule_item_table.py,sha256=M9ZoAmc-wpZsgbzdMIFeFmHPNxST8NR2L-VlcjZ3hIU,2711
 zou/migrations/versions/e3f6db74cc1e_.py,sha256=dIFNZuDzemSZRcbn9m5b8HnjCNR0ufiGwLkQEjFFcco,907
-zou/migrations/versions/e7e633bd6fa2_add_exceptions_to_budget_entries.py,sha256=rcG1DNHVvXRQ6mp8Z4XW_bcCDBoBriUm33ufcd1zmx4,1036
+zou/migrations/versions/e7e633bd6fa2_add_exceptions_to_budget_entries.py,sha256=ab1K8GHcMLkaYW4TkMUQnZcDg9RlD3YLtpVS0jpyps8,978
 zou/migrations/versions/e839d6603c09_add_person_id_to_shot_history.py,sha256=MFKReFog5-kR2ftgY7J7Gd3slcMHpPUCyzCGw0Wr-5U,1295
 zou/migrations/versions/ee2373fbe3a4_.py,sha256=_m4Awx8OxqCTN-deyq8dx9xvDEcNumibrqZ_7DXav-o,5666
 zou/migrations/versions/f0567e8d0c62_.py,sha256=ZsyaVPAUrN1biNNxdQbOyGjG3KjoBiHXM3CcuLJxwac,1138
@@ -446,9 +446,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.46.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.46.dist-info/METADATA,sha256=l_Jg-X9ADP-eG6swO7GtW2Sh_qR6vCTMVzrzrHmNRZI,6826
-zou-0.20.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-0.20.46.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.46.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.46.dist-info/RECORD,,
+zou-0.20.48.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.48.dist-info/METADATA,sha256=WWbxBdmkfb6nCdb7rZmnEcINwUPa6MHqAoLGXhPppi0,6826
+zou-0.20.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zou-0.20.48.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.48.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.48.dist-info/RECORD,,