From a0d1703e8f8ef56e7c15e9aec65c58e1a2564260 Mon Sep 17 00:00:00 2001
From: stres1 <a@b.com>
Date: Thu, 28 Jul 2022 16:13:09 +0200
Subject: [PATCH] detection  no-tflite ok

---
 src/components/vision.py | 6 +++++-
 src/ui/test/test.py      | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/vision.py b/src/components/vision.py
index a189c83..e78f8e1 100644
--- a/src/components/vision.py
+++ b/src/components/vision.py
@@ -315,6 +315,7 @@ class Vision(Component):
             try:
                 # create tensorflow model
                 model = tf.saved_model.load(str(self.models_dir / model_name))
+                model = model.signatures['serving_default']
                 tf_mode = "normal"
             except Exception:
                 self.log.exception(traceback.format_exc())
@@ -386,7 +387,10 @@ class Vision(Component):
                 "detection_classes": [map(lambda class_id: class_id + 1, class_ids)][0:1],
             }
         else:
-            detections = self.model(tensor)
+            input_tensor = tf.convert_to_tensor(np.asarray(tensor))
+            #input_tensor = input_tensor[tf.newaxis, ...]
+
+            detections = self.model(input_tensor)
             if lock:
                 self.lock.unlock()
         # WARNING: results other than the ones related to tensor[-1] will be discarded
diff --git a/src/ui/test/test.py b/src/ui/test/test.py
index a3ada99..00c9bcd 100755
--- a/src/ui/test/test.py
+++ b/src/ui/test/test.py
@@ -270,6 +270,8 @@ class Test(Widget):
 
     def done(self, ok=True):
         self.log.info("cycle done")
+        self.data["vision"][0].pop("detections")
+        self.data["vision"][0].pop("results")
         archived = Archive.archive(self.recipe, self.data, ok and self.data["ok"], overridden=self.data["overridden"])
         self.log.info(f"cycle archived locally: {archived!r}")
         # COUNT OK