Merge branch 'develop' into gu/pydantic_dataclasses

Author: Gabefire

.github/CODEOWNERS

@@ -1,3 +1,3 @@
-# Platform team's approval is required for all code changes (excluding notebook changes)
-* @Labelbox/platform
+# SDK team's approval is required for all code changes (excluding notebook changes)
+* @Labelbox/sdk
 *.ipynb

docs/labelbox/fact-checking-tool.rst

@@ -0,0 +1,6 @@
+Fact Checking Tool
+===============================================================================================
+
+.. automodule:: labelbox.schema.tool_building.fact_checking_tool
+   :members:
+   :show-inheritance:

docs/labelbox/index.rst

@@ -19,6 +19,7 @@ Labelbox Python SDK Documentation
     enums
     exceptions
     export-task
+    fact-checking-tool
     foundry-client
     foundry-model
     identifiable
@@ -39,14 +40,15 @@ Labelbox Python SDK Documentation
     pagination
     project
     project-model-config
+    prompt-issue-tool
     quality-mode
     request-client
     resource-tag
     review
     search-filters
     send-to-annotate-params
     slice
-    step_reasoning_tool
+    step-reasoning-tool
     task
     task-queue
     user

docs/labelbox/prompt-issue-tool.rst

@@ -0,0 +1,6 @@
+Step Reasoning Tool
+===============================================================================================
+
+.. automodule:: labelbox.schema.tool_building.prompt_issue_tool
+   :members:
+   :show-inheritance:

docs/labelbox/step_reasoning_tool.rst renamed to docs/labelbox/step-reasoning-tool.rst

