superb-ai-onprem 0.5.10__py3-none-any.whl → 0.5.12__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 (
@@ -28,6 +31,7 @@ from .entities import (
     Export,
     Content,
     Frame,
+    Model,
 
     # Enums
     DataType,
@@ -77,6 +81,9 @@ __all__ = (
     "ActivityService",
     "ExportService",
     "ContentService",
+    "PredictionService",
+    "ModelService",
+    "InferService",
 
     # Core Entities
     "Data",
@@ -93,6 +100,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.10'
-__version_tuple__ = version_tuple = (0, 5, 10)
+__version__ = version = '0.5.12'
+__version_tuple__ = version_tuple = (0, 5, 12)
 
 __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/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/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/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():
@@ -590,3 +620,43 @@ class Queries():
         ''',
         "variables": update_frames_params,
     }
+    
+    GET_DETAIL = {
+        "name": "getDataDetail",
+        "query": f'''
+            query GetDataDetail($datasetId: ID!, $id: ID!) {{
+                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

@@ -269,7 +269,7 @@ class DataService(BaseService):
         self,
         dataset_id: str,
         data_id: str,
-    ):
+    ) -> bool:
         """Delete a data.
 
         Args:
@@ -277,14 +277,21 @@ class DataService(BaseService):
             data_id (str): The data id.
 
         Returns:
-            Data: The deleted data.
+            bool: True if deletion was successful.
+        
+        Raises:
+            BadParameterError: If required parameters are missing.
         """
+        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.DELETE,
             Queries.DELETE["variables"](dataset_id=dataset_id, data_id=data_id)
         )
-        data = Data.model_validate(response)
-        return data
+        return response.get("deleteData", False)
 
     def insert_prediction(
         self,
@@ -769,3 +776,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",
 )

spb_onprem/datasets/params/delete_dataset.py

@@ -0,0 +1,12 @@
+def delete_dataset_params(dataset_id: str):
+    """Generate variables for delete dataset GraphQL mutation.
+    
+    Args:
+        dataset_id (str): The ID of the dataset to delete.
+        
+    Returns:
+        dict: Variables dictionary for the GraphQL mutation.
+    """
+    return {
+        "dataset_id": dataset_id
+    }

spb_onprem/datasets/queries.py

@@ -3,6 +3,7 @@ from spb_onprem.datasets.params import (
     datasets_params,
     create_dataset_params,
     update_dataset_params,
+    delete_dataset_params,
 )
 
 class Schemas:
@@ -77,3 +78,13 @@ class Queries():
         ''',
         "variables": update_dataset_params,
     }
+    
+    DELETE_DATASET = {
+        "name": "deleteDataset",
+        "query": '''
+            mutation DeleteDataset($dataset_id: ID!) {
+                deleteDataset(datasetId: $dataset_id)
+            }
+        ''',
+        "variables": delete_dataset_params,
+    }

spb_onprem/datasets/service.py

@@ -130,3 +130,21 @@ class DatasetService(BaseService):
             ),
         )
         return Dataset.model_validate(response)
+    
+    def delete_dataset(self, dataset_id: str) -> bool:
+        """Delete the dataset.
+        
+        Args:
+            dataset_id (str): The ID of the dataset to delete.
+        
+        Returns:
+            bool: True if deletion was successful.
+        """
+        if dataset_id is None:
+            raise BadParameterError("dataset_id is required.")
+
+        response = self.request_gql(
+            Queries.DELETE_DATASET,
+            Queries.DELETE_DATASET["variables"](dataset_id=dataset_id)
+        )
+        return response.get("deleteDataset", False)

spb_onprem/entities.py

@@ -26,6 +26,8 @@ from .activities.entities import (
 )
 from .exports.entities import Export
 from .contents.entities import Content
+from .predictions.entities import PredictionSet
+from .models.entities import Model
 
 __all__ = [
     # Core Entities
@@ -43,6 +45,8 @@ __all__ = [
     "Export",
     "Content",
     "Frame",
+    "PredictionSet",
+    "Model",
 
     # Enums
     "DataType",

spb_onprem/inferences/__init__.py

@@ -0,0 +1,5 @@
+from .service import InferService
+
+__all__ = [
+    "InferService",
+]

spb_onprem/inferences/service.py

@@ -0,0 +1,56 @@
+import os
+from typing import Dict, Any
+
+from spb_onprem.base_service import BaseService
+from spb_onprem.exceptions import BadParameterError
+
+
+class InferService(BaseService):
+    """Service class for handling inference operations."""
+    
+    def __init__(self):
+        super().__init__()
+        self.model_endpoint_url = os.environ.get("MODEL_ENDPOINT_URL")
+        if not self.model_endpoint_url:
+            raise ValueError("MODEL_ENDPOINT_URL environment variable is required")
+    
+    def infer_data(
+        self,
+        model_id: str,
+        base64_image: str
+    ) -> Dict[str, Any]:
+        """Perform inference on image data using the specified model.
+        
+        Args:
+            model_id (str): The model ID to use for inference.
+            base64_image (str): Base64 encoded image data.
+        
+        Returns:
+            Dict[str, Any]: The inference result.
+        
+        Raises:
+            BadParameterError: If required parameters are missing.
+        """
+        if model_id is None:
+            raise BadParameterError("model_id is required.")
+        if base64_image is None:
+            raise BadParameterError("base64_image is required.")
+            
+        payload = {
+            "model_id": model_id,
+            "base64_image": base64_image,
+        }
+        
+        try:
+            response = self.request(
+                method="POST",
+                url=self.model_endpoint_url,
+                json_data=payload,
+                headers={
+                    "Content-Type": "application/json"
+                }
+            )
+            return response
+        except Exception as e:
+            print(f"Failed to fetch inference result: {e}")
+            raise

spb_onprem/models/__init__.py

@@ -0,0 +1,7 @@
+from .service import ModelService
+from .entities import Model
+
+__all__ = [
+    "ModelService",
+    "Model",
+]

spb_onprem/models/entities.py

@@ -0,0 +1,9 @@
+from typing import Optional
+from spb_onprem.base_model import BaseModel
+
+
+class Model(BaseModel):
+    """Model entity representing a model in the dataset."""
+    
+    id: str
+    name: Optional[str] = None

spb_onprem/models/params/__init__.py

@@ -0,0 +1,7 @@
+from .get_models import get_models_params
+from .delete_model import delete_model_params
+
+__all__ = [
+    "get_models_params",
+    "delete_model_params",
+]

spb_onprem/models/params/delete_model.py

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

spb_onprem/models/params/get_models.py

@@ -0,0 +1,29 @@
+def get_models_params(
+    dataset_id: str,
+    filter: dict = None,
+    cursor: str = None,
+    length: int = 50
+):
+    """Generate variables for get models GraphQL query.
+    
+    Args:
+        dataset_id (str): The ID of the dataset.
+        filter (dict, optional): Filter for models.
+        cursor (str, optional): Cursor for pagination.
+        length (int): Number of items to retrieve per page.
+        
+    Returns:
+        dict: Variables dictionary for the GraphQL query.
+    """
+    params = {
+        "dataset_id": dataset_id,
+        "length": length
+    }
+    
+    if filter is not None:
+        params["filter"] = filter
+        
+    if cursor is not None:
+        params["cursor"] = cursor
+        
+    return params

spb_onprem/models/queries.py

@@ -0,0 +1,33 @@
+from .params import (
+    get_models_params,
+    delete_model_params,
+)
+
+
+class Queries:
+    GET_MODELS = {
+        "name": "getModels",
+        "query": '''
+            query GetModels($dataset_id: String!, $filter: ModelFilter, $cursor: String, $length: Int) {
+                models(datasetId: $dataset_id, filter: $filter, cursor: $cursor, length: $length) {
+                    models {
+                        id
+                        name
+                    }
+                    next
+                    totalCount
+                }
+            }
+        ''',
+        "variables": get_models_params
+    }
+    
+    DELETE_MODEL = {
+        "name": "deleteModel",
+        "query": '''
+            mutation DeleteModel($dataset_id: String!, $id: String!) {
+                deleteModel(datasetId: $dataset_id, id: $id)
+            }
+        ''',
+        "variables": delete_model_params
+    }