synapse-sdk 1.0.0a53__tar.gz → 1.0.0a55__tar.gz

{synapse_sdk-1.0.0a53 → synapse_sdk-1.0.0a55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse-sdk
-Version: 1.0.0a53
+Version: 1.0.0a55
 Summary: synapse sdk
 Author-email: datamaker <developer@datamaker.io>
 License: MIT

{synapse_sdk-1.0.0a53 → synapse_sdk-1.0.0a55}/synapse_sdk/clients/backend/__init__.py

@@ -1,6 +1,6 @@
 from synapse_sdk.clients.backend.annotation import AnnotationClientMixin
 from synapse_sdk.clients.backend.core import CoreClientMixin
-from synapse_sdk.clients.backend.data_collection import DataCollectionClientMixin
+from synapse_sdk.clients.backend.dataset import DatasetClientMixin
 from synapse_sdk.clients.backend.hitl import HITLClientMixin
 from synapse_sdk.clients.backend.integration import IntegrationClientMixin
 from synapse_sdk.clients.backend.ml import MLClientMixin
@@ -9,7 +9,7 @@ from synapse_sdk.clients.backend.ml import MLClientMixin
 class BackendClient(
     AnnotationClientMixin,
     CoreClientMixin,
-    DataCollectionClientMixin,
+    DatasetClientMixin,
     IntegrationClientMixin,
     MLClientMixin,
     HITLClientMixin,

synapse_sdk-1.0.0a53/synapse_sdk/clients/backend/data_collection.py → synapse_sdk-1.0.0a55/synapse_sdk/clients/backend/dataset.py

@@ -8,13 +8,13 @@ from synapse_sdk.clients.base import BaseClient
 from synapse_sdk.clients.utils import get_batched_list
 
 
-class DataCollectionClientMixin(BaseClient):
-    def list_data_collection(self):
+class DatasetClientMixin(BaseClient):
+    def list_dataset(self):
         path = 'data_collections/'
         return self._list(path)
 
-    def get_data_collection(self, data_collection_id):
-        """Get data_collection from synapse-backend.
+    def get_dataset(self, data_collection_id):
+        """Get dataset from synapse-backend.
 
         Args:
             data_collection_id: The data_collection id to get.
@@ -40,19 +40,19 @@ class DataCollectionClientMixin(BaseClient):
         path = 'data_units/'
         return self._post(path, data=data)
 
-    def upload_data_collection(
+    def upload_dataset(
         self,
-        data_collection_id: int,
-        data_collection: Dict,
+        dataset_id: int,
+        dataset: Dict,
         project_id: Optional[int] = None,
         batch_size: int = 1000,
         process_pool: int = 10,
     ):
-        """Upload data_collection to synapse-backend.
+        """Upload dataset to synapse-backend.
 
         Args:
-            data_collection_id: The data_collection id to upload the data to.
-            data_collection: The data_collection to upload.
+            dataset_id: The dataset id to upload the data to.
+            dataset: The dataset to upload.
                 * structure:
                     - files: The files to upload. (key: file name, value: file pathlib object)
                     - meta: The meta data to upload.
@@ -60,14 +60,14 @@ class DataCollectionClientMixin(BaseClient):
             batch_size: The batch size to upload the data.
             process_pool: The process pool to upload the data.
         """
-        # TODO validate data_collection with schema
+        # TODO validate dataset with schema
 
-        params = [(data, data_collection_id) for data in data_collection]
+        params = [(data, dataset_id) for data in dataset]
 
         with Pool(processes=process_pool) as pool:
-            data_collection = pool.starmap(self.upload_data_file, tqdm(params))
+            dataset = pool.starmap(self.upload_data_file, tqdm(params))
 
-        batches = get_batched_list(data_collection, batch_size)
+        batches = get_batched_list(dataset, batch_size)
 
         for batch in tqdm(batches):
             data_units = self.create_data_units(batch)
@@ -90,7 +90,7 @@ class DataCollectionClientMixin(BaseClient):
                 * structure:
                     - files: The files to upload. (key: file name, value: file pathlib object)
                     - meta: The meta data to upload.
-            data_collection_id: The data_collection id to upload the data to.
+            data_collection_id: The dataset id to upload the data to.
 
         Returns:
             Dict: The result of the upload.

{synapse_sdk-1.0.0a53 → synapse_sdk-1.0.0a55}/synapse_sdk/clients/ray/serve.py

@@ -8,6 +8,7 @@ class ServeClientMixin(BaseClient):
         response = self._get(path, params=params)
         for key, item in response['applications'].items():
             response['applications'][key]['deployments'] = list(item['deployments'].values())
+            response['applications'][key]['route_prefix'] = item['route_prefix']
         return list(response['applications'].values())
 
     def get_serve_application(self, pk, params=None):
@@ -15,6 +16,7 @@ class ServeClientMixin(BaseClient):
         response = self._get(path, params=params)
         try:
             response['applications'][pk]['deployments'] = list(response['applications'][pk]['deployments'].values())
+            response['applications'][pk]['route_prefix'] = response['applications'][pk]['route_prefix']
             return response['applications'][pk]
         except KeyError:
             raise ClientError(404, 'Serve Application Not Found')

{synapse_sdk-1.0.0a53 → synapse_sdk-1.0.0a55}/synapse_sdk/plugins/categories/export/actions/export.py

@@ -27,13 +27,6 @@ class ExportRun(Run):
         error: str | None = None
         created: str
 
-    class MetricsRecord(BaseModel):
-        """Metrics record model."""
-
-        stand_by: int
-        failed: int
-        success: int
-
     def log_file(
         self, log_type: str, target_id: int, data_file_info: dict, status: ExportStatus, error: str | None = None
     ):
@@ -58,16 +51,6 @@ class ExportRun(Run):
             ).model_dump(),
         )
 
-    def log_metrics(self, record: MetricsRecord, category: str):
-        """Log export metrics.
-
-        Args:
-            record (MetricsRecord): The metrics record to log.
-            category (str): The category of the metrics.
-        """
-        record = self.MetricsRecord.model_validate(record)
-        self.set_metrics(value=record.dict(), category=category)
-
     def export_log_json_file(
         self,
         target_id: int,
@@ -280,7 +263,6 @@ class ExportAction(Action):
             'proportion': 100,
         }
     }
-    metrics_categories = {'data_file', 'original_file'}
 
     def get_filtered_results(self, filters, handler):
         """Get filtered target results."""

{synapse_sdk-1.0.0a53 → synapse_sdk-1.0.0a55}/synapse_sdk/plugins/categories/export/templates/plugin/export.py

@@ -42,8 +42,6 @@ def export(run, export_items, path_root, **params):
     origin_files_output_path.mkdir(parents=True, exist_ok=True)
 
     total = params['count']
-    original_file_metrics_record = run.MetricsRecord(stand_by=total, success=0, failed=0)
-    data_file_metrics_record = run.MetricsRecord(stand_by=total, success=0, failed=0)
     # progress init
     run.set_progress(0, total, category='dataset_conversion')
     for no, export_item in enumerate(export_items, start=1):
@@ -58,30 +56,12 @@ def export(run, export_items, path_root, **params):
         if save_original_file_flag:
             if no == 1:
                 run.log_message('Saving original file.')
-            original_status = save_original_file(run, final_data, origin_files_output_path, errors_original_file_list)
-
-            original_file_metrics_record.stand_by -= 1
-            if original_status == ExportStatus.FAILED:
-                original_file_metrics_record.failed += 1
-                continue
-            else:
-                original_file_metrics_record.success += 1
-
-        run.log_metrics(record=original_file_metrics_record, category='original_file')
+            save_original_file(run, final_data, origin_files_output_path, errors_original_file_list)
 
         # Extract data as JSON files
         if no == 1:
             run.log_message('Saving json file.')
-        data_status = save_as_json(run, final_data, json_output_path, errors_json_file_list)
-
-        data_file_metrics_record.stand_by -= 1
-        if data_status == ExportStatus.FAILED:
-            data_file_metrics_record.failed += 1
-            continue
-        else:
-            data_file_metrics_record.success += 1
-
-        run.log_metrics(record=data_file_metrics_record, category='data_file')
+        save_as_json(run, final_data, json_output_path, errors_json_file_list)
 
     run.end_log()
 
@@ -146,7 +126,6 @@ def save_original_file(run, result, base_path, error_file_list):
         status = ExportStatus.FAILED
 
     run.export_log_original_file(result['id'], file_info, status, error_msg)
-    return status
 
 
 def save_as_json(run, result, base_path, error_file_list):
@@ -173,4 +152,3 @@ def save_as_json(run, result, base_path, error_file_list):
         status = ExportStatus.FAILED
 
     run.export_log_json_file(result['id'], file_info, status, error_msg)
-    return status