Skip to content

Commit 08981e0

Browse files
authored
🐛♻️ web-api: fixes adding group member by user-name and some cleanup (#6940)
1 parent e94782d commit 08981e0

File tree

56 files changed

+214
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+214
-121
lines changed

api/specs/web-server/_projects_nodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
ServiceResourcesDict,
2222
)
2323
from models_library.generics import Envelope
24+
from models_library.groups import GroupID
2425
from models_library.projects import ProjectID
2526
from models_library.projects_nodes_io import NodeID
26-
from models_library.users import GroupID
2727
from simcore_service_webserver._meta import API_VTAG
2828
from simcore_service_webserver.projects._crud_handlers import ProjectPathParams
2929
from simcore_service_webserver.projects._nodes_handlers import (

api/specs/web-server/_wallets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
WalletPaymentInitiated,
2828
)
2929
from models_library.generics import Envelope
30+
from models_library.groups import GroupID
3031
from models_library.rest_pagination import Page, PageQueryParameters
31-
from models_library.users import GroupID
3232
from models_library.wallets import WalletID
3333
from simcore_service_webserver._meta import API_VTAG
3434
from simcore_service_webserver.wallets._groups_api import WalletGroupGet
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import enum
2+
3+
4+
class GroupType(enum.Enum):
5+
"""
6+
standard: standard group, e.g. any group that is not a primary group or special group such as the everyone group
7+
primary: primary group, e.g. the primary group is the user own defined group that typically only contain the user (same as in linux)
8+
everyone: the only group for all users
9+
"""
10+
11+
STANDARD = "standard"
12+
PRIMARY = "primary"
13+
EVERYONE = "everyone"

packages/models-library/src/models_library/api_schemas_catalog/service_access_rights.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pydantic import BaseModel
22

3+
from ..groups import GroupID
34
from ..services import ServiceKey, ServiceVersion
4-
from ..users import GroupID
55

66

77
class ServiceAccessRightsGet(BaseModel):

packages/models-library/src/models_library/api_schemas_catalog/services.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from ..boot_options import BootOptions
88
from ..emails import LowerCaseEmailStr
9+
from ..groups import GroupID
910
from ..services_access import ServiceAccessRights, ServiceGroupAccessRightsV2
1011
from ..services_authoring import Author
1112
from ..services_enums import ServiceType
@@ -18,7 +19,6 @@
1819
)
1920
from ..services_resources import ServiceResourcesDict
2021
from ..services_types import ServiceKey, ServiceVersion
21-
from ..users import GroupID
2222
from ..utils.change_case import snake_to_camel
2323

2424

packages/models-library/src/models_library/api_schemas_webserver/folders.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
from models_library.basic_types import IDStr
55
from models_library.folders import FolderID
6+
from models_library.groups import GroupID
67
from models_library.projects_access import AccessRights
7-
from models_library.users import GroupID
88
from models_library.utils.common_validators import null_or_none_str_to_none_validator
99
from pydantic import ConfigDict, PositiveInt, field_validator
1010

packages/models-library/src/models_library/api_schemas_webserver/folders_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from ..access_rights import AccessRights
77
from ..basic_types import IDStr
88
from ..folders import FolderID
9-
from ..users import GroupID
9+
from ..groups import GroupID
1010
from ..utils.common_validators import null_or_none_str_to_none_validator
1111
from ..workspaces import WorkspaceID
1212
from ._base import InputSchema, OutputSchema

packages/models-library/src/models_library/api_schemas_webserver/socketio.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from ..basic_types import IDStr
2-
from ..users import GroupID, UserID
2+
from ..groups import GroupID
3+
from ..users import UserID
34

45

56
class SocketIORoomStr(IDStr):

packages/models-library/src/models_library/api_schemas_webserver/wallets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from pydantic import ConfigDict, Field, HttpUrl, ValidationInfo, field_validator
66

77
from ..basic_types import AmountDecimal, IDStr, NonNegativeDecimal
8-
from ..users import GroupID
8+
from ..groups import GroupID
99
from ..wallets import WalletID, WalletStatus
1010
from ._base import InputSchema, OutputSchema
1111

packages/models-library/src/models_library/api_schemas_webserver/workspaces.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from typing import NamedTuple
33

44
from models_library.basic_types import IDStr
5-
from models_library.users import GroupID
5+
from models_library.groups import GroupID
66
from models_library.workspaces import WorkspaceID
77
from pydantic import ConfigDict, PositiveInt
88

0 commit comments

Comments
 (0)