Merge pull request #65 from fabrizio-turchi/issue-#61

Fix #61 issue, rename classes FacetXXX to XXXFacet and FacetEntity to …

Author: ajnelson-nist

case_mapping/base.py

@@ -188,7 +188,7 @@ class UcoInherentCharacterizationThing(UcoThing):
     pass
 
 
-class FacetEntity(UcoInherentCharacterizationThing):
+class Facet(UcoInherentCharacterizationThing):
     pass
 
 
@@ -198,7 +198,7 @@ def __init__(
         *args: Any,
         created_by: Optional["IdentityAbstraction"] = None,
         description: Union[None, str, Sequence[str]] = None,
-        facets: Union[None, FacetEntity, Sequence[FacetEntity]] = None,
+        facets: Union[None, Facet, Sequence[Facet]] = None,
         modified_time: Union[None, datetime, Sequence[datetime]] = None,
         object_created_time: Optional[datetime] = None,
         object_marking: Union[None, "UcoObject", Sequence["UcoObject"]] = None,
@@ -275,7 +275,7 @@ def append_indexed_items(self, *args):
             current_index = len(self["olo:slot"])
 
             for item in args:
-                if isinstance(item, FacetEntity):
+                if isinstance(item, Facet):
                     new_entry = dict()
                     current_index += 1
                     new_entry["olo:index"] = str(current_index)

case_mapping/case/investigation.py

@@ -3,7 +3,7 @@
 
 from pytz import timezone
 
-from ..base import FacetEntity, UcoObject
+from ..base import Facet, UcoObject
 from ..uco.action import Action
 from ..uco.location import Location
 
@@ -13,7 +13,7 @@ def __init__(
         self,
         *args: Any,
         description: Optional[str] = None,
-        facets: Optional[List[FacetEntity]] = None,
+        facets: Optional[List[Facet]] = None,
         end_time: Optional[datetime] = None,
         environment: Optional[UcoObject] = None,
         instrument: Union[None, UcoObject, List[UcoObject]] = None,

case_mapping/directory.py

@@ -1,9 +1,9 @@
-from .base import FacetEntity
+from .base import Facet
 from .case import *
 from .uco import *
 
-submodules = [v for k, v in globals().items() if k[:2] != "__" and k != "FacetEntity"]
+submodules = [v for k, v in globals().items() if k[:2] != "__" and k != "Facet"]
 
-directory: dict[str, type[FacetEntity]] = dict()
+directory: dict[str, type[Facet]] = dict()
 for submodule in submodules:
     directory |= submodule.directory