fix

spatialyze/data_types/__init__.py

@@ -1,4 +1,3 @@
-from .bounding_box import BoundingBox
 from .box import Box
 from .camera import Camera
 from .camera_config import CameraConfig
@@ -7,7 +6,6 @@
 from .trajectory import Trajectory
 
 __all__ = [
-    "BoundingBox",
     "Box",
     "CameraConfig",
     "Camera",

spatialyze/database.py

@@ -1,5 +1,5 @@
 from os import environ
-from typing import TYPE_CHECKING, Callable, List, Tuple
+from typing import TYPE_CHECKING, Callable
 
 import pandas as pd
 import psycopg2
@@ -9,7 +9,6 @@
 # from mobilitydb.psycopg import register as mobilitydb_register
 from postgis.psycopg import register as postgis_register
 
-from spatialyze.data_types import Trajectory
 from spatialyze.predicate import (
     FindAllTablesVisitor,
     GenSqlVisitor,
@@ -69,15 +68,15 @@
 ]
 
 
-def columns(fn: Callable[[Tuple[str, str]], str], columns: List[Tuple[str, str]]) -> str:
+def columns(fn: "Callable[[tuple[str, str]], str]", columns: "list[tuple[str, str]]") -> str:
     return ",".join(map(fn, columns))
 
 
-def _schema(column: Tuple[str, str]) -> str:
+def _schema(column: "tuple[str, str]") -> str:
     return " ".join(column)
 
 
-def _name(column: Tuple[str, str]) -> str:
+def _name(column: "tuple[str, str]") -> str:
     return column[0]
 
 

spatialyze/predicate.py

@@ -1,13 +1,8 @@
 from typing import (
     Any,
     Callable,
-    Dict,
     Generic,
-    List,
     Literal,
-    Optional,
-    Set,
-    Tuple,
     TypeVar,
 )
 
@@ -132,7 +127,7 @@ def __repr__(self):
 
 
 class ArrayNode(PredicateNode):
-    exprs: List["PredicateNode"]
+    exprs: "list[PredicateNode]"
 
 
 def wrap_literal(x: Any) -> "PredicateNode":
@@ -161,7 +156,7 @@ class BinOpNode(PredicateNode):
 
 class BoolOpNode(PredicateNode):
     op: BoolOp
-    exprs: List["PredicateNode"]
+    exprs: "list[PredicateNode]"
 
 
 class UnaryOpNode(PredicateNode):
@@ -179,7 +174,7 @@ def lit(value: Any, python: bool = True):
 
 
 class TableNode(PredicateNode):
-    index: Optional[int]
+    index: "int | None"
 
     def __getattr__(self, name: str) -> "TableAttrNode":
         return TableAttrNode(name, self, False)
@@ -202,7 +197,7 @@ def __init__(self, index: int):
 
 
 class CameraTableNode(TableNode):
-    def __init__(self, index: Optional[int] = None):
+    def __init__(self, index: "int | None" = None):
         self.index = index
         self.time = TableAttrNode("timestamp", self, True)
         self.ego = TableAttrNode("egoTranslation", self, True)
@@ -230,12 +225,12 @@ def __getitem__(self, index: int) -> "CameraTableNode":
 camera = CameraTableNode()
 
 
-Fn = Callable[["GenSqlVisitor", List["PredicateNode"]], str]
+Fn = Callable[["GenSqlVisitor", "list[PredicateNode]"], str]
 
 
 class CallNode(PredicateNode):
-    _fn: Tuple["Fn"]
-    params: List["PredicateNode"]
+    _fn: "tuple[Fn]"
+    params: "list[PredicateNode]"
 
     def __init__(self, fn: "Fn", name: "str", params: "list[PredicateNode]"):
         self._fn = (fn,)
@@ -358,7 +353,7 @@ def visit_CastNode(self, node: "CastNode"):
 class ExpandBoolOpTransformer(BaseTransformer):
     def __call__(self, node: "PredicateNode"):
         if isinstance(node, BoolOpNode):
-            exprs: List["PredicateNode"] = []
+            exprs: "list[PredicateNode]" = []
             for expr in node.exprs:
                 e = self(expr)
                 if isinstance(e, BoolOpNode) and e.op == node.op:
@@ -369,8 +364,8 @@ def __call__(self, node: "PredicateNode"):
         return super().__call__(node)
 
 
-class FindAllTablesVisitor(Visitor[Tuple[Set[int], bool]]):
-    tables: Set[int]
+class FindAllTablesVisitor(Visitor["tuple[set[int], bool]"]):
+    tables: "set[int]"
     camera: bool
 
     def __init__(self):
@@ -393,9 +388,9 @@ def reset(self):
 
 
 class MapTablesTransformer(BaseTransformer):
-    mapping: Dict[int, int]
+    mapping: "dict[int, int]"
 
-    def __init__(self, mapping: Dict[int, int]):
+    def __init__(self, mapping: "dict[int, int]"):
         self.mapping = mapping
 
     def visit_ObjectTableNode(self, node: "ObjectTableNode"):
@@ -415,7 +410,7 @@ def visit_BinOpNode(self, node: "BinOpNode"):
         return node
 
 
-normalizers: List[BaseTransformer] = [ExpandBoolOpTransformer(), NormalizeArrayAtTime()]
+normalizers: "list[BaseTransformer]" = [ExpandBoolOpTransformer(), NormalizeArrayAtTime()]
 
 
 def normalize(predicate: "PredicateNode") -> "PredicateNode":
@@ -425,19 +420,19 @@ def normalize(predicate: "PredicateNode") -> "PredicateNode":
     return predicate
 
 
-BIN_OP: Dict[BinOp, str] = {
+BIN_OP: "dict[BinOp, str]" = {
     "add": "+",
     "sub": "-",
     "mul": "*",
     "div": "/",
 }
 
-BOOL_OP: Dict[BoolOp, str] = {
+BOOL_OP: "dict[BoolOp, str]" = {
     "and": " AND ",
     "or": " OR ",
 }
 
-COMP_OP: Dict[CompOp, str] = {
+COMP_OP: "dict[CompOp, str]" = {
     "eq": "=",
     "ne": "<>",
     "ge": ">=",
@@ -446,7 +441,7 @@ def normalize(predicate: "PredicateNode") -> "PredicateNode":
     "lt": "<",
 }
 
-UNARY_OP: Dict[UnaryOp, str] = {
+UNARY_OP: "dict[UnaryOp, str]" = {
     "invert": "NOT ",
     "neg": "-",
 }
@@ -514,20 +509,20 @@ def visit_CastNode(self, node: "CastNode"):
         return f"({self(node.expr)})::{node.to}"
 
 
-def resolve_object_attr(attr: str, num: Optional[int] = None):
+def resolve_object_attr(attr: str, num: "int | None" = None):
     if num is None:
         return attr
     return f"t{num}.{attr}"
 
 
-def resolve_camera_attr(attr: str, num: Optional[int] = None):
+def resolve_camera_attr(attr: str, num: "int | None" = None):
     if num is None:
         return attr
     return f"c{num}.{attr}"
 
 
 # TODO: this is duplicate with the one in database.py
-TRAJECTORY_COLUMNS: List[Tuple[str, str]] = [
+TRAJECTORY_COLUMNS: "list[tuple[str, str]]" = [
     ("itemId", "TEXT"),
     ("cameraId", "TEXT"),
     ("objectType", "TEXT"),
@@ -538,7 +533,7 @@ def resolve_camera_attr(attr: str, num: Optional[int] = None):
 ]
 
 
-CAMERA_COLUMNS: List[Tuple[str, str]] = [
+CAMERA_COLUMNS: "list[tuple[str, str]]" = [
     ("cameraId", "TEXT"),
     ("frameId", "TEXT"),
     ("frameNum", "Int"),

spatialyze/utils/F/ahead.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from spatialyze.predicate import (
     BinOpNode,
     GenSqlVisitor,
@@ -12,7 +10,7 @@
 
 
 @call_node
-def ahead(visitor: "GenSqlVisitor", args: "List[PredicateNode]"):
+def ahead(visitor: "GenSqlVisitor", args: "list[PredicateNode]"):
     obj1, obj2 = args
 
     if not isinstance(obj2, TableAttrNode) and (

spatialyze/world.py

@@ -31,10 +31,10 @@ def addGeogConstructs(self, geogConstructs: "RoadNetwork"):
 
     def object(self, index: "int | None" = None):
         if index is not None:
-            node = ObjectTableNode(self._objectCounts)
-            self._objectCounts += 1
-        else:
-            node = ObjectTableNode(index)
+            return ObjectTableNode(index)
+
+        node = ObjectTableNode(self._objectCounts)
+        self._objectCounts += 1
         return node
 
     def camera(self):