superb-ai-onprem 0.5.9__py3-none-any.whl → 0.5.11__py3-none-any.whl

spb_onprem/__init__.py

@@ -10,6 +10,9 @@ 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
 
 # Core Entities and Enums
 from .entities import (
@@ -77,6 +80,9 @@ __all__ = (
     "ActivityService",
     "ExportService",
     "ContentService",
+    "PredictionService",
+    "ModelService",
+    "InferService",
 
     # Core Entities
     "Data",
@@ -93,6 +99,8 @@ __all__ = (
     "Export",
     "Content",
     "Frame",
+    "PredictionSet",
+    "Model",
     
     # Enums
     "DataType",

spb_onprem/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.9'
-__version_tuple__ = version_tuple = (0, 5, 9)
+__version__ = version = '0.5.11'
+__version_tuple__ = version_tuple = (0, 5, 11)
 
 __commit_id__ = commit_id = None

spb_onprem/activities/service.py

@@ -65,8 +65,7 @@ class ActivityService(BaseService):
                 meta=meta,
             )
         )
-        activity_dict = response
-        return Activity.model_validate(activity_dict)
+        return Activity.model_validate(response)
     
     def get_activities(
         self,

spb_onprem/contents/params/__init__.py

@@ -1,8 +1,10 @@
 
 from .create import create_variables
 from .get_download_url import get_download_url_params
+from .delete_content import delete_content_params
 
 __all__ = (
     "create_variables",
     "get_download_url_params",
+    "delete_content_params",
 )

spb_onprem/contents/params/delete_content.py

@@ -0,0 +1,10 @@
+def delete_content_params(content_id: str):
+    """Generate variables for delete content GraphQL mutation.
+    
+    Args:
+        content_id (str): The ID of the content to delete.
+        
+    Returns:
+        dict: Variables dictionary for the GraphQL query.
+    """
+    return {"id": content_id}

spb_onprem/contents/queries.py

@@ -1,6 +1,7 @@
 from .params import (
     create_variables,
     get_download_url_params,
+    delete_content_params,
 )
 
 class Queries:
@@ -33,3 +34,13 @@ class Queries:
         ''',
         "variables": get_download_url_params
     }
+    
+    DELETE = {
+        "name": "deleteContent",
+        "query": '''
+            mutation DeleteContent($id: ID!) {
+                deleteContent(id: $id)
+            }
+        ''',
+        "variables": delete_content_params
+    }

spb_onprem/contents/service.py

@@ -176,3 +176,22 @@ class ContentService(BaseService):
             variables=Queries.GET_DOWNLOAD_URL["variables"](content_id)
         )
         return response
+
+    def delete_content(
+        self,
+        content_id: str,
+    ) -> bool:
+        '''
+        Delete a content by ID.
+        
+        Args:
+            content_id (str): The ID of the content to delete.
+            
+        Returns:
+            bool: True if deletion was successful.
+        '''
+        response = self.request_gql(
+            query=Queries.DELETE,
+            variables=Queries.DELETE["variables"](content_id)
+        )
+        return response.get("deleteContent", False)

spb_onprem/data/entities/data.py

@@ -24,7 +24,6 @@ class Data(CustomBaseModel):
     annotation: Optional[Annotation] = None
     predictions: Optional[List[Prediction]] = None
     meta: Optional[List[DataMeta]] = None
-    system_meta: Optional[List[DataMeta]] = Field(None, alias="systemMeta")
     created_at: Optional[str] = Field(None, alias="createdAt")
     created_by: Optional[str] = Field(None, alias="createdBy")
     updated_at: Optional[str] = Field(None, alias="updatedAt")

spb_onprem/data/params/__init__.py

@@ -15,6 +15,12 @@ from .data_list import (
     DataFilterOptions,
     DataListFilter,
 )
+from .get_data_detail import (
+    get_data_detail_params,
+)
+from .get_evaluation_value_list import (
+    get_evaluation_value_list_params,
+)
 from .remove_data_from_slice import (
     remove_data_from_slice_params
 )
@@ -73,6 +79,8 @@ __all__ = [
     "get_params",
     "get_data_id_list_params",
     "get_data_list_params",
+    "get_data_detail_params",
+    "get_evaluation_value_list_params",
     "AnnotationFilter",
     "AnnotationRangeFilter",
     "DataFilterOptions",

spb_onprem/data/params/create_data.py

@@ -36,7 +36,7 @@ def create_params(
                     "meta": version.meta,
                 }
                 for version in data.annotation.versions
-            ],
+            ] if data.annotation.versions is not None else [],
             "meta": data.annotation.meta
         } if data.annotation is not None else None,
         "predictions": [
@@ -56,13 +56,5 @@ def create_params(
                 "value": meta.value,
             }
             for meta in data.meta
-        ] if data.meta is not None else None,
-        "systemMeta": [
-            {
-                "key": meta.key,
-                "type": meta.type.value,
-                "value": meta.value,
-            }
-            for meta in data.system_meta
-        ] if data.system_meta is not None else None,
+        ] if data.meta is not None else [],
     }

spb_onprem/data/params/get_data_detail.py

@@ -0,0 +1,14 @@
+def get_data_detail_params(dataset_id: str, data_id: str):
+    """Generate variables for get data detail GraphQL query.
+    
+    Args:
+        dataset_id (str): The ID of the dataset.
+        data_id (str): The ID of the data.
+        
+    Returns:
+        dict: Variables dictionary for the GraphQL query.
+    """
+    return {
+        "datasetId": dataset_id,
+        "id": data_id
+    }

spb_onprem/data/params/get_evaluation_value_list.py

@@ -0,0 +1,36 @@
+from typing import Union
+from spb_onprem.base_types import UndefinedType, Undefined
+
+
+def get_evaluation_value_list_params(
+    dataset_id: str,
+    prediction_set_id: str,
+    filter: Union[UndefinedType, dict] = Undefined,
+    length: int = 50,
+    cursor: Union[UndefinedType, str] = Undefined
+):
+    """Generate variables for get evaluation value list GraphQL query.
+    
+    Args:
+        dataset_id (str): The ID of the dataset.
+        prediction_set_id (str): The ID of the prediction set.
+        filter (Union[UndefinedType, dict], optional): Diagnosis filter for evaluation values.
+        length (int): Number of items to retrieve per page.
+        cursor (Union[UndefinedType, str], optional): Cursor for pagination.
+        
+    Returns:
+        dict: Variables dictionary for the GraphQL query.
+    """
+    params = {
+        "datasetId": dataset_id,
+        "predictionSetId": prediction_set_id,
+        "length": length
+    }
+    
+    if filter is not Undefined:
+        params["filter"] = filter
+        
+    if cursor is not Undefined:
+        params["cursor"] = cursor
+        
+    return params

spb_onprem/data/params/update_data.py

@@ -23,10 +23,6 @@ def update_params(
         Optional[List[DataMeta]],
         UndefinedType
     ] = Undefined,
-    system_meta: Union[
-        Optional[List[DataMeta]],
-        UndefinedType
-    ] = Undefined,
 ):
     """Make the variables for the updateData query.
 
@@ -56,17 +52,5 @@ def update_params(
             }
             for meta in meta
         ] if meta is not None else None
-    
-    if system_meta is not Undefined:
-        if system_meta is not None and not isinstance(system_meta, list):
-            raise ValueError("meta must be a list of DataMeta or None.")
-        variables["systemMeta"] = [
-            {
-                "key": meta.key,
-                "type": meta.type.value,
-                "value": meta.value,
-            }
-            for meta in system_meta
-        ] if system_meta is not None else None
 
     return variables

spb_onprem/data/params/upsert_data_meta.py

@@ -11,10 +11,6 @@ def upsert_data_meta_params(
         Optional[List[DataMeta]],
         UndefinedType
     ] = Undefined,
-    system_meta: Union[
-        Optional[List[DataMeta]],
-        UndefinedType
-    ] = Undefined,
 ):
     """Make the variables for the upsertDataMeta query.
 
@@ -37,12 +33,4 @@ def upsert_data_meta_params(
             for item in meta
         ] if meta is not None else None
 
-    if system_meta is not Undefined:
-        if system_meta is not None and not isinstance(system_meta, list):
-            raise ValueError("system_meta must be a list of DataMeta or None.")
-        variables["system_meta"] = [
-            item.model_dump(by_alias=True, exclude_unset=True)
-            for item in system_meta
-        ] if system_meta is not None else None
-
     return variables

spb_onprem/data/queries.py

@@ -4,6 +4,8 @@ from .params import (
     get_params,
     get_data_id_list_params,
     get_data_list_params,
+    get_data_detail_params,
+    get_evaluation_value_list_params,
     remove_data_from_slice_params,
     insert_data_to_slice_params,
     delete_data_params,
@@ -106,6 +108,34 @@ class Schemas:
             {DATA}  
         }}
     '''
+    
+    DATA_DETAIL = '''
+        id
+        datasetId
+        scene {
+            id
+            content {
+                id
+            }
+        }
+        annotation {
+            versions {
+                id
+                content {
+                    id
+                }
+            }
+        }
+        predictions {
+            id
+            content {
+                id
+            }
+        }
+        thumbnail {
+            id
+        }
+    '''
 
 
 class Queries():
@@ -122,7 +152,6 @@ class Queries():
                 $annotation: AnnotationInput,
                 $predictions: [PredictionInput!],
                 $meta: [DataMetaInput!]
-                $systemMeta: [DataMetaInput!]
             ) {{
             createData(
                 datasetId: $datasetId,
@@ -134,7 +163,6 @@ class Queries():
                 annotation: $annotation,
                 predictions: $predictions,
                 meta: $meta,
-                systemMeta: $systemMeta
             ) 
                 {{
                     {Schemas.DATA}
@@ -151,15 +179,13 @@ class Queries():
                 $dataset_id: ID!,
                 $data_id: ID!,
                 $key: String,
-                $meta: [DataMetaInput!],
-                $systemMeta: [DataMetaInput!]
+                $meta: [DataMetaInput!]
             ) {{
             updateData(
                 datasetId: $dataset_id,
                 id: $data_id,
                 key: $key,
-                meta: $meta,
-                systemMeta: $systemMeta
+                meta: $meta
             ) 
                 {{
                     {Schemas.DATA}
@@ -594,3 +620,43 @@ class Queries():
         ''',
         "variables": update_frames_params,
     }
+    
+    GET_DETAIL = {
+        "name": "getDataDetail",
+        "query": f'''
+            query GetDataDetail($datasetId: String!, $id: String!) {{
+                data(datasetId: $datasetId, id: $id) {{
+                    {Schemas.DATA_DETAIL}
+                }}
+            }}
+        ''',
+        "variables": get_data_detail_params
+    }
+    
+    GET_EVALUATION_VALUE_LIST = {
+        "name": "getEvaluationValueList",
+        "query": '''
+            query GetEvaluationValueList(
+                $datasetId: String!,
+                $predictionSetId: String!,
+                $filter: DiagnosisFilter,
+                $length: Int,
+                $cursor: String
+            ) {
+                evaluationValueList(
+                    datasetId: $datasetId,
+                    predictionSetId: $predictionSetId,
+                    filter: $filter,
+                    length: $length,
+                    cursor: $cursor
+                ) {
+                    totalCount
+                    next
+                    data {
+                        dataId
+                    }
+                }
+            }
+        ''',
+        "variables": get_evaluation_value_list_params
+    }

spb_onprem/data/service.py

@@ -1,19 +1,13 @@
 """
-base_service.py
-
-This module defines the BaseService class, which serves as an abstract base class for services that handle data operations.
+This module defines the DataService class for handling data-related operations.
 
 Classes:
-    BaseService: An abstract base class that requires the implementation of the create_data method.
+    DataService: A service class that provides methods for data management operations.
 """
-from io import BytesIO
 from typing import (
     Optional, List, Union,
 )
 
-from spb_onprem.contents.service import (
-    ContentService
-)
 from spb_onprem.base_service import BaseService
 from spb_onprem.base_types import (
     Undefined,
@@ -22,17 +16,11 @@ from spb_onprem.base_types import (
 from .queries import Queries
 from .entities import (
     Data,
-    Scene,
     AnnotationVersion,
-    Annotation,
-    DataMeta,
     Prediction,
     Frame,
 )
 from .enums import (
-    DataType,
-    SceneType,
-    DataMetaValue,
     DataStatus,
 )
 from .params import (
@@ -177,105 +165,23 @@ class DataService(BaseService):
             response.get("totalCount", 0)
         )
 
-    def _detect_image_type(self, file_data: BytesIO) -> str:
-        """Detect image type from BytesIO data using magic numbers.
-        
-        Args:
-            file_data (BytesIO): The image data.
-            
-        Returns:
-            str: The MIME type of the image.
-            
-        Raises:
-            BadParameterError: If the file format is not a supported image type.
-        """
-        current_pos = file_data.tell()
-        file_data.seek(0)
-        header = file_data.read(12)
-        file_data.seek(current_pos)
-        
-        if header.startswith(b'\xff\xd8\xff'):
-            return 'image/jpeg'
-        elif header.startswith(b'\x89PNG\r\n\x1a\n'):
-            return 'image/png'
-        elif header.startswith(b'GIF8'):
-            return 'image/gif'
-        elif header.startswith(b'RIFF') and header[8:12] == b'WEBP':
-            return 'image/webp'
-        else:
-            raise BadParameterError(
-                "Unsupported image format. Only JPEG, PNG, GIF, and WebP formats are supported."
-            )
-
-    def create_image_data(
+    def create_data(
         self,
-        dataset_id: str,
-        key: str,
-        image_content: Union[
-            BytesIO,
-            str,
-        ],
-        slices: Optional[List[str]] = None,
-        annotation: Optional[dict] = None,
-        predictions: Optional[List[dict]] = None,
-        meta: Optional[List[dict]] = None,
-        system_meta: Optional[List[dict]] = None,
+        data: Data,
     ):
-        """Create an image data.
+        """Create data in the dataset.
 
         Args:
-            dataset_id (str): The dataset id.
-            key (str): The key of the data.
-            image_content (Union[BytesIO, str]): The image content. If str, it is considered as a file path.
-            slices (Optional[List[str]]): The slices to add the data to.
-            annotation (Optional[dict]): The annotation data.
-            predictions (Optional[List[dict]]): The predictions data.
-            meta (Optional[List[dict]]): The meta data.
-            system_meta (Optional[List[dict]]): The system meta data.
+            data (Data): The data object to create.
 
         Returns:
             Data: The created data.
         """
-        content_service = ContentService()
-        if isinstance(image_content, str):
-            content = content_service.upload_content(
-                image_content,
-                key,
-            )    
-        else:
-            # Detect the image type from BytesIO data
-            content_type = self._detect_image_type(image_content)
-            content = content_service.upload_content_with_data(
-                image_content,
-                content_type,
-                key,
-            )
-
-        # Create Data object for the create_params function
-        data_obj = Data(
-            dataset_id=dataset_id,
-            key=key,
-            type=DataType.SUPERB_IMAGE,
-            slice_ids=slices,
-            scene=[Scene(
-                id=f"{key}_scene_0",
-                type=SceneType.IMAGE,
-                content=content,
-                meta={}
-            )],
-            thumbnail=content,
-            annotation=annotation,
-            predictions=predictions,
-            meta=meta,
-            system_meta=system_meta,
-        )
-
         response = self.request_gql(
             Queries.CREATE,
-            Queries.CREATE["variables"](data_obj)
+            Queries.CREATE["variables"](data)
         )
-        data = Data.model_validate(response)
-        return data
+        return Data.model_validate(response)
 
     def update_data(
         self,
@@ -289,10 +195,6 @@ class DataService(BaseService):
             List[dict],
             UndefinedType,
         ] = Undefined,
-        system_meta: Union[
-            List[dict],
-            UndefinedType,
-        ] = Undefined,
     ):
         """Update a data.
 
@@ -301,7 +203,6 @@ class DataService(BaseService):
             data_id (str): The data id.
             key (Union[str, UndefinedType], optional): The key of the data. Defaults to Undefined.
             meta (Union[List[dict], UndefinedType], optional): The meta data. Defaults to Undefined.
-            system_meta (Union[List[dict], UndefinedType], optional): The system meta data. Defaults to Undefined.
 
         Returns:
             Data: The updated data.
@@ -313,7 +214,6 @@ class DataService(BaseService):
                 data_id=data_id,
                 key=key,
                 meta=meta,
-                system_meta=system_meta,
             )
         )
         data = Data.model_validate(response)
@@ -869,3 +769,98 @@ class DataService(BaseService):
         )
         data = Data.model_validate(response)
         return data
+
+    def get_data_detail(
+        self,
+        dataset_id: str,
+        data_id: str,
+    ) -> Data:
+        """Get detailed data information including all nested relationships.
+        
+        This method retrieves comprehensive data information including:
+        - Scene content references
+        - Annotation versions with content references
+        - Predictions with content references
+        - Thumbnail references
+        
+        Args:
+            dataset_id (str): The dataset ID.
+            data_id (str): The data ID.
+        
+        Returns:
+            Data: The data object with all nested relationships.
+        """
+        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.GET_DETAIL,
+            Queries.GET_DETAIL["variables"](dataset_id, data_id)
+        )
+        data_dict = response.get("data", {})
+        return Data.model_validate(data_dict)
+    
+    def get_evaluation_value_list(
+        self,
+        dataset_id: str,
+        prediction_set_id: str,
+        filter: Union[UndefinedType, dict] = Undefined,
+        length: int = 50,
+        cursor: Union[UndefinedType, str] = Undefined
+    ) -> dict:
+        """Get evaluation values list for diagnosis filtering.
+        
+        Retrieves evaluation values for diagnosis filtering with pagination support.
+        
+        Args:
+            dataset_id (str): The dataset ID.
+            prediction_set_id (str): The prediction set ID.
+            filter (Union[UndefinedType, dict]): Diagnosis filter for evaluation values.
+            length (int): Number of items to retrieve per page.
+            cursor (Union[UndefinedType, str]): Cursor for pagination.
+        
+        Returns:
+            dict: Response containing totalCount, next cursor, and data list with dataId fields.
+        """
+        if dataset_id is None:
+            raise BadParameterError("dataset_id is required.")
+        if prediction_set_id is None:
+            raise BadParameterError("prediction_set_id is required.")
+
+        response = self.request_gql(
+            Queries.GET_EVALUATION_VALUE_LIST,
+            Queries.GET_EVALUATION_VALUE_LIST["variables"](
+                dataset_id=dataset_id,
+                prediction_set_id=prediction_set_id,
+                filter=filter,
+                length=length,
+                cursor=cursor
+            )
+        )
+        return response.get("evaluationValueList", {})
+    
+    def get_total_data_id_count_in_evaluation_value(
+        self,
+        dataset_id: str,
+        prediction_set_id: str,
+        filter: Union[UndefinedType, dict] = Undefined
+    ) -> int:
+        """Get total count of data IDs in evaluation values for diagnosis filtering.
+        
+        Args:
+            dataset_id (str): The dataset ID.
+            prediction_set_id (str): The prediction set ID.
+            filter (Union[UndefinedType, dict]): Diagnosis filter for evaluation values.
+        
+        Returns:
+            int: Total count of evaluation values.
+        """
+        result = self.get_evaluation_value_list(
+            dataset_id=dataset_id,
+            prediction_set_id=prediction_set_id,
+            filter=filter,
+            length=1
+        )
+        return result.get("totalCount", 0)

spb_onprem/datasets/params/__init__.py

@@ -2,10 +2,12 @@ from .dataset import dataset_params
 from .datasets import datasets_params
 from .create_dataset import create_dataset_params
 from .update_dataset import update_dataset_params
+from .delete_dataset import delete_dataset_params
 
 __all__ = (
     "dataset_params",
     "datasets_params",
     "create_dataset_params",
     "update_dataset_params",
+    "delete_dataset_params",
 )