synapse-sdk 1.0.0a54__py3-none-any.whl → 1.0.0a55__py3-none-any.whl

synapse_sdk/clients/backend/dataset.py

@@ -10,16 +10,16 @@ from synapse_sdk.clients.utils import get_batched_list
 
 class DatasetClientMixin(BaseClient):
     def list_dataset(self):
-        path = 'datasets/'
+        path = 'data_collections/'
         return self._list(path)
 
-    def get_dataset(self, dataset_id):
+    def get_dataset(self, data_collection_id):
         """Get dataset from synapse-backend.
 
         Args:
-            dataset_id: The dataset id to get.
+            data_collection_id: The data_collection id to get.
         """
-        path = f'datasets/{dataset_id}/?expand=file_specifications'
+        path = f'data_collections/{data_collection_id}/?expand=file_specifications'
         return self._get(path)
 
     def create_data_file(self, file_path: Path):
@@ -82,7 +82,7 @@ class DatasetClientMixin(BaseClient):
 
                 self.create_tasks(tasks_data)
 
-    def upload_data_file(self, data: Dict, dataset_id: int) -> Dict:
+    def upload_data_file(self, data: Dict, data_collection_id: int) -> Dict:
         """Upload files to synapse-backend.
 
         Args:
@@ -90,13 +90,13 @@ class DatasetClientMixin(BaseClient):
                 * structure:
                     - files: The files to upload. (key: file name, value: file pathlib object)
                     - meta: The meta data to upload.
-            dataset_id: The dataset id to upload the data to.
+            data_collection_id: The dataset id to upload the data to.
 
         Returns:
             Dict: The result of the upload.
         """
         for name, path in data['files'].items():
             data_file = self.create_data_file(path)
-            data['dataset'] = dataset_id
+            data['data_collection'] = data_collection_id
             data['files'][name] = {'checksum': data_file['checksum'], 'path': str(path)}
         return data

synapse_sdk/plugins/categories/upload/actions/upload.py

@@ -1,6 +1,8 @@
 import json
+import re
 from datetime import datetime
 from enum import Enum
+from pathlib import Path
 from typing import Annotated, Dict, List
 
 from pydantic import AfterValidator, BaseModel, field_validator
@@ -201,7 +203,7 @@ class UploadAction(Action):
             'generate_tasks': (5, 45, 25, 25, 0),
             'generate_ground_truths': (5, 35, 30, 15, 15),
         }
-        options = kwargs['plugin_config']['actions']['upload']['options']
+        options = self.config.get('options', {})
         progress_categories = self.progress_categories
         if options['allow_generate_tasks'] and not kwargs['params']['allow_generate_ground_truths']:
             ratio_name = 'generate_tasks'
@@ -217,9 +219,9 @@ class UploadAction(Action):
             progress_categories[category]['proportion'] = progress_ratios[ratio_name][i]
         self.progress_categories = progress_categories
 
-    def get_uploader(self, path):
+    def get_uploader(self, path, file_specification, organized_files):
         """Get uploader from entrypoint."""
