Merge branch 'master' into pr-osparc-fix-metric-raising-errors

Author: GitHK

api/specs/web-server/_projects_nodes.py

@@ -21,9 +21,9 @@
     ServiceResourcesDict,
 )
 from models_library.generics import Envelope
+from models_library.groups import GroupID
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
-from models_library.users import GroupID
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.projects._crud_handlers import ProjectPathParams
 from simcore_service_webserver.projects._nodes_handlers import (

api/specs/web-server/_wallets.py

@@ -27,8 +27,8 @@
     WalletPaymentInitiated,
 )
 from models_library.generics import Envelope
+from models_library.groups import GroupID
 from models_library.rest_pagination import Page, PageQueryParameters
-from models_library.users import GroupID
 from models_library.wallets import WalletID
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.wallets._groups_api import WalletGroupGet

packages/aws-library/src/aws_library/ec2/_client.py

@@ -181,7 +181,8 @@ async def launch_instances(
             )
             instance_ids = [i["InstanceId"] for i in instances["Instances"]]
             _logger.info(
-                "New instances launched: %s, waiting for them to start now...",
+                "%s New instances launched: %s, waiting for them to start now...",
+                len(instance_ids),
                 instance_ids,
             )
 

packages/common-library/src/common_library/groups_enums.py

@@ -0,0 +1,13 @@
+import enum
+
+
+class GroupType(enum.Enum):
+    """
+    standard: standard group, e.g. any group that is not a primary group or special group such as the everyone group
+    primary: primary group, e.g. the primary group is the user own defined group that typically only contain the user (same as in linux)
+    everyone: the only group for all users
+    """
+
+    STANDARD = "standard"
+    PRIMARY = "primary"
+    EVERYONE = "everyone"

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

@@ -1,7 +1,7 @@
 from pydantic import BaseModel
 
+from ..groups import GroupID
 from ..services import ServiceKey, ServiceVersion
-from ..users import GroupID
 
 
 class ServiceAccessRightsGet(BaseModel):

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

@@ -6,6 +6,7 @@
 
 from ..boot_options import BootOptions
 from ..emails import LowerCaseEmailStr
+from ..groups import GroupID
 from ..services_access import ServiceAccessRights, ServiceGroupAccessRightsV2
 from ..services_authoring import Author
 from ..services_enums import ServiceType
@@ -18,7 +19,6 @@
 )
 from ..services_resources import ServiceResourcesDict
 from ..services_types import ServiceKey, ServiceVersion
-from ..users import GroupID
 from ..utils.change_case import snake_to_camel
 
 

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

@@ -3,8 +3,8 @@
 
 from models_library.basic_types import IDStr
 from models_library.folders import FolderID
+from models_library.groups import GroupID
 from models_library.projects_access import AccessRights
-from models_library.users import GroupID
 from models_library.utils.common_validators import null_or_none_str_to_none_validator
 from pydantic import ConfigDict, PositiveInt, field_validator
 

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

@@ -6,7 +6,7 @@
 from ..access_rights import AccessRights
 from ..basic_types import IDStr
 from ..folders import FolderID
-from ..users import GroupID
+from ..groups import GroupID
 from ..utils.common_validators import null_or_none_str_to_none_validator
 from ..workspaces import WorkspaceID
 from ._base import InputSchema, OutputSchema

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

@@ -1,5 +1,6 @@
 from ..basic_types import IDStr
-from ..users import GroupID, UserID
+from ..groups import GroupID
+from ..users import UserID
 
 
 class SocketIORoomStr(IDStr):

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

@@ -5,7 +5,7 @@
 from pydantic import ConfigDict, Field, HttpUrl, ValidationInfo, field_validator
 
 from ..basic_types import AmountDecimal, IDStr, NonNegativeDecimal
-from ..users import GroupID
+from ..groups import GroupID
 from ..wallets import WalletID, WalletStatus
 from ._base import InputSchema, OutputSchema