February Release

Author: ibayer

.gitignore

@@ -133,3 +133,6 @@ tools/fastai
 
 # link checker
 checklink/cookies.txt
+
+#ipyannotator
+**/**/autogenerated*/

.gitlab-ci.yml

@@ -2,18 +2,19 @@ image: docker:latest
 services:
   - docker:dind
 
+variables:
+  IMG_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+  GIT_STRATEGY: clone
+
 before_script:
   - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
   - docker pull $IMG_TAG || true
   - apk update && apk add --no-cache git bash
 
-variables:
-  IMG_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-  GIT_STRATEGY: clone
-
 stages:
   - build
   - test
+  - release
 
 
 build_image:
@@ -78,3 +79,15 @@ run_tests:
       --env MASTER_TOKEN=$MASTER_TOKEN
       $IMG_TAG
       /bin/bash -c "./scripts/test_nb.sh"
+
+
+build_whls:
+  tags:
+    - docker
+  stage: release
+  when: manual
+  script:
+    - >
+      docker run -i --rm
+      $IMG_TAG
+      /bin/bash -c "poetry build -f wheel && poetry publish -r palaimon -u $POETRY_HTTP_BASIC_PYPI_USERNAME -p $POETRY_HTTP_BASIC_PYPI_PASSWORD"

Dockerfile

@@ -45,12 +45,18 @@ RUN git clone git://github.com/yyuu/pyenv.git .pyenv
 
 RUN pyenv install 3.7.3 -f && pyenv global 3.7.3
 
+# Poetry publish command has some bugs in handling config and env variables:
+# https://github.com/python-poetry/poetry/issues/2210
+# https://github.com/python-poetry/poetry/issues/858
+# _URL ending for repositories environment variable
+# and NO /simple/ or /legacy/ etc. endpoint for real url is a must
 ENV POETRY_VERSION=1.1.0             \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     POETRY_NO_INTERACTION=1          \
     POETRY_VIRTUALENVS_CREATE=false  \
     PYTHONUNBUFFERED=1               \
-    POETRY_HOME=/poetry
+    POETRY_HOME=/poetry              \
+    POETRY_REPOSITORIES_PALAIMON_URL=https://pypi.palaimon.io/
 
 # uses $POETRY_VERSION & $POETRY_HOME internally
 RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python

README.md

@@ -85,8 +85,7 @@ Also check out the following notebook for a more high level overview.
     data science workflow. `nbs/08_tutorial_road_damage.ipynb`
 - Slides + recoding of jupytercon 2020 talk explaining the high level concepts / vision
     of ipyannotator. TODO add public link
-    
-    
+
 ## Jupyter lab trouble shooting
 
 For clean (re)install make sure to have all the lab extencions active:

ipyannotator/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.0"
+__version__ = "0.3.5"

ipyannotator/_nbdev.py

@@ -8,6 +8,21 @@
          "draw_img": "01_bbox_canvas.ipynb",
          "points2bbox_coords": "01_bbox_canvas.ipynb",
          "BBoxCanvas": "01_bbox_canvas.ipynb",
+         "draw_bbox": "01a_datasets.ipynb",
+         "xywh_to_xyxy": "01a_datasets.ipynb",
+         "xyxy_to_xywh": "01a_datasets.ipynb",
+         "bbox_intersection": "01a_datasets.ipynb",
+         "overlap": "01a_datasets.ipynb",
+         "sample_bbox": "01a_datasets.ipynb",
+         "draw_rectangle": "01a_datasets.ipynb",
+         "draw_ellipse": "01a_datasets.ipynb",
+         "create_simple_object_detection_dataset": "01a_datasets.ipynb",
+         "create_color_classification": "01a_datasets.ipynb",
+         "create_shape_color_classification": "01a_datasets.ipynb",
+         "create_object_detection": "01a_datasets.ipynb",
+         "get_cifar10": "01a_datasets_download.ipynb",
+         "get_oxford_102_flowers": "01a_datasets_download.ipynb",
+         "get_cub_200_2011": "01a_datasets_download.ipynb",
          "NaviGUI": "02_navi_widget.ipynb",
          "NaviLogic": "02_navi_widget.ipynb",
          "Navi": "02_navi_widget.ipynb",
