superb-ai-onprem 0.4.4__tar.gz → 0.5.0__tar.gz

{superb_ai_onprem-0.4.4/superb_ai_onprem.egg-info → superb_ai_onprem-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superb-ai-onprem
-Version: 0.4.4
+Version: 0.5.0
 Summary: Python SDK for Superb AI On-premise
 Home-page: https://github.com/Superb-AI-Suite/superb-ai-onprem-python
 Author: Superb AI

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/__init__.py

@@ -27,6 +27,7 @@ from .entities import (
     ActivityHistory,
     Export,
     Content,
+    Frame,
 
     # Enums
     DataType,
@@ -44,6 +45,20 @@ from .searches import (
     AnnotationFilter,
     DataListFilter,
     DataFilterOptions,
+    AnnotationRangeFilter,
+    DateTimeRangeFilter,
+    UserFilter,
+    StringMetaFilter,
+    NumberMetaFilter,
+    DateTimeMetaFilter,
+    MetaFilterOptions,
+    DataSliceStatusFilter,
+    DataSliceUserFilter,
+    DataSliceTagsFilter,
+    DataSliceCommentFilter,
+    DataSlicePropertiesFilter,
+    DataSliceFilter,
+    CommentStatus,
     DatasetsFilter,
     DatasetsFilterOptions,
     SlicesFilter,
@@ -77,6 +92,7 @@ __all__ = (
     "ActivityHistory",
     "Export",
     "Content",
+    "Frame",
     
     # Enums
     "DataType",
@@ -87,11 +103,25 @@ __all__ = (
     "ActivityStatus",
     "ActivitySchema",
     "SchemaType",
+    "CommentStatus",
     
     # Filters
     "AnnotationFilter",
     "DataListFilter",
     "DataFilterOptions",
+    "AnnotationRangeFilter",
+    "DateTimeRangeFilter",
+    "UserFilter",
+    "StringMetaFilter",
+    "NumberMetaFilter",
+    "DateTimeMetaFilter",
+    "MetaFilterOptions",
+    "DataSliceStatusFilter",
+    "DataSliceUserFilter",
+    "DataSliceTagsFilter",
+    "DataSliceCommentFilter",
+    "DataSlicePropertiesFilter",
+    "DataSliceFilter",
     "DatasetsFilter",
     "DatasetsFilterOptions",
     "SlicesFilter",

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.4'
-__version_tuple__ = version_tuple = (0, 4, 4)
+__version__ = version = '0.5.0'
+__version_tuple__ = version_tuple = (0, 5, 0)
+
+__commit_id__ = commit_id = 'gba065a190'

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/entities/__init__.py

@@ -4,9 +4,11 @@ from .data import Data
 from .prediction import Prediction
 from .scene import Scene
 from .data_slice import DataSlice
+from .frame import Frame
 
 
 __all__ = (
+    "Frame",
     "Data",
     "Scene",
     "Annotation",

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/entities/annotation.py

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

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/entities/data.py

@@ -6,6 +6,7 @@ from .annotation import Annotation
 from .prediction import Prediction
 from .data_meta import DataMeta
 from .data_slice import DataSlice
+from .frame import Frame
 from spb_onprem.contents.entities import BaseContent
 
 class Data(CustomBaseModel):
@@ -18,6 +19,7 @@ class Data(CustomBaseModel):
     key: Optional[str] = None
     type: Optional[DataType] = None
     scene: Optional[List[Scene]] = None
+    frames: Optional[List[Frame]] = None
     thumbnail: Optional[BaseContent] = None
     annotation: Optional[Annotation] = None
     predictions: Optional[List[Prediction]] = None

superb_ai_onprem-0.5.0/spb_onprem/data/entities/frame.py

@@ -0,0 +1,19 @@
+from typing import Optional
+from spb_onprem.base_model import CustomBaseModel, Field
+
+
+class GeoLocation(CustomBaseModel):
+    lat: float
+    lon: float
+
+
+class Frame(CustomBaseModel):
+    """
+    The frame of the data.
+    Frame is the representation of a single frame in a sequence of data, such as a video or time series.
+    """
+    id: str
+    index: Optional[int] = None
+    captured_at: Optional[str] = Field(None, alias="capturedAt")
+    geo_location: Optional[GeoLocation] = Field(None, alias="geoLocation")
+    meta: Optional[dict] = None

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/params/__init__.py

@@ -63,6 +63,9 @@ from .change_data_reviewer import (
 from .update_data_slice import (
     update_data_slice_params,
 )
+from .update_frames import (
+    update_frames_params,
+)
 
 __all__ = [
     "create_params",
@@ -90,4 +93,5 @@ __all__ = [
     "change_data_labeler_params",
     "change_data_reviewer_params",
     "update_data_slice_params",
+    "update_frames_params",
 ]

superb_ai_onprem-0.5.0/spb_onprem/data/params/data_list.py

@@ -0,0 +1,226 @@
+from typing import (
+    Optional,
+    List,
+    Union,
+    Any
+)
+from enum import Enum
+from spb_onprem.base_model import CustomBaseModel, Field
+from spb_onprem.data.enums import DataType, DataStatus
+from spb_onprem.exceptions import BadParameterError
+
+
+class CommentStatus(str, Enum):
+    """댓글 상태를 나타내는 열거형"""
+    RESOLVED = "RESOLVED"
+    UNRESOLVED = "UNRESOLVED"
+
+
+class AnnotationFilter(CustomBaseModel):
+    type: 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 DateTimeRangeFilter(CustomBaseModel):
+    """날짜/시간 범위 필터"""
+    from_date: Optional[str] = Field(None, alias="from")
+    to_date: Optional[str] = Field(None, alias="to")
+    equals: Optional[str] = None
+
+
+class UserFilter(CustomBaseModel):
+    """사용자 필터 옵션"""
+    equals: Optional[str] = None
+    contains: Optional[str] = None
+    in_list: Optional[List[str]] = Field(None, alias="in")
+    exists: Optional[bool] = None
+
+
+class StringMetaFilter(CustomBaseModel):
+    """문자열 메타 데이터 필터"""
+    key: str
+    contains: Optional[str] = None
+    equals: Optional[str] = None
+    in_list: Optional[List[str]] = Field(None, alias="in")
+
+
+class NumberMetaFilter(CustomBaseModel):
+    """숫자 메타 데이터 필터"""
+    key: str
+    min_value: Optional[float] = Field(None, alias="min")
+    max_value: Optional[float] = Field(None, alias="max")
+    equals: Optional[float] = None
+    in_list: Optional[List[float]] = Field(None, alias="in")
+
+
+class DateTimeMetaFilter(CustomBaseModel):
+    """날짜/시간 메타 데이터 필터"""
+    key: str
+    from_date: Optional[str] = Field(None, alias="from")
+    to_date: Optional[str] = Field(None, alias="to")
+    equals: Optional[str] = None
+
+
+class MetaFilterOptions(CustomBaseModel):
+    """메타 데이터 필터 옵션들"""
+    string_meta: Optional[List[StringMetaFilter]] = Field(None, alias="stringMeta")
+    number_meta: Optional[List[NumberMetaFilter]] = Field(None, alias="numberMeta")
+    date_time_meta: Optional[List[DateTimeMetaFilter]] = Field(None, alias="dateTimeMeta")
+
+
+class DataSliceStatusFilter(CustomBaseModel):
+    """데이터 슬라이스 상태 필터"""
+    in_list: Optional[List[DataStatus]] = Field(None, alias="in")
+    equals: Optional[DataStatus] = None
+    not_in: Optional[List[DataStatus]] = Field(None, alias="notIn")
+
+
+class DataSliceUserFilter(CustomBaseModel):
+    """데이터 슬라이스 사용자 필터 (labeler, reviewer용)"""
+    equals: Optional[str] = None
+    in_list: Optional[List[str]] = Field(None, alias="in")
+    exists: Optional[bool] = None
+
+
+class DataSliceTagsFilter(CustomBaseModel):
+    """데이터 슬라이스 태그 필터"""
+    contains: Optional[str] = None
+    has_any: Optional[List[str]] = Field(None, alias="hasAny")
+    has_all: Optional[List[str]] = Field(None, alias="hasAll")
+    exists: Optional[bool] = None
+
+
+class DataSliceCommentFilter(CustomBaseModel):
+    """데이터 슬라이스 댓글 필터"""
+    comment_contains: Optional[str] = Field(None, alias="commentContains")
+    category: Optional[str] = None
+    status: Optional[CommentStatus] = None
+    created_by: Optional[UserFilter] = Field(None, alias="createdBy")
+    created_at: Optional[DateTimeRangeFilter] = Field(None, alias="createdAt")
+    exists: Optional[bool] = None
+
+
+class DataSlicePropertiesFilter(CustomBaseModel):
+    """슬라이스 속성 필터 (ID 제외)"""
+    status: Optional[DataSliceStatusFilter] = None
+    labeler: Optional[DataSliceUserFilter] = None
+    reviewer: Optional[DataSliceUserFilter] = None
+    tags: Optional[DataSliceTagsFilter] = None
+    status_changed_at: Optional[DateTimeRangeFilter] = Field(None, alias="statusChangedAt")
+    comments: Optional[DataSliceCommentFilter] = None
+    meta: Optional[MetaFilterOptions] = None
+
+
+class DataSliceFilter(CustomBaseModel):
+    """슬라이스 필터 (ID + must/not 구조)"""
+    id: str  # 검색할 슬라이스 ID (필수)
+    must: Optional[DataSlicePropertiesFilter] = None  # 만족해야 하는 조건
+    not_filter: Optional[DataSlicePropertiesFilter] = Field(None, alias="not")  # 만족하지 않아야 하는 조건
+
+
+class DataFilterOptions(CustomBaseModel):
+    id_in: Optional[List[str]] = Field(None, alias="idIn")
+    slice_id: Optional[str] = Field(None, alias="sliceId")
+    slice_id_in: Optional[List[str]] = Field(None, alias="sliceIdIn")
+    slice_id_any: Optional[List[str]] = Field(None, alias="sliceIdAny")  # 추가된 필드
+    slice_id_exists: Optional[bool] = Field(None, alias="sliceIdExists")  # 추가된 필드
+    key_contains: Optional[str] = Field(None, alias="keyContains")
+    key_matches: Optional[str] = Field(None, alias="keyMatches")
+    sub_type_contains: Optional[str] = Field(None, alias="subTypeContains")  # 추가된 필드
+    sub_type_matches: Optional[str] = Field(None, alias="subTypeMatches")  # 추가된 필드
+    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")
+    
+    # 추가된 필드들 (GraphQL과 매칭)
+    created_at: Optional[DateTimeRangeFilter] = Field(None, alias="createdAt")
+    updated_at: Optional[DateTimeRangeFilter] = Field(None, alias="updatedAt")
+    created_by: Optional[UserFilter] = Field(None, alias="createdBy")
+    updated_by: Optional[UserFilter] = Field(None, alias="updatedBy")
+    meta: Optional[MetaFilterOptions] = None
+
+
+class DataListFilter(CustomBaseModel):
+    must_filter: Optional[DataFilterOptions] = Field(None, alias="must")
+    not_filter: Optional[DataFilterOptions] = Field(None, alias="not")
+    slice: Optional[DataSliceFilter] = Field(None, alias="slice")
+
+
+def get_data_id_list_params(
+    dataset_id: str,
+    data_filter: Optional[DataListFilter] = None,
+    cursor: Optional[str] = None,
+    length: Optional[int] = 50,
+):
+    """Make the variables for the dataIdList query.
+
+    Args:
+        dataset_id (str): The dataset id.
+        data_filter (Optional[DataListFilter], optional): The filter for the data list. Defaults to None.
+        cursor (Optional[str], optional): The cursor for the data list. Defaults to None.
+        length (Optional[int], optional): The length of the data list. Defaults to 50.
+
+    Raises:
+        BadParameterError: The maximum length is 200.
+
+    Returns:
+        dict: The variables for the dataIdList query.
+    """
+    if length > 200:
+        raise BadParameterError("The maximum length is 200.")
+
+    return {
+        "dataset_id": dataset_id,
+        "filter": data_filter.model_dump(
+            by_alias=True, exclude_unset=True
+        ) if data_filter else None,
+        "cursor": cursor,
+        "length": length
+    }
+
+
+def get_data_list_params(
+    dataset_id: str,
+    data_filter: Optional[DataListFilter] = None,
+    cursor: Optional[str] = None,
+    length: Optional[int] = 10,
+):
+    """Make the variables for the dataList query.
+
+    Args:
+        dataset_id (str): The dataset id.
+        data_filter (Optional[DataListFilter], optional): The filter for the data list. Defaults to None.
+        cursor (Optional[str], optional): The cursor for the data list. Defaults to None.
+        length (Optional[int], optional): The length of the data list. Defaults to 10.
+
+    Raises:
+        BadParameterError: The maximum length is 50.
+
+    Returns:
+        dict: The variables for the dataList query.
+    """
+
+    if length > 50:
+        raise BadParameterError("The maximum length is 50.")
+
+    return {
+        "dataset_id": dataset_id,
+        "filter": data_filter.model_dump(
+            by_alias=True, exclude_unset=True
+        ) if data_filter else None,
+        "cursor": cursor,
+        "length": length
+    }

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/params/insert_annotation_version.py

@@ -23,9 +23,9 @@ def insert_annotation_version_params(
         "meta": version.meta
     }
     
-    # channel과 version 필드가 있으면 추가
-    if version.channel is not None:
-        version_data["channel"] = version.channel
+    # channels과 version 필드가 있으면 추가
+    if version.channels is not None:
+        version_data["channels"] = version.channels
     if version.version is not None:
         version_data["version"] = version.version
 

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/params/insert_slice_annotation_version.py

@@ -24,10 +24,10 @@ def insert_slice_annotation_version_params(
         ),
         "meta": version.meta
     }
-    
-    # channel과 version 필드가 있으면 추가
-    if version.channel is not None:
-        version_data["channel"] = version.channel
+
+    # channels과 version 필드가 있으면 추가
+    if version.channels is not None:
+        version_data["channels"] = version.channels
     if version.version is not None:
         version_data["version"] = version.version
 

superb_ai_onprem-0.5.0/spb_onprem/data/params/update_frames.py

@@ -0,0 +1,40 @@
+import json
+from typing import Union, List
+from spb_onprem.data.entities import Frame
+from spb_onprem.base_types import UndefinedType, Undefined
+
+
+def update_frames_params(
+    dataset_id: str,
+    data_id: str,
+    frames: Union[List[Frame], UndefinedType] = Undefined,  
+):
+    """Update frames of selected data.
+    Args:
+        dataset_id (str): dataset id which the data belongs to
+        data_id (str): data id to be updated
+        frames (list[Frame]): list of frames to be updated  
+        
+    Returns:
+        dict: the params for graphql query
+    """
+    result = {
+        "dataset_id": dataset_id,
+        "data_id": data_id,
+    }
+    if frames is not Undefined:
+        result["frames"] = []
+        for frame in frames:
+            frame_data = {
+                "index": frame.index,
+                "capturedAt": frame.captured_at,
+                "meta": json.dumps(frame.meta) if frame.meta else None,
+            }
+            if frame.geo_location is not None:
+                frame_data["geoLocation"] = {
+                    "lat": frame.geo_location.lat,
+                    "lon": frame.geo_location.lon
+                }
+            result["frames"].append(frame_data)
+
+    return result

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/params/update_slice_annotation_version.py

@@ -8,7 +8,7 @@ def update_slice_annotation_version_params(
     data_id: str,
     slice_id: str,
     id: str,
-    channel: Union[str, UndefinedType, None] = Undefined,
+    channels: Union[List[str], UndefinedType, None] = Undefined,
     version: Union[str, UndefinedType, None] = Undefined,
     meta: Union[dict, UndefinedType, None] = Undefined,
 ):
@@ -19,7 +19,7 @@ def update_slice_annotation_version_params(
         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.
+        channels (list[str], optional): The channels of the annotation version.
         version (str, optional): The version string of the annotation version.
         meta (dict, optional): The meta of the annotation version.
     """
@@ -30,8 +30,8 @@ def update_slice_annotation_version_params(
         "id": id,
     }
 
-    if channel is not Undefined:
-        variables["channel"] = channel
+    if channels is not Undefined:
+        variables["channels"] = channels
     if version is not Undefined:
         variables["version"] = version
     if meta is not Undefined:

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/queries.py

@@ -20,6 +20,7 @@ from .params import (
     change_data_labeler_params,
     change_data_reviewer_params,
     update_data_slice_params,
+    update_frames_params,
 )
 
 
@@ -46,10 +47,21 @@ class Schemas:
             }
             meta
         }
+        frames {
+            id
+            index
+            capturedAt
+            geoLocation {
+                lat
+                lon
+            }
+            meta
+        }
         annotation {
+            meta
             versions {
                 id
-                channel
+                channels
                 version
                 content {
                     id
@@ -57,23 +69,11 @@ class Schemas:
                 meta
             }
         }
-        predictions {
-            setId
-            content {
-                id
-            }
-            meta
-        }
         meta {
             key
             type
             value
         }
-        systemMeta {
-            key
-            type
-            value
-        }
         slices {
             id
             status
@@ -84,7 +84,7 @@ class Schemas:
             annotation {
                 versions {
                     id
-                    channel
+                    channels
                     version
                     content {
                         id
@@ -574,3 +574,23 @@ class Queries():
         ''',
         "variables": update_data_slice_params,
     }
+    
+    UPDATE_FRAMES = {
+        "name": "updateFrames",
+        "query": f'''
+            mutation (
+                $dataset_id: ID!,
+                $data_id: ID!,
+                $frames: [DataFrameInput!],
+            ) {{
+                updateFrames(
+                    datasetId: $dataset_id,
+                    dataId: $data_id,
+                    frames: $frames,
+                ) {{
+                    {Schemas.DATA}
+                }}
+            }}
+        ''',
+        "variables": update_frames_params,
+    }

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/data/service.py

@@ -572,7 +572,7 @@ class DataService(BaseService):
         data_id: str,
         slice_id: str,
         id: str,
-        channel: Union[str, UndefinedType, None] = Undefined,
+        channels: Union[List[str], UndefinedType, None] = Undefined,
         version: Union[str, UndefinedType, None] = Undefined,
         meta: Union[dict, UndefinedType, None] = Undefined,
     ):
@@ -583,7 +583,7 @@ class DataService(BaseService):
             data_id (str): The data id.
             slice_id (str): The slice id.
             id (str): The annotation version id.
-            channel (Union[str, UndefinedType, None], optional): The channel. Defaults to Undefined.
+            channels (Union[List[str], UndefinedType, None], optional): The channels. Defaults to Undefined.
             version (Union[str, UndefinedType, None], optional): The version. Defaults to Undefined.
             meta (Union[dict, UndefinedType, None], optional): The meta. Defaults to Undefined.
 
@@ -606,7 +606,7 @@ class DataService(BaseService):
                 data_id=data_id,
                 slice_id=slice_id,
                 id=id,
-                channel=channel,
+                channels=channels,
                 version=version,
                 meta=meta,
             )
@@ -804,3 +804,34 @@ class DataService(BaseService):
         )
         data = Data.model_validate(response)
         return data
+
+    def update_frames(
+        self,
+        dataset_id: str,
+        data_id: str,
+        frames: Union[List[Frame], UndefinedType] = Undefined,  
+    ):
+        """Update frames of selected data.
+        Args:
+            dataset_id (str): dataset id which the data belongs to
+            data_id (str): data id to be updated
+            frames (list[Frame]): list of frames to be updated  
+            
+        Returns:
+            Data: The updated data.
+        """
+        if dataset_id is None:
+            raise BadParameterError("dataset_id is required.")
+        if data_id is None:
+            raise BadParameterError("data_id is required.")
+
+        response = self.request_gql(
+            Queries.UPDATE_FRAMES,
+            Queries.UPDATE_FRAMES["variables"](
+                dataset_id=dataset_id,
+                data_id=data_id,
+                frames=frames,
+            )
+        )
+        data = Data.model_validate(response)
+        return data

{superb_ai_onprem-0.4.4 → superb_ai_onprem-0.5.0}/spb_onprem/entities.py

@@ -6,6 +6,7 @@ from .data.entities import (
     Prediction,
     DataMeta,
     DataSlice,
+    Frame,
 )
 from .datasets.entities import Dataset
 from .slices.entities import Slice
@@ -41,6 +42,7 @@ __all__ = [
     "ActivityHistory",
     "Export",
     "Content",
+    "Frame",
 
     # Enums
     "DataType",