From b8517675c49babf13fd564db04d30051ccdb0ad7 Mon Sep 17 00:00:00 2001 From: Hironsan Date: Thu, 4 Nov 2021 11:28:26 +0900 Subject: [PATCH] Update import method of urls --- backend/api/urls.py | 97 ++++++++++++++++++----------------- backend/api/views/__init__.py | 18 ------- 2 files changed, 50 insertions(+), 65 deletions(-) diff --git a/backend/api/urls.py b/backend/api/urls.py index 32730ab3..2356a5af 100644 --- a/backend/api/urls.py +++ b/backend/api/urls.py @@ -1,197 +1,200 @@ from django.urls import include, path -from . import views +from .views import (annotation, annotation_relations, auto_labeling, comment, + example, example_state, export_dataset, health, + import_dataset, import_export, label, project, + relation_types, role, statistics, tag, task, user) urlpatterns_project = [ path( route='upload', - view=views.UploadAPI.as_view(), + view=import_dataset.UploadAPI.as_view(), name='upload' ), path( route='catalog', - view=views.DatasetCatalog.as_view(), + view=import_dataset.DatasetCatalog.as_view(), name='catalog' ), path( route='download-format', - view=views.DownloadDatasetCatalog.as_view(), + view=export_dataset.DownloadDatasetCatalog.as_view(), name='download-format' ), path( route='download', - view=views.DownloadAPI.as_view(), + view=export_dataset.DownloadAPI.as_view(), name='download-dataset' ), path( route='statistics', - view=views.StatisticsAPI.as_view(), + view=statistics.StatisticsAPI.as_view(), name='statistics'), path( route='labels', - view=views.LabelList.as_view(), + view=label.LabelList.as_view(), name='label_list' ), path( route='label-upload', - view=views.LabelUploadAPI.as_view(), + view=label.LabelUploadAPI.as_view(), name='label_upload' ), path( route='labels/', - view=views.LabelDetail.as_view(), + view=label.LabelDetail.as_view(), name='label_detail' ), path( route='examples', - view=views.ExampleList.as_view(), + view=example.ExampleList.as_view(), name='example_list' ), path( route='examples/', - view=views.ExampleDetail.as_view(), + view=example.ExampleDetail.as_view(), name='example_detail' ), path( route='relation_types', - view=views.RelationTypesList.as_view(), + view=relation_types.RelationTypesList.as_view(), name='relation_types_list' ), path( route='relation_type-upload', - view=views.RelationTypesUploadAPI.as_view(), + view=relation_types.RelationTypesUploadAPI.as_view(), name='relation_type-upload' ), path( route='relation_types/', - view=views.RelationTypesDetail.as_view(), + view=relation_types.RelationTypesDetail.as_view(), name='relation_type_detail' ), path( route='annotation_relations', - view=views.AnnotationRelationsList.as_view(), + view=annotation_relations.AnnotationRelationsList.as_view(), name='relation_types_list' ), path( route='annotation_relation-upload', - view=views.AnnotationRelationsUploadAPI.as_view(), + view=annotation_relations.AnnotationRelationsUploadAPI.as_view(), name='annotation_relation-upload' ), path( route='annotation_relations/', - view=views.AnnotationRelationsDetail.as_view(), + view=annotation_relations.AnnotationRelationsDetail.as_view(), name='annotation_relation_detail' ), # Todo: remove. path( route='docs', - view=views.DocumentList.as_view(), + view=example.DocumentList.as_view(), name='doc_list' ), path( route='docs/', - view=views.DocumentDetail.as_view(), + view=example.DocumentDetail.as_view(), name='doc_detail' ), path( route='approval/', - view=views.ApprovalAPI.as_view(), + view=annotation.ApprovalAPI.as_view(), name='approve_labels' ), # Todo: change. path( route='docs//annotations', - view=views.AnnotationList.as_view(), + view=annotation.AnnotationList.as_view(), name='annotation_list' ), path( route='docs//annotations/', - view=views.AnnotationDetail.as_view(), + view=annotation.AnnotationDetail.as_view(), name='annotation_detail' ), path( route='tags', - view=views.TagList.as_view(), + view=tag.TagList.as_view(), name='tag_list' ), path( route='tags/', - view=views.TagDetail.as_view(), + view=tag.TagDetail.as_view(), name='tag_detail' ), path( route='examples//comments', - view=views.CommentListDoc.as_view(), + view=comment.CommentListDoc.as_view(), name='comment_list_doc' ), path( route='comments', - view=views.CommentListProject.as_view(), + view=comment.CommentListProject.as_view(), name='comment_list_project' ), path( route='examples//comments/', - view=views.CommentDetail.as_view(), + view=comment.CommentDetail.as_view(), name='comment_detail' ), path( route='examples//states', - view=views.ExampleStateList.as_view(), + view=example_state.ExampleStateList.as_view(), name='example_state_list' ), path( route='roles', - view=views.RoleMappingList.as_view(), + view=role.RoleMappingList.as_view(), name='rolemapping_list' ), path( route='roles/', - view=views.RoleMappingDetail.as_view(), + view=role.RoleMappingDetail.as_view(), name='rolemapping_detail' ), path( route='auto-labeling-templates', - view=views.AutoLabelingTemplateListAPI.as_view(), + view=auto_labeling.AutoLabelingTemplateListAPI.as_view(), name='auto_labeling_templates' ), path( route='auto-labeling-templates/', - view=views.AutoLabelingTemplateDetailAPI.as_view(), + view=auto_labeling.AutoLabelingTemplateDetailAPI.as_view(), name='auto_labeling_template' ), path( route='auto-labeling-configs', - view=views.AutoLabelingConfigList.as_view(), + view=auto_labeling.AutoLabelingConfigList.as_view(), name='auto_labeling_configs' ), path( route='auto-labeling-configs/', - view=views.AutoLabelingConfigDetail.as_view(), + view=auto_labeling.AutoLabelingConfigDetail.as_view(), name='auto_labeling_config' ), path( route='auto-labeling-config-testing', - view=views.AutoLabelingConfigTest.as_view(), + view=auto_labeling.AutoLabelingConfigTest.as_view(), name='auto_labeling_config_test' ), path( route='examples//auto-labeling', - view=views.AutoLabelingAnnotation.as_view(), + view=auto_labeling.AutoLabelingAnnotation.as_view(), name='auto_labeling_annotation' ), path( route='auto-labeling-parameter-testing', - view=views.AutoLabelingConfigParameterTest.as_view(), + view=auto_labeling.AutoLabelingConfigParameterTest.as_view(), name='auto_labeling_parameter_testing' ), path( route='auto-labeling-template-testing', - view=views.AutoLabelingTemplateTest.as_view(), + view=auto_labeling.AutoLabelingTemplateTest.as_view(), name='auto_labeling_template_test' ), path( route='auto-labeling-mapping-testing', - view=views.AutoLabelingMappingTest.as_view(), + view=auto_labeling.AutoLabelingMappingTest.as_view(), name='auto_labeling_mapping_test' ) ] @@ -199,44 +202,44 @@ urlpatterns_project = [ urlpatterns = [ path( route='health', - view=views.Health.as_view(), + view=health.Health.as_view(), name='health' ), path('auth/', include('dj_rest_auth.urls')), path('fp/', include('django_drf_filepond.urls')), path( route='me', - view=views.Me.as_view(), + view=user.Me.as_view(), name='me' ), path( route='features', - view=views.Features.as_view(), + view=import_export.Features.as_view(), name='features' ), path( route='projects', - view=views.ProjectList.as_view(), + view=project.ProjectList.as_view(), name='project_list' ), path( route='users', - view=views.Users.as_view(), + view=user.Users.as_view(), name='user_list' ), path( route='roles', - view=views.Roles.as_view(), + view=role.Roles.as_view(), name='roles' ), path( route='tasks/status/', - view=views.TaskStatus.as_view(), + view=task.TaskStatus.as_view(), name='task_status' ), path( route='projects/', - view=views.ProjectDetail.as_view(), + view=project.ProjectDetail.as_view(), name='project_detail' ), path('projects//', include(urlpatterns_project)) diff --git a/backend/api/views/__init__.py b/backend/api/views/__init__.py index 260cc724..e69de29b 100644 --- a/backend/api/views/__init__.py +++ b/backend/api/views/__init__.py @@ -1,18 +0,0 @@ -from .annotation import * -from .annotation_relations import * -from .auto_labeling import * -from .comment import * -from .example import * -from .example_state import * -from .export_dataset import * -from .health import * -from .import_dataset import * -from .import_export import * -from .label import * -from .project import * -from .relation_types import * -from .role import * -from .statistics import * -from .tag import * -from .task import * -from .user import *