superb-ai-onprem 0.5.8__py3-none-any.whl → 0.5.10__py3-none-any.whl

spb_onprem/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.8'
-__version_tuple__ = version_tuple = (0, 5, 8)
+__version__ = version = '0.5.10'
+__version_tuple__ = version_tuple = (0, 5, 10)
 
 __commit_id__ = commit_id = None

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

@@ -122,7 +122,6 @@ class Queries():
                 $annotation: AnnotationInput,
                 $predictions: [PredictionInput!],
                 $meta: [DataMetaInput!]
-                $systemMeta: [DataMetaInput!]
             ) {{
             createData(
                 datasetId: $datasetId,
@@ -134,7 +133,6 @@ class Queries():
                 annotation: $annotation,
                 predictions: $predictions,
                 meta: $meta,
-                systemMeta: $systemMeta
             ) 
                 {{
                     {Schemas.DATA}
@@ -151,15 +149,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}

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,102 +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,
-            )
-
         response = self.request_gql(
             Queries.CREATE,
-            Queries.CREATE["variables"](
-                dataset_id=dataset_id,
-                key=key,
-                type=DataType.SUPERB_IMAGE,
-                slices=slices,
-                scene=[{
-                    "id": f"{key}_scene_0",
-                    "type": SceneType.IMAGE,
-                    "content": content.model_dump(by_alias=True),
-                    "meta": {}
-                }],
-                thumbnail=content.model_dump(by_alias=True),
-                annotation=annotation,
-                predictions=predictions,
-                meta=meta,
-                system_meta=system_meta,
-            )
+            Queries.CREATE["variables"](data)
         )
-        data = Data.model_validate(response)
-        return data
+        return Data.model_validate(response)
 
     def update_data(
         self,
@@ -286,10 +195,6 @@ class DataService(BaseService):
             List[dict],
             UndefinedType,
         ] = Undefined,
-        system_meta: Union[
-            List[dict],
-            UndefinedType,
-        ] = Undefined,
     ):
         """Update a data.
 
@@ -298,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.
@@ -310,7 +214,6 @@ class DataService(BaseService):
                 data_id=data_id,
                 key=key,
                 meta=meta,
-                system_meta=system_meta,
             )
         )
         data = Data.model_validate(response)

{superb_ai_onprem-0.5.8.dist-info → superb_ai_onprem-0.5.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superb-ai-onprem
-Version: 0.5.8
+Version: 0.5.10
 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.8.dist-info → superb_ai_onprem-0.5.10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 spb_onprem/__init__.py,sha256=lGZRdgpRdBFM97SawPJIC-a5uRzrd5jdb9i5yHDeveQ,2649
-spb_onprem/_version.py,sha256=94GfHP_pnw8tNHpsnH9lv-lFOG6x-yD9RalL7Ee8XUA,704
+spb_onprem/_version.py,sha256=ssU-HhfV0VSycUpIh7CbiGRJhaZLd00QnDLLKR6dd90,706
 spb_onprem/base_model.py,sha256=XLtyoxRBs68LrvbFH8V4EvQGPc2W17koC310MnS37jc,442
 spb_onprem/base_service.py,sha256=dPfr3mGXYlqadOXycu6RBFX1HcZ1qzEsskLoOxERLOU,5737
 spb_onprem/base_types.py,sha256=5HO6uy6qf08b4KSElwIaGy7UkoQG2KqVO6gcHbsqqSo,269
@@ -31,11 +31,11 @@ spb_onprem/contents/params/__init__.py,sha256=TYVs27fn47eTjnXGL6SQvkbWQqWaGwY6hJ
 spb_onprem/contents/params/create.py,sha256=JLMbNiIecOsVvVSYY6DfUpWjZxZKuO9-NSpuRlSIxS0,408
 spb_onprem/contents/params/get_download_url.py,sha256=3oaiqmjJRxw0U59SoTxoih1pcU-cuQvcU-g89lCcqtQ,98
 spb_onprem/data/__init__.py,sha256=5XKxNm2BlKufrX5uRQreUEzJ-nerTrozKpG1RJL5wt8,68
-spb_onprem/data/queries.py,sha256=B5vd_8Q8ziwtz44GozbZ-yEN5zKAgMY8wKex-YJJJSs,15607
-spb_onprem/data/service.py,sha256=Nt6kO64pZVy_pVVmoGgCPl_1cf6-VHb9fsiD7iigiiU,25876
+spb_onprem/data/queries.py,sha256=FgmTnTL1LeIyOW7WZNT6djpW5hIE7gx-f-a1QJZ43T8,15433
+spb_onprem/data/service.py,sha256=EWKRCVW4XCrC1F-DUSj3IK-8xoFE3LzMUD5oZVbWDjA,22402
 spb_onprem/data/entities/__init__.py,sha256=ZQ2YWAHIan2ZLa1z5ozPSJwW3pqdlsJCxmAT3NuG89c,376
 spb_onprem/data/entities/annotation.py,sha256=pS97Nx3TWMBrb-iiBfRct4RXl7hPMy2IOzTIpXkmBJU,751
-spb_onprem/data/entities/data.py,sha256=9wD6fk6K-GDaCesWhxA4vW8IyrlG2Tn7xqR1ZB7VN6k,1293
+spb_onprem/data/entities/data.py,sha256=TOdnete4bfwROQ7C7oew7vV8bZyewQvFdjccyx4mec8,1217
 spb_onprem/data/entities/data_meta.py,sha256=zh5Cw_5F5c9f0Ixp-rHDe6P4PceSdIHHwTqcaMoW9Yk,1064
 spb_onprem/data/entities/data_slice.py,sha256=5ElQvOJE6Ivo9mWeNS3JlUV3EUtw8LAejPkfdLRq2aE,633
 spb_onprem/data/entities/frame.py,sha256=pnJ3rVzduvi_pZdJR_IJp2wRhexZspSDMUhY6CsY5Io,566
@@ -50,7 +50,7 @@ spb_onprem/data/params/__init__.py,sha256=G83X-qgnWnuOMuMpsDKO0NZ9xWqQtmk6bdaT47
 spb_onprem/data/params/change_data_labeler.py,sha256=jUG6bm0uheR1jVCy-RwFY97C9K93fdDdf3KDHJIelM4,570
 spb_onprem/data/params/change_data_reviewer.py,sha256=dFix3NfS2_8lpaoWxz6anLEJWMLdmRKM34ib8XwQiVQ,577
 spb_onprem/data/params/change_data_status.py,sha256=34gGtmTJT8wiDDpHOgQYvgP0-ziuYEBDFlpfY8SAZtI,593
-spb_onprem/data/params/create_data.py,sha256=8DOfbEchf9GSybiYY1cZoNzNYwILokoAkxXRFybJUAU,2038
+spb_onprem/data/params/create_data.py,sha256=aL6Bwd9talB2rnmdHbR9QkUx1Msni07-6aoBkhGoivM,1827
 spb_onprem/data/params/data.py,sha256=ZPJRjCbkjOCV73NxlGm5DxbSaNOAztVBRZRE8FFQ9mw,779
 spb_onprem/data/params/data_list.py,sha256=sxMBaK3n2YgbUQ9yNmcRkcngbClnkEJFAeeX07umS2M,8645
 spb_onprem/data/params/delete_annotation_version.py,sha256=R_jBVujor-09VS1Aa8yGP14R8nJ2Aa9OmmKezC4gz4c,457
@@ -66,13 +66,13 @@ spb_onprem/data/params/insert_slice_annotation_version.py,sha256=KinI05UaaQWcv-1
 spb_onprem/data/params/remove_data_from_slice.py,sha256=UjoQH0gTdm1nE1DafUmq3CP1nzHiCwDUnytQ6oBcZAA,478
 spb_onprem/data/params/remove_data_meta.py,sha256=nlj2Ln9CtdS4Si8TmETZlQoAU62nCTCLbZR2_yE3yB8,1847
 spb_onprem/data/params/update_annotation.py,sha256=zEmXYlBBYeC8A9eNyGidSw2XbgLd-pgvRZK5eui2plA,787
-spb_onprem/data/params/update_data.py,sha256=zlIqvUzMrEh-6eRUZ35lKmG2Ep6pYCPEl9dWvXz2rdM,1861
+spb_onprem/data/params/update_data.py,sha256=159Mx-5gmKQZKSAZlpTNiE4_EHVNwkEbjyeOZLs9SuM,1315
 spb_onprem/data/params/update_data_slice.py,sha256=xjxUs0y4koFtW1uW84ARKsepK8FwhGVjMkSMS6A1eFU,523
 spb_onprem/data/params/update_frames.py,sha256=AluCJDUJelq_yrXR3DjkwWF-82qQukvERkIE-qNjO8I,1226
 spb_onprem/data/params/update_scene.py,sha256=zMJFUHF3vz_hVSkkVEwHwdZBjWRbRxgTQFtsBowAg-k,930
 spb_onprem/data/params/update_slice_annotation.py,sha256=7eu2DFvznOv0HuvKiZTHDOTS2UijyTjbEiqLBbUncfE,607
 spb_onprem/data/params/update_slice_annotation_version.py,sha256=M2STViLDSQDZ0WNYLcenum-NHpKQXUOfGh1XE6An_7c,1318
-spb_onprem/data/params/upsert_data_meta.py,sha256=gVj-IY4V8DDbQQI9kEIwnwz7Pg4ObwUzyBhFoDNE-v4,1507
+spb_onprem/data/params/upsert_data_meta.py,sha256=faBI9UuH9onOxmEHc4C63nFJXqZ8YMnD2q-HKj_ZMxM,1033
 spb_onprem/datasets/__init__.py,sha256=Sjrb1tewB3CoODtHjRYOe-w2HpZi9UgbCyE2p8MzHfw,74
 spb_onprem/datasets/queries.py,sha256=PSj-3tOJfWUw8YXsv682LbcZoGbGHGgSQbWQGXjLePY,1912
 spb_onprem/datasets/service.py,sha256=ehc3IMYCN72pWZXvSs-j5jeYWQ6CxkU-0AA1-OwmtIk,3872
@@ -108,7 +108,7 @@ spb_onprem/slices/params/update_slice.py,sha256=kryOmCnRTQ_OU0qDKgugppLrpeUpuLwm
 spb_onprem/users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spb_onprem/users/entities/__init__.py,sha256=X8HZsCTlQnuPszok3AwI-i7bsQi0Ehul5L_2jZaol5E,57
 spb_onprem/users/entities/auth.py,sha256=_KP-7yUErBxhJMm-dE3ObprPEG6e0JI2qNg6g8aK1qM,3371
-superb_ai_onprem-0.5.8.dist-info/licenses/LICENSE,sha256=CdinbFiHKGkGl6cPde6WgXhMuzyUXEG6tzy2-7udZ8o,1066
+superb_ai_onprem-0.5.10.dist-info/licenses/LICENSE,sha256=CdinbFiHKGkGl6cPde6WgXhMuzyUXEG6tzy2-7udZ8o,1066
 tests/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 tests/activities/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 tests/activities/real_test.py,sha256=0gQHg7rIEuZndGZyNHMWSD5nUZPMsUGigfCjWFxMthQ,1786
@@ -121,7 +121,7 @@ tests/exports/test_entities.py,sha256=hG7G4kVkyHKT3mv4lvrzUqOW8ILeHiYj87QZjQcmg9
 tests/exports/test_integration.py,sha256=cCcEgwIIHyQRlc04EAXSKz7RcblQvhI2GBR3uVaOOq8,6201
 tests/exports/test_params.py,sha256=oRRa6nEru_FImlB3TrmFiBidz6ZstCx4rVaCK-EMGfQ,11070
 tests/exports/test_service.py,sha256=IDcKxrmByh00jk9142P2ThuGureMoijTHNdU0rERGG8,14628
-superb_ai_onprem-0.5.8.dist-info/METADATA,sha256=uuwPhCI6hNstRsrePMgkC2O3caJVLUeChVb8r6do8sI,5817
-superb_ai_onprem-0.5.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-superb_ai_onprem-0.5.8.dist-info/top_level.txt,sha256=LbqU6FjWKaxO7FPS5-71e3OIS8VgBi5VrtQMWFOW25Q,17
-superb_ai_onprem-0.5.8.dist-info/RECORD,,
+superb_ai_onprem-0.5.10.dist-info/METADATA,sha256=JJIfex7sDBjoqRwth4WEEkTyMzsu1qALX9arBRqbd0g,5818
+superb_ai_onprem-0.5.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+superb_ai_onprem-0.5.10.dist-info/top_level.txt,sha256=LbqU6FjWKaxO7FPS5-71e3OIS8VgBi5VrtQMWFOW25Q,17
+superb_ai_onprem-0.5.10.dist-info/RECORD,,