Pydantic integration 2.4.1

backend/core/permission.py

@@ -54,7 +54,7 @@ def _init_structure(cls, roles: List[str] = []) -> None:
             roles = Role.list_roles_names()
         for role_name in roles:
             try:
-                role_obj = scopes.from_path(role_name, scope="Role")
+                role_obj = Role(role_name)
                 for (resource_key, permissions) in role_obj.Resources.items():
                     for permission in permissions:
                         if permission:

backend/endpoints/api/v1/frontend/fleetmanager/statistics.py

@@ -29,9 +29,10 @@
 from movai_core_shared.logger import Log
 
 from dal.models.var import Var
-from dal.scopes.robot import Robot
-from dal.scopes.configuration import Configuration
+from dal.new_models.configuration import Configuration
 from dal.scopes.fleetrobot import FleetRobot
+from dal.scopes.robot import Robot
+
 
 LOGGER = Log.get_logger(__name__)
 

backend/endpoints/api/v1/frontend/ide/callbackeditor.py

@@ -3,8 +3,8 @@
    Unauthorized copying of this file, via any medium is strictly prohibited
    Proprietary and confidential
 """
-from dal.models.callback import Callback
-from dal.models.message import Message
+from dal.new_models.callback import Callback
+from dal.new_models.message import Message
 
 
 class CallbcakEditor:

backend/endpoints/api/v1/frontend/ide/datavalidation.py

@@ -7,7 +7,7 @@
 
 from movai_core_shared.logger import Log
 
-from dal.models.scopestree import ScopesTree
+from dal.new_models.configuration import Configuration
 
 
 LOGGER = Log.get_logger(__name__)
@@ -32,7 +32,7 @@ def validate_configuration(config_string):
             config_key_path = config_string.replace("$(config ", "").replace(")", "").split(".")
             config_name = config_key_path[0]
             config_key_path.pop(0)
-            config = ScopesTree()().Configuration[config_name]
+            config = Configuration(config_name)
             val = config.get_value()
             for key in config_key_path:
                 val = val[key]
@@ -53,8 +53,7 @@ def validate_configuration_raw(value):
             config_key_path = value.split(".")
             config_name = config_key_path[0]
             config_key_path.pop(0)
-            scopes = ScopesTree()
-            config = scopes().Configuration[config_name]
+            config = Configuration(config_name)
             val = config.get_value()
             for key in config_key_path:
                 val = val[key]

backend/endpoints/api/v1/frontend/ide/getportsdata.py

@@ -3,7 +3,7 @@
    Unauthorized copying of this file, via any medium is strictly prohibited
    Proprietary and confidential
 """
-from dal.models.message import Message
+from dal.new_models.message import Message
 
 
 def get_ports_data():

backend/endpoints/api/v1/frontend/ide/viewer.py

@@ -12,15 +12,18 @@
 
 from movai_core_shared.logger import Log
 
-from dal.models.scopestree import ScopesTree
 from dal.models.var import Var as Variable
+
 from dal.scopes.fleetrobot import FleetRobot
 from dal.scopes.package import Package
 
+
 LOGGER = Log.get_logger(__name__)
 
 try:
-    from movai_core_enterprise.scopes.graphicscene import GraphicScene
+    from movai_core_enterprise.models.annotation import Annotation
+    from movai_core_enterprise.models.graphicscene import GraphicScene as GraphicSceneModel
+    from movai_core_enterprise.scopes.graphicscene import GraphicScene as GraphicSceneScope
 except ImportError:
     LOGGER.warning("Failed to import GraphicScene, because movai_core_enterprise is not installed.")
 
@@ -257,9 +260,9 @@ def add2scene_aux(tree_node, scene_name, tree_object, scene):
 
 
 def add2scene(tree_node, scene_name, tree_object):
