Merge branch 'develop' into ct/prompt-issue-tool-name-correction

Author: ChuckTerry

libs/labelbox/src/labelbox/__init__.py

@@ -55,7 +55,7 @@
 from labelbox.schema.tool_building.step_reasoning_tool import StepReasoningTool
 from labelbox.schema.tool_building.prompt_issue_tool import PromptIssueTool
 from labelbox.schema.tool_building.relationship_tool import RelationshipTool
-from labelbox.schema.role import Role, ProjectRole
+from labelbox.schema.role import Role, ProjectRole, UserGroupRole
 from labelbox.schema.invite import Invite, InviteLimit
 from labelbox.schema.data_row_metadata import (
     DataRowMetadataOntology,

libs/labelbox/src/labelbox/client.py

@@ -507,16 +507,16 @@ def delete_project_memberships(
         self, project_id: str, user_ids: list[str]
     ) -> dict:
         """Deletes project memberships for one or more users.
-        
+
         Args:
             project_id (str): ID of the project
             user_ids (list[str]): List of user IDs to remove from the project
-            
+
         Returns:
             dict: Result containing:
                 - success (bool): True if operation succeeded
                 - errorMessage (str or None): Error message if operation failed
-            
+
         Example:
             >>> result = client.delete_project_memberships(
             >>>     project_id="project123",
@@ -539,12 +539,12 @@ def delete_project_memberships(
                 errorMessage
             }
         }"""
-        
+
         params = {
             "projectId": project_id,
             "userIds": user_ids,
         }
-        
+
         result = self.execute(mutation, params)
         return result["deleteProjectMemberships"]
 

libs/labelbox/src/labelbox/orm/model.py

@@ -399,6 +399,7 @@ class Entity(metaclass=EntityMeta):
         CatalogSlice: Type[labelbox.CatalogSlice]
         ModelSlice: Type[labelbox.ModelSlice]
         TaskQueue: Type[labelbox.TaskQueue]
+        UserGroupRole: Type[labelbox.UserGroupRole]
 
     @classmethod
     def _attributes_of_type(cls, attr_type):

libs/labelbox/src/labelbox/schema/api_key.py

@@ -258,7 +258,9 @@ def _get_available_api_key_roles(client: "Client") -> List[str]:
             if role["name"] in ["None", "Tenant Admin"]:
                 continue
             if all(perm in current_permissions for perm in role["permissions"]):
-                available_roles.append(format_role(role["name"]))
+                # Preserve server-provided role names (case-sensitive) so callers can
+                # pass them through without normalization.
+                available_roles.append(role["name"])
         client._cached_available_api_key_roles = available_roles
         return available_roles
 
@@ -332,9 +334,25 @@ def create_api_key(
             raise ValueError("role must be a Role object or a valid role name")
 
         allowed_roles = ApiKey._get_available_api_key_roles(client)
-        # Format the input role name consistently with available roles
-        formatted_role_name = format_role(role_name)
-        if formatted_role_name not in allowed_roles:
+        # Determine the exact server role name to pass through.
+        #
+        # - If caller provides a string, require exact match (case-sensitive).
+        # - If caller provides a Role object (which may be normalized by the SDK),
+        #   map it back to the server role name.
+        server_role_name: Optional[str] = None
+        if hasattr(role, "name"):
+            # Role objects in the SDK are often normalized (e.g. "TENANT_ADMIN").
+            # Map normalized name back to the server-provided role display name.
+            normalized_to_server = {format_role(r): r for r in allowed_roles}
+            server_role_name = (
+                role_name
+                if role_name in allowed_roles
+                else normalized_to_server.get(format_role(role_name))
+            )
+        else:
+            server_role_name = role_name if role_name in allowed_roles else None
+
+        if server_role_name is None:
             raise ValueError(
                 f"Invalid role specified. Allowed roles are: {allowed_roles}"
             )
@@ -371,7 +389,7 @@ def create_api_key(
         params = {
             "name": name,
             "userEmail": user_email,
-            "role": role_name,
+            "role": server_role_name,
             "validitySeconds": validity_seconds,
         }
 

libs/labelbox/src/labelbox/schema/organization.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Dict, List, Set, Optional, Union
 
 from lbox.exceptions import LabelboxError
 
@@ -22,6 +22,7 @@
         ProjectRole,
         Role,
         User,
+        UserGroupRole,
     )
 
 
@@ -65,6 +66,7 @@ def invite_user(
         email: str,
         role: "Role",
         project_roles: Optional[List["ProjectRole"]] = None,
+        user_group_roles: Optional[List["UserGroupRole"]] = None,
     ) -> "Invite":
         """
         Invite a new member to the org. This will send the user an email invite
@@ -88,6 +90,40 @@ def invite_user(
                 f"Project roles cannot be set for a user with organization level permissions. Found role name `{role.name}`, expected `NONE`"
             )
 
+        if user_group_roles and role.name != "NONE":
+            raise ValueError(
+                f"User Group roles cannot be set for a user with organization level permissions. Found role name `{role.name}`, expected `NONE`"
+            )
+
+        if user_group_roles:
+            # The backend can 500 if the same groupId appears more than once.
+            # We dedupe exact duplicates (same groupId+roleId), but reject
+            # conflicting assignments (same groupId with different roleId).
+
+            deduped_user_group_roles: Dict[str, "UserGroupRole"] = {}
+            conflicting_user_group_ids: Set[str] = set()
+
+            for user_group_role in user_group_roles:
+                user_group_id = user_group_role.user_group.id
+                role_id = user_group_role.role.uid
+
+                existing = deduped_user_group_roles.get(user_group_id)
+                if existing is None:
+                    deduped_user_group_roles[user_group_id] = user_group_role
+                else:
+                    if existing.role.uid != role_id:
+                        conflicting_user_group_ids.add(user_group_id)
+
+            if conflicting_user_group_ids:
+                conflicts_str = ", ".join(sorted(conflicting_user_group_ids))
+                raise ValueError(
+                    "user_group_roles contains conflicting role assignments for "
+                    "the same UserGroup. Each UserGroup may only appear once. "
+                    f"Conflicting user_group.id values: {conflicts_str}"
+                )
+
+            user_group_roles = list(deduped_user_group_roles.values())
+
         data_param = "data"
         query_str = """mutation createInvitesPyApi($%s: [CreateInviteInput!]){
                     createInvites(data: $%s){  invite { id createdAt organizationRoleName inviteeEmail inviter { %s } }}}""" % (
@@ -104,6 +140,19 @@ def invite_user(
             for project_role in project_roles or []
         ]
 
+        user_group_ids = [
+            user_group_role.user_group.id
+            for user_group_role in user_group_roles or []
+        ]
+
+        user_group_with_role_ids = [
+            {
+                "groupId": user_group_role.user_group.id,
+                "roleId": user_group_role.role.uid,
+            }
+            for user_group_role in user_group_roles or []
+        ]
+
         res = self.client.execute(
             query_str,
             {
@@ -114,6 +163,8 @@ def invite_user(
                         "organizationId": self.uid,
                         "organizationRoleId": role.uid,
                         "projects": projects,
+                        "userGroupIds": user_group_ids,
+                        "userGroupWithRoleIds": user_group_with_role_ids,
                     }
                 ]
             },

libs/labelbox/src/labelbox/schema/project.py

@@ -317,7 +317,9 @@ def get_resource_tags(self) -> List[ResourceTag]:
 
         return [ResourceTag(self.client, tag) for tag in results]
 
-    def labels(self, datasets=None, order_by=None, created_by=None) -> PaginatedCollection:
+    def labels(
+        self, datasets=None, order_by=None, created_by=None
+    ) -> PaginatedCollection:
         """Custom relationship expansion method to support limited filtering.
 
         Args:
@@ -334,7 +336,7 @@ def labels(self, datasets=None, order_by=None, created_by=None) -> PaginatedColl
         Example:
             >>> # Get all labels
             >>> all_labels = project.labels()
-            >>> 
+            >>>
             >>> # Get labels by specific user
             >>> user_labels = project.labels(created_by=user_id)
             >>> # or
@@ -351,16 +353,22 @@ def labels(self, datasets=None, order_by=None, created_by=None) -> PaginatedColl
 
         # Build where clause
         where_clauses = []
-        
+
         if datasets is not None:
-            dataset_ids = ", ".join('"%s"' % dataset.uid for dataset in datasets)
-            where_clauses.append(f"dataRow: {{dataset: {{id_in: [{dataset_ids}]}}}}")
-        
+            dataset_ids = ", ".join(
+                '"%s"' % dataset.uid for dataset in datasets
+            )
+            where_clauses.append(
+                f"dataRow: {{dataset: {{id_in: [{dataset_ids}]}}}}"
+            )
+
         if created_by is not None:
             # Handle both User object and user_id string
-            user_id = created_by.uid if hasattr(created_by, 'uid') else created_by
+            user_id = (
+                created_by.uid if hasattr(created_by, "uid") else created_by
+            )
             where_clauses.append(f'createdBy: {{id: "{user_id}"}}')
-        
+
         if where_clauses:
             where = " where:{" + ", ".join(where_clauses) + "}"
         else:
@@ -396,7 +404,7 @@ def labels(self, datasets=None, order_by=None, created_by=None) -> PaginatedColl
 
     def delete_labels_by_user(self, user_id: str) -> int:
         """Soft deletes all labels created by a specific user in this project.
-        
+
         This performs a soft delete (sets deleted=true in the database).
         The labels will no longer appear in queries but remain in the database.
         Labels are deleted in chunks of 500 to avoid overwhelming the API.
@@ -413,18 +421,18 @@ def delete_labels_by_user(self, user_id: str) -> int:
             >>> print(f"Deleted {deleted_count} labels")
         """
         labels_to_delete = list(self.labels(created_by=user_id))
-        
+
         if not labels_to_delete:
             return 0
-        
+
         chunk_size = 500
         total_deleted = 0
-        
+
         for i in range(0, len(labels_to_delete), chunk_size):
-            chunk = labels_to_delete[i:i + chunk_size]
+            chunk = labels_to_delete[i : i + chunk_size]
             Entity.Label.bulk_delete(chunk)
             total_deleted += len(chunk)
-        
+
         return total_deleted
 
     def export(

libs/labelbox/src/labelbox/schema/role.py

@@ -6,6 +6,7 @@
 
 if TYPE_CHECKING:
     from labelbox import Client, Project
+    from labelbox.schema.user_group import UserGroup
 
 _ROLES: Optional[Dict[str, "Role"]] = None
 
@@ -45,3 +46,9 @@ class UserRole(Role): ...
 class ProjectRole:
     project: "Project"
     role: Role
+
+
+@dataclass
+class UserGroupRole:
+    user_group: "UserGroup"
+    role: Role

libs/labelbox/src/labelbox/schema/user_group.py

@@ -9,6 +9,7 @@
 from collections import defaultdict
 from dataclasses import dataclass
 from enum import Enum
+import uuid
 from typing import Any, Dict, Iterator, List, Optional, Set
 
 from lbox.exceptions import (
@@ -415,6 +416,14 @@ def delete(self) -> bool:
         if not self.id:
             raise ValueError("Group id is required")
 
+        # The API expects a UUID-formatted identifier and may respond with an
+        # internal server error if the value cannot be parsed. Validate client-side
+        # so callers get a consistent exception.
+        try:
+            uuid.UUID(str(self.id))
+        except Exception as e:
+            raise MalformedQueryException("Invalid user group id") from e
+
         query = """
         mutation DeleteUserGroupPyApi($id: ID!) {
             deleteUserGroup(where: {id: $id}) {

libs/labelbox/src/labelbox/schema/workflow/workflow_utils.py

@@ -117,31 +117,6 @@ def validate_node_connections(
                             "node_type": node_type,
                         }
                     )
-                elif len(predecessors) > 1:
-                    # Check if all predecessors are initial nodes
-                    node_map = {n.id: n for n in nodes}
-                    predecessor_nodes = [
-                        node_map.get(pred_id) for pred_id in predecessors
-                    ]
-                    all_initial = all(
-                        pred_node
-                        and pred_node.definition_id in initial_node_types
-                        for pred_node in predecessor_nodes
-                        if pred_node is not None
-                    )
-
-                    if not all_initial:
-                        preds_info = ", ".join(
-                            [p[:8] + "..." for p in predecessors]
-                        )
-                        errors.append(
-                            {
-                                "reason": f"has multiple incoming connections ({len(predecessors)}) but not all are from initial nodes",
-                                "node_id": node.id,
-                                "node_type": node_type,
-                                "details": f"Connected from: {preds_info}",
-                            }
-                        )
 
             # Check outgoing connections (except terminal nodes)
             if node.definition_id not in terminal_node_types:

libs/labelbox/tests/integration/test_project_set_model_setup_complete.py

@@ -36,7 +36,7 @@ def test_live_chat_evaluation_project_delete_cofig(
 
     with pytest.raises(
         expected_exception=LabelboxError,
-        match="Cannot create model config for project because model setup is complete",
+        match="Cannot (create model config for project because model setup is complete|perform this action because model setup is complete)",
     ):
         project_model_config.delete()