Merge branch 'develop' into kjamrozy/ptdt-4605

Author: kjamrozy

libs/labelbox/src/labelbox/schema/foundry/foundry_client.py

@@ -18,8 +18,8 @@ def _create_app(self, app: App) -> App:
                 $name: String!, $modelId: ID!, $ontologyId: ID!, $description: String, $inferenceParams: Json!, $classToSchemaId: Json!
             ){{
                 createModelFoundryApp(input: {{
-                    name: $name 
-                    modelId: $modelId 
+                    name: $name
+                    modelId: $modelId
                     ontologyId: $ontologyId
                     description: $description
                     inferenceParams: $inferenceParams
@@ -89,6 +89,7 @@ def run_app(
             "classToSchemaId": app.class_to_schema_id,
             "inferenceParams": app.inference_params,
             "ontologyId": app.ontology_id,
+            "modelAppId": app.id,
         }
 
         data_rows_key = (

libs/labelbox/src/labelbox/schema/model_run.py

@@ -56,6 +56,7 @@ class ModelRun(DbObject):
     created_by_id = Field.String("created_by_id", "createdBy")
     model_id = Field.String("model_id")
     training_metadata = Field.Json("training_metadata")
+    model_app_id = Field.String("model_app_id")
 
     class Status(Enum):
         EXPORTING_DATA = "EXPORTING_DATA"

libs/labelbox/tests/integration/test_api_keys.py

@@ -4,8 +4,6 @@
 
 from labelbox.schema.timeunit import TimeUnit
 from labelbox.schema.api_key import ApiKey
-from lbox.exceptions import LabelboxError
-# The creation of API keys requires a feature flag to be enabled.
 
 
 @pytest.mark.skipif(
@@ -227,26 +225,3 @@ def test_create_api_key_invalid_time_unit(client):
             time_unit="days",  # String instead of TimeUnit enum
         )
     assert "valid TimeUnit" in str(excinfo.value)
-
-
-@pytest.mark.skipif(
-    condition=os.environ["LABELBOX_TEST_ENVIRON"] == "prod",
-    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
-
-    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)