@@ -26,10 +41,15 @@
          "CaptureAnnotator": "06_capture_annotator.ipynb",
          "ImCanvas": "07_im2im_annotator.ipynb",
          "Im2ImAnnotatorGUI": "07_im2im_annotator.ipynb",
+         "text_on_img": "07_im2im_annotator.ipynb",
+         "flatten": "07_im2im_annotator.ipynb",
+         "reconstruct_class_images": "07_im2im_annotator.ipynb",
          "Im2ImAnnotatorLogic": "07_im2im_annotator.ipynb",
          "Im2ImAnnotator": "07_im2im_annotator.ipynb"}
 
 modules = ["bbox_canvas.py",
+           "datasets/generators.py",
+           "datasets/download.py",
            "navi_widget.py",
            "storage.py",
            "bbox_annotator.py",

ipyannotator/bbox_annotator.py

@@ -53,23 +53,43 @@ class BBoxAnnotatorLogic(HasTraits):
     bbox_coords = Dict()
     current_im_num = Int()
 
-    def __init__(self, project_path, image_dir='pics'):
+    def __init__(self, project_path, file_name=None, image_dir='pics', results_dir=None):
         self.project_path = Path(project_path)
-        self.image_dir, self.annotation_file_path = setup_project_paths(self.project_path, image_dir=image_dir)
-        self.image_paths = get_image_list_from_folder(self.image_dir)
+        self.image_dir, self.annotation_file_path = setup_project_paths(self.project_path,
+                                                                        file_name=file_name,
+                                                                        image_dir=image_dir,
+                                                                        results_dir=results_dir)
+
+        # select images and bboxes only from given annotatin file
+        if self.annotation_file_path.is_file():
+            with self.annotation_file_path.open() as json_file:
+                data = json.load(json_file)
+                im_names = data.keys()
+            self.image_paths = sorted(im for im in get_image_list_from_folder(self.image_dir) if str(im) in im_names)
+        else:
+            self.image_paths = sorted(get_image_list_from_folder(self.image_dir))
+
+
+        if not self.image_paths:
+            raise Exception ("!! No Images to dipslay !!")
+
         self.current_im_num = len(self.image_paths)
+
         self.annotations = AnnotationStorage(self.image_paths)
 
+        if self.annotation_file_path.exists():
+            self.annotations.load(self.annotation_file_path)
+        else:
+            self.annotations.save(self.annotation_file_path)
+
     def _update_im(self):
         self.image_path = str(self.image_paths[self.index])
 
     def _update_coords(self): # from annotations
-        im_name = self.__get_name_by_index(self.index)
-        self.bbox_coords = self.annotations.get(im_name) or {}
+        self.bbox_coords = self.annotations.get(self.image_path) or {}
 
     def _update_annotations(self, index): # from coordinates
-        im_name = self.__get_name_by_index(index)
-        self.annotations[im_name] = self.bbox_coords
+        self.annotations[str(self.image_paths[index])] = self.bbox_coords
 
     def _save_annotations(self, *args, **kwargs): # to disk
         index = kwargs.pop('old_index', self.index)
@@ -90,9 +110,6 @@ def _idx_changed(self, change):
         self._update_im()
         self._update_coords()
 
-    def __get_name_by_index(self, idx):
-        return self.image_paths[idx].name
-
 # Cell
 
 class BBoxAnnotator(BBoxAnnotatorGUI):
@@ -106,8 +123,9 @@ class BBoxAnnotator(BBoxAnnotatorGUI):
     """
     debug_output = Output()
 
-    def __init__(self, project_path, canvas_size=(200, 400), image_dir='pics'):
-        self._model = BBoxAnnotatorLogic(project_path, image_dir=image_dir)
+    def __init__(self, project_path, canvas_size=(200, 400), file_name=None, image_dir='pics', results_dir=None):
+        self._model = BBoxAnnotatorLogic(project_path, file_name=file_name,
+                                         image_dir=image_dir, results_dir=results_dir)
 
         super().__init__(canvas_size=canvas_size)
 

ipyannotator/bbox_canvas.py

@@ -175,10 +175,11 @@ def _update_canvas_bbox_coords(self, change):
 #         print('-> Observe bbox_coords: ', change)
 
         if change['new'] == self._canvas_bbox_coords: # change event from gui, do nothing
-            print('-> GUI')
+            pass
+#             print('-> GUI')
         else: # recalculate canvas coordinates as bbox was set by backend:
             self._canvas_bbox_coords = {k: v * self._image_scale for k, v in self.bbox_coords.items()}
-            print('-> Backend')
+#             print('-> Backend')
 #         print('<- Observe bbox_coords')
 
 

ipyannotator/capture_annotator.py

@@ -153,13 +153,16 @@ class CaptureAnnotatorLogic(HasTraits):
     all_none = Bool()
 
 
-    def __init__(self, project_path, question=None, image_dir='pics', filter_files=None):
+    def __init__(self, project_path, question=None, image_dir='pics', filter_files=None, results_dir=None):
         self.project_path = Path(project_path)
-        self.image_dir, self.annotation_file_path = setup_project_paths(self.project_path, image_dir=image_dir)
+        self.image_dir, self.annotation_file_path = setup_project_paths(self.project_path, image_dir=image_dir, results_dir=results_dir)
 
         self.image_paths = sorted(get_image_list_from_folder(self.image_dir)) #todo: use sorted in storage?
+
         if filter_files:
-            self.image_paths = [p for p in self.image_paths if p.name in filter_files]
+            self.image_paths = [p for p in self.image_paths if str(p) in filter_files]
+        if not self.image_paths:
+            raise UserWarning("No image files to display! Check image_dir of filter.")
         self.current_im_num = len(self.image_paths)
         self.annotations = AnnotationStorage(self.image_paths)
         if question:
@@ -172,15 +175,14 @@ def _update_state(self, change=None): # from annotations
         state_images = self._get_state_names(self.index)
         current_state = {}
         for im_path in state_images:
-            in_name = im_path.name
-            current_state[im_path] = self.annotations.get(in_name) or {}
+            current_state[str(im_path)] = self.annotations.get(str(im_path)) or {}
         self.all_none = all(value == {'answer': False} for value in current_state.values())
         self.current_state = current_state
 
+
     def _update_annotations(self, index): # from screen
         for p, anno in self.current_state.items():
-            self.annotations[Path(p).name] = anno
-
+            self.annotations[str(p)] = anno
 
     def _save_annotations(self, *args, **kwargs): # to disk
         index = kwargs.pop('old_index', self.index)
@@ -213,7 +215,7 @@ def _handle_grid_click(self, event, name=None):
         p = Path(self.image_dir, name)
         current_state = self.current_state.copy()
         if not p.is_dir():
-            current_state[p] = {'answer': not self.current_state[p].get('answer', False)}
+            current_state[str(p)] = {'answer': not self.current_state[str(p)].get('answer', False)}
             if self.all_none:
                 self.all_none = False
         else:
@@ -237,12 +239,12 @@ class CaptureAnnotator(CaptureAnnotatorGUI):
     """
 
     def __init__(self, project_path, image_dir='pics', image_width=150, image_height=150,
-                 n_rows=3, n_cols=3, question=None, filter_files=None):
+                 n_rows=3, n_cols=3, question=None, filter_files=None, results_dir=None):
 
         super().__init__(image_width, image_height, n_rows, n_cols)
 
         self._model = CaptureAnnotatorLogic(project_path, question, image_dir,
-                                           filter_files=filter_files)
+                                           filter_files=filter_files, results_dir=results_dir)
 
         self._save_btn.on_click(self._model._save_annotations)