From e41aeebb6ef092d58fc614c8d73410b036d5f9b1 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Wed, 8 May 2024 08:31:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- label_studio/core/middleware.py | 8 ++++++++ label_studio/core/settings/base.py | 3 ++- label_studio/core/settings/label_studio.py | 2 +- label_studio/core/views.py | 4 ++-- label_studio/data_manager/functions.py | 14 +++++++------- label_studio/data_manager/views.py | 2 +- label_studio/organizations/views.py | 2 +- label_studio/projects/views.py | 4 ++-- 8 files changed, 24 insertions(+), 15 deletions(-) diff --git a/label_studio/core/middleware.py b/label_studio/core/middleware.py index 587fe41..f2cd13d 100644 --- a/label_studio/core/middleware.py +++ b/label_studio/core/middleware.py @@ -128,3 +128,11 @@ class UpdateLastActivityMiddleware(CommonMiddleware): if hasattr(request, 'user') and request.method not in SAFE_METHODS: if request.user.is_authenticated: request.user.update_last_activity() + + +class CustomHeadersMiddleware(MiddlewareMixin): + def process_request(self, request): + # 获取 Token + token = "a29c0fbdea3f5d1bd5cf8cb3a3121a3bd5f9b20e" + # 添加头部 + request.META["HTTP_AUTHORIZATION"] = f"Token {token}" diff --git a/label_studio/core/settings/base.py b/label_studio/core/settings/base.py index 1c82918..93e2ca5 100644 --- a/label_studio/core/settings/base.py +++ b/label_studio/core/settings/base.py @@ -164,6 +164,7 @@ MIDDLEWARE = [ 'core.middleware.SetSessionUIDMiddleware', 'core.middleware.ContextLogMiddleware', 'core.middleware.DatabaseIsLockedRetryMiddleware', + 'core.middleware.CustomHeadersMiddleware', ] REST_FRAMEWORK = { @@ -341,7 +342,7 @@ BATCH_SIZE = 1000 PROJECT_TITLE_MIN_LEN = 3 PROJECT_TITLE_MAX_LEN = 50 LOGIN_REDIRECT_URL = '/' -LOGIN_URL = '/' +LOGIN_URL = 'projects' MIN_GROUND_TRUTH = 10 DATA_UNDEFINED_NAME = '$undefined$' LICENSE = {} diff --git a/label_studio/core/settings/label_studio.py b/label_studio/core/settings/label_studio.py index d41ffc5..e88c41f 100644 --- a/label_studio/core/settings/label_studio.py +++ b/label_studio/core/settings/label_studio.py @@ -1,7 +1,7 @@ """This file and its contents are licensed under the Apache License 2.0. Please see the included NOTICE for copyright information and LICENSE for a copy of the license. """ from core.settings.base import * - +X_FRAME_OPTIONS = 'ALLOWALL' DJANGO_DB = get_env('DJANGO_DB', DJANGO_DB_SQLITE) DATABASES = {'default': DATABASES_ALL[DJANGO_DB]} diff --git a/label_studio/core/views.py b/label_studio/core/views.py index 3a0b350..1c595c3 100644 --- a/label_studio/core/views.py +++ b/label_studio/core/views.py @@ -32,13 +32,13 @@ def main(request): if user.active_organization is None and 'organization_pk' not in request.session: logout(request) - return redirect(reverse('user-login')) + return redirect(reverse('projects:project-index')) # business mode access return redirect(reverse('projects:project-index')) # not authenticated - return redirect(reverse('user-login')) + return redirect(reverse('projects:project-index')) def version_page(request): diff --git a/label_studio/data_manager/functions.py b/label_studio/data_manager/functions.py index 4ecb7dc..4b8100d 100644 --- a/label_studio/data_manager/functions.py +++ b/label_studio/data_manager/functions.py @@ -84,7 +84,7 @@ def get_all_columns(project): 'title': '已完成', 'type': 'Datetime', 'target': 'tasks', - 'help': '最后注释日期', + 'help': '最后标注日期', 'visibility_defaults': { 'explore': True, 'labeling': False @@ -92,10 +92,10 @@ def get_all_columns(project): }, { 'id': 'total_annotations', - 'title': '注释', + 'title': '标注', 'type': "Number", 'target': 'tasks', - 'help': '每个任务的总注释', + 'help': '每个任务的总标注', 'visibility_defaults': { 'explore': True, 'labeling': True @@ -106,7 +106,7 @@ def get_all_columns(project): 'title': "已取消", 'type': "Number", 'target': 'tasks', - 'help': '完全取消（跳过）注释', + 'help': '完全取消（跳过）标注', 'visibility_defaults': { 'explore': True, 'labeling': False @@ -125,10 +125,10 @@ def get_all_columns(project): }, { 'id': 'annotations_results', - 'title': "注释结果", + 'title': "标注结果", 'type': "String", 'target': 'tasks', - 'help': '注释结果堆叠在所有注释上', + 'help': '标注结果堆叠在所有标注上', 'visibility_defaults': { 'explore': False, 'labeling': False @@ -180,7 +180,7 @@ def get_all_columns(project): }, { 'id': 'annotators', - 'title': '注释于', + 'title': '标注者', 'type': 'List', 'target': 'tasks', 'help': '完成任务的所有用户', diff --git a/label_studio/data_manager/views.py b/label_studio/data_manager/views.py index 9203dcb..d0636b2 100644 --- a/label_studio/data_manager/views.py +++ b/label_studio/data_manager/views.py @@ -7,7 +7,7 @@ from core.utils.common import find_editor_files from core.version import get_short_version -@login_required +# @login_required def task_page(request, pk): response = { 'version': get_short_version() diff --git a/label_studio/organizations/views.py b/label_studio/organizations/views.py index 61a090d..6872054 100644 --- a/label_studio/organizations/views.py +++ b/label_studio/organizations/views.py @@ -4,6 +4,6 @@ from django.shortcuts import render from django.contrib.auth.decorators import login_required -@login_required +# @login_required def organization_people_list(request): return render(request, 'organizations/people_list.html') diff --git a/label_studio/projects/views.py b/label_studio/projects/views.py index 688cd8e..17e4dcb 100644 --- a/label_studio/projects/views.py +++ b/label_studio/projects/views.py @@ -20,12 +20,12 @@ from organizations.models import Organization logger = logging.getLogger(__name__) -@login_required +# @login_required def project_list(request): return render(request, 'projects/list.html') -@login_required +# @login_required def project_settings(request, pk, sub_path): return render(request, 'projects/settings.html')