Merge branch 'main' of https://github.com/openvinotoolkit/geti-sdk

Author: ljcornel

.github/workflows/build-docs.yaml

@@ -9,8 +9,22 @@ on:
     paths-ignore:
       - ".github/**" # Ignore changes towards the .github directory
 
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
 jobs:
   build_docs:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: self-hosted
     steps:
       - name: Checkout repository
@@ -34,25 +48,32 @@ jobs:
           make html
           cd ..
 
-      - name: Commit documentation changes
+      - name: Clean up repo directory
         run: |
           mkdir -p /tmp/docs_build
           cp -r docs/build/html/* /tmp/docs_build
           rm -rf ./*
-          git fetch && git pull
-          git checkout gh-pages
+          # git fetch && git pull
+          # git checkout gh-pages
           cp -r /tmp/docs_build/* ./
           rm -rf /tmp/docs_build
           touch .nojekyll
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
-          git commit -m "Update documentation" -a || true
+          # git config --local user.email "action@github.com"
+          # git config --local user.name "GitHub Action"
+          # git add .
+          # git commit -m "Update documentation" -a || true
           # The above command will fail if no changes were present, so we ignore
           # the return code.
 
-      - name: Push changes
-        uses: ad-m/github-push-action@master
+      - name: Setup Pages
+        uses: actions/configure-pages@v2
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
         with:
-          branch: gh-pages
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          # Upload entire repository
+          path: '.'
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

geti_sdk/deployment/deployment.py

@@ -51,6 +51,7 @@ def __attrs_post_init__(self):
         self._is_single_task: bool = len(self.project.get_trainable_tasks()) == 1
         self._are_models_loaded: bool = False
         self._inference_converters: Dict[str, Any] = {}
+        self._alternate_inference_converters: Dict[str, Any] = {}
         self._empty_labels: Dict[str, Label] = {}
 
     @property
@@ -131,6 +132,7 @@ def load_inference_models(self, device: str = "CPU"):
         """
         try:
             from ote_sdk.usecases.exportable_code.prediction_to_annotation_converter import (
+                DetectionBoxToAnnotationConverter,
                 IPredictionToAnnotationConverter,
                 create_converter,
             )
@@ -159,6 +161,16 @@ def load_inference_models(self, device: str = "CPU"):
                 converter_type=task.type.to_ote_domain(), labels=model.ote_label_schema
             )
             inference_converters.update({task.title: inference_converter})
+
+            # This is a workaround for a backwards incompatible change in later ote
+            # versions
+            if task.type.is_detection:
+                alternate_inference_converter = DetectionBoxToAnnotationConverter(
+                    labels=model.ote_label_schema
+                )
+                self._alternate_inference_converters.update(
+                    {task.title: alternate_inference_converter}
+                )
             empty_label = next((label for label in task.labels if label.is_empty), None)
             empty_labels.update({task.title: empty_label})
 
@@ -274,9 +286,23 @@ def _infer_task(self, image: np.ndarray, task: Task) -> Prediction:
         height: int = image.shape[0]
 
         if len(postprocessing_results) != 0:
-            annotation_scene_entity = converter.convert_to_annotation(
-                predictions=postprocessing_results, metadata=metadata
-            )
+            # The try/except is a workaround to handle different detection inference
+            # results by different ote sdk versions
+            try:
+                annotation_scene_entity = converter.convert_to_annotation(
+                    predictions=postprocessing_results, metadata=metadata
+                )
+            except TypeError as error:
+                if task.type.is_detection:
+                    converter = self._alternate_inference_converters[task.title]
+                    annotation_scene_entity = converter.convert_to_annotation(
+                        predictions=postprocessing_results, metadata=metadata
+                    )
+                    # Make sure next time we get it right in one shot
+                    self._inference_converters.update({task.title: converter})
+                else:
+                    raise error
+
             prediction = Prediction.from_ote(
                 annotation_scene_entity, image_width=width, image_height=height
             )