-        return self.entrypoint(self.run, path)
+        return self.entrypoint(self.run, path, file_specification, organized_files)
 
     def start(self) -> Dict:
         """Start upload process.
@@ -231,19 +233,23 @@ class UploadAction(Action):
         storage = self.client.get_storage(self.params['storage'])
         pathlib_cwd = get_pathlib(storage, self.params['path'])
 
-        # Initialize uploader.
-        uploader = self.get_uploader(pathlib_cwd)
-
         # Analyze Collection file specifications to determine the data structure for upload.
         file_specification_template = self._analyze_collection()
+        organized_files = self._organize_files(pathlib_cwd, file_specification_template)
+
+        # Initialize uploader.
+        uploader = self.get_uploader(pathlib_cwd, file_specification_template, organized_files)
 
         # Setup result dict.
         result = {}
 
-        # Organize data according to Collection file specification structure.
+        # Get organized files from the uploader (plugin developer's custom implementation)
+        # or use the default organization method if uploader doesn't provide valid files
         organized_files = uploader.handle_upload_files()
-        if not self._validate_organized_files(file_specification_template, organized_files):
-            self.run.log_message('Validate organized files failed.')
+
+        # Validate the organized files
+        if not self._validate_organized_files(organized_files, file_specification_template):
+            self.run.log_message('Validation failed.', context=Context.ERROR.value)
             self.run.end_log()
             return result
 
@@ -307,11 +313,6 @@ class UploadAction(Action):
 
         return collection['file_specifications']
 
-    def _validate_organized_files(self, file_specification_template: Dict, organized_files: List) -> bool:
-        """Validate organized files from Uploader."""
-        validator = FileSpecificationValidator(file_specification_template, organized_files)
-        return validator.validate()
-
     def _upload_files(self, organized_files, organized_files_count: int) -> List:
         """Upload files to synapse-backend.
 
@@ -419,3 +420,174 @@ class UploadAction(Action):
         # Finish progress
         self.run.log_message('Generating ground truths completed')
         self.run.set_progress(1, 1, category='generate_ground_truths')
