Merge branch 'develop' into pno/PLT-2503-workflow-management

Author: paulnoirel

libs/labelbox/pyproject.toml

@@ -11,7 +11,6 @@ dependencies = [
     "strenum>=0.4.15",
     "tqdm>=4.66.2",
     "geojson>=3.1.0",
-    "mypy==1.10.1",
     "lbox-clients==1.1.2",
 ]
 readme = "README.md"

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/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

@@ -227,27 +227,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 sdmin 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)

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
@@ -125,7 +123,6 @@ matplotlib-inline==0.1.7
 mistune==3.0.2
     # via nbconvert
 mypy==1.10.1
-    # via labelbox
 mypy-extensions==1.0.0
     # via black
     # via mypy

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
@@ -52,10 +50,6 @@ jinja2==3.1.4
     # via sphinx
 markupsafe==2.1.5
     # via jinja2
-mypy==1.10.1
-    # via labelbox
-mypy-extensions==1.0.0
-    # via mypy
 numpy==2.0.2
     # via labelbox
     # via opencv-python-headless
@@ -123,15 +117,12 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 strenum==0.4.15
     # via labelbox
-tomli==2.2.1
-    # via mypy
 tqdm==4.66.4
     # via labelbox
 typeguard==4.3.0
     # via labelbox
 typing-extensions==4.12.2
     # via labelbox
-    # via mypy
     # via pydantic
     # via pydantic-core
     # via typeguard