diff --git a/annofabcli/statistics/database.py b/annofabcli/statistics/database.py index 1049a270..831c0c62 100644 --- a/annofabcli/statistics/database.py +++ b/annofabcli/statistics/database.py @@ -2,7 +2,6 @@ import json import logging import multiprocessing -from collections import defaultdict from dataclasses import dataclass from functools import partial from pathlib import Path @@ -13,8 +12,7 @@ import dateutil.parser import more_itertools from annofabapi.dataclass.task import Task as DcTask -from annofabapi.models import CommentStatus, InputDataId, JobStatus, ProjectJobType, Task, TaskHistory -from annofabapi.parser import lazy_parse_simple_annotation_zip +from annofabapi.models import InputDataId, JobStatus, ProjectJobType, Task, TaskHistory from annofabcli.common.dataclasses import WaitOptions from annofabcli.common.download import DownloadingFile diff --git "a/tests/data/stat_visualization/mask_visualization_dir/visualization1/\343\202\277\343\202\271\343\202\257list.csv" "b/tests/data/stat_visualization/mask_visualization_dir/visualization1/\343\202\277\343\202\271\343\202\257list.csv" index a9881fa6..606db397 100644 --- "a/tests/data/stat_visualization/mask_visualization_dir/visualization1/\343\202\277\343\202\271\343\202\257list.csv" +++ "b/tests/data/stat_visualization/mask_visualization_dir/visualization1/\343\202\277\343\202\271\343\202\257list.csv" @@ -1,4 +1,4 @@ -project_id,task_id,phase,phase_stage,status,number_of_rejections_by_inspection,number_of_rejections_by_acceptance,created_datetime,first_annotation_user_id,first_annotation_username,first_annotation_worktime_hour,first_annotation_started_datetime,first_inspection_user_id,first_inspection_username,first_inspection_worktime_hour,first_inspection_started_datetime,first_acceptance_user_id,first_acceptance_username,first_acceptance_worktime_hour,first_acceptance_started_datetime,first_acceptance_completed_datetime,worktime_hour,annotation_worktime_hour,inspection_worktime_hour,acceptance_worktime_hour,input_data_count,annotation_count,inspection_comment_count,inspection_is_skipped,acceptance_is_skipped -prj1,task1,acceptance,1,complete,0,0,2023-12-27T21:53:53.72+09:00,bob,bob,0.185208888888889,2024-01-09T11:27:00.015+09:00,,,,,alice,alice,0.547898611111111,2024-01-09T13:03:11.715+09:00,2024-01-11T13:04:01.134+09:00,0.7331075,0.185208888888889,0,0.547898611111111,10,20,0,False,False -prj1,task2,acceptance,1,complete,0,1,2023-12-27T21:54:09.075+09:00,bob,bob,0.214761944444444,2024-01-09T11:43:19.68+09:00,,,,,alice,alice,0.267357222222222,2024-01-10T15:10:43.647+09:00,2024-01-11T14:23:30.968+09:00,0.538455555555556,0.220598611111111,0,0.317856944444444,10,20,1,False,False -prj1,task3,acceptance,1,complete,0,1,2023-12-27T21:54:24.099+09:00,bob,bob,0.195141111111111,2024-01-09T11:56:20.118+09:00,,,,,chris,chris,0.573847777777778,2024-01-09T15:23:53.291+09:00,2024-01-16T11:14:02.961+09:00,1.3610325,0.324384722222222,0,1.03664777777778,10,20,2,False,False +project_id,task_id,phase,phase_stage,status,number_of_rejections_by_inspection,number_of_rejections_by_acceptance,created_datetime,first_annotation_user_id,first_annotation_username,first_annotation_worktime_hour,first_annotation_started_datetime,first_inspection_user_id,first_inspection_username,first_inspection_worktime_hour,first_inspection_started_datetime,first_acceptance_user_id,first_acceptance_username,first_acceptance_worktime_hour,first_acceptance_started_datetime,first_acceptance_completed_datetime,worktime_hour,annotation_worktime_hour,inspection_worktime_hour,acceptance_worktime_hour,input_data_count,annotation_count,inspection_comment_count,inspection_comment_count_in_inspection_phase,inspection_comment_count_in_acceptance_phase,inspection_is_skipped,acceptance_is_skipped +prj1,task1,acceptance,1,complete,0,0,2023-12-27T21:53:53.72+09:00,bob,bob,0.185208888888889,2024-01-09T11:27:00.015+09:00,,,,,alice,alice,0.547898611111111,2024-01-09T13:03:11.715+09:00,2024-01-11T13:04:01.134+09:00,0.7331075,0.185208888888889,0,0.547898611111111,10,20,0,0,0,False,False +prj1,task2,acceptance,1,complete,0,1,2023-12-27T21:54:09.075+09:00,bob,bob,0.214761944444444,2024-01-09T11:43:19.68+09:00,,,,,alice,alice,0.267357222222222,2024-01-10T15:10:43.647+09:00,2024-01-11T14:23:30.968+09:00,0.538455555555556,0.220598611111111,0,0.317856944444444,10,20,1,0,1,False,False +prj1,task3,acceptance,1,complete,0,1,2023-12-27T21:54:24.099+09:00,bob,bob,0.195141111111111,2024-01-09T11:56:20.118+09:00,,,,,chris,chris,0.573847777777778,2024-01-09T15:23:53.291+09:00,2024-01-16T11:14:02.961+09:00,1.3610325,0.324384722222222,0,1.03664777777778,10,20,2,0,2,False,False diff --git "a/tests/data/stat_visualization/merge_visualization_dir/visualization1/\343\202\277\343\202\271\343\202\257list.csv" "b/tests/data/stat_visualization/merge_visualization_dir/visualization1/\343\202\277\343\202\271\343\202\257list.csv" index a9881fa6..606db397 100644 --- "a/tests/data/stat_visualization/merge_visualization_dir/visualization1/\343\202\277\343\202\271\343\202\257list.csv" +++ "b/tests/data/stat_visualization/merge_visualization_dir/visualization1/\343\202\277\343\202\271\343\202\257list.csv" @@ -1,4 +1,4 @@ -project_id,task_id,phase,phase_stage,status,number_of_rejections_by_inspection,number_of_rejections_by_acceptance,created_datetime,first_annotation_user_id,first_annotation_username,first_annotation_worktime_hour,first_annotation_started_datetime,first_inspection_user_id,first_inspection_username,first_inspection_worktime_hour,first_inspection_started_datetime,first_acceptance_user_id,first_acceptance_username,first_acceptance_worktime_hour,first_acceptance_started_datetime,first_acceptance_completed_datetime,worktime_hour,annotation_worktime_hour,inspection_worktime_hour,acceptance_worktime_hour,input_data_count,annotation_count,inspection_comment_count,inspection_is_skipped,acceptance_is_skipped -prj1,task1,acceptance,1,complete,0,0,2023-12-27T21:53:53.72+09:00,bob,bob,0.185208888888889,2024-01-09T11:27:00.015+09:00,,,,,alice,alice,0.547898611111111,2024-01-09T13:03:11.715+09:00,2024-01-11T13:04:01.134+09:00,0.7331075,0.185208888888889,0,0.547898611111111,10,20,0,False,False -prj1,task2,acceptance,1,complete,0,1,2023-12-27T21:54:09.075+09:00,bob,bob,0.214761944444444,2024-01-09T11:43:19.68+09:00,,,,,alice,alice,0.267357222222222,2024-01-10T15:10:43.647+09:00,2024-01-11T14:23:30.968+09:00,0.538455555555556,0.220598611111111,0,0.317856944444444,10,20,1,False,False -prj1,task3,acceptance,1,complete,0,1,2023-12-27T21:54:24.099+09:00,bob,bob,0.195141111111111,2024-01-09T11:56:20.118+09:00,,,,,chris,chris,0.573847777777778,2024-01-09T15:23:53.291+09:00,2024-01-16T11:14:02.961+09:00,1.3610325,0.324384722222222,0,1.03664777777778,10,20,2,False,False +project_id,task_id,phase,phase_stage,status,number_of_rejections_by_inspection,number_of_rejections_by_acceptance,created_datetime,first_annotation_user_id,first_annotation_username,first_annotation_worktime_hour,first_annotation_started_datetime,first_inspection_user_id,first_inspection_username,first_inspection_worktime_hour,first_inspection_started_datetime,first_acceptance_user_id,first_acceptance_username,first_acceptance_worktime_hour,first_acceptance_started_datetime,first_acceptance_completed_datetime,worktime_hour,annotation_worktime_hour,inspection_worktime_hour,acceptance_worktime_hour,input_data_count,annotation_count,inspection_comment_count,inspection_comment_count_in_inspection_phase,inspection_comment_count_in_acceptance_phase,inspection_is_skipped,acceptance_is_skipped +prj1,task1,acceptance,1,complete,0,0,2023-12-27T21:53:53.72+09:00,bob,bob,0.185208888888889,2024-01-09T11:27:00.015+09:00,,,,,alice,alice,0.547898611111111,2024-01-09T13:03:11.715+09:00,2024-01-11T13:04:01.134+09:00,0.7331075,0.185208888888889,0,0.547898611111111,10,20,0,0,0,False,False +prj1,task2,acceptance,1,complete,0,1,2023-12-27T21:54:09.075+09:00,bob,bob,0.214761944444444,2024-01-09T11:43:19.68+09:00,,,,,alice,alice,0.267357222222222,2024-01-10T15:10:43.647+09:00,2024-01-11T14:23:30.968+09:00,0.538455555555556,0.220598611111111,0,0.317856944444444,10,20,1,0,1,False,False +prj1,task3,acceptance,1,complete,0,1,2023-12-27T21:54:24.099+09:00,bob,bob,0.195141111111111,2024-01-09T11:56:20.118+09:00,,,,,chris,chris,0.573847777777778,2024-01-09T15:23:53.291+09:00,2024-01-16T11:14:02.961+09:00,1.3610325,0.324384722222222,0,1.03664777777778,10,20,2,0,2,False,False