+
+    def _validate_organized_files(self, organized_files: List, file_specification_template: Dict) -> bool:
+        """Validate organized files from Uploader."""
+        validator = FileSpecificationValidator(file_specification_template, organized_files)
+        return validator.validate()
+
+    def _organize_files(self, directory: Path, file_specification: List) -> List:
+        """Organize files according to the file specification.
+        This method handles type-based directory structure where files are organized in
+        directories named after file types (e.g., 'image_1/' directory contains image files
+        like '1.jpg', '2.jpg'). For each dataset ID found in the primary directory, it attempts
+        to find corresponding files in all type directories.
+
+        TODO : Add Logic to handle file specific name patterns and extensions.
+        (e.g. pcd:S_DCH_230725_0156_LR_037.pcd, image_1:S_DCH_230725_0156_FC_037, image_2:S_DCH_230725_0156_LF_037.jpg)
+        Args:
+            directory (Path): Root directory containing files to organize.
+            file_specification (List): File specification list.
+        Returns:
+            List: List of dictionaries containing organized files.
+        """
+        organized_files = []
+        self.run.log_message(f'Looking for files in {directory}...')
+
+        # Check for type-based directory structure (e.g., image_1/, pcd_1/)
+        type_dirs = {}
+        type_extensions = {}  # Store common extensions for each type directory
+
+        for spec in file_specification:
+            spec_name = spec['name']
+
+            spec_dir = directory / spec_name
+            if spec_dir.exists() and spec_dir.is_dir():
+                type_dirs[spec_name] = spec_dir
+
+                # Analyze file extensions in this directory
+                extensions = {}
+                for file_path in spec_dir.glob('*'):
+                    if file_path.is_file():
+                        ext = file_path.suffix.lower()
+                        extensions[ext] = extensions.get(ext, 0) + 1
+
+                # Find the most common extension
+                if extensions:
+                    common_ext = max(extensions.items(), key=lambda x: x[1])[0]
+                    type_extensions[spec_name] = common_ext
+                    self.run.log_message(f'Found type directory: {spec_name} (common extension: {common_ext})')
+
+        # If type-based directories don't exist, exit early
+        if not type_dirs:
+            self.run.log_message('No type-based directory structure found.', context=Context.INFO.value)
+            return organized_files
+
+        self.run.log_message('Detected type-based directory structure')
+
+        # Build a comprehensive map of all dataset IDs across all type directories
+        dataset_files = {}  # Dictionary: file_name -> {spec_name -> file_path}
+
+        # First pass: collect all dataset IDs from all type directories
+        for spec_name, dir_path in type_dirs.items():
+            for file_path in dir_path.glob('*'):
+                if file_path.is_file():
+                    file_name = file_path.stem
+
+                    # Initialize dataset entry if it doesn't exist
+                    if file_name not in dataset_files:
+                        dataset_files[file_name] = {}
+
+                    # Map this file to its specification
+                    if spec_name not in dataset_files[file_name]:
+                        dataset_files[file_name][spec_name] = file_path
+                    else:
+                        # If multiple files with same file_name for same spec, use most recent
+                        existing_file = dataset_files[file_name][spec_name]
+                        if file_path.stat().st_mtime > existing_file.stat().st_mtime:
+                            dataset_files[file_name][spec_name] = file_path
+                            self.run.log_message(
+                                f"Found newer file for name of {file_name}, spec '{spec_name}': "
+                                f'{file_path.name} (replacing {existing_file.name})'
+                            )
+
+        if not dataset_files:
+            self.run.log_message('No dataset files found.', context=Context.WARNING.value)
+            return organized_files
+
+        self.run.log_message(f'Found {len(dataset_files)} potential datasets by ID')
+
+        # Second pass: organize valid datasets
+        for file_name, files_dict in sorted(dataset_files.items()):
+            self.run.log_message(f'Processing file name: {file_name}')
+
+            # Add file spec details for logging
+            for spec_name, file_path in files_dict.items():
+                self.run.log_message(f"Mapped '{spec_name}' to: {file_path.name}")
+
+            # Check if all required files are present
+            required_specs = [spec['name'] for spec in file_specification if spec.get('is_required', False)]
+            if all(req in files_dict for req in required_specs):
+                # Create metadata for this dataset
+                meta_data = {
+                    'origin_file_stem': file_name,
+                    'created_at': datetime.now().isoformat(),
+                }
+
+                # Add the organized dataset
+                organized_files.append({'files': files_dict, 'meta': meta_data})
+                self.run.log_message(f'Successfully organized dataset for ID {file_name}')
+            else:
+                # Missing required files warning
+                missing = [req for req in required_specs if req not in files_dict]
+                self.run.log_message(
+                    f'Dataset ID {file_name} is missing required files: {", ".join(missing)}',
+                    context=Context.WARNING.value,
+                )
+
+        self.run.log_message(f'Total datasets organized: {len(organized_files)}')
+        return organized_files
+
+    def _map_files_to_specification(self, directory: Path, file_specification: List) -> Dict[str, Path]:
+        """Map files in a directory to the file specification.
+
+        Args:
+            directory (Path): Directory containing files to map.
+            file_specification (List): File specification list.
+
+        Returns:
+            Dict[str, Path]: Dictionary mapping file specification names to file paths.
+        """
+        files_dict = {}
+
+        # Get all files in the directory once
+        all_files = [f for f in directory.iterdir() if f.is_file()]
+
+        # Process each file specification
+        for file_spec in file_specification:
+            file_name = file_spec['name']
+            is_required = file_spec.get('is_required', False)
+
+            # Generate name pattern based on the specification
+            name_parts = re.split(r'_(\d+)$', file_name)
+
+            # Find files matching the pattern
+            matching_files = []
+            if len(name_parts) > 1:
+                base_name = name_parts[0]
+                index = name_parts[1]
+                # Match patterns like "pcd_1.ext", "point_cloud_1.ext", etc.
+                for file in all_files:
+                    if base_name in file.stem and f'_{index}' in file.stem:
+                        matching_files.append(file)
+            else:
+                # Simple match - just find files containing the pattern
+                for file in all_files:
+                    if file_name in file.stem:
+                        matching_files.append(file)
+
+            # Process matching files
+            if matching_files:
+                # Sort by modification time (newest first) if multiple files match
+                if len(matching_files) > 1:
+                    matching_files.sort(key=lambda f: f.stat().st_mtime, reverse=True)
+                    self.run.log_message(
+                        f"Multiple files match '{file_name}'. Using most recent: {matching_files[0].name}"
+                    )
+
+                files_dict[file_name] = matching_files[0]
+                self.run.log_message(f"Mapped '{file_name}' to: {matching_files[0].name}")
+            elif is_required:
+                self.run.log_message(f"Required file '{file_name}' not found.", context=Context.WARNING.value)
+
+        return files_dict