@@ -74,7 +74,7 @@ dev-dependencies = [
 line-length = 80
 
 [tool.ruff.lint]
-ignore = ["F841", "E722", "F811", "F402", "F601", "F403", "F821", "F541"]
+ignore = ["F841", "E722", "F811", "F403", "F821", "F541"]
 exclude = ["**/__init__.py"]
 
 [tool.rye.scripts]

libs/labelbox/pyproject.toml

@@ -46,17 +46,14 @@
 from labelbox.schema.model_config import ModelConfig
 from labelbox.schema.model_run import DataSplit, ModelRun
 from labelbox.schema.ontology import (
-    Classification,
     FeatureSchema,
     Ontology,
     OntologyBuilder,
-    Option,
-    PromptResponseClassification,
-    ResponseOption,
     Tool,
 )
-from labelbox.schema.ontology import PromptResponseClassification
-from labelbox.schema.ontology import ResponseOption
+from labelbox.schema.tool_building.fact_checking_tool import FactCheckingTool
+from labelbox.schema.tool_building.step_reasoning_tool import StepReasoningTool
+from labelbox.schema.tool_building.prompt_issue_tool import PromptIssueTool
 from labelbox.schema.role import Role, ProjectRole
 from labelbox.schema.invite import Invite, InviteLimit
 from labelbox.schema.data_row_metadata import (
@@ -94,3 +91,10 @@
 from labelbox.schema.task_queue import TaskQueue
 from labelbox.schema.user import User
 from labelbox.schema.webhook import Webhook
+from labelbox.schema.tool_building.classification import (
+    Classification,
+    Option,
+    ResponseOption,
+    PromptResponseClassification,
+)
+from lbox.exceptions import *

libs/labelbox/src/labelbox/__init__.py

@@ -860,7 +860,7 @@ def _create_project(self, input: _CoreProjectInput) -> Project:
         extra_params = {k: v for k, v in extra_params.items() if v is not None}
         return self._create(Entity.Project, params, extra_params)
 
-    def get_roles(self) -> List[Role]:
+    def get_roles(self) -> Dict[str, Role]:
         """
         Returns:
             Roles: Provides information on available roles within an organization.

libs/labelbox/src/labelbox/client.py

@@ -14,6 +14,7 @@
     Union,
     cast,
 )
+import warnings
 
 import requests
 from google.api_core import retry
@@ -72,7 +73,7 @@ def errors(self) -> List[Dict[str, Any]]:
             See `AnnotationImport.statuses` for more details.
         * This information will expire after 24 hours.
         """
-        self.wait_until_done()
+        self.wait_till_done()
         return self._fetch_remote_ndjson(self.error_file_url)
 
     @property
@@ -101,15 +102,20 @@ def statuses(self) -> List[Dict[str, Any]]:
 
         * This information will expire after 24 hours.
         """
-        self.wait_until_done()
+        self.wait_till_done()
         return self._fetch_remote_ndjson(self.status_file_url)
 
-    def wait_till_done(
+    def wait_until_done(
         self, sleep_time_seconds: int = 10, show_progress: bool = False
     ) -> None:
-        self.wait_until_done(sleep_time_seconds, show_progress)
+        warnings.warn(
+            "The method wait_until_done for AnnotationImport is deprecated and will be removed in the next major release. Use the wait_till_done method instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        self.wait_till_done(sleep_time_seconds, show_progress)
 
-    def wait_until_done(
+    def wait_till_done(
         self, sleep_time_seconds: int = 10, show_progress: bool = False
     ) -> None:
         """Blocks import job until certain conditions are met.
@@ -587,6 +593,20 @@ def parent_id(self) -> str:
         """
         return self.project().uid
 
+    def delete(self) -> None:
+        """
+        Deletes a MALPredictionImport job
+        """
+
+        query_string = """
+            mutation deleteModelAssistedLabelingPredictionImportPyApi($id: ID!) {
+                deleteModelAssistedLabelingPredictionImport(where: { id: $id }) {
+                        id
+                    }
+                }
+            """
+        self.client.execute(query_string, {"id": self.uid})
+
     @classmethod
     def create_from_file(
         cls, client: "labelbox.Client", project_id: str, name: str, path: str

libs/labelbox/src/labelbox/schema/annotation_import.py

@@ -1,5 +1,6 @@
 import json
 from typing import TYPE_CHECKING, Callable, List, Optional, Dict, Any
+import warnings
 
 from labelbox.orm.model import Entity
 
@@ -23,6 +24,11 @@ def __init__(
         ]
 
     def wait_until_done(self, timeout_seconds: int = 300) -> None:
+        warnings.warn(
+            "The method wait_until_done for CreateBatchesTask is deprecated and will be removed in the next major release. Use the wait_till_done method instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self.wait_till_done(timeout_seconds)
 
     def wait_till_done(self, timeout_seconds: int = 300) -> None:

libs/labelbox/src/labelbox/schema/create_batches_task.py

@@ -29,7 +29,7 @@
 
 from labelbox.schema.identifiable import GlobalKey, UniqueId
 from labelbox.schema.identifiables import DataRowIdentifiers, UniqueIds
-from labelbox.schema.ontology import SchemaId
+from labelbox.schema.tool_building.types import SchemaId
 from labelbox.utils import (
     _CamelCaseMixin,
     format_iso_datetime,

libs/labelbox/src/labelbox/schema/data_row_metadata.py

@@ -16,6 +16,7 @@
     TypeVar,
     Union,
 )
+import warnings
 
 import requests
 from pydantic import BaseModel
@@ -484,6 +485,11 @@ def organization(self):
         return self._task.organization
 
     def wait_until_done(self, timeout_seconds: int = 7200) -> None:
+        warnings.warn(
+            "The method wait_until_done for ExportTask is deprecated and will be removed in the next major release. Use the wait_till_done method instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self.wait_till_done(timeout_seconds)
 
     def wait_till_done(self, timeout_seconds: int = 7200) -> None:

libs/labelbox/src/labelbox/schema/export_task.py

@@ -71,13 +71,17 @@ class LabelingServiceDashboard(_CamelCaseMixin):
     created_at: Optional[datetime] = Field(frozen=True, default=None)
     updated_at: Optional[datetime] = Field(frozen=True, default=None)
     created_by_id: Optional[str] = Field(frozen=True, default=None)
-    status: LabelingServiceStatus = Field(frozen=True, default=None)
+    status: Optional[LabelingServiceStatus] = Field(frozen=True, default=None)
     data_rows_count: int = Field(frozen=True)
     tasks_completed_count: int = Field(frozen=True)
     tasks_remaining_count: Optional[int] = Field(frozen=True, default=None)
     media_type: Optional[MediaType] = Field(frozen=True, default=None)
-    editor_task_type: EditorTaskType = Field(frozen=True, default=None)
-    tags: List[LabelingServiceDashboardTags] = Field(frozen=True, default=None)
+    editor_task_type: Optional[EditorTaskType] = Field(
+        frozen=True, default=None
+    )
+    tags: Optional[List[LabelingServiceDashboardTags]] = Field(
+        frozen=True, default=None
+    )
 
     client: Any  # type Any to avoid circular import from client
 

libs/labelbox/src/labelbox/schema/labeling_service_dashboard.py

@@ -119,7 +119,7 @@ def _upsert_labels_by_label_ids(
             MEALabelRegistrationTaskStatus(where: $where) {status errorMessage}
         }
         """
-        return self._wait_until_done(
+        return self._wait_till_done(
             lambda: self.client.execute(
                 status_query_str, {"where": {"id": task_id}}
             )["MEALabelRegistrationTaskStatus"],
@@ -144,7 +144,7 @@ def _upsert_labels_by_project_id(
             MEALabelRegistrationTaskStatus(where: $where) {status errorMessage}
         }
         """
-        return self._wait_until_done(
+        return self._wait_till_done(
             lambda: self.client.execute(
                 status_query_str, {"where": {"id": task_id}}
             )["MEALabelRegistrationTaskStatus"],
@@ -182,14 +182,14 @@ def upsert_data_rows(
             MEADataRowRegistrationTaskStatus(where: $where) {status errorMessage}
         }
         """
-        return self._wait_until_done(
+        return self._wait_till_done(
             lambda: self.client.execute(
                 status_query_str, {"where": {"id": task_id}}
             )["MEADataRowRegistrationTaskStatus"],
             timeout_seconds=timeout_seconds,
         )
 
-    def _wait_until_done(self, status_fn, timeout_seconds=120, sleep_time=5):
+    def _wait_till_done(self, status_fn, timeout_seconds=120, sleep_time=5):
         # Do not use this function outside of the scope of upsert_data_rows or upsert_labels. It could change.
         original_timeout = timeout_seconds
         while True:
@@ -419,7 +419,7 @@ def assign_data_rows_to_split(
             assignDataRowsToDataSplitTaskStatus(where: {id : $id}){status errorMessage}}
             """
 
-        return self._wait_until_done(
+        return self._wait_till_done(
             lambda: self.client.execute(
                 status_query_str, {"id": task_id}, experimental=True
             )["assignDataRowsToDataSplitTaskStatus"],