Remove unnecessary utils (#22)

* remove unnecessary utils * remove ignores * remove files * revert * add objectypefilter test * update test * update test * fix test * fix test * add test
apperception-db · Sep 10, 2023 · 523056a · 523056a
1 parent dbdfc3a
commit 523056a
Show file tree

Hide file tree

Showing 17 changed files with 166 additions and 683 deletions.
diff --git a/codecov.yml b/codecov.yml
@@ -1,10 +1,6 @@
 ignore:
-  - "spatialyze/legacy"
   - "spatialyze/video_processor/modules"
   - "spatialyze/video_processor/stages/detection_estimation/*"
   - "spatialyze/video_processor/stages/segment_trajectory/*"
   - "spatialyze/video_processor/stages/strongsort_with_skip.py"
-  - "spatialyze/video_processor/utils/preprocess.py"
-  - "spatialyze/video_processor/utils/process_pipeline.py"
-  - "spatialyze/video_processor/utils/query_analyzer.py"
   - "**/__init__.py"
diff --git a/pyproject.toml b/pyproject.toml
@@ -104,8 +104,4 @@ ignore = [
   'spatialyze/video_processor/modules',
   'spatialyze/video_processor/stages/detection_2d/ground_truth.py',
   'spatialyze/video_processor/stages/detection_estimation',
-  'spatialyze/video_processor/stages/segment_trajectory/construct_segment_trajectory.py',
-  'spatialyze/video_processor/utils/process_pipeline.py',
-  'spatialyze/video_processor/utils/query_analyzer.py',
-  'spatialyze/video_processor/utils/preprocess.py',
 ]
diff --git a/spatialyze/predicate.py b/spatialyze/predicate.py
@@ -248,7 +248,9 @@ class CastNode(PredicateNode):
     expr: "PredicateNode"
 
 
-def cast(expr: "PredicateNode", to: str) -> "CastNode":
+def cast(expr: "Any", to: str) -> "CastNode":
+    if not isinstance(expr, PredicateNode):
+        expr = LiteralNode(expr, True)
     return CastNode(to, expr)
 
 

diff --git a/spatialyze/video_processor/actions/bbox2d_overlay.py b/spatialyze/video_processor/actions/bbox2d_overlay.py
diff --git a/spatialyze/video_processor/actions/save_video.py b/spatialyze/video_processor/actions/save_video.py
diff --git a/spatialyze/video_processor/actions/tracking2d_overlay.py b/spatialyze/video_processor/actions/tracking2d_overlay.py
diff --git a/spatialyze/video_processor/stages/detection_2d/object_type_filter.py b/spatialyze/video_processor/stages/detection_2d/object_type_filter.py
@@ -31,10 +31,7 @@ def __init__(self, types: "list[str] | None" = None, predicate: "PredicateNode |
             self.types = types
 
     def __repr__(self) -> str:
-        return f"ObjectTypeFilter(types={self.types})"
-
-    def add_type(self, type: "str"):
-        self.types.append(type)
+        return f"ObjectTypeFilter(types={sorted(self.types)})"
 
     def _run(self, payload: "Payload"):
         detection_2d = Detection2D.get(payload)