synapse_sdk/plugins/categories/upload/templates/plugin/upload.py

@@ -3,42 +3,38 @@ from typing import List
 
 
 class Uploader:
-    """Plugin upload action class.
+    """Plugin upload action interface for organizing files.
 
-    * Organize, upload, setup task, generate ground truths for the uploaded data.
+    This class provides a minimal interface for plugin developers to implement
+    their own file organization logic.
     """
 
-    def __init__(self, run, path: Path, *args, **kwargs):
+    def __init__(self, run, path: Path, file_specification: List = None, organized_files: List = None):
         """Initialize the plugin upload action class.
 
         Args:
-            run: Plugin run object.
-            path: pathlib object by upload target destination path.
+            run: Plugin run object with logging capabilities.
+            path: Path object pointing to the upload target directory.
+            file_specification: List of specifications that define the structure of files to be uploaded.
+                Each specification contains details like file name, type, and requirements.
         """
         self.run = run
         self.path = path
+        self.file_specification = file_specification
+        self.organized_files = organized_files
 
     def handle_upload_files(self) -> List:
-        """Handle upload files.
+        """Customize the organization of files for upload.
 
-        * Organize data according to collection file specification structure.
-        * Structure files according to the file specification of the target collection.
+        This method provides a hook for plugin developers to modify the default file organization.
+        You can override this method to filter files, transform data, or add custom metadata
+        based on your specific requirements.
+
+        Args:
+            organized_files (List): The default organized files structure.
+                Each item is a dictionary with 'files' and 'meta' keys.
 
         Returns:
-            List: List of dictionaries containing 'files' and 'meta'.
-
-        Examples:
-            [
-              {
-          "files": {
-              'image_1': image_1_pathlib_object,
-              'image_2': image_2_pathlib_object,
-              'meta_1': meta_1_pathlib_object,
-          },
-          "meta": {
-            "key": "value"
-          }
-              }
-            ]
+            List: The modified list of organized files to be uploaded.
         """
-        return []
+        return self.organized_files

{synapse_sdk-1.0.0a54.dist-info → synapse_sdk-1.0.0a55.dist-info}/METADATA

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

{synapse_sdk-1.0.0a54.dist-info → synapse_sdk-1.0.0a55.dist-info}/RECORD

@@ -31,7 +31,7 @@ synapse_sdk/clients/agent/service.py,sha256=s7KuPK_DB1nr2VHrigttV1WyFonaGHNrPvU8
 synapse_sdk/clients/backend/__init__.py,sha256=Fiehino2n3voaHTdpJHXSY7K_CDnMkQeokapbgeoTBk,1187
 synapse_sdk/clients/backend/annotation.py,sha256=f4jS4qlXH7M7mQ3EuCq-NrjJ_hJNDz8pEFAYqf-e008,996
 synapse_sdk/clients/backend/core.py,sha256=5XAOdo6JZ0drfk-FMPJ96SeTd9oja-VnTwzGXdvK7Bg,1027
-synapse_sdk/clients/backend/dataset.py,sha256=11R5LuTva9jgXatxQAlKy7UEJmwIWzTsLVdFf3MZ9F8,3400
+synapse_sdk/clients/backend/dataset.py,sha256=eQ0O43Ck91z5Om7mb-vW_P5NIaX1OZKirjGs-WQHdM4,3480
 synapse_sdk/clients/backend/hitl.py,sha256=na2mSXFud92p4zUEuagcDWk2klxO7xn-e86cm0VZEvs,709
 synapse_sdk/clients/backend/integration.py,sha256=9LjkYcBpi7aog-MODSDS4RlmYahypu65qxBj-AcY7xc,2683
 synapse_sdk/clients/backend/ml.py,sha256=JoPH9Ly2E3HJ7S5mdGLtcGq7ruQVVrYfWArogwZLlms,1193
