Init folder structure

Author: hovnatan

superannotate/__init__.py

@@ -1,6 +1,4 @@
-import json
 import logging
-from pathlib import Path
 
 import packaging.version
 import requests
@@ -49,9 +47,10 @@ def consensus(*args, **kwargs):
     add_annotation_cuboid_to_image, add_annotation_ellipse_to_image,
     add_annotation_point_to_image, add_annotation_polygon_to_image,
     add_annotation_polyline_to_image, add_annotation_template_to_image,
-    create_fuse_image, delete_image, download_image, download_image_annotations,
-    download_image_preannotations, get_image_annotations, get_image_bytes,
-    get_image_metadata, get_image_preannotations, search_images,
+    create_folder, create_fuse_image, delete_image, download_image,
+    download_image_annotations, download_image_preannotations,
+    get_folder_metadata, get_image_annotations, get_image_bytes,
+    get_image_metadata, get_image_preannotations, search_folders, search_images,
     set_image_annotation_status, upload_image_annotations
 )
 from .db.project_images import (
@@ -86,15 +85,14 @@ def consensus(*args, **kwargs):
     SANonExistingProjectNameException
 )
 from .input_converters.conversion import (
-    coco_split_dataset, convert_project_type, export_annotation,
-    import_annotation, convert_json_version
+    coco_split_dataset, convert_json_version, convert_project_type,
+    export_annotation, import_annotation
 )
 from .ml.ml_funcs import (
     delete_model, download_model, plot_model_metrics, run_prediction,
     run_segmentation, run_training, stop_model_training
 )
 from .ml.ml_models import search_models
-
 from .old_to_new_format_convertor import update_json_format
 from .version import __version__
 

superannotate/common.py

@@ -4,11 +4,11 @@
 import os
 import sys
 import time
-from tqdm import tqdm
 from pathlib import Path
-from enum import IntEnum
+
 import numpy as np
 from PIL import Image
+from tqdm import tqdm
 
 logger = logging.getLogger("superannotate-python-sdk")
 
@@ -152,9 +152,6 @@ def rename_kwargs(func_name, kwargs, aliases):
             kwargs[new] = kwargs.pop(alias)
 
 
-logger = logging.getLogger('httplogger')
-
-
 def hex_to_rgb(hex_string):
     """Converts HEX values to RGB values
     """
@@ -298,14 +295,6 @@ def write_to_json(output_path, json_data):
 }  # Resolution limit
 
 
-def process_api_response(data):
-    logger.info("Maintenance operations are being performed")
-    if 'metadata' not in data:
-        return data
-
-    return data['data']
-
-
 def tqdm_converter(
     total_num, images_converted, images_not_converted, finish_event
 ):

superannotate/db/images.py

@@ -17,7 +17,6 @@
     add_annotation_polyline_to_json, add_annotation_template_to_json
 )
 from ..api import API
