superb-ai-onprem 0.5.22__tar.gz → 0.6.1__tar.gz

{superb_ai_onprem-0.5.22 → superb_ai_onprem-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superb-ai-onprem
-Version: 0.5.22
+Version: 0.6.1
 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.5.22 → superb_ai_onprem-0.6.1}/spb_onprem/__init__.py

@@ -46,23 +46,29 @@ from .entities import (
 
 # Filters
 from .searches import (
-    AnnotationFilter,
-    DataListFilter,
-    DataFilterOptions,
-    AnnotationRangeFilter,
-    DateTimeRangeFilter,
-    UserFilter,
-    StringMetaFilter,
+    DateTimeRangeFilterOption,
+    UserFilterOption,
+    NumericRangeFilter,
+    GeoLocationFilter,
     NumberMetaFilter,
-    DateTimeMetaFilter,
-    MetaFilterOptions,
-    DataSliceStatusFilter,
-    DataSliceUserFilter,
-    DataSliceTagsFilter,
-    DataSliceCommentFilter,
+    KeywordMetaFilter,
+    DateMetaFilter,
+    MiscMetaFilter,
+    MetaFilter,
+    CountFilter,
+    DistanceCountFilter,
+    FrameCountsFilter,
+    FrameFilterOptions,
+    DataFilterOptions,
+    DataSliceStatusFilterOption,
+    DataSliceUserFilterOption,
+    DataSliceTagsFilterOption,
+    DataSliceCommentFilterOption,
     DataSlicePropertiesFilter,
     DataSliceFilter,
-    CommentStatus,
+    FrameFilter,
+    DataFilter,
+    DataListFilter,
     DatasetsFilter,
     DatasetsFilterOptions,
     SlicesFilter,
@@ -115,22 +121,29 @@ __all__ = (
     "CommentStatus",
     
     # Filters
-    "AnnotationFilter",
-    "DataListFilter",
-    "DataFilterOptions",
-    "AnnotationRangeFilter",
-    "DateTimeRangeFilter",
-    "UserFilter",
-    "StringMetaFilter",
+    "DateTimeRangeFilterOption",
+    "UserFilterOption",
+    "NumericRangeFilter",
+    "GeoLocationFilter",
     "NumberMetaFilter",
-    "DateTimeMetaFilter",
-    "MetaFilterOptions",
-    "DataSliceStatusFilter",
-    "DataSliceUserFilter",
-    "DataSliceTagsFilter",
-    "DataSliceCommentFilter",
+    "KeywordMetaFilter",
+    "DateMetaFilter",
+    "MiscMetaFilter",
+    "MetaFilter",
+    "CountFilter",
+    "DistanceCountFilter",
+    "FrameCountsFilter",
+    "FrameFilterOptions",
+    "DataFilterOptions",
+    "DataSliceStatusFilterOption",
+    "DataSliceUserFilterOption",
+    "DataSliceTagsFilterOption",
+    "DataSliceCommentFilterOption",
     "DataSlicePropertiesFilter",
     "DataSliceFilter",
+    "FrameFilter",
+    "DataFilter",
+    "DataListFilter",
     "DatasetsFilter",
     "DatasetsFilterOptions",
     "SlicesFilter",

{superb_ai_onprem-0.5.22 → superb_ai_onprem-0.6.1}/spb_onprem/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.22'
-__version_tuple__ = version_tuple = (0, 5, 22)
+__version__ = version = '0.6.1'
+__version_tuple__ = version_tuple = (0, 6, 1)
 
-__commit_id__ = commit_id = 'g752414d7f'
+__commit_id__ = commit_id = 'g0879205eb'

{superb_ai_onprem-0.5.22 → superb_ai_onprem-0.6.1}/spb_onprem/data/params/__init__.py

@@ -10,9 +10,28 @@ from .data import (
 from .data_list import (
     get_data_id_list_params,
     get_data_list_params,
-    AnnotationFilter,
-    AnnotationRangeFilter,
+    DateTimeRangeFilterOption,
+    UserFilterOption,
+    NumericRangeFilter,
+    GeoLocationFilter,
+    NumberMetaFilter,
+    KeywordMetaFilter,
+    DateMetaFilter,
+    MiscMetaFilter,
+    MetaFilter,
+    CountFilter,
+    DistanceCountFilter,
+    FrameCountsFilter,
+    FrameFilterOptions,
     DataFilterOptions,
+    DataSliceStatusFilterOption,
+    DataSliceUserFilterOption,
+    DataSliceTagsFilterOption,
+    DataSliceCommentFilterOption,
+    DataSlicePropertiesFilter,
+    DataSliceFilter,
+    FrameFilter,
+    DataFilter,
     DataListFilter,
 )
 from .get_data_detail import (
@@ -81,9 +100,28 @@ __all__ = [
     "get_data_list_params",
     "get_data_detail_params",
     "get_evaluation_value_list_params",
-    "AnnotationFilter",
-    "AnnotationRangeFilter",
+    "DateTimeRangeFilterOption",
+    "UserFilterOption",
+    "NumericRangeFilter",
+    "GeoLocationFilter",
+    "NumberMetaFilter",
+    "KeywordMetaFilter",
+    "DateMetaFilter",
+    "MiscMetaFilter",
+    "MetaFilter",
+    "CountFilter",
+    "DistanceCountFilter",
+    "FrameCountsFilter",
+    "FrameFilterOptions",
     "DataFilterOptions",
+    "DataSliceStatusFilterOption",
+    "DataSliceUserFilterOption",
+    "DataSliceTagsFilterOption",
+    "DataSliceCommentFilterOption",
+    "DataSlicePropertiesFilter",
+    "DataSliceFilter",
+    "FrameFilter",
+    "DataFilter",
     "DataListFilter",
     "remove_data_from_slice_params",
     "insert_data_to_slice_params",

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

@@ -0,0 +1,215 @@
+from typing import Optional, List, Union, Literal
+from spb_onprem.base_model import CustomBaseModel, Field
+from spb_onprem.data.enums import DataType, DataStatus
+from spb_onprem.exceptions import BadParameterError
+
+# === 기본 필터 ===
+class DateTimeRangeFilterOption(CustomBaseModel):
+    datetime_from: Optional[str] = Field(None, alias="from")
+    to: Optional[str] = None
+    equals: Optional[str] = None
+
+class UserFilterOption(CustomBaseModel):
+    equals: Optional[str] = None
+    contains: Optional[str] = None
+    user_in: Optional[List[str]] = Field(None, alias="in")
+    exists: Optional[bool] = None
+
+class NumericRangeFilter(CustomBaseModel):
+    gt: Optional[float] = None
+    gte: Optional[float] = None
+    lt: Optional[float] = None
+    lte: Optional[float] = None
+    equals: Optional[float] = None
+
+class GeoLocationFilter(CustomBaseModel):
+    latitude: float
+    longitude: float
+    radius_in_meters: float = Field(..., alias="radiusInMeters")
+
+# === Meta 필터 ===
+class NumberMetaFilter(CustomBaseModel):
+    key: str
+    range: Optional[NumericRangeFilter] = None
+
+class KeywordMetaFilter(CustomBaseModel):
+    key: str
+    equals: Optional[str] = None
+    contains: Optional[str] = None
+    keyword_in: Optional[List[str]] = Field(None, alias="in")
+
+class DateMetaFilter(CustomBaseModel):
+    key: str
+    range: Optional[DateTimeRangeFilterOption] = None
+
+class MiscMetaFilter(CustomBaseModel):
+    key: str
+    equals: str
+
+class MetaFilter(CustomBaseModel):
+    num: Optional[List[NumberMetaFilter]] = None
+    keyword: Optional[List[KeywordMetaFilter]] = None
+    date: Optional[List[DateMetaFilter]] = None
+    misc: Optional[List[MiscMetaFilter]] = None
+
+# === Count 필터 ===
+class CountFilter(CustomBaseModel):
+    key: str
+    range: Optional[NumericRangeFilter] = None
+
+class DistanceCountFilter(CustomBaseModel):
+    key: str
+    distance_range: NumericRangeFilter = Field(..., alias="distanceRange")
+    count_range: NumericRangeFilter = Field(..., alias="countRange")
+
+class FrameCountsFilter(CustomBaseModel):
+    annotation_class: Optional[List[CountFilter]] = Field(None, alias="class")
+    group: Optional[List[CountFilter]] = None
+    sub_class: Optional[List[CountFilter]] = Field(None, alias="subClass")
+    distance: Optional[List[DistanceCountFilter]] = None
+
+# === Frame 필터 ===
+class FrameFilterOptions(CustomBaseModel):
+    index: Optional[NumericRangeFilter] = None
+    version_contains: Optional[str] = Field(None, alias="versionContains")
+    channels_in: Optional[List[str]] = Field(None, alias="channelsIn")
+    timestamp: Optional[DateTimeRangeFilterOption] = None
+    location: Optional[GeoLocationFilter] = None
+    meta: Optional[MetaFilter] = None
+    counts: Optional[FrameCountsFilter] = None
+
+# === Data 필터 ===
+class DataFilterOptions(CustomBaseModel):
+    id_in: Optional[List[str]] = Field(None, alias="idIn")
+    slice_id_in: Optional[List[str]] = Field(None, alias="sliceIdIn")
+    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[str]] = Field(None, alias="typeIn")
+    created_at: Optional[DateTimeRangeFilterOption] = Field(None, alias="createdAt")
+    updated_at: Optional[DateTimeRangeFilterOption] = Field(None, alias="updatedAt")
+    created_by: Optional[UserFilterOption] = Field(None, alias="createdBy")
+    updated_by: Optional[UserFilterOption] = Field(None, alias="updatedBy")
+    meta: Optional[MetaFilter] = None
+    assigned_to_user: Optional[str] = Field(None, alias="assignedToUser")
+
+class DataSliceStatusFilterOption(CustomBaseModel):
+    status_in: Optional[List[str]] = Field(None, alias="in")
+    equals: Optional[str] = None
+    status_not_in: Optional[List[str]] = Field(None, alias="notIn")
+
+class DataSliceUserFilterOption(CustomBaseModel):
+    equals: Optional[str] = None
+    user_in: Optional[List[str]] = Field(None, alias="in")
+    exists: Optional[bool] = None
+
+class DataSliceTagsFilterOption(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 DataSliceCommentFilterOption(CustomBaseModel):
+    comment_contains: Optional[str] = Field(None, alias="commentContains")
+    category: Optional[str] = None
+    status: Optional[str] = None
+    created_by: Optional[UserFilterOption] = Field(None, alias="createdBy")
+    created_at: Optional[DateTimeRangeFilterOption] = Field(None, alias="createdAt")
+    exists: Optional[bool] = None
+
+class DataSlicePropertiesFilter(CustomBaseModel):
+    status: Optional[DataSliceStatusFilterOption] = None
+    labeler: Optional[DataSliceUserFilterOption] = None
+    reviewer: Optional[DataSliceUserFilterOption] = None
+    tags: Optional[DataSliceTagsFilterOption] = None
+    status_changed_at: Optional[DateTimeRangeFilterOption] = Field(None, alias="statusChangedAt")
+    comments: Optional[DataSliceCommentFilterOption] = None
+    meta: Optional[MetaFilter] = None
+    assigned_to_user: Optional[str] = Field(None, alias="assignedToUser")
+
+class DataSliceFilter(CustomBaseModel):
+    id: str
+    must_filter: Optional[DataSlicePropertiesFilter] = Field(None, alias="must")
+    not_filter: Optional[DataSlicePropertiesFilter] = Field(None, alias="not")
+
+
+class FrameFilter(CustomBaseModel):
+    conditions: Optional[FrameFilterOptions] = None
+    mode: Optional[Union[str, Literal["INDIVIDUAL_FRAMES", "DATA_SUMMARY"]]] = "INDIVIDUAL_FRAMES"
+    matching_frame_count: Optional[NumericRangeFilter] = Field(None, alias="matchingFrameCount")
+
+
+class DataFilter(CustomBaseModel):
+    must_filter: Optional[DataFilterOptions] = Field(None, alias="must")
+    not_filter: Optional[DataFilterOptions] = Field(None, alias="not")
+    frames: Optional[List[FrameFilter]] = None
+    slice: Optional[DataSliceFilter] = 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")
+    frames: Optional[List[FrameFilter]] = Field(None, alias="frames")
+
+
+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.5.22 → superb_ai_onprem-0.6.1}/spb_onprem/data/queries.py

@@ -31,6 +31,10 @@ class Schemas:
         data {
             id
         }
+        selectedFrames {
+            id
+            selectedFrameIndex
+        }
         next
         totalCount
     '''
@@ -254,6 +258,10 @@ class Queries():
                     length: $length
                 ) {{
                     {Schemas.DATA_PAGE}
+                    selectedFrames {{
+                        dataId
+                        selectedFrameIndex
+                    }}
                     next
                     totalCount
                 }}
@@ -623,7 +631,7 @@ class Queries():
     GET_DETAIL = {
         "name": "data",
         "query": f'''
-            query GetDataDetail($datasetId: String!, $id: ID) {{
+            query GetDataDetail($datasetId: ID!, $id: ID!) {{
                 data(datasetId: $datasetId, id: $id) {{
                     {Schemas.DATA_DETAIL}
                 }}

{superb_ai_onprem-0.5.22 → superb_ai_onprem-0.6.1}/spb_onprem/data/service.py

@@ -121,10 +121,13 @@ class DataService(BaseService):
         )
         data_list = response.get("data", [])
         data = [Data.model_validate(data_dict) for data_dict in data_list]
+        
+        selected_frames = response.get("selectedFrames", [])
+        
         return (
             data,
             response.get("next", None),
-            response.get("totalCount", 0)
+            response.get("totalCount", 0),
         )
 
     def get_data_id_list(

superb_ai_onprem-0.6.1/spb_onprem/searches.py

@@ -0,0 +1,76 @@
+# Filters
+from .data.params.data_list import (
+    DateTimeRangeFilterOption,
+    UserFilterOption,
+    NumericRangeFilter,
+    GeoLocationFilter,
+    NumberMetaFilter,
+    KeywordMetaFilter,
+    DateMetaFilter,
+    MiscMetaFilter,
+    MetaFilter,
+    CountFilter,
+    DistanceCountFilter,
+    FrameCountsFilter,
+    FrameFilterOptions,
+    DataFilterOptions,
+    DataSliceStatusFilterOption,
+    DataSliceUserFilterOption,
+    DataSliceTagsFilterOption,
+    DataSliceCommentFilterOption,
+    DataSlicePropertiesFilter,
+    DataSliceFilter,
+    FrameFilter,
+    DataFilter,
+    DataListFilter,
+)
+from .datasets.params.datasets import (
+    DatasetsFilter,
+    DatasetsFilterOptions,
+)
+from .slices.params.slices import (
+    SlicesFilterOptions,
+    SlicesFilter,
+)
+from .activities.params.activities import (
+    ActivitiesFilter,
+    ActivitiesFilterOptions,
+)
+from .exports.params.exports import (
+    ExportFilter,
+    ExportFilterOptions,
+)
+
+__all__ = [
+    "DateTimeRangeFilterOption",
+    "UserFilterOption",
+    "NumericRangeFilter",
+    "GeoLocationFilter",
+    "NumberMetaFilter",
+    "KeywordMetaFilter",
+    "DateMetaFilter",
+    "MiscMetaFilter",
+    "MetaFilter",
+    "CountFilter",
+    "DistanceCountFilter",
+    "FrameCountsFilter",
+    "FrameFilterOptions",
+    "DataFilterOptions",
+    "DataSliceStatusFilterOption",
+    "DataSliceUserFilterOption",
+    "DataSliceTagsFilterOption",
+    "DataSliceCommentFilterOption",
+    "DataSlicePropertiesFilter",
+    "DataSliceFilter",
+    "FrameFilter",
+    "DataFilter",
+    "DataListFilter",
+    "DatasetsFilter",
+    "DatasetsFilterOptions",
+    "SlicesFilter",
+    "SlicesFilterOptions",
+    "ActivitiesFilter",
+    "ActivitiesFilterOptions",
+    "ExportFilter",
+    "ExportFilterOptions",
+]

{superb_ai_onprem-0.5.22 → superb_ai_onprem-0.6.1}/spb_onprem/slices/service.py

@@ -124,8 +124,8 @@ class SliceService(BaseService):
                 slice_id=slice_id
             )
         )
-        slice_dict = response.get("slice", {})
-        return Slice.model_validate(slice_dict)
+        # slice_dict = response.get("slice", {})
+        return Slice.model_validate(response)
     
     def get_slice_by_name(
         self,

{superb_ai_onprem-0.5.22 → superb_ai_onprem-0.6.1}/superb_ai_onprem.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superb-ai-onprem
-Version: 0.5.22
+Version: 0.6.1
 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.5.22 → superb_ai_onprem-0.6.1}/tests/data/test_data_service.py

@@ -125,7 +125,7 @@ class TestDataService:
         query_structure = Queries.GET_DETAIL
 
         # Assert
-        assert query_structure["name"] == "getDataDetail"
+        assert query_structure["name"] == "data"
         assert "query GetDataDetail($datasetId: ID!, $id: ID!)" in query_structure["query"]
         assert "data(datasetId: $datasetId, id: $id)" in query_structure["query"]
         assert callable(query_structure["variables"])