superb-ai-onprem 0.5.9__tar.gz → 0.5.11__tar.gz

superb_ai_onprem-0.5.11/.github/workflows/tests.yml

@@ -0,0 +1,42 @@
+name: CI - Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Cache pip dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: pip-${{ runner.os }}-3.11-${{ hashFiles('setup.py', 'requirements-test.txt') }}
+          restore-keys: |
+            pip-${{ runner.os }}-3.11-
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -e .
+          pip install -r requirements-test.txt
+
+      - name: Run tests
+        run: |
+          pytest tests/ -v --ignore=tests/activities/real_test.py --ignore=tests/exports/real_test.py

{superb_ai_onprem-0.5.9/superb_ai_onprem.egg-info → superb_ai_onprem-0.5.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superb-ai-onprem
-Version: 0.5.9
+Version: 0.5.11
 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.11/requirements-test.txt

@@ -0,0 +1,7 @@
+# Test dependencies for superb-ai-onprem-python SDK
+pytest>=7.0.0
+pytest-cov>=4.0.0
+pytest-mock>=3.10.0
+
+# Additional testing utilities
+coverage>=7.0.0

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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",

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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 = 'gd78508cdd'
+__commit_id__ = commit_id = 'gf23f2712d'

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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,

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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",
 )

superb_ai_onprem-0.5.11/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}

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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
+    }

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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)

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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")

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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",

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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 [],
     }

superb_ai_onprem-0.5.11/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
+    }

superb_ai_onprem-0.5.11/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

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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

{superb_ai_onprem-0.5.9 → superb_ai_onprem-0.5.11}/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
+    }