feat: update entity and namedentity blueprints

equinor · Nov 7, 2023 · a632e03 · a632e03
1 parent edd6d90
commit a632e03
Show file tree

Hide file tree

Showing 28 changed files with 119 additions and 83 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,6 +29,7 @@ deepdiff = "^5.8.1"
 pygments = "^2.16.1"
 pytest = "^7.4.3"
 dictdiffer = "^0.9.0"
+setuptools = "^68.2.2"
 
 [tool.pytest]
 addopts = ["--ignore gen"]

diff --git a/src/home/system/SIMOS/Entity.json b/src/home/system/SIMOS/Entity.json
@@ -1,8 +1,36 @@
 {
   "name": "Entity",
   "type": "dmss://system/SIMOS/Blueprint",
-  "description": "Blueprint for a DMT reference",
-  "extends": [
-    "dmss://system/SIMOS/NamedEntity"
+  "description": "Blueprint for an entity.",
+  "attributes": [
+    {
+      "name": "name",
+      "type": "dmss://system/SIMOS/BlueprintAttribute",
+      "optional": true,
+      "attributeType": "string",
+      "label": "Name"
+    },
+    {
+      "name": "type",
+      "type": "dmss://system/SIMOS/BlueprintAttribute",
+      "attributeType": "string",
+      "label": "Type",
+      "default": "",
+      "optional": false
+    },
+    {
+      "name": "description",
+      "type": "dmss://system/SIMOS/BlueprintAttribute",
+      "attributeType": "string",
+      "default": "",
+      "optional": true,
+      "label": "Description"
+    },
+    {
+      "name": "_meta_",
+      "type": "dmss://system/SIMOS/BlueprintAttribute",
+      "attributeType": "dmss://system/SIMOS/Meta",
+      "optional": true
+    }
   ]
 }
diff --git a/src/home/system/SIMOS/NamedEntity.json b/src/home/system/SIMOS/NamedEntity.json
@@ -2,35 +2,16 @@
   "name": "NamedEntity",
   "type": "dmss://system/SIMOS/Blueprint",
   "description": "Blueprint for an entity which MUST have a name",
+  "extends": [
+    "dmss://system/SIMOS/Entity"
+  ],
   "attributes": [
     {
       "name": "name",
       "type": "dmss://system/SIMOS/BlueprintAttribute",
       "optional": false,
       "attributeType": "string",
       "label": "Name"
-    },
-    {
-      "name": "type",
-      "type": "dmss://system/SIMOS/BlueprintAttribute",
-      "attributeType": "string",
-      "label": "Type",
-      "default": "",
-      "optional": false
-    },
-    {
-      "name": "description",
-      "type": "dmss://system/SIMOS/BlueprintAttribute",
-      "attributeType": "string",
-      "default": "",
-      "optional": true,
-      "label": "Description"
-    },
-    {
-      "name": "_meta_",
-      "type": "dmss://system/SIMOS/BlueprintAttribute",
-      "attributeType": "dmss://system/SIMOS/Meta",
-      "optional": true
     }
   ]
 }
