Merge pull request #383 from roboflow/tony/upload-floderstruct-classification

upload classification project with the CLI

Author: tonylampada

.gitignore

@@ -154,3 +154,4 @@ tests/manual/data
 README.roboflow.txt
 *.zip
 .DS_Store
+.claude

CLAUDE.md

@@ -0,0 +1,115 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Development Commands
+
+### Running Tests
+```bash
+python -m unittest
+```
+
+### Linting and Code Quality
+```bash
+# Format code with ruff
+make style
+
+# Check code quality (includes ruff and mypy)
+make check_code_quality
+
+# Individual commands
+ruff format roboflow
+ruff check roboflow --fix
+mypy roboflow
+```
+
+### Building Documentation
+```bash
+# Install documentation dependencies
+python -m pip install mkdocs mkdocs-material mkdocstrings mkdocstrings[python]
+
+# Serve documentation locally
+mkdocs serve
+```
+
+### Installing Development Environment
+```bash
+# Create virtual environment
+python3 -m venv env
+source env/bin/activate
+
+# Install in editable mode with dev dependencies
+pip install -e ".[dev]"
+
+# Install pre-commit hooks
+pip install pre-commit
+pre-commit install
+```
+
+## Architecture Overview
+
+The Roboflow Python SDK follows a hierarchical object model that mirrors the Roboflow platform structure:
+
+### Core Components
+
+1. **Roboflow** (`roboflow/__init__.py`) - Entry point and authentication
+   - Handles API key management and workspace initialization
+   - Provides `login()` for CLI authentication
+   - Creates workspace connections
+
+2. **Workspace** (`roboflow/core/workspace.py`) - Manages Roboflow workspaces
+   - Lists and accesses projects
+   - Handles dataset uploads and model deployments
+   - Manages workspace-level operations
+
+3. **Project** (`roboflow/core/project.py`) - Represents a computer vision project
+   - Manages project metadata and versions
+   - Handles image/annotation uploads
+   - Supports different project types (object-detection, classification, etc.)
+
+4. **Version** (`roboflow/core/version.py`) - Dataset version management
+   - Downloads datasets in various formats
+   - Deploys models
+   - Provides access to trained models for inference
+
+5. **Model Classes** (`roboflow/models/`) - Type-specific inference models
+   - `ObjectDetectionModel` - Bounding box predictions
+   - `ClassificationModel` - Image classification
+   - `InstanceSegmentationModel` - Pixel-level segmentation
+   - `SemanticSegmentationModel` - Class-based segmentation
+   - `KeypointDetectionModel` - Keypoint predictions
+
+### API Adapters
+
+- **rfapi** (`roboflow/adapters/rfapi.py`) - Low-level API communication
+- **deploymentapi** (`roboflow/adapters/deploymentapi.py`) - Model deployment operations
+
+### CLI Interface
+
+The `roboflow` command line tool (`roboflow/roboflowpy.py`) provides:
+- Authentication: `roboflow login`
+- Dataset operations: `roboflow download`, `roboflow upload`, `roboflow import`
+- Inference: `roboflow infer`
+- Project/workspace management: `roboflow project`, `roboflow workspace`
+
+### Key Design Patterns
+
+1. **Hierarchical Access**: Always access objects through their parent (Workspace → Project → Version → Model)
+2. **API Key Flow**: API key is passed down through the object hierarchy
+3. **Format Flexibility**: Supports multiple dataset formats (YOLO, COCO, Pascal VOC, etc.)
+4. **Batch Operations**: Upload and download operations support concurrent processing
+
+## Project Configuration
+
+- **Python Version**: 3.8+
+- **Main Dependencies**: See `requirements.txt`
+- **Entry Point**: `roboflow=roboflow.roboflowpy:main`
+- **Code Style**: Enforced by ruff with Google docstring convention
+- **Type Checking**: mypy configured for Python 3.8
+
+## Important Notes
+
+- API keys are stored in `~/.config/roboflow/config.json` (Unix) or `~/roboflow/config.json` (Windows)
+- The SDK supports both hosted inference (Roboflow platform) and local inference (via Roboflow Inference)
+- Pre-commit hooks automatically run formatting and linting checks
+- Test files intentionally excluded from linting: `tests/manual/debugme.py`

