superb-ai-onprem 0.3.7__py3-none-any.whl → 0.4.0__py3-none-any.whl

spb_onprem/__init__.py

@@ -22,6 +22,7 @@ from .entities import (
     DataMeta,
     Dataset,
     Slice,
+    DataSlice,
     Activity,
     ActivityHistory,
     Export,
@@ -32,6 +33,7 @@ from .entities import (
     SceneType,
     DataMetaTypes,
     DataMetaValue,
+    DataSliceStatus,
     ActivityStatus,
     ActivitySchema,
     SchemaType,
@@ -70,6 +72,7 @@ __all__ = (
     "DataMeta",
     "Dataset",
     "Slice",
+    "DataSlice",
     "Activity",
     "ActivityHistory",
     "Export",
@@ -80,6 +83,7 @@ __all__ = (
     "SceneType",
     "DataMetaTypes",
     "DataMetaValue",
+    "DataSliceStatus",
     "ActivityStatus",
     "ActivitySchema",
     "SchemaType",

spb_onprem/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.7'
-__version_tuple__ = version_tuple = (0, 3, 7)
+__version__ = version = '0.4.0'
+__version_tuple__ = version_tuple = (0, 4, 0)

spb_onprem/contents/service.py

@@ -3,14 +3,14 @@ import requests
 import json
 
 from io import BytesIO
-from typing import Optional, Union
+from typing import Optional, Tuple, Union
 
 from spb_onprem.base_service import BaseService
 from spb_onprem.base_types import (
     Undefined,
     UndefinedType,
 )
-from .entities import BaseContent
+from .entities import BaseContent, Content
 from .queries import Queries
 
 
@@ -30,7 +30,7 @@ class ContentService(BaseService):
             str,
             UndefinedType
         ] = Undefined,
-    ) -> str:
+    ) -> Tuple[Content, str]:
         '''
         Creates a new content.
         Args:
@@ -45,7 +45,8 @@ class ContentService(BaseService):
             query=Queries.CREATE,
             variables=Queries.CREATE["variables"](key, content_type)
         )
-        return response['uploadURL']
+        content = Content.model_validate(response['content'])
+        return content, response['uploadURL']
 
     def upload_content(
         self,

spb_onprem/data/entities/__init__.py

@@ -3,6 +3,7 @@ from .data_meta import DataMeta
 from .data import Data
 from .prediction import Prediction
 from .scene import Scene
+from .data_slice import DataSlice
 
 
 __all__ = (
@@ -12,4 +13,5 @@ __all__ = (
     "AnnotationVersion",
     "Prediction",
     "DataMeta",
+    "DataSlice",
 )

spb_onprem/data/entities/annotation.py

@@ -11,6 +11,8 @@ class AnnotationVersion(CustomBaseModel):
     This has the content of the data annotation.
     """
     id: Optional[str] = None
+    channel: Optional[str] = None
+    version: Optional[str] = None
     content: Optional[BaseContent] = None
     meta: Optional[dict] = None
 

spb_onprem/data/entities/data.py

@@ -5,6 +5,7 @@ from .scene import Scene
 from .annotation import Annotation
 from .prediction import Prediction
 from .data_meta import DataMeta
+from .data_slice import DataSlice
 from spb_onprem.contents.entities import BaseContent
 
 class Data(CustomBaseModel):
@@ -26,3 +27,4 @@ class Data(CustomBaseModel):
     created_by: Optional[str] = Field(None, alias="createdBy")
     updated_at: Optional[str] = Field(None, alias="updatedAt")
     updated_by: Optional[str] = Field(None, alias="updatedBy")
+    slices: Optional[List[DataSlice]] = None

spb_onprem/data/entities/data_slice.py

@@ -0,0 +1,17 @@
+from typing import List, Optional, Any
+from spb_onprem.base_model import CustomBaseModel, Field
+from spb_onprem.data.enums.data_slice_status import DataSliceStatus
+from .annotation import Annotation
+
+class DataSlice(CustomBaseModel):
+    """
+    데이터 슬라이스 정보를 담는 클래스
+    """
+    id: Optional[str] = None
+    status: Optional[DataSliceStatus] = DataSliceStatus.PENDING
+    labeler: Optional[str] = None
+    reviewer: Optional[str] = None
+    tags: Optional[List[str]] = None
+    status_changed_at: Optional[str] = Field(None, alias="statusChangedAt")
+    annotation: Optional[Annotation] = None
+    meta: Optional[Any] = None 

spb_onprem/data/enums/__init__.py

@@ -1,10 +1,12 @@
 from .data_meta_type import DataMetaTypes, DataMetaValue
 from .data_type import DataType
 from .scene_type import SceneType
+from .data_slice_status import DataSliceStatus
 
 __all__ = (
     "DataType",
     "SceneType",
     "DataMetaTypes",
     "DataMetaValue",
+    "DataSliceStatus",
 )

spb_onprem/data/enums/data_slice_status.py

@@ -0,0 +1,12 @@
+from enum import Enum
+
+class DataSliceStatus(str, Enum):
+    """
+    데이터 슬라이스의 상태를 나타내는 열거형
+    """
+    PENDING = "PENDING"
+    REQUEST_LABELING = "REQUEST_LABELING"
+    LABELING = "LABELING"
+    REVIEWING = "REVIEWING"
+    COMPLETED = "COMPLETED"
+    REJECTED = "REJECTED" 

spb_onprem/data/params/__init__.py

@@ -1,36 +1,35 @@
-from .data_list import (
-    AnnotationFilter,
-    DataListFilter,
-    DataFilterOptions,
-    get_data_id_list_params,
-    get_data_list_params,
-)
-from .create_data import (
+from .create import (
     create_params
 )
-from .update_data import (
+from .update import (
     update_params
 )
-from .data import (
+from .get import (
     get_params
 )
-from .insert_data_to_slice import (
-    insert_data_to_slice_params
+from .get_data_id_list import (
+    get_data_id_list_params
+)
+from .get_data_list import (
+    get_data_list_params
 )
 from .remove_data_from_slice import (
     remove_data_from_slice_params
 )
+from .insert_data_to_slice import (
+    insert_data_to_slice_params
+)
 from .delete_data import (
-    delete_data_params,
+    delete_data_params
 )
 from .insert_prediction import (
-    insert_prediction_params,
+    insert_prediction_params
 )
 from .delete_prediction import (
-    delete_prediction_params,
+    delete_prediction_params
 )
 from .update_annotation import (
-    update_annotation_params,
+    update_annotation_params
 )
 from .insert_annotation_version import (
     insert_annotation_version_params,
@@ -38,22 +37,51 @@ from .insert_annotation_version import (
 from .delete_annotation_version import (
     delete_annotation_version_params,
 )
+from .update_slice_annotation import (
+    update_slice_annotation_params,
+)
+from .insert_slice_annotation_version import (
+    insert_slice_annotation_version_params,
+)
+from .update_slice_annotation_version import (
+    update_slice_annotation_version_params,
+)
+from .delete_slice_annotation_version import (
+    delete_slice_annotation_version_params,
+)
+from .change_data_status import (
+    change_data_status_params,
+)
+from .change_data_labeler import (
+    change_data_labeler_params,
+)
+from .change_data_reviewer import (
+    change_data_reviewer_params,
+)
+from .update_data_slice import (
+    update_data_slice_params,
+)
 
-__all__ = (
-    "AnnotationFilter",
-    "DataListFilter",
-    "DataFilterOptions",
+__all__ = [
     "create_params",
     "update_params",
     "get_params",
     "get_data_id_list_params",
     "get_data_list_params",
-    "insert_data_to_slice_params",
     "remove_data_from_slice_params",
+    "insert_data_to_slice_params",
     "delete_data_params",
     "insert_prediction_params",
     "delete_prediction_params",
     "update_annotation_params",
     "insert_annotation_version_params",
     "delete_annotation_version_params",
-)
+    "update_slice_annotation_params",
+    "insert_slice_annotation_version_params",
+    "update_slice_annotation_version_params",
+    "delete_slice_annotation_version_params",
+    "change_data_status_params",
+    "change_data_labeler_params",
+    "change_data_reviewer_params",
+    "update_data_slice_params",
+]

spb_onprem/data/params/change_data_labeler.py

@@ -0,0 +1,23 @@
+from typing import Optional
+
+
+def change_data_labeler_params(
+    dataset_id: str,
+    data_id: str,
+    slice_id: str,
+    labeler: Optional[str],
+):
+    """Make the variables for the changeDataLabeler query.
+
+    Args:
+        dataset_id (str): The dataset ID of the data.
+        data_id (str): The ID of the data.
+        slice_id (str): The slice ID.
+        labeler (Optional[str]): The labeler ID. None to unassign.
+    """
+    return {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+        "slice_id": slice_id,
+        "labeler": labeler,
+    } 

spb_onprem/data/params/change_data_reviewer.py

@@ -0,0 +1,23 @@
+from typing import Optional
+
+
+def change_data_reviewer_params(
+    dataset_id: str,
+    data_id: str,
+    slice_id: str,
+    reviewer: Optional[str],
+):
+    """Make the variables for the changeDataReviewer query.
+
+    Args:
+        dataset_id (str): The dataset ID of the data.
+        data_id (str): The ID of the data.
+        slice_id (str): The slice ID.
+        reviewer (Optional[str]): The reviewer ID. None to unassign.
+    """
+    return {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+        "slice_id": slice_id,
+        "reviewer": reviewer,
+    } 

spb_onprem/data/params/change_data_status.py

@@ -0,0 +1,23 @@
+from spb_onprem.data.enums.data_slice_status import DataSliceStatus
+
+
+def change_data_status_params(
+    dataset_id: str,
+    data_id: str,
+    slice_id: str,
+    status: DataSliceStatus,
+):
+    """Make the variables for the changeDataStatus query.
+
+    Args:
+        dataset_id (str): The dataset ID of the data.
+        data_id (str): The ID of the data.
+        slice_id (str): The slice ID.
+        status (DataSliceStatus): The new status of the data slice.
+    """
+    return {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+        "slice_id": slice_id,
+        "status": status.value,
+    } 

spb_onprem/data/params/data_list.py

@@ -8,7 +8,16 @@ from spb_onprem.exceptions import BadParameterError
 
 class AnnotationFilter(CustomBaseModel):
     type: Optional[str] = None
-    key: Optional[str] = None
+    name: Optional[str] = None
+
+
+class AnnotationRangeFilter(CustomBaseModel):
+    annotation_type: Optional[str] = Field(None, alias="annotationType")
+    class_name: Optional[str] = Field(None, alias="className")
+    class_count_equals: Optional[int] = Field(None, alias="classCountEquals")
+    class_count_in: Optional[List[int]] = Field(None, alias="classCountIn")
+    class_count_max: Optional[int] = Field(None, alias="classCountMax")
+    class_count_min: Optional[int] = Field(None, alias="classCountMin")
 
 
 class DataFilterOptions(CustomBaseModel):
@@ -18,8 +27,10 @@ class DataFilterOptions(CustomBaseModel):
     key_contains: Optional[str] = Field(None, alias="keyContains")
     key_matches: Optional[str] = Field(None, alias="keyMatches")
     type_in: Optional[List[DataType]] = Field(None, alias="typeIn")
+    annotation_any: Optional[List[AnnotationFilter]] = Field(None, alias="annotationAny")
     annotation_in: Optional[List[AnnotationFilter]] = Field(None, alias="annotationIn")
     annotation_exists: Optional[bool] = Field(None, alias="annotationExists")
+    annotation_range: Optional[List[AnnotationRangeFilter]] = Field(None, alias="annotationRange")
     prediction_set_id_in: Optional[List[str]] = Field(None, alias="predictionSetIdIn")
     prediction_set_id_exists: Optional[bool] = Field(None, alias="predictionSetIdExists")
 

spb_onprem/data/params/delete_slice_annotation_version.py

@@ -0,0 +1,24 @@
+def delete_slice_annotation_version_params(
+    dataset_id: str,
+    data_id: str,
+    slice_id: str,
+    id: str,
+):
+    """Delete slice annotation version from selected data.
+
+    Args:
+        dataset_id (str): dataset id which the data belongs to
+        data_id (str): data id to be deleted from
+        slice_id (str): slice id of the data
+        id (str): annotation version id to be deleted
+
+    Returns:
+        dict: the params for graphql query
+    """
+
+    return {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+        "slice_id": slice_id,
+        "id": id,
+    } 

spb_onprem/data/params/insert_annotation_version.py

@@ -16,14 +16,21 @@ def insert_annotation_version_params(
     Returns:
         dict: the params for graphql query
     """
+    version_data = {
+        "content": version.content.model_dump(
+            by_alias=True, exclude_unset=True
+        ),
+        "meta": version.meta
+    }
+    
+    # channel과 version 필드가 있으면 추가
+    if version.channel is not None:
+        version_data["channel"] = version.channel
+    if version.version is not None:
+        version_data["version"] = version.version
 
     return {
         "dataset_id": dataset_id,
         "data_id": data_id,
-        "version": {
-        "content": version.content.model_dump(
-                by_alias=True, exclude_unset=True
-            ),
-            "meta": version.meta
-        },
+        "version": version_data,
     }

spb_onprem/data/params/insert_slice_annotation_version.py

@@ -0,0 +1,39 @@
+from spb_onprem.data.entities import AnnotationVersion
+
+
+def insert_slice_annotation_version_params(
+    dataset_id: str,
+    data_id: str,
+    slice_id: str,
+    version: AnnotationVersion,
+):
+    """Insert slice annotation version to selected data.
+
+    Args:
+        dataset_id (str): dataset id which the data belongs to
+        data_id (str): data id to be inserted
+        slice_id (str): slice id of the data
+        version (AnnotationVersion): annotation version to be inserted
+
+    Returns:
+        dict: the params for graphql query
+    """
+    version_data = {
+        "content": version.content.model_dump(
+            by_alias=True, exclude_unset=True
+        ),
+        "meta": version.meta
+    }
+    
+    # channel과 version 필드가 있으면 추가
+    if version.channel is not None:
+        version_data["channel"] = version.channel
+    if version.version is not None:
+        version_data["version"] = version.version
+
+    return {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+        "slice_id": slice_id,
+        "version": version_data,
+    } 

spb_onprem/data/params/update_data_slice.py

@@ -0,0 +1,23 @@
+from typing import Any
+
+
+def update_data_slice_params(
+    dataset_id: str,
+    data_id: str,
+    slice_id: str,
+    meta: Any,
+):
+    """Make the variables for the updateDataSlice query.
+
+    Args:
+        dataset_id (str): The dataset ID of the data.
+        data_id (str): The ID of the data.
+        slice_id (str): The slice ID.
+        meta (Any): The meta of the data slice.
+    """
+    return {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+        "slice_id": slice_id,
+        "meta": meta,
+    } 

spb_onprem/data/params/update_slice_annotation.py

@@ -0,0 +1,24 @@
+from typing import Union, Any
+from spb_onprem.base_types import UndefinedType, Undefined
+
+
+def update_slice_annotation_params(
+    dataset_id: str,
+    data_id: str,
+    slice_id: str,
+    meta: Any,
+):
+    """Make the variables for the updateSliceAnnotation query.
+
+    Args:
+        dataset_id (str): The dataset ID of the data.
+        data_id (str): The ID of the data.
+        slice_id (str): The slice ID.
+        meta (Any): The meta of the slice annotation.
+    """
+    return {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+        "slice_id": slice_id,
+        "meta": meta,
+    } 

spb_onprem/data/params/update_slice_annotation_version.py

@@ -0,0 +1,40 @@
+from typing import Union, Optional, Any
+from spb_onprem.base_types import UndefinedType, Undefined
+from spb_onprem.exceptions import BadParameterError
+
+
+def update_slice_annotation_version_params(
+    dataset_id: str,
+    data_id: str,
+    slice_id: str,
+    id: str,
+    channel: Union[str, UndefinedType, None] = Undefined,
+    version: Union[str, UndefinedType, None] = Undefined,
+    meta: Union[dict, UndefinedType, None] = Undefined,
+):
+    """Make the variables for the updateSliceAnnotationVersion query.
+
+    Args:
+        dataset_id (str): The dataset ID of the data.
+        data_id (str): The ID of the data.
+        slice_id (str): The slice ID.
+        id (str): The annotation version ID.
+        channel (str, optional): The channel of the annotation version.
+        version (str, optional): The version string of the annotation version.
+        meta (dict, optional): The meta of the annotation version.
+    """
+    variables = {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+        "slice_id": slice_id,
+        "id": id,
+    }
+
+    if channel is not Undefined:
+        variables["channel"] = channel
+    if version is not Undefined:
+        variables["version"] = version
+    if meta is not Undefined:
+        variables["meta"] = meta
+
+    return variables