diff --git a/src/home/system/SIMOS/recipe_links/pdf.json b/src/home/system/SIMOS/recipe_links/pdf.json
@@ -2,7 +2,7 @@
   "type": "dmss://system/SIMOS/RecipeLink",
   "_blueprintPath_": "dmss://system/SIMOS/blob_types/PDF",
   "extends": [
-    "dmss://system/SIMOS/Entity",
+    "dmss://system/SIMOS/NamedEntity",
     "_default_"
   ],
   "uiRecipes": [

diff --git a/src/tests/unit/common/entity/validators/test_validate_entity.py b/src/tests/unit/common/entity/validators/test_validate_entity.py
@@ -12,6 +12,7 @@ class ValidateEntityTestCase(unittest.TestCase):
     def setUp(self) -> None:
         simos_blueprints = [
             "dmss://system/SIMOS/Blueprint",
+            "dmss://system/SIMOS/Entity",
             "dmss://system/SIMOS/NamedEntity",
             "dmss://system/SIMOS/BlueprintAttribute",
         ]

diff --git a/src/tests/unit/common/tree/test_tree_node_delete.py b/src/tests/unit/common/tree/test_tree_node_delete.py
@@ -8,7 +8,7 @@
 
 class TreeNodeDeleteTest(unittest.TestCase):
     def setUp(self) -> None:
-        simos_blueprints = ["dmss://system/SIMOS/NamedEntity"]
+        simos_blueprints = ["dmss://system/SIMOS/Entity", "dmss://system/SIMOS/NamedEntity"]
         mock_blueprint_folder = "src/tests/unit/common/tree/mock_data/mock_blueprints"
         mock_blueprints_and_file_names = {
             "Blueprint4": "Blueprint4.blueprint.json",

diff --git a/src/tests/unit/common/tree/test_tree_node_from_dict.py b/src/tests/unit/common/tree/test_tree_node_from_dict.py
@@ -21,6 +21,7 @@ class TreeNodeFromDictTestCase(unittest.TestCase):
     def setUp(self) -> None:
         simos_blueprints = [
             "dmss://system/SIMOS/Reference",
+            "dmss://system/SIMOS/Entity",
             "dmss://system/SIMOS/NamedEntity",
         ]
         mock_blueprint_folder = "src/tests/unit/common/tree/mock_data/mock_blueprints"

diff --git a/src/tests/unit/common/tree/test_tree_node_helpers.py b/src/tests/unit/common/tree/test_tree_node_helpers.py
@@ -28,6 +28,7 @@ def setUp(self) -> None:
         ).provider
         simos_blueprints = [
             "dmss://system/SIMOS/Reference",
+            "dmss://system/SIMOS/Entity",
             "dmss://system/SIMOS/NamedEntity",
         ]
         mock_blueprint_folder = "src/tests/unit/common/tree/mock_data/mock_blueprints"

diff --git a/src/tests/unit/common/tree/test_tree_node_to_dict.py b/src/tests/unit/common/tree/test_tree_node_to_dict.py
@@ -8,7 +8,7 @@
 
 class TreeNodeToDictTestCase(unittest.TestCase):
     def setUp(self) -> None:
-        simos_blueprints = ["dmss://system/SIMOS/NamedEntity"]
+        simos_blueprints = ["dmss://system/SIMOS/NamedEntity", "dmss://system/SIMOS/Entity"]
         mock_blueprint_folder = "src/tests/unit/common/tree/mock_data/mock_blueprints"
         mock_blueprints_and_file_names = {
             "all_contained_cases_blueprint": "all_contained_cases_blueprint.blueprint.json",

diff --git a/src/tests/unit/common/tree/test_tree_node_to_ref_dict.py b/src/tests/unit/common/tree/test_tree_node_to_ref_dict.py
@@ -13,6 +13,7 @@ def setUp(self) -> None:
         simos_blueprints = [
             "dmss://system/SIMOS/Package",
             "dmss://system/SIMOS/Reference",
+            "dmss://system/SIMOS/Entity",
             "dmss://system/SIMOS/NamedEntity",
         ]
         mock_blueprint_folder = "src/tests/unit/common/tree/mock_data/mock_blueprints"

diff --git a/src/tests/unit/common/tree/test_tree_node_update.py b/src/tests/unit/common/tree/test_tree_node_update.py
@@ -21,6 +21,7 @@
 class DocumentServiceTestCase(unittest.TestCase):
     def setUp(self) -> None:
         simos_blueprints = [
+            "dmss://system/SIMOS/Entity",
             "dmss://system/SIMOS/NamedEntity",
             "dmss://system/SIMOS/Reference",
             "dmss://system/SIMOS/Action",

diff --git a/src/tests/unit/services/document_service/mock_blueprints/blob_blueprints/blob.blueprint.json b/src/tests/unit/services/document_service/mock_blueprints/blob_blueprints/blob.blueprint.json
@@ -3,7 +3,7 @@
   "type": "dmss://system/SIMOS/Blueprint",
   "description": "Test for a blueprint with storageAffinity in storageRecipe",
   "extends": [
-    "dmss://system/SIMOS/NamedEntity"
+    "dmss://system/SIMOS/Entity"
   ],
   "attributes": [
     {

diff --git a/...ces/document_service/mock_blueprints/blob_blueprints/uncontained_blueprint.blueprint.json b/...ces/document_service/mock_blueprints/blob_blueprints/uncontained_blueprint.blueprint.json
@@ -3,7 +3,7 @@
   "type": "dmss://system/SIMOS/Blueprint",
   "description": "uncontained_blueprint",
   "extends": [
-    "dmss://system/SIMOS/NamedEntity"
+    "dmss://system/SIMOS/Entity"
   ],
   "attributes": [
     {

diff --git a/src/tests/unit/services/document_service/mock_blueprints/people_and_cats/Cat.blueprint.json b/src/tests/unit/services/document_service/mock_blueprints/people_and_cats/Cat.blueprint.json
@@ -3,13 +3,13 @@
   "type": "dmss://system/SIMOS/Blueprint",
   "description": "A cat has an owner, but the owner is both storage and model uncontained.",
   "extends": [
-    "dmss://system/SIMOS/NamedEntity"
+    "dmss://system/SIMOS/Entity"
   ],
   "attributes": [
     {
       "name": "owner",
       "type": "dmss://system/SIMOS/BlueprintAttribute",
-      "attributeType": "dmss://system/SIMOS/NamedEntity",
+      "attributeType": "dmss://system/SIMOS/Entity",
       "contained": false
     }
   ]

diff --git a/...sts/unit/services/document_service/mock_blueprints/people_and_cats/CatCage.blueprint.json b/...sts/unit/services/document_service/mock_blueprints/people_and_cats/CatCage.blueprint.json
@@ -3,7 +3,7 @@
   "type": "dmss://system/SIMOS/Blueprint",
   "description": "This is a cage that contains a cat. The cat is model and storage contained in the cage. If the cage is removed, so is the cat.",
   "extends": [
-    "dmss://system/SIMOS/NamedEntity"
+    "dmss://system/SIMOS/Entity"
   ],
   "attributes": [
     {

diff --git a/...t/services/document_service/mock_blueprints/people_and_cats/CoupleOfPeople.blueprint.json b/...t/services/document_service/mock_blueprints/people_and_cats/CoupleOfPeople.blueprint.json
@@ -3,7 +3,7 @@
   "type": "dmss://system/SIMOS/Blueprint",
   "description": "Two People ",
   "extends": [
-    "dmss://system/SIMOS/NamedEntity"
+    "dmss://system/SIMOS/Entity"
   ],
   "attributes": [
     {

diff --git a/...ests/unit/services/document_service/mock_blueprints/people_and_cats/Person.blueprint.json b/...ests/unit/services/document_service/mock_blueprints/people_and_cats/Person.blueprint.json
@@ -3,23 +3,23 @@
   "type": "dmss://system/SIMOS/Blueprint",
   "description": "This blueprint has attributes for all the possible cases of storage uncontained. This is set in the storage recipe, that ",
   "extends": [
-    "dmss://system/SIMOS/NamedEntity"
+    "dmss://system/SIMOS/Entity"
   ],
   "attributes": [
     {
       "name": "containedPersonInfo",
       "type": "dmss://system/SIMOS/BlueprintAttribute",
-      "attributeType": "dmss://system/SIMOS/NamedEntity"
+      "attributeType": "dmss://system/SIMOS/Entity"
     },
     {
       "name": "storageUncontainedBestFriend",
       "type": "dmss://system/SIMOS/BlueprintAttribute",
-      "attributeType": "dmss://system/SIMOS/NamedEntity"
+      "attributeType": "dmss://system/SIMOS/Entity"
     },
     {
       "name": "storageUncontainedListOfFriends",
       "type": "dmss://system/SIMOS/BlueprintAttribute",
-      "attributeType": "dmss://system/SIMOS/NamedEntity",
+      "attributeType": "dmss://system/SIMOS/Entity",
       "dimensions": "*"
     },
     {

diff --git a/src/tests/unit/services/document_service/test_data_source_and_repositories.py b/src/tests/unit/services/document_service/test_data_source_and_repositories.py
@@ -17,7 +17,7 @@
 
 class DataSourceTestCase(unittest.TestCase):
     def setUp(self) -> None:
-        simos_blueprints = ["dmss://system/SIMOS/NamedEntity"]
+        simos_blueprints = ["dmss://system/SIMOS/Entity", "dmss://system/SIMOS/NamedEntity"]
         mock_blueprint_folder = "src/tests/unit/services/document_service/mock_blueprints/blob_blueprints"
         mock_blueprints_and_file_names = {
             "blobContainer": "blobContainer.blueprint.json",

diff --git a/src/tests/unit/services/document_service/test_document_service_get_document.py b/src/tests/unit/services/document_service/test_document_service_get_document.py
@@ -68,6 +68,7 @@ def setUp(self):
         self.document_repository.find = self.mock_find
 
         simos_blueprints = [
+            "dmss://system/SIMOS/Entity",
             "dmss://system/SIMOS/NamedEntity",
             "dmss://system/SIMOS/Reference",
         ]

diff --git a/src/tests/unit/services/document_service/test_get_extended_blueprint.py b/src/tests/unit/services/document_service/test_get_extended_blueprint.py
@@ -11,7 +11,7 @@
 
 class GetExtendedBlueprintTestCase(unittest.TestCase):
     def setUp(self):
-        simos_blueprints = ["dmss://system/SIMOS/NamedEntity"]
+        simos_blueprints = ["dmss://system/SIMOS/Entity", "dmss://system/SIMOS/NamedEntity"]
         mock_blueprint_folder = "src/tests/unit/services/document_service/mock_blueprints/extended_blueprints"
         mock_blueprints_and_file_names = {
             "SecondLevelExtendedBlueprint": "SecondLevelExtendedBlueprint.blueprint.json",

diff --git a/src/tests/unit/services/document_service/test_reference_resolve.py b/src/tests/unit/services/document_service/test_reference_resolve.py
@@ -16,6 +16,7 @@ class GetDocumentResolveTestCase(unittest.TestCase):
     def setUp(self) -> None:
         simos_blueprints = [
             "dmss://system/SIMOS/Package",
+            "dmss://system/SIMOS/Entity",
             "dmss://system/SIMOS/NamedEntity",
         ]
         mock_blueprint_folder = "src/tests/unit/services/document_service/mock_blueprints/car_rental_blueprints"