Adding classVar and remove quiet_mode

label_studio/core/permissions.py

@@ -4,45 +4,46 @@
 from typing import Optional
 
 from pydantic import BaseModel
+from typing import ClassVar
 
 import rules
 
 logger = logging.getLogger(__name__)
 
 
 class AllPermissions(BaseModel):
-    organizations_create: str = 'organizations.create'
-    organizations_view: str = 'organizations.view'
-    organizations_change: str = 'organizations.change'
-    organizations_delete: str = 'organizations.delete'
-    organizations_invite: str = 'organizations.invite'
-    projects_create: str = 'projects.create'
-    projects_view: str = 'projects.view'
-    projects_change: str = 'projects.change'
-    projects_delete: str = 'projects.delete'
-    tasks_create: str = 'tasks.create'
-    tasks_view: str = 'tasks.view'
-    tasks_change: str = 'tasks.change'
-    tasks_delete: str = 'tasks.delete'
-    annotations_create: str = 'annotations.create'
-    annotations_view: str = 'annotations.view'
-    annotations_change: str = 'annotations.change'
-    annotations_delete: str = 'annotations.delete'
-    actions_perform: str = 'actions.perform'
-    predictions_any: str = 'predictions.any'
-    avatar_any: str = 'avatar.any'
-    labels_create: str = 'labels.create'
-    labels_view: str = 'labels.view'
-    labels_change: str = 'labels.change'
-    labels_delete: str = 'labels.delete'
-    models_create: str = 'models.create'
-    models_view: str = 'models.view'
-    models_change: str = 'models.change'
-    models_delete: str = 'models.delete'
-    model_provider_connection_create: str = 'model_provider_connection.create'
-    model_provider_connection_view: str = 'model_provider_connection.view'
-    model_provider_connection_change: str = 'model_provider_connection.change'
-    model_provider_connection_delete: str = 'model_provider_connection.delete'
+    organizations_create : ClassVar[str] = 'organizations.create'
+    organizations_view : ClassVar[str] = 'organizations.view'
+    organizations_change : ClassVar[str] = 'organizations.change'
+    organizations_delete : ClassVar[str] = 'organizations.delete'
+    organizations_invite : ClassVar[str] = 'organizations.invite'
+    projects_create : ClassVar[str] = 'projects.create'
+    projects_view : ClassVar[str] = 'projects.view'
+    projects_change : ClassVar[str] = 'projects.change'
+    projects_delete : ClassVar[str] = 'projects.delete'
+    tasks_create : ClassVar[str] = 'tasks.create'
+    tasks_view : ClassVar[str] = 'tasks.view'
+    tasks_change : ClassVar[str] = 'tasks.change'
+    tasks_delete : ClassVar[str] = 'tasks.delete'
+    annotations_create : ClassVar[str] = 'annotations.create'
+    annotations_view : ClassVar[str] = 'annotations.view'
+    annotations_change : ClassVar[str] = 'annotations.change'
+    annotations_delete : ClassVar[str] = 'annotations.delete'
+    actions_perform : ClassVar[str] = 'actions.perform'
+    predictions_any : ClassVar[str] = 'predictions.any'
+    avatar_any : ClassVar[str] = 'avatar.any'
+    labels_create : ClassVar[str] = 'labels.create'
+    labels_view : ClassVar[str] = 'labels.view'
+    labels_change : ClassVar[str] = 'labels.change'
+    labels_delete : ClassVar[str] = 'labels.delete'
+    models_create : ClassVar[str] = 'models.create'
+    models_view : ClassVar[str] = 'models.view'
+    models_change : ClassVar[str] = 'models.change'
+    models_delete : ClassVar[str] = 'models.delete'
+    model_provider_connection_create : ClassVar[str] = 'model_provider_connection.create'
+    model_provider_connection_view : ClassVar[str] = 'model_provider_connection.view'
+    model_provider_connection_change : ClassVar[str] = 'model_provider_connection.change'
+    model_provider_connection_delete : ClassVar[str] = 'model_provider_connection.delete'
 
 
 all_permissions = AllPermissions()

label_studio/data_manager/managers.py

@@ -3,7 +3,6 @@
 import logging
 import re
 from datetime import datetime
-from typing import ClassVar
 
 import ujson as json
 from core.feature_flags import flag_set
@@ -33,6 +32,7 @@
 
 from label_studio.core.utils.common import load_func
 from label_studio.core.utils.params import cast_bool_from_str
+from typing import ClassVar
 
 logger = logging.getLogger(__name__)
 
@@ -42,18 +42,18 @@
 class _Operator(BaseModel):
     EQUAL: ClassVar[str] = 'equal'
     NOT_EQUAL: ClassVar[str] = 'not_equal'
-    LESS: ClassVar[str] = 'less'
-    GREATER: ClassVar[str] = 'greater'
-    LESS_OR_EQUAL: ClassVar[str] = 'less_or_equal'
-    GREATER_OR_EQUAL: ClassVar[str] = 'greater_or_equal'
-    IN: ClassVar[str] = 'in'
-    NOT_IN: ClassVar[str] = 'not_in'
-    IN_LIST: ClassVar[str] = 'in_list'
-    NOT_IN_LIST: ClassVar[str] = 'not_in_list'
-    EMPTY: ClassVar[str] = 'empty'
-    CONTAINS: ClassVar[str] = 'contains'
-    NOT_CONTAINS: ClassVar[str] = 'not_contains'
-    REGEX: ClassVar[str] = 'regex'
+    LESS : ClassVar[str] = 'less'
+    GREATER : ClassVar[str] = 'greater'
+    LESS_OR_EQUAL : ClassVar[str] = 'less_or_equal'
+    GREATER_OR_EQUAL : ClassVar[str] = 'greater_or_equal'
+    IN : ClassVar[str] = 'in'
+    NOT_IN : ClassVar[str] = 'not_in'
+    IN_LIST : ClassVar[str] = 'in_list'
+    NOT_IN_LIST : ClassVar[str] = 'not_in_list'
+    EMPTY : ClassVar[str] = 'empty'
+    CONTAINS : ClassVar[str] = 'contains'
+    NOT_CONTAINS : ClassVar[str] = 'not_contains'
+    REGEX : ClassVar[str] = 'regex'
 
 
 Operator = _Operator()

label_studio/server.py

@@ -146,17 +146,20 @@ def _create_user(input_args, config):
                 print(f'User {DEFAULT_USERNAME} password changed')
             return user
 
-        if input_args.quiet_mode:
-            return None
+        """if input_args.quiet_mode:
+            return None"""
 
         print(f'Please enter default user email, or press Enter to use {DEFAULT_USERNAME}')
         username = input('Email: ')
         if not username:
             username = DEFAULT_USERNAME
-
-    if not password and not input_args.quiet_mode:
+    
+    if not password:
         password = getpass.getpass(f'User password for {username}: ')
 
+    """if not password and not input_args.quiet_mode:
+        password = getpass.getpass(f'User password for {username}: ')"""
+
     try:
         user = User.objects.create_user(email=username, password=password)
         user.is_staff = True