Some (incomplete) fixes to examples

Author: LukasGold

examples/controller_logic.py

@@ -2,7 +2,7 @@
 
 from typing_extensions import override
 
-from osw.controller.entity import Entity, Hardware
+from osw.controller.entity import Entity
 from osw.express import OswExpress
 
 # Create/update the password file under examples/accounts.pwd.yaml
@@ -18,7 +18,7 @@
 osw_obj.fetch_schema(
     fetchSchemaParam=OswExpress.FetchSchemaParam(schema_title="Category:Hardware")
 )
-
+from osw.model.entity import Hardware  # noqa: E402
 
 title = "Item:OSW7d7193567ea14e4e89b74de88983b718"
 # title = "Item:OSWe02213b6c4664d04834355dc8eb08b99"

examples/create_entity.py

@@ -3,7 +3,8 @@
 import osw.model.entity as model
 
 my_entity = model.Item(
-    label=[model.Label(text="MyItem")], statements=[model.Statement(predicate="IsA")]
+    label=[model.Label(text="MyItem")],
+    statements=[model.DataStatement(property="IsA", value="Category:Item")],
 )
 pprint(my_entity.dict())
 print(my_entity.json())

examples/device_inventory.py

@@ -26,7 +26,7 @@
     model, "Corporation"
 ):  # only load if not already loaded. note: does not detect updated schemas yet
     DEPENDENCIES = {
-        "MetaDeviceCategory": "Category:OSWd845b96813a344458f140e48c4d063fd",
+        "DeviceType": "Category:OSWd845b96813a344458f140e48c4d063fd",
         "Device(SubclassWithMetaModel)": "Category:OSW5bf1542d9cf847db83cbc73d579ba9d6",
         "Corporation": "Category:OSW5f4a3751d23e482d80fb0b72dcd6bc31",  #
     }
@@ -47,7 +47,7 @@
 )
 
 # Create a new device type with the new manufacturer as manufacturer
-new_category = model.MetaDeviceCategory(  # here used as a device type
+new_category = model.DeviceType(  # here used as a device type
     uuid=uuid.uuid5(
         uuid_namespace, "MyNewDeviceCategory"
     ),  # use a stable id from the source dataset / file
@@ -70,7 +70,7 @@
         namespace="Category",
         # meta_category_title= (
         # "Category:OSWd845b96813a344458f140e48c4d063fd")
-        # usage of MetaDeviceCategory not yet supported
+        # usage of DeviceType not yet supported
     )
 )
 

examples/generate_rdf.py

@@ -19,6 +19,7 @@
 # load dependencies
 DEPENDENCIES = {
     "Tool": "Category:OSWe427aafafbac4262955b9f690a83405d",
+    "Device": "Category:OSWf0fe562f422d49c6877490b3dfee2f3f",
 }
 osw_obj.install_dependencies(DEPENDENCIES, mode="append", policy="if-missing")
 

examples/ontology_import emmo.py examples/ontology_import_emmo.pyexamples/ontology_import emmo.py renamed to examples/ontology_import_emmo.py

@@ -3,8 +3,6 @@
 from typing import ClassVar
 from uuid import uuid4
 
-from pydantic.v1 import BaseModel
-
 import osw.model.entity as model
 from osw.core import OSW
 from osw.express import OswExpress
@@ -20,7 +18,7 @@
 
 # todo: does dataclass export only most specific class jsonschema
 class MyPythonClass(
-    BaseModel
+    model.OswBaseModel
 ):  # We don't inherit from model.Item here because this will trigger a full schema
     #  export
     __uuid__: ClassVar[uuid4] = "23e4356e-b726-4c5b-b63f-620b301eb836"

examples/register_model.py

@@ -14,7 +14,8 @@
 )
 
 my_entity = model.Item(
-    label=[model.Label(text="MyItem")], statements=[model.Statement(predicate="IsA")]
+    label=[model.Label(text="MyItem")],
+    statements=[model.DataStatement(property="IsA", value="Category:Item")],
 )
 pprint(my_entity)