-from ..common import process_api_response
 from ..exceptions import SABaseException
 from ..parameter_decorators import project_metadata
 from .annotation_classes import (
@@ -46,16 +45,43 @@ def _get_project_root_folder_id(project):
     if not response.ok:
         raise SABaseException(response.status_code, response.text)
 
-    response = process_api_response(response.json())
+    response = response.json()
 
     return response['folder_id']
 
 
+def create_folder(project, folder_name):
+    """Create a new folder in the project.
+
+    :param project: project name or metadata of the project to be deleted
+    :type project: str or dict
+    :param folder_name: the new folder's name
+    :type folder_name: str
+
+    :return: dict object metadata the new folder
+    :rtype: dict
+    """
+    if not isinstance(project, dict):
+        project = get_project_metadata_bare(project)
+    params = {"team_id": project["team_id"], "project_id": project["id"]}
+    data = {"name": folder_name}
+    response = _api.send_request(
+        req_type='POST', path='/folder', params=params, json_req=data
+    )
+    if not response.ok:
+        raise SABaseException(
+            response.status_code, "Couldn't create project " + response.text
+        )
+    res = response.json()
+    return res
+
+
 def search_images(
     project,
     image_name_prefix=None,
     annotation_status=None,
-    return_metadata=False
+    return_metadata=False,
+    folder_name=None
 ):
     """Search images by name_prefix (case-insensitive) and annotation status
 
@@ -76,19 +102,24 @@ def search_images(
     if not isinstance(project, dict):
         project = get_project_metadata_bare(project)
     team_id, project_id = project["team_id"], project["id"]
-    folder_id = _get_project_root_folder_id(project)  # maybe changed in future
     if annotation_status is not None:
         annotation_status = common.annotation_status_str_to_int(
             annotation_status
         )
 
+    if folder_name is not None:
+        folder = get_folder_metadata(project, folder_name)
+        folder_id = folder["id"]
+    else:
+        folder_id = None
+
     result_list = []
     params = {
         'team_id': team_id,
         'project_id': project_id,
-        'folder_id': folder_id,
         'annotation_status': annotation_status,
-        'offset': 0
+        'offset': 0,
+        'folder_id': folder_id
     }
     if image_name_prefix is not None:
         params['name'] = image_name_prefix
@@ -97,28 +128,32 @@ def search_images(
         response = _api.send_request(
             req_type='GET', path='/images', params=params
         )
-        if response.ok:
-            # print(response.json())
-            response = process_api_response(response.json())
-            results = response["data"]
-            total_got += len(results)
-            for r in results:
-                if return_metadata:
-                    result_list.append(r)
-                else:
-                    result_list.append(r["name"])
-
-            if response["count"] <= total_got:
-                break
-            params["offset"] = total_got
-            # print(
-            #     "Got to ", len(result_list),
-            #     response.json()["count"], len(new_results), params['offset']
-            # )
-        else:
+        if not response.ok:
             raise SABaseException(
                 response.status_code, "Couldn't search images " + response.text
             )
+        response = response.json()
+        images = response["images"]
+        folders = response["folders"]
+
+        image_count = images["count"]
+        folder_count = folders["count"]
+
+        results_images = images["data"]
+        total_got += len(results_images) + len(folders["data"])
+        for r in results_images:
+            if return_metadata:
+                result_list.append(r)
+            else:
+                result_list.append(r["name"])
+
+        if image_count + folder_count <= total_got:
+            break
+        params["offset"] = total_got
+        # print(
+        #     "Got to ", len(result_list),
+        #     response.json()["count"], len(new_results), params['offset']
+        # )
 
     if return_metadata:
 
@@ -133,6 +168,55 @@ def process_result(x):
         return result_list
 
 
+def get_folder_metadata(project, folder_name):
+    folders = search_folders(project, folder_name, return_metadata=True)
+    if len(folders) == 0:
+        raise SABaseException(0, "Folder doesn't exist")
+    elif len(folders) > 1:
+        raise SABaseException(0, "Multiple folders with the same name")
+    else:
+        return folders[0]
+
+
+def search_folders(project, folder_name=None, return_metadata=False):
+    if not isinstance(project, dict):
+        project = get_project_metadata_bare(project)
+    team_id, project_id = project["team_id"], project["id"]
+    result_list = []
+    params = {'team_id': team_id, 'project_id': project_id, 'offset': 0}
+    total_got = 0
+    total_folders = 0
+    while True:
+        response = _api.send_request(
+            req_type='GET', path='/images', params=params
+        )
+        if not response.ok:
+            raise SABaseException(
+                response.status_code, "Couldn't search images " + response.text
+            )
+        response = response.json()
+        images = response["images"]
+        folders = response["folders"]
+
+        results_folders = folders["data"]
+        for r in folders["data"]:
+            if folder_name is not None and r["name"] != folder_name:
+                continue
+            if return_metadata:
+                result_list.append(r)
+            else:
+                result_list.append(r["name"])
+
+        total_folders += len(results_folders)
+        if folders["count"] <= total_folders:
+            break
+
+        total_got += len(images["data"]) + len(results_folders)
+        params["offset"] = total_got
+
+    return result_list
+
+
 @project_metadata
 def get_image_metadata(project, image_names, return_dict_on_single_output=True):
     """Returns image metadata
@@ -219,7 +303,7 @@ def set_image_annotation_status(project, image_name, annotation_status):
     if not response.ok:
         raise SABaseException(response.status_code, response.text)
 
-    response = process_api_response(response.json())
+    response = response.json()
 
     return response
 

superannotate/db/search_projects.py

@@ -1,9 +1,10 @@
 import logging
 
 from ..api import API
-from ..exceptions import (SABaseException)
-from ..common import process_api_response
+from ..exceptions import SABaseException
+
 logger = logging.getLogger("superannotate-python-sdk")
+
 _api = API.get_instance()
 
 
@@ -34,7 +35,7 @@ def search_projects(
             req_type='GET', path='/projects', params=params
         )
         if response.ok:
-            new_results = process_api_response(response.json())
+            new_results = response.json()
             result_list += new_results["data"]
             if new_results["count"] <= len(result_list):
                 break

superannotate/ml/ml_funcs.py

@@ -17,7 +17,7 @@
 from ..api import API
 from ..common import (
     _AVAILABLE_SEGMENTATION_MODELS, model_training_status_int_to_str,
-    process_api_response, project_type_str_to_int
+    project_type_str_to_int
 )
 from ..db.images import get_image_metadata, search_images
 from ..exceptions import SABaseException
@@ -449,7 +449,7 @@ def download_model(model, output_dir):
         params=params
     )
     if response.ok:
-        response = process_api_response(response.json())
+        response = response.json()
     else:
         raise SABaseException(0, "Could not get model info ")
 

superannotate/ml/ml_models.py

@@ -1,10 +1,11 @@
-from ..common import process_api_response
-from ..exceptions import SABaseException
+import logging
+
 from ..api import API
 from ..common import project_type_int_to_str
-import logging
+from ..exceptions import SABaseException
 
 logger = logging.getLogger("superannotate-python-sdk")
+
 _api = API.get_instance()
 
 
@@ -30,7 +31,7 @@ def search_models(
 
     if not response.ok:
         raise SABaseException(0, "could not search models")
-    result = process_api_response(response.json())
+    result = response.json()
 
     for model in result['data']:
         model['type'] = project_type_int_to_str(model['type'])