Merge branch 'develop' into develop

Author: paulnoirel

libs/labelbox/src/labelbox/schema/timeunit.py

@@ -14,8 +14,8 @@ class TimeUnit(Enum):
         WEEK (int): 604800 seconds (7 days)
     """
 
-    SECOND: int = 1
-    MINUTE: int = 60
-    HOUR: int = 60 * 60
-    DAY: int = 24 * 60 * 60
-    WEEK: int = 7 * 24 * 60 * 60
+    SECOND = 1
+    MINUTE = 60
+    HOUR = 60 * 60
+    DAY = 24 * 60 * 60
+    WEEK = 7 * 24 * 60 * 60

libs/labelbox/tests/integration/test_api_keys.py

@@ -231,23 +231,22 @@ def test_create_api_key_invalid_time_unit(client):
 
 @pytest.mark.skipif(
     condition=os.environ["LABELBOX_TEST_ENVIRON"] == "prod",
-    reason="Accounts with sdmin permission can create API keys",
+    reason="Accounts with admin permission can create API keys",
 )
 def test_create_api_key_insufficient_permissions(client):
     """Test that creating an API key fails when the user has insufficient permissions."""
     user_email = client.get_user().email
 
-    assert client.get_user().org_role().name == "Admin"
-
-    # Attempt to create another API key using the limited permissions client
-    # This should fail due to insufficient permissions
-    with pytest.raises(LabelboxError) as excinfo:
-        client.create_api_key(
-            name=f"Test Key {uuid.uuid4()}",
-            user=user_email,
-            role="Admin",
-            validity=5,
-            time_unit=TimeUnit.MINUTE,
-        )
-
-    assert "192" in str(excinfo.value)
+    if client.get_user().org_role().name != "Admin":
+        # Attempt to create another API key using the limited permissions client
+        # This should fail due to insufficient permissions
+        with pytest.raises(LabelboxError) as excinfo:
+            client.create_api_key(
+                name=f"Test Key {uuid.uuid4()}",
+                user=user_email,
+                role="Admin",
+                validity=5,
+                time_unit=TimeUnit.MINUTE,
+            )
+
+        assert "192" in str(excinfo.value)

requirements-dev.lock

@@ -6,8 +6,6 @@
 #   features: []
 #   all-features: true
 #   with-sources: false
-#   generate-hashes: false
-#   universal: false
 
 -e file:libs/labelbox
 -e file:libs/lbox-clients

requirements.lock

@@ -6,8 +6,6 @@
 #   features: []
 #   all-features: true
 #   with-sources: false
-#   generate-hashes: false
-#   universal: false
 
 -e file:libs/labelbox
 -e file:libs/lbox-clients