@@ -100,10 +100,10 @@ synapse_sdk/plugins/categories/smart_tool/templates/plugin/__init__.py,sha256=47
 synapse_sdk/plugins/categories/smart_tool/templates/plugin/auto_label.py,sha256=eevNg0nOcYFR4z_L_R-sCvVOYoLWSAH1jwDkAf3YCjY,320
 synapse_sdk/plugins/categories/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/upload/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/upload/actions/upload.py,sha256=8FIRkEtSPTToSZBYn7B2qaTj9778RDjr84BHnn6ajSM,15951
+synapse_sdk/plugins/categories/upload/actions/upload.py,sha256=L9OqHWNyzO5qXi9-afkgRI1hfL7ysJjY0z0a5kujJrQ,24202
 synapse_sdk/plugins/categories/upload/templates/config.yaml,sha256=kwHNWHFYbzDi1mEh40KozatPZbZGH44dlP0t0J7ejJw,483
 synapse_sdk/plugins/categories/upload/templates/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/upload/templates/plugin/upload.py,sha256=dnK8gy33GjG5ettayawDJv1gM3xCm1K6lM-PfeeTjQw,1163
+synapse_sdk/plugins/categories/upload/templates/plugin/upload.py,sha256=IZU4sdSMSLKPCtlNqF7DP2howTdYR6hr74HCUZsGdPk,1559
 synapse_sdk/plugins/templates/cookiecutter.json,sha256=NxOWk9A_v1pO0Ny4IYT9Cj5iiJ16--cIQrGC67QdR0I,396
 synapse_sdk/plugins/templates/hooks/post_gen_project.py,sha256=jqlYkY1O2TxIR-Vh3gnwILYy8k-D39Xx66d2KNQVMCs,147
 synapse_sdk/plugins/templates/hooks/pre_prompt.py,sha256=aOAMM623s0sKFGjTZaotAOYFvsNMxeii4tPyhOAFKVE,539
@@ -134,9 +134,9 @@ synapse_sdk/utils/storage/providers/__init__.py,sha256=x7RGwZryT2FpVxS7fGWryRVpq
 synapse_sdk/utils/storage/providers/gcp.py,sha256=i2BQCu1Kej1If9SuNr2_lEyTcr5M_ncGITZrL0u5wEA,363
 synapse_sdk/utils/storage/providers/s3.py,sha256=W94rQvhGRXti3R4mYP7gmU5pcyCQpGFIBLvxxqLVdRM,2231
 synapse_sdk/utils/storage/providers/sftp.py,sha256=_8s9hf0JXIO21gvm-JVS00FbLsbtvly4c-ETLRax68A,1426
-synapse_sdk-1.0.0a54.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
-synapse_sdk-1.0.0a54.dist-info/METADATA,sha256=JHOOafiDzcZBZjHOAL8AUzlEjhWs1YyLz6VH4jCGK4I,1303
-synapse_sdk-1.0.0a54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-synapse_sdk-1.0.0a54.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
-synapse_sdk-1.0.0a54.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
-synapse_sdk-1.0.0a54.dist-info/RECORD,,
+synapse_sdk-1.0.0a55.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
+synapse_sdk-1.0.0a55.dist-info/METADATA,sha256=d2fJLQn1LuXa0NeLokHzsjeE8zgIyOJrOH3bRBUoIw0,1303
+synapse_sdk-1.0.0a55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+synapse_sdk-1.0.0a55.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
+synapse_sdk-1.0.0a55.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
+synapse_sdk-1.0.0a55.dist-info/RECORD,,