-    scene_scope = ScopesTree().from_path(scene_name, scope="GraphicScene")
-    add2scene_aux(tree_node, scene_name, tree_object, scene_scope)
-    scene_scope.write()
+    scene = GraphicSceneModel(scene_name)
+    add2scene_aux(tree_node, scene_name, tree_object, scene)
+    scene.write()
 
 
 def add_annotation_to_object(
@@ -309,13 +312,13 @@ def del2scene_aux(obj_name, scene_name, scene_scope):
 
 
 def del2scene(obj_name, scene_name):
-    scene_scope = ScopesTree().from_path(scene_name, scope="GraphicScene")
-    del2scene_aux(obj_name, scene_name, scene_scope)
-    scene_scope.write()
+    scene = GraphicSceneModel(scene_name)
+    del2scene_aux(obj_name, scene_name, scene)
+    scene.write()
 
 
-def reset_scene(scene_path):
-    scene = ScopesTree().from_path(scene_path, scope="GraphicScene")
+def reset_scene(scene_name):
+    scene = GraphicSceneModel(scene_name)
     types = list(filter(lambda x: x != "memory", list(scene.AssetType)))
     for asset_type in types:
         del scene.AssetType[asset_type]
@@ -345,7 +348,7 @@ def __init__(self, scene_name):
         """Virtually private constructor."""
         MemorySingleton.__instance = self
         self.scene_name = scene_name
-        self.memory = GraphicScene(scene_name).AssetType["memory"]
+        self.memory = GraphicSceneScope(scene_name).AssetType["memory"]
 
     def __set_tree(self, tree=[]):
         self.memory.add("AssetName", "tree", Value=tree)
@@ -479,11 +482,10 @@ def delete_add_object():
             delete_add_object()
 
     @classmethod
-    def on_retrieve_scene(cls, scene_path=DEFAULT_SCENE_NAME):
-        cls.migrate_poses_in_scene(scene_path)
-        my_scopes = ScopesTree()
-        scene = my_scopes.from_path(scene_path, scope="GraphicScene")
-        sprint("Scene types", scene_path, list(scene.AssetType))
+    def on_retrieve_scene(cls, scene_name=DEFAULT_SCENE_NAME):
+        cls.migrate_poses_in_scene(scene_name)
+        scene = GraphicSceneModel(scene_name)
+        sprint("Scene types", scene_name, list(scene.AssetType))
         return scene.AssetType["memory"].AssetName["tree"].Value.value
 
     @staticmethod
@@ -513,16 +515,15 @@ def migrate_poses_in_scene(scene_path):
         try:
             types = ["KeyPoint", "Map", "Mesh", "GlobalRef", "Robot", "PointCloud", "NodeItem"]
             scene_name = scene_path.split("/")[-1]
-            scopes = ScopesTree()
-            new_scene = scopes().GraphicScene[scene_name]
-            scene = GraphicScene(scene_name)
+            scene_model = GraphicSceneModel(scene_name)
+            scene_scope = GraphicSceneScope(scene_name)
             for t in types:
                 try:
-                    for i in new_scene.AssetType[t].AssetName:
-                        point = new_scene.AssetType[t].AssetName[i].Value
+                    for i in scene_model.AssetType[t].AssetName:
+                        point = scene_model.AssetType[t].AssetName[i].Value
                         sprint("Migrate value", t, i)
                         if isinstance(point._value, Pose):
-                            scene.AssetType[t].AssetName[i].Value = point.value
+                            scene_scope.AssetType[t].AssetName[i].Value = point.value
                 except Exception as e:
                     sprint("Caught exception while migrating types...", e)
         except Exception as e:
@@ -537,7 +538,7 @@ def get_computed_annotations(annotations_name):
         computed_annotations_dict = {}
         for annotation_name in annotations_name:
             try:
-                annotation = ScopesTree().from_path(annotation_name, scope="Annotation")
+                annotation = Annotation(annotation_name)
                 computed_annotations_dict.update(annotation.get_computed_annotation())
             except Exception as e:
                 sprint("Caught Exception while computing annotation", annotation_name, e)