superb-ai-onprem 0.9.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

spb_onprem/__init__.py

@@ -10,9 +10,8 @@ from .slices.service import SliceService
 from .activities.service import ActivityService
 from .exports.service import ExportService
 from .contents.service import ContentService
-from .predictions.service import PredictionService
 from .models.service import ModelService
-from .inferences.service import InferService
+from .reports.service import ReportService
 
 # Core Entities and Enums
 from .entities import (
@@ -21,7 +20,6 @@ from .entities import (
     Scene,
     Annotation,
     AnnotationVersion,
-    Prediction,
     DataMeta,
     Dataset,
     Slice,
@@ -31,9 +29,9 @@ from .entities import (
     Export,
     Content,
     Frame,
-    Model,
     Comment,
     Reply,
+    DataAnnotationStat,
 
     # Enums
     DataType,
@@ -47,6 +45,24 @@ from .entities import (
     CommentStatus,
 )
 
+# Models and Reports Entities
+from .models import (
+    Model,
+    ModelTrainClass,
+    ModelPageInfo,
+    ModelsFilter,
+    ModelsFilterOptions,
+)
+
+from .reports import (
+    AnalyticsReport,
+    AnalyticsReportItem,
+    AnalyticsReportItemType,
+    AnalyticsReportPageInfo,
+    AnalyticsReportsFilter,
+    AnalyticsReportsFilterOptions,
+)
+
 # Filters
 from .searches import (
     DateTimeRangeFilterOption,
@@ -80,6 +96,7 @@ from .searches import (
     ActivitiesFilterOptions,
     ExportFilter,
     ExportFilterOptions,
+    AnnotationCountsFilter
 )
 
 __all__ = (
@@ -90,16 +107,14 @@ __all__ = (
     "ActivityService",
     "ExportService",
     "ContentService",
-    "PredictionService",
     "ModelService",
-    "InferService",
+    "ReportService",
 
     # Core Entities
     "Data",
     "Scene",
     "Annotation",
     "AnnotationVersion",
-    "Prediction",
     "DataMeta",
     "Dataset",
     "Slice",
@@ -109,10 +124,24 @@ __all__ = (
     "Export",
     "Content",
     "Frame",
-    "PredictionSet",
-    "Model",
     "Comment",
     "Reply",
+    "DataAnnotationStat",
+    
+    # Models Entities
+    "Model",
+    "ModelTrainClass",
+    "ModelPageInfo",
+    "ModelsFilter",
+    "ModelsFilterOptions",
+    
+    # Reports Entities
+    "AnalyticsReport",
+    "AnalyticsReportItem",
+    "AnalyticsReportItemType",
+    "AnalyticsReportPageInfo",
+    "AnalyticsReportsFilter",
+    "AnalyticsReportsFilterOptions",
     
     # Enums
     "DataType",
@@ -157,4 +186,5 @@ __all__ = (
     "ActivitiesFilterOptions",
     "ExportFilter",
     "ExportFilterOptions",
+    "AnnotationCountsFilter",
 )

spb_onprem/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.9.0'
-__version_tuple__ = version_tuple = (0, 9, 0)
+__version__ = version = '0.10.0'
+__version_tuple__ = version_tuple = (0, 10, 0)
 
 __commit_id__ = commit_id = None

spb_onprem/data/entities/__init__.py

@@ -5,6 +5,7 @@ from .data import Data
 from .scene import Scene
 from .data_slice import DataSlice
 from .frame import Frame
+from .data_annotation_stats import DataAnnotationStat
 
 
 __all__ = (
@@ -17,4 +18,5 @@ __all__ = (
     "Reply",
     "DataMeta",
     "DataSlice",
+    "DataAnnotationStat",
 )

spb_onprem/data/entities/data.py

@@ -7,6 +7,7 @@ from .data_meta import DataMeta
 from .data_slice import DataSlice
 from .frame import Frame
 from spb_onprem.contents.entities import BaseContent
+from .data_annotation_stats import DataAnnotationStat
 
 class Data(CustomBaseModel):
     """
@@ -28,6 +29,7 @@ class Data(CustomBaseModel):
     
     # 어노테이션 및 예측
     annotation: Optional[Annotation] = Field(None, description="어노테이션 데이터")
+    annotation_stats: Optional[List[AnnotationStat]] = Field(None, alias="annotationStats", description="어노테이션 통계 정보")
 
     # 메타데이터
     meta: Optional[List[DataMeta]] = Field(None, description="커스텀 메타데이터 목록")

spb_onprem/data/entities/data_annotation_stats.py

@@ -0,0 +1,8 @@
+
+
+class DataAnnotationStat(CustomBaseModel):
+    type: Optional[str] = Field(None, description="어노테이션 타입")
+    group: Optional[str] = Field(None, description="어노테이션 그룹")
+    annotation_class: Optional[str] = Field(None, alias="annotationClass", description="어노테이션 클래스")
+    sub_class: Optional[str] = Field(None, alias="subClass", description="어노테이션 서브 클래스")
+    count: Optional[int] = Field(None, description="어노테이션 개수")

spb_onprem/data/params/data_list.py

@@ -173,10 +173,14 @@ class DistanceCountFilter(CustomBaseModel):
     distance_range: NumericRangeFilter = Field(..., alias="distanceRange")
     count_range: NumericRangeFilter = Field(..., alias="countRange")
 
-class FrameCountsFilter(CustomBaseModel):
+
+class AnnotationCountsFilter(CustomBaseModel):
     annotation_class: Optional[List[CountFilter]] = Field(None, alias="class")
     group: Optional[List[CountFilter]] = None
     sub_class: Optional[List[CountFilter]] = Field(None, alias="subClass")
+
+
+class FrameCountsFilter(AnnotationCountsFilter):
     distance: Optional[List[DistanceCountFilter]] = None
 
 # === Frame 필터 ===
@@ -227,6 +231,7 @@ class DataFilterOptions(CustomBaseModel):
     # 메타데이터 및 기타
     meta: Optional[MetaFilter] = Field(None, description="커스텀 메타데이터 필터")
     assigned_to_user: Optional[str] = Field(None, alias="assignedToUser", description="할당된 사용자")
+    annotation_counts: Optional[AnnotationCountsFilter] = Field(None, alias="annotationCounts", description="어노테이션 개수 필터")
 
 class DataSliceStatusFilterOption(CustomBaseModel):
     status_in: Optional[List[str]] = Field(None, alias="in")
@@ -261,6 +266,7 @@ class DataSlicePropertiesFilter(CustomBaseModel):
     comments: Optional[DataSliceCommentFilterOption] = None
     meta: Optional[MetaFilter] = None
     assigned_to_user: Optional[str] = Field(None, alias="assignedToUser")
+    annotation_counts: Optional[AnnotationCountsFilter] = Field(None, alias="annotationCounts")
 
 class DataSliceFilter(CustomBaseModel):
     id: str
@@ -270,7 +276,6 @@ class DataSliceFilter(CustomBaseModel):
 
 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")
 
 

spb_onprem/data/params/update_data.py

@@ -9,6 +9,7 @@ from spb_onprem.base_types import (
 )
 from spb_onprem.data.entities import (
     DataMeta,
+    DataAnnotationStat,
 )
 
 
@@ -23,6 +24,10 @@ def update_params(
         Optional[List[DataMeta]],
         UndefinedType
     ] = Undefined,
+    annotation_stats: Union[
+        Optional[List[DataAnnotationStat]],
+        UndefinedType
+    ] = Undefined
 ):
     """Make the variables for the updateData query.
 
@@ -31,6 +36,7 @@ def update_params(
         data_id (str): The ID of the data.
         key (str): The key of the data.
         meta (List[DataMeta]): The meta of the data.
+        annotation_stats (List[DataAnnotationStat]): The annotation stats of the data.
     """
     variables = {
         "datasetId": dataset_id,
@@ -52,4 +58,9 @@ def update_params(
             for meta_item in meta
         ] if meta is not None else None
 
+    if annotation_stats is not Undefined:
+        variables["annotation_stats"] = [
+            stat.model_dump(by_alias=True, exclude_unset=True) for stat in annotation_stats
+        ] if annotation_stats is not None else None
+
     return variables

spb_onprem/data/params/update_data_slice.py

@@ -1,8 +1,11 @@
-from typing import Any, Optional, Union
+from typing import Any, Optional, Union, List
 from spb_onprem.base_types import (
     Undefined,
     UndefinedType,
 )
+from spb_onprem.data.entities import (
+    DataAnnotationStat,
+)
 
 
 def update_data_slice_params(
@@ -13,6 +16,10 @@ def update_data_slice_params(
         Optional[dict],
         UndefinedType
     ] = Undefined,
+    annotation_stats: Union[
+        Optional[List[DataAnnotationStat]],
+        UndefinedType
+    ] = Undefined
 ):
     """Make the variables for the updateDataSlice query.
 
@@ -27,7 +34,12 @@ def update_data_slice_params(
         "data_id": data_id,
         "slice_id": slice_id,
     }
-    
+
+    if annotation_stats is not Undefined:
+        params["annotation_stats"] = [
+            stat.model_dump(by_alias=True, exclude_unset=True) for stat in annotation_stats
+        ] if annotation_stats is not None else None
+
     if meta is not Undefined:
         params["meta"] = meta
 

spb_onprem/data/queries.py

@@ -71,6 +71,13 @@ class Schemas:
                 meta
             }
         }
+        annotationStats {
+            type
+            group
+            annotationClass
+            subClass
+            count
+        }
         meta {
             key
             type
@@ -172,12 +179,14 @@ class Queries():
                 $data_id: ID!,
                 $key: String,
                 $meta: [DataMetaInput!]
+                $annotation_stats: [DataAnnotationStatInput!]
             ) {{
             updateData(
                 datasetId: $dataset_id,
                 id: $data_id,
                 key: $key,
-                meta: $meta
+                meta: $meta,
+                annotationStats: $annotation_stats,
             ) 
                 {{
                     {Schemas.DATA}
@@ -541,12 +550,14 @@ class Queries():
                 $data_id: ID!,
                 $slice_id: ID!,
                 $meta: JSONObject!,
+                $annotation_stats: [DataAnnotationStatInput!],
             ) {{
                 updateDataSlice(
                     datasetId: $dataset_id,
                     dataId: $data_id,
                     sliceId: $slice_id,
                     meta: $meta,
+                    annotationStats: $annotation_stats,
                 ) {{
                     {Schemas.DATA}
                 }}

spb_onprem/data/service.py

@@ -198,6 +198,10 @@ class DataService(BaseService):
             List[DataMeta],
             UndefinedType,
         ] = Undefined,
+        annotation_stats: Union[
+            Optional[List[DataAnnotationStat]],
+            UndefinedType,
+        ] = Undefined,
     ):
         """Update a data.
 
@@ -217,6 +221,7 @@ class DataService(BaseService):
                 data_id=data_id,
                 key=key,
                 meta=meta,
+                annotation_stats=annotation_stats,
             )
         )
         data = Data.model_validate(response)
@@ -665,6 +670,10 @@ class DataService(BaseService):
             Optional[dict],
             UndefinedType
         ] = Undefined,
+        annotation_stats: Union]
+            Optional[List[DataAnnotationStat]],
+            UndefinedType
+        ] = Undefined,
     ):
         """Update the metadata of a data slice.
 

spb_onprem/entities.py

@@ -3,12 +3,12 @@ from .data.entities import (
     Scene,
     Annotation,
     AnnotationVersion,
-    Prediction,
     DataMeta,
     DataSlice,
     Frame,
     Comment,
     Reply,
+    DataAnnotationStat,
 )
 from .data.entities.comment import CommentStatus
 from .datasets.entities import Dataset
@@ -29,8 +29,17 @@ from .activities.entities import (
 )
 from .exports.entities import Export
 from .contents.entities import Content
-from .predictions.entities import PredictionSet
-from .models.entities import Model
+from .models.entities import (
+    Model,
+    ModelTrainClass,
+    ModelPageInfo,
+)
+from .reports.entities import (
+    AnalyticsReport,
+    AnalyticsReportItem,
+    AnalyticsReportItemType,
+    AnalyticsReportPageInfo,
+)
 
 __all__ = [
     # Core Entities
@@ -38,7 +47,6 @@ __all__ = [
     "Scene",
     "Annotation",
     "AnnotationVersion",
-    "Prediction",
     "DataMeta",
     "DataSlice",
     "Dataset",
@@ -48,10 +56,20 @@ __all__ = [
     "Export",
     "Content",
     "Frame",
-    "PredictionSet",
-    "Model",
     "Comment",
     "Reply",
+    "DataAnnotationStat",
+    
+    # Models Entities
+    "Model",
+    "ModelTrainClass",
+    "ModelPageInfo",
+    
+    # Reports Entities
+    "AnalyticsReport",
+    "AnalyticsReportItem",
+    "AnalyticsReportItemType",
+    "AnalyticsReportPageInfo",
 
     # Enums
     "DataType",

spb_onprem/models/__init__.py

@@ -1,7 +1,12 @@
 from .service import ModelService
-from .entities import Model
+from .entities import Model, ModelTrainClass, ModelPageInfo
+from .params import ModelsFilter, ModelsFilterOptions
 
-__all__ = [
+__all__ = (
     "ModelService",
     "Model",
-]
+    "ModelTrainClass",
+    "ModelPageInfo",
+    "ModelsFilter",
+    "ModelsFilterOptions",
+)

spb_onprem/models/entities/__init__.py

@@ -0,0 +1,9 @@
+from .model import Model
+from .model_train_class import ModelTrainClass
+from .model_page_info import ModelPageInfo
+
+__all__ = (
+    "Model",
+    "ModelTrainClass",
+    "ModelPageInfo",
+)

spb_onprem/models/entities/model.py

@@ -0,0 +1,32 @@
+from typing import Optional, List, Any
+from spb_onprem.base_model import CustomBaseModel, Field
+from spb_onprem.contents.entities.base_content import BaseContent
+from spb_onprem.slices.entities.slice import Slice
+from .model_train_class import ModelTrainClass
+
+
+class Model(CustomBaseModel):
+    """
+    모델 엔터티
+    
+    머신러닝 모델의 정보와 학습 상태, 성능 지표를 포함합니다.
+    """
+    id: Optional[str] = Field(None, description="모델 고유 식별자")
+    dataset_id: Optional[str] = Field(None, alias="datasetId", description="이 모델이 속한 데이터셋 ID")
+    baseline_model: Optional[str] = Field(None, alias="baselineModel", description="사용된 베이스라인 모델")
+    name: Optional[str] = Field(None, description="모델 이름")
+    description: Optional[str] = Field(None, description="모델 설명")
+    training_classes: Optional[List[ModelTrainClass]] = Field(None, alias="trainingClasses", description="모델의 학습 클래스")
+    training_data_count: Optional[int] = Field(None, alias="trainingDataCount", description="학습용 데이터 수")
+    validation_data_count: Optional[int] = Field(None, alias="validationDataCount", description="검증용 데이터 수")
+    is_pinned: Optional[bool] = Field(None, alias="isPinned", description="모델 즐겨찾기 고정 여부")
+    is_trained: Optional[bool] = Field(None, alias="isTrained", description="모델 학습 완료 여부")
+    trained_at: Optional[str] = Field(None, alias="trainedAt", description="모델 학습 완료 일시 (ISO 8601)")
+    model_content: Optional[BaseContent] = Field(None, alias="modelContent", description="모델 컨텐츠 베이스")
+    created_by: Optional[str] = Field(None, alias="createdBy", description="생성자")
+    created_at: Optional[str] = Field(None, alias="createdAt", description="생성일시 (ISO 8601)")
+    updated_by: Optional[str] = Field(None, alias="updatedBy", description="수정자")
+    updated_at: Optional[str] = Field(None, alias="updatedAt", description="수정일시 (ISO 8601)")
+    meta: Optional[Any] = Field(None, description="추가 메타데이터 (JSONObject)")
+    training_slices: Optional[List[Slice]] = Field(None, alias="trainingSlices", description="모델의 학습용 슬라이스")
+    validation_slices: Optional[List[Slice]] = Field(None, alias="validationSlices", description="모델의 검증용 슬라이스")

spb_onprem/models/entities/model_page_info.py

@@ -0,0 +1,14 @@
+from typing import Optional, List
+from spb_onprem.base_model import CustomBaseModel, Field
+from .model import Model
+
+
+class ModelPageInfo(CustomBaseModel):
+    """
+    모델 페이지 정보 엔터티
+    
+    모델 목록 조회 시 페이지네이션 정보를 포함합니다.
+    """
+    models: Optional[List[Model]] = Field(None, description="쿼리와 일치하는 모델 목록")
+    next: Optional[str] = Field(None, description="페이지네이션에 사용할 커서")
+    total_count: Optional[int] = Field(None, alias="totalCount", description="쿼리와 일치하는 모델의 총 개수")

spb_onprem/models/entities/model_train_class.py

@@ -0,0 +1,15 @@
+from typing import Optional
+from spb_onprem.base_model import CustomBaseModel, Field
+
+
+class ModelTrainClass(CustomBaseModel):
+    """
+    모델 학습 클래스 엔터티
+    
+    모델 학습에 사용되는 클래스별 정보와 성능 지표를 포함합니다.
+    """
+    class_name: Optional[str] = Field(None, alias="class", description="모델 학습 클래스 이름")
+    annotation_type: Optional[str] = Field(None, alias="annotationType", description="어노테이션 타입")
+    ap: Optional[float] = Field(None, description="AP (Average Precision) 점수")
+    training_annotations_count: Optional[int] = Field(None, alias="trainingAnnotationsCount", description="학습용 어노테이션 수")
+    validation_annotations_count: Optional[int] = Field(None, alias="validationAnnotationsCount", description="검증용 어노테이션 수")

spb_onprem/models/params/__init__.py

@@ -1,7 +1,19 @@
-from .get_models import get_models_params
+from .models import models_params, ModelsFilter, ModelsFilterOptions
+from .model import model_params
+from .create_model import create_model_params
+from .update_model import update_model_params
+from .pin_model import pin_model_params
+from .unpin_model import unpin_model_params
 from .delete_model import delete_model_params
 
-__all__ = [
-    "get_models_params",
+__all__ = (
+    "models_params",
+    "model_params",
+    "create_model_params",
+    "update_model_params",
+    "pin_model_params",
+    "unpin_model_params",
     "delete_model_params",
-]
+    "ModelsFilter",
+    "ModelsFilterOptions",
+)

spb_onprem/models/params/create_model.py

@@ -0,0 +1,70 @@
+from typing import List, Union, Any, Optional
+from spb_onprem.base_types import Undefined, UndefinedType
+from spb_onprem.models.entities.model_train_class import ModelTrainClass
+
+
+def create_model_params(
+    dataset_id: str,
+    name: str,
+    baseline_model: str,
+    training_slice_ids: List[str],
+    validation_slice_ids: List[str],
+    description: Union[str, UndefinedType] = Undefined,
+    training_classes: Union[List[ModelTrainClass], UndefinedType] = Undefined,
+    model_content_id: Union[str, UndefinedType] = Undefined,
+    is_trained: Union[bool, UndefinedType] = Undefined,
+    trained_at: Union[str, UndefinedType] = Undefined,
+    is_pinned: Union[bool, UndefinedType] = Undefined,
+    meta: Union[Any, UndefinedType] = Undefined,
+):
+    """Get parameters for creating a model.
+    
+    Args:
+        dataset_id: The dataset ID
+        name: The model name
+        baseline_model: The baseline model used
+        training_slice_ids: The IDs of the training slices
+        validation_slice_ids: The IDs of the validation slices
+        description: Optional model description
+        training_classes: Optional training classes
+        model_content_id: Optional model content ID
+        is_trained: Optional trained status
+        trained_at: Optional trained timestamp
+        is_pinned: Optional pinned status
+        meta: Optional metadata
+        
+    Returns:
+        dict: Parameters for creating a model
+    """
+    params = {
+        "datasetId": dataset_id,
+        "name": name,
+        "baselineModel": baseline_model,
+        "trainingSliceIds": training_slice_ids,
+        "validationSliceIds": validation_slice_ids,
+    }
+    
+    if not isinstance(description, UndefinedType):
+        params["description"] = description
+    
+    if not isinstance(training_classes, UndefinedType):
+        params["trainingClasses"] = [
+            tc.model_dump(by_alias=True, exclude_unset=True) for tc in training_classes
+        ] if training_classes is not None else None
+    
+    if not isinstance(model_content_id, UndefinedType):
+        params["modelContentId"] = model_content_id
+    
+    if not isinstance(is_trained, UndefinedType):
+        params["isTrained"] = is_trained
+    
+    if not isinstance(trained_at, UndefinedType):
+        params["trainedAt"] = trained_at
+    
+    if not isinstance(is_pinned, UndefinedType):
+        params["isPinned"] = is_pinned
+    
+    if not isinstance(meta, UndefinedType):
+        params["meta"] = meta
+    
+    return params

spb_onprem/models/params/delete_model.py

@@ -1,14 +1,17 @@
-def delete_model_params(dataset_id: str, model_id: str):
-    """Generate variables for delete model GraphQL mutation.
+def delete_model_params(
+    dataset_id: str,
+    model_id: str,
+):
+    """Get parameters for deleting a model.
     
     Args:
-        dataset_id (str): The ID of the dataset.
-        model_id (str): The ID of the model to delete.
+        dataset_id: The dataset ID
+        model_id: The model ID
         
     Returns:
-        dict: Variables dictionary for the GraphQL mutation.
+        dict: Parameters for deleting a model
     """
     return {
-        "dataset_id": dataset_id,
-        "id": model_id
-    }
+        "datasetId": dataset_id,
+        "id": model_id,
+    }

spb_onprem/models/params/model.py

@@ -0,0 +1,17 @@
+def model_params(
+    dataset_id: str,
+    model_id: str,
+):
+    """Get parameters for retrieving a single model.
+    
+    Args:
+        dataset_id: The dataset ID
+        model_id: The model ID
+        
+    Returns:
+        dict: Parameters for retrieving a model
+    """
+    return {
+        "datasetId": dataset_id,
+        "modelId": model_id,
+    }