From 77ed8eaa864a6a659dcaadaa3ad6f3803cc79330 Mon Sep 17 00:00:00 2001
From: visi <visi@vertex.link>
Date: Fri, 17 Jan 2025 12:02:50 -0500
Subject: [PATCH] wip

---
 synapse/models/material.py  |  7 +++++++
 synapse/models/person.py    | 30 +++++++++++++-----------------
 synapse/models/transport.py |  4 ++--
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/synapse/models/material.py b/synapse/models/material.py
index f9524486bf..2ceba1e41b 100644
--- a/synapse/models/material.py
+++ b/synapse/models/material.py
@@ -62,6 +62,10 @@ def getModelDefs(self):
                 ('phys:object', ('ndef', {'interface': 'phys:object'}), {
                     'doc': 'A node which represents a physical object.'}),
 
+                ('phys:contained:type:taxonomy', ('taxonomy', {}), {
+                    'interfaces': ('meta:taxonomy',),
+                    'doc': 'A taxonomy for types of contained relationships.'}),
+
                 ('phys:contained', ('guid', {}), {
                     'doc': 'A node which represents a physical object containing another physical object.'}),
 
@@ -86,6 +90,9 @@ def getModelDefs(self):
 
                 ('phys:contained', {}, (
 
+                    ('type', ('phys:contained:type:taxonomy', {}), {
+                        'doc': 'The type of container relationship.'}),
+
                     ('period', ('ival', {}), {
                         'doc': 'The period where the container held the object.'}),
 
diff --git a/synapse/models/person.py b/synapse/models/person.py
index e3f0622d8a..0ba85efe39 100644
--- a/synapse/models/person.py
+++ b/synapse/models/person.py
@@ -22,31 +22,25 @@ def getModelDefs(self):
                 }),
                 ('ps:name', ('str', {'lower': True, 'onespace': True}), {
                     'doc': 'An arbitrary, lower spaced string with normalized whitespace.',
-                    'ex': 'robert grey'
-                }),
+                    'ex': 'robert grey'}),
+
                 ('ps:person', ('guid', {}), {
-                    'interfaces': ('phys:object',),
-                    'template': {'phys:object': 'person'},
-                    'doc': 'A GUID for a person.',
-                }),
+                    'doc': 'A GUID for a person.'}),
+
                 ('ps:persona', ('guid', {}), {
                     'deprecated': True,
-                    'doc': 'A GUID for a suspected person.',
-                }),
+                    'doc': 'Deprecated. Please use ps:contact.'}),
+
                 ('ps:person:has', ('comp', {'fields': (('person', 'ps:person'), ('node', 'ndef'))}), {
                     'deprecated': True,
-                    'doc': 'A person owns, controls, or has exclusive use of an object or'
-                           ' resource, potentially during a specific period of time.'
-                }),
+                    'doc': 'Deprecated. Please use ps:person -(has)>.'}),
+
                 ('ps:persona:has', ('comp', {'fields': (('persona', 'ps:persona'), ('node', 'ndef'))}), {
                     'deprecated': True,
-                    'doc': 'A persona owns, controls, or has exclusive use of an object or'
-                           ' resource, potentially during a specific period of time.'}),
+                    'doc': 'Deprecated. Please use ps:contact -(has)>.'}),
 
                 ('ps:contact', ('guid', {}), {
                     'doc': 'A GUID for a contact info record.',
-                    'interfaces': ('phys:object',),
-                    'template': {'phys:object': 'contact'},
                     'display': {
                         'columns': (
                             {'type': 'prop', 'opts': {'name': 'name'}},
@@ -64,9 +58,11 @@ def getModelDefs(self):
                     'doc': 'A GUID for a list of associated contacts.',
                 }),
                 ('ps:workhist', ('guid', {}), {
-                    'doc': "A GUID representing entry in a contact's work history.",
-                }),
+                    'doc': "A GUID representing entry in a contact's work history."}),
+
                 ('ps:vitals', ('guid', {}), {
+                    'interfaces': ('phys:object',),
+                    'template': {'phys:object', 'person'},
                     'doc': 'Statistics and demographic data about a person or contact.'}),
 
                 ('ps:skill', ('guid', {}), {
diff --git a/synapse/models/transport.py b/synapse/models/transport.py
index f177b5a2ec..8acafe022d 100644
--- a/synapse/models/transport.py
+++ b/synapse/models/transport.py
@@ -113,7 +113,7 @@ def getModelDefs(self):
                         'place': 'station',
                         'segment': 'train route',
                         'vehicle': 'train'},
-                    'doc': 'An individual instance of a train running a route.'}),
+                    'doc': 'An individual instance of a consist of train cars running a route.'}),
 
                 ('transport:rail:car', ('guid', {}), {
                     'interfaces': ('transport:container',),
@@ -231,7 +231,7 @@ def getModelDefs(self):
 
                 ('transport:segment', {
                     # train, flight, drive, launch...
-                    'doc': 'Properties common to a specific segment of a journey made by a vehicle.',
+                    'doc': 'Properties common to a specific instance of a route taken by a vehicle.',
                     'interfaces': ('transport:schedule',),
 
                     'props': (