roboflow/__init__.py

@@ -15,7 +15,7 @@
 from roboflow.models import CLIPModel, GazeModel  # noqa: F401
 from roboflow.util.general import write_line
 
-__version__ = "1.1.64"
+__version__ = "1.1.65"
 
 
 def check_key(api_key, model, notebook, num_retries=0):

roboflow/core/workspace.py

@@ -301,10 +301,11 @@ def upload_dataset(
         """  # noqa: E501 // docs
         if dataset_format != "NOT_USED":
             print("Warning: parameter 'dataset_format' is deprecated and will be removed in a future release")
-        parsed_dataset = folderparser.parsefolder(dataset_path)
         project, created = self._get_or_create_project(
             project_id=project_name, license=project_license, type=project_type
         )
+        is_classification = project.type == "classification"
+        parsed_dataset = folderparser.parsefolder(dataset_path, is_classification=is_classification)
         if created:
             print(f"Created project {project.id}")
         else:
@@ -361,15 +362,19 @@ def _save_annotation(image_id, imagedesc):
 
             annotationdesc = imagedesc.get("annotationfile")
             if isinstance(annotationdesc, dict):
-                if annotationdesc.get("rawText"):
+                if annotationdesc.get("type") == "classification_folder":
+                    annotation_path = annotationdesc.get("classification_label")
+                elif annotationdesc.get("rawText"):
                     annotation_path = annotationdesc
-                else:
+                elif annotationdesc.get("file"):
                     annotation_path = f"{location}{annotationdesc['file']}"
-                labelmap = annotationdesc.get("labelmap")
+                    labelmap = annotationdesc.get("labelmap")
 
                 if isinstance(labelmap, str):
                     labelmap = load_labelmap(labelmap)
-            else:
+
+            # If annotation_path is still None at this point, then no annotation will be saved.
+            if annotation_path is None:
                 return None, None
 
             annotation, upload_time, _retry_attempts = project.save_annotation(

roboflow/util/folderparser.py

@@ -21,7 +21,7 @@ def _patch_sep(filename):
     return filename.replace("\\", "/")
 
 
-def parsefolder(folder):
+def parsefolder(folder, is_classification=False):
     folder = _patch_sep(folder).strip().rstrip("/")
     if not os.path.exists(folder):
         raise Exception(f"folder does not exist. {folder}")
@@ -36,6 +36,8 @@ def parsefolder(folder):
     if not _map_annotations_to_images_1to1(images, annotations):
         annotations = _loadAnnotations(folder, annotations)
         _map_annotations_to_images_1tomany(images, annotations)
+    if is_classification:
+        _infer_classification_labels_from_folders(images)
     return {
         "location": folder,
         "images": images,
@@ -299,3 +301,16 @@ def _list_map(my_list, key):
     for i in my_list:
         d.setdefault(i[key], []).append(i)
     return d
+
+
+def _infer_classification_labels_from_folders(images):
+    for image in images:
+        if image.get("annotationfile"):
+            continue
+        dirname = image.get("dirname", "").strip("/")
+        if not dirname or dirname == ".":
+            # Skip images in root directory or invalid paths
+            continue
+        class_name = os.path.basename(dirname)
+        if class_name and class_name != ".":
+            image["annotationfile"] = {"classification_label": class_name, "type": "classification_folder"}

tests/datasets/corrosion-singlelabel-classification/README.dataset.txt

@@ -0,0 +1,5 @@
+# Synthetic Corrosion Dataset > 2022-08-16 10:23am
+https://universe.roboflow.com/classification/synthetic-corrosion-dataset
+
+Provided by Roboflow
+License: CC BY 4.0