gedcom-x 0.5.6__py3-none-any.whl → 0.5.8__py3-none-any.whl

gedcomx/{GedcomX.py → translation.py}

@@ -1,384 +1,221 @@
-DEBUG = False
-import base64
-import json
-import mimetypes
+from . import *
+from .mutations import GedcomXEventOrFact
 import re
-import uuid
-import xml.etree.ElementTree as ET
-
-from typing import List, Optional
-from xml.dom import minidom
-from .Address import Address
-from .Agent import Agent
-from .Attribution import Attribution
-from .Conclusion import Conclusion
-from .Coverage import Coverage
-from .Date import Date, date_to_timestamp
-from .Document import Document
-from .EvidenceReference import EvidenceReference
-from .Exceptions import TagConversionError
-from .Event import Event,EventType,EventRole,EventRoleType
-from .Fact import Fact, FactType, FactQualifier
-from .Gedcom import Gedcom
-from .Gedcom5x import Gedcom5x, GedcomRecord
-from .Gender import Gender, GenderType
-from .Group import Group
-from .Identifier import Identifier, IdentifierType, make_uid, IdentifierList
-from .Logging import get_logger
-from .Name import Name, NameType, NameForm, NamePart, NamePartType, NamePartQualifier
-from .Note import Note
-from .OnlineAccount import OnlineAccount
-from .Person import Person
-from .PlaceDescription import PlaceDescription
-from .PlaceReference import PlaceReference
-from .Qualifier import Qualifier
-from .Relationship import Relationship, RelationshipType
-from .SourceCitation import SourceCitation
-from .SourceDescription import SourceDescription, ResourceType
-from .SourceReference import SourceReference, KnownSourceReference
-from .Subject import Subject
-from .TextValue import TextValue
-from .TopLevelTypeCollection import TopLevelTypeCollection
-from .Resource import Resource, URI
-
-import_log = get_logger('import')
-convert_log = get_logger('conversion')
-
-def TypeCollection(item_type):
-    class Collection:
-        def __init__(self):
-            self._items = []
-            self._id_index = {}
-            self._name_index = {}
-            self._uri_index = {}
-            self.uri = URI(path=f'/{item_type.__name__}s/')
-
-        def __iter__(self):
-            self._index = 0
-            return self
-
-        def __next__(self):
-            if self._index < len(self._items):
-                result = self._items[self._index]
-                self._index += 1
-                return result
-            else:
-                raise StopIteration
-
-        @property
-        def item_type(self):
-            return item_type
-        
-        def _update_indexes(self, item):
-            # Update the id index
-            if hasattr(item, 'id'):
-                self._id_index[item.id] = item
-            
-            try:
-                if hasattr(item, '_uri'):
-                    self._uri_index[item._uri.value] = item
-            except AttributeError as e:
-                print(f"type{item}")
-                assert False
-
-            # Update the name index
-            ''' #TODO Fix name handling on persons
-            if hasattr(item, 'names'):
-                names = getattr(item, 'names')
-                for name in names:
-                    print(name._as_dict_)
-                    name_value = name.value if isinstance(name, TextValue) else name
-                    if name_value in self._name_index:
-                        self._name_index[name_value].append(item)
-                    else:
-                        self._name_index[name_value] = [item]
-            '''
-
-        def _remove_from_indexes(self, item):
-            # Remove from the id index
-            if hasattr(item, 'id'):
-                if item.id in self._id_index:
-                    del self._id_index[item.id]
-
-            # Remove from the name index
-            if hasattr(item, 'names'):
-                names = getattr(item, 'names')
-                for name in names:
-                    name_value = name.value if isinstance(name, TextValue) else name
-                    if name_value in self._name_index:
-                        if item in self._name_index[name_value]:
-                            self._name_index[name_value].remove(item)
-                            if not self._name_index[name_value]:
-                                del self._name_index[name_value]
-
-        def byName(self, sname: str):
-            # Use the name index for fast lookup
-            if sname:
-                sname = sname.strip()
-                return self._name_index.get(sname, [])
-            return None
-
-        def byId(self, id):
-            # Use the id index for fast lookup
-            return self._id_index.get(id, None)
-        
-        def byUri(self, uri):
-            # Use the id index for fast lookup
-            return self._uri_index.get(uri.value, None)
-
-        def append(self, item):
-            if not isinstance(item, item_type):
-                raise TypeError(f"Expected item of type {item_type.__name__}, got {type(item).__name__}")
-            if item.uri:
-                item.uri.path  = f'{str(item_type.__name__)}s' if (item.uri.path is None or item.uri.path == "") else item.uri.path
-            else:
-                item.uri = URI(path=f'/{item_type.__name__}s/')
-            
-            
-            #if isinstance(item,Agent):
-            #    item._uri._path  = 'Agents'
-            #    print(item._uri._as_dict_)
-                
-            self._items.append(item)
-            self._update_indexes(item)
-
-        def remove(self, item):
-            if item not in self._items:
-                raise ValueError("Item not found in the collection.")
-            self._items.remove(item)
-            self._remove_from_indexes(item)
-
-        def __repr__(self):
-            return f"Collection({self._items!r})"
-        
-        def list(self):
-            for item in self._items:
-                print(item)
-        
-        def __call__(self, **kwargs):
-            results = []
-            for item in self._items:
-                match = True
-                for key, value in kwargs.items():
-                    if not hasattr(item, key) or getattr(item, key) != value:
-                        match = False
-                        break
-                if match:
-                    results.append(item)
-            return results
-        
-        def __len__(self):
-            return len(self._items)
-        
-        def __getitem__(self, index):
-            return self._items[index]
-    
-        @property
-        def _items_as_dict(self) -> dict:
-            return {f'{str(item_type.__name__)}s':  [item._as_dict_ for item in self._items]}
-
-        @property
-        def _as_dict_(self):
-            return {f'{str(item_type.__name__).lower()}s': [item._as_dict_ for item in self._items]}     
-
-        @property
-        def json(self) -> str:
-            
-            return json.dumps(self._as_dict_, indent=4)    
-
-    return Collection()
-
-class GedcomX:
-    """
-    Main GedcomX Object representing a Genealogy. Stores collections of Top Level Gedcom-X Types.
-    complies with GEDCOM X Conceptual Model V1 (http://gedcomx.org/conceptual-model/v1)
-
-    Parameters
-    ----------
-    id : str
-        Unique identifier for this Genealogy.
-    attribution : Attribution Object
-        Attribution information for the Genealogy
-    filepath : str
-        Not Implimented.
-    description : str
-        Description of the Genealogy: ex. 'My Family Tree'
-
-    Raises
-    ------
-    ValueError
-        If `id` is not a valid UUID.
-    """
-    version = 'http://gedcomx.org/conceptual-model/v1'
-
-    def __init__(self, id: Optional[str] = None,
-                 attribution: Optional[Attribution] = None,
-                 filepath: Optional[str] = None,
-                 description: Optional[str] = None) -> None:
-        
-        self.id = id
-        self.attribution = attribution
-        self._filepath = None
-        
-        self.description = description
-        self.source_descriptions = TypeCollection(SourceDescription)
-        self.persons = TypeCollection(Person)
-        self.relationships = TypeCollection(Relationship)      
-        self.agents = TypeCollection(Agent)
-        self.events = TypeCollection(Event)
-        self.documents = TypeCollection(Document)
-        self.places = TypeCollection(PlaceDescription)
-        self.groups = TypeCollection(Group)
-
-        self.relationship_table = {}
-
-        self.default_id_generator = make_uid
-
-    def add(self,gedcomx_type_object):
-        if gedcomx_type_object:
-            if isinstance(gedcomx_type_object,Person):
-                self.add_person(gedcomx_type_object)
-            elif isinstance(gedcomx_type_object,SourceDescription):
-                self.add_source_description(gedcomx_type_object)
-            elif isinstance(gedcomx_type_object,Agent):
-                self.add_agent(gedcomx_type_object)
-            elif isinstance(gedcomx_type_object,PlaceDescription):
-                self.add_place_description(gedcomx_type_object)
-            elif isinstance(gedcomx_type_object,Event):
-                self.add_event(gedcomx_type_object)
-            elif isinstance(gedcomx_type_object,Relationship):
-                self.add_relationship(gedcomx_type_object)
-            else:
-                raise ValueError(f"I do not know how to add an Object of type {type(gedcomx_type_object)}")
-        else:
-            Warning("Tried to add a None type to the Geneology")
-
-    def add_source_description(self,sourceDescription: SourceDescription):
-        if sourceDescription and isinstance(sourceDescription,SourceDescription):
-            if sourceDescription.id is None:
-                sourceDescription.id =self.default_id_generator()
-            self.source_descriptions.append(item=sourceDescription)
-            self.lastSourceDescriptionAdded = sourceDescription
-        else:
-            raise ValueError(f"When adding a SourceDescription, value must be of type SourceDescription, type {type(sourceDescription)} was provided")
-
-    def add_person(self,person: Person):
-        """Add a Person object to the Genealogy
-
-        Args:
-            person: Person Object
-
-        Returns:
-            None
-
-        Raises:
-            ValueError: If `person` is not of type Person.
-        """
-        if person and isinstance(person,Person):
-            if person.id is None:
-                person.id =self.personURIgenerator()
-            self.persons.append(item=person)
-        else:
-            raise ValueError(f'person must be a Person Object not type: {type(person)}')
-        
-    def add_relationship(self,relationship: Relationship):
-        if relationship and isinstance(relationship,Relationship):
-            if isinstance(relationship.person1,Resource) and isinstance(relationship.person2,Resource):
-                print("Adding unresolved Relationship")
-                self.relationships.append(relationship)
-                return
-
-            if relationship.person1:
-                if relationship.person1.id is None:
-                    relationship.person1.id = self.personURIgenerator()
-                if not self.persons.byId(relationship.person1.id):
-                    self.persons.append(relationship.person1)
-                if relationship.person1.id not in self.relationship_table:
-                    self.relationship_table[relationship.person1.id] = []
-                self.relationship_table[relationship.person1.id].append(relationship)
-                relationship.person1._add_relationship(relationship)
-            else:
-                pass
-            
-            if relationship.person2:
-                if relationship.person2.id is None:
-                    relationship.person2.id = self.personURIgenerator() #TODO
-                if not self.persons.byId(relationship.person2.id):
-                    self.persons.append(relationship.person2)
-                if relationship.person2.id not in self.relationship_table:
-                    self.relationship_table[relationship.person2.id] = []
-                self.relationship_table[relationship.person2.id].append(relationship)
-                relationship.person2._add_relationship(relationship)
-            else:
-                pass
-
-            self.relationships.append(relationship)
-        else:
-            raise ValueError()
-    
-    def add_place_description(self,placeDescription: PlaceDescription):
-        if placeDescription and isinstance(placeDescription,PlaceDescription):
-            if placeDescription.id is None:
-                Warning("PlaceDescription has no id")
-            self.places.append(placeDescription)
-
-    def add_agent(self,agent: Agent):
-        """Add a Agent object to the Genealogy
-
-        Args:
-            agent: Agent Object
-
-        Returns:
-            None
-
-        Raises:
-            ValueError: If `agent` is not of type Agent.
-        """
-        if agent and isinstance(agent,Agent):
-            if agent in self.agents:
-                return
-            if agent.id is None:
-                agent.id = Agent.default_id_generator()
-            if self.agents.byId(agent.id):
-                pass #TODO Deal with duplicates
-                #raise ValueError
-            print(f'Added Agent with id: {agent.id}')
-            self.agents.append(agent)
-    
-    def add_event(self,event_to_add: Event):
-        if event_to_add and isinstance(event_to_add,Event):
-            for current_event in self.events:
-                if event_to_add == current_event:
-                    return
-            self.events.append(event_to_add)
+'''
+{'type': 'Object | Objects | Propertyof',
+    'Object': 'Class',
+    'Objects': ['Class',...],
+    'Propertyof': 'Class',
+    'Args': {'argname':'value|rTextValue|rIntValue|rFloatValue|rBoolValue|id|resource'},
+    'Assign': {'propertyname':'value|rTextValue|rIntValue|rFloatValue|rBoolValue|id|resource'},
+    'Selectoe':callable
+}
 
-    def get_person_by_id(self,id: str):
-        filtered = [person for person in self.persons if getattr(person, 'id') == id]
-        if filtered: return filtered[0]
-        return None
-    
-    def source(self,id: str):
-        filtered = [source for source in self.source_descriptions if getattr(source, 'id') == id]
-        if filtered: return filtered[0]
-        return None        
-
-    def json(self):
-        """
-        JSON Representation of the GedcomX Genealogy.
-
-        Returns:
-            str: JSON Representation of the GedcomX Genealogy in the GEDCOM X JSON Serialization Format
-        """
-        gedcomx_json = {
-            'persons': [person._as_dict_ for person in self.persons],
-            'sourceDescriptions' : [sourceDescription._as_dict_ for sourceDescription in self.source_descriptions],
-            'relationships': [relationship._as_dict_ for relationship in self.relationships],
-            'agents': [agent._as_dict_ for agent in self.agents],
-            'events': [event._as_dict_ for event in self.events],
-            'places': [place._as_dict_ for place in self.places],
-            'documents': [document._as_dict_ for document in self.documents],
-        }
-        return json.dumps(gedcomx_json, indent=4)
+'''
+g7toXtable = {
+    "https://gedcom.io/terms/v7/ABBR": {},
+    "https://gedcom.io/terms/v7/ADDR": {'type':'Object','Object':Address, 'Args':{'value':'value'},'addmethod':'add_address'},
+    "https://gedcom.io/terms/v7/ADOP": {},
+    "https://gedcom.io/terms/v7/ADOP-FAMC": {},
+    "https://gedcom.io/terms/v7/ADR1": {'type':'Propertyof','propertyof':Address,'assign':{'street':'value'}},
+    "https://gedcom.io/terms/v7/ADR2": {'type':'Propertyof','propertyof':Address,'assign':{'street2':'value'}},
+    "https://gedcom.io/terms/v7/ADR3": {'type':'Propertyof','propertyof':Address,'assign':{'street3':'value'}},
+    "https://gedcom.io/terms/v7/AGE": {},
+    "https://gedcom.io/terms/v7/AGNC": {},
+    "https://gedcom.io/terms/v7/ALIA": {},
+    "https://gedcom.io/terms/v7/ANCI": {},
+    "https://gedcom.io/terms/v7/ANUL": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/ASSO": {},
+    "https://gedcom.io/terms/v7/AUTH": {},
+    "https://gedcom.io/terms/v7/BAPL": {},
+    "https://gedcom.io/terms/v7/BAPM": {},
+    "https://gedcom.io/terms/v7/BARM": {},
+    "https://gedcom.io/terms/v7/BASM": {},
+    "https://gedcom.io/terms/v7/BIRT": {},
+    "https://gedcom.io/terms/v7/BLES": {},
+    "https://gedcom.io/terms/v7/BURI": {},
+    "https://gedcom.io/terms/v7/CALN": {},
+    "https://gedcom.io/terms/v7/CAST": {},
+    "https://gedcom.io/terms/v7/CAUS": {},
+    "https://gedcom.io/terms/v7/CENS": {},
+    "https://gedcom.io/terms/v7/CHAN": {},
+    "https://gedcom.io/terms/v7/CHIL": {},
+    "https://gedcom.io/terms/v7/CHR": {},
+    "https://gedcom.io/terms/v7/CHRA": {},
+    "https://gedcom.io/terms/v7/CITY": {'type':'Propertyof','propertyof':Address,'assign':{'city':'value'}},
+    "https://gedcom.io/terms/v7/CONF": {},
+    "https://gedcom.io/terms/v7/CONL": {},
+    "https://gedcom.io/terms/v7/CONT": {},
+    "https://gedcom.io/terms/v7/COPR": {},
+    "https://gedcom.io/terms/v7/CORP": {},
+    "https://gedcom.io/terms/v7/CREA": {},
+    "https://gedcom.io/terms/v7/CREM": {},
+    "https://gedcom.io/terms/v7/CROP": {},
+    "https://gedcom.io/terms/v7/CTRY": {'type':'Propertyof','propertyof':Address,'assign':{'country':'value'}},
+    "https://gedcom.io/terms/v7/DATA": {},
+    "https://gedcom.io/terms/v7/DATA-EVEN": {},
+    "https://gedcom.io/terms/v7/DATA-EVEN-DATE": {},
+    "https://gedcom.io/terms/v7/DATE": {},
+    "https://gedcom.io/terms/v7/DATE-exact": {},
+    "https://gedcom.io/terms/v7/DEAT": {},
+    "https://gedcom.io/terms/v7/DESI": {},
+    "https://gedcom.io/terms/v7/DEST": {},
+    "https://gedcom.io/terms/v7/DIV": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/DIVF": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/DSCR": {},
+    "https://gedcom.io/terms/v7/EDUC": {},
+    "https://gedcom.io/terms/v7/EMAIL": {},
+    "https://gedcom.io/terms/v7/EMIG": {},
+    "https://gedcom.io/terms/v7/ENDL": {},
+    "https://gedcom.io/terms/v7/ENGA": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/EVEN": {},
+    "https://gedcom.io/terms/v7/EXID": {},
+    "https://gedcom.io/terms/v7/EXID-TYPE": {},
+    "https://gedcom.io/terms/v7/FACT": {},
+    "https://gedcom.io/terms/v7/FAM": {'type':'Object','Object':Relationship,'Args':{'id':'xref'},'stackentry':['lastrelationship','lastrelationshipdata']},
+    "https://gedcom.io/terms/v7/FAM-CENS": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/FAM-EVEN": {},
+    "https://gedcom.io/terms/v7/FAM-FACT": {},
+    "https://gedcom.io/terms/v7/FAM-HUSB": {'type':'Object','Object':Resource,'Args':{'Id':'xref'}},
+    "https://gedcom.io/terms/v7/FAM-NCHI": {},
+    "https://gedcom.io/terms/v7/FAM-RESI": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/FAM-WIFE": {'type':'Object','Object':Resource,'Args':{'Id':'xref'}},
+    "https://gedcom.io/terms/v7/FAMC": {},
+    "https://gedcom.io/terms/v7/FAMC-ADOP": {},
+    "https://gedcom.io/terms/v7/FAMC-STAT": {},
+    "https://gedcom.io/terms/v7/FAMS": {},
+    "https://gedcom.io/terms/v7/FAX": {},
+    "https://gedcom.io/terms/v7/FCOM": {},
+    "https://gedcom.io/terms/v7/FILE": {},
+    "https://gedcom.io/terms/v7/FILE-TRAN": {},
+    "https://gedcom.io/terms/v7/FORM": {},
+    "https://gedcom.io/terms/v7/GEDC": {},
+    "https://gedcom.io/terms/v7/GEDC-VERS": {},
+    "https://gedcom.io/terms/v7/GIVN": {},
+    "https://gedcom.io/terms/v7/GRAD": {},
+    "https://gedcom.io/terms/v7/HEAD": {},
+    "https://gedcom.io/terms/v7/HEAD-DATE": {},
+    "https://gedcom.io/terms/v7/HEAD-LANG": {},
+    "https://gedcom.io/terms/v7/HEAD-PLAC": {},
+    "https://gedcom.io/terms/v7/HEAD-PLAC-FORM": {},
+    "https://gedcom.io/terms/v7/HEAD-SOUR": {},
+    "https://gedcom.io/terms/v7/HEAD-SOUR-DATA": {},
+    "https://gedcom.io/terms/v7/HEIGHT": {},
+    "https://gedcom.io/terms/v7/HUSB": {},
+    "https://gedcom.io/terms/v7/IDNO": {},
+    "https://gedcom.io/terms/v7/IMMI": {},
+    "https://gedcom.io/terms/v7/INDI": {},
+    "https://gedcom.io/terms/v7/INDI-CENS": {},
+    "https://gedcom.io/terms/v7/INDI-EVEN": {},
+    "https://gedcom.io/terms/v7/INDI-FACT": {},
+    "https://gedcom.io/terms/v7/INDI-FAMC": {},
+    "https://gedcom.io/terms/v7/INDI-NAME": {},
+    "https://gedcom.io/terms/v7/INDI-NCHI": {},
+    "https://gedcom.io/terms/v7/INDI-RELI": {},
+    "https://gedcom.io/terms/v7/INDI-RESI": {},
+    "https://gedcom.io/terms/v7/INDI-TITL": {},
+    "https://gedcom.io/terms/v7/INIL": {},
+    "https://gedcom.io/terms/v7/LANG": {},
+    "https://gedcom.io/terms/v7/LATI": {},
+    "https://gedcom.io/terms/v7/LEFT": {},
+    "https://gedcom.io/terms/v7/LONG": {},
+    "https://gedcom.io/terms/v7/MAP": {},
+    "https://gedcom.io/terms/v7/MARB": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/MARC": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/MARL": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/MARR": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/MARS": {'type':'Mutation','Object':GedcomXEventOrFact,'Args':{'value':'value'},'propertyof':[Relationship],'method':'add_fact'},
+    "https://gedcom.io/terms/v7/MEDI": {},
+    "https://gedcom.io/terms/v7/MIME": {},
+    "https://gedcom.io/terms/v7/NAME": {},
+    "https://gedcom.io/terms/v7/NAME-TRAN": {},
+    "https://gedcom.io/terms/v7/NAME-TYPE": {},
+    "https://gedcom.io/terms/v7/NATI": {},
+    "https://gedcom.io/terms/v7/NATU": {},
+    "https://gedcom.io/terms/v7/NCHI": {},
+    "https://gedcom.io/terms/v7/NICK": {},
+    "https://gedcom.io/terms/v7/NMR": {},
+    "https://gedcom.io/terms/v7/NO": {},
+    "https://gedcom.io/terms/v7/NO-DATE": {},
+    "https://gedcom.io/terms/v7/NOTE": {},
+    "https://gedcom.io/terms/v7/NOTE-TRAN": {},
+    "https://gedcom.io/terms/v7/NPFX": {},
+    "https://gedcom.io/terms/v7/NSFX": {},
+    "https://gedcom.io/terms/v7/OBJE": {'type':'Object','Object':SourceReference,'Args':{'Id':'xref'}},
+    "https://gedcom.io/terms/v7/OCCU": {},
+    "https://gedcom.io/terms/v7/ORDN": {},
+    "https://gedcom.io/terms/v7/PAGE": {},
+    "https://gedcom.io/terms/v7/PEDI": {},
+    "https://gedcom.io/terms/v7/PHON": {},
+    "https://gedcom.io/terms/v7/PHRASE": {},
+    "https://gedcom.io/terms/v7/PLAC": {},
+    "https://gedcom.io/terms/v7/PLAC-FORM": {},
+    "https://gedcom.io/terms/v7/PLAC-TRAN": {},
+    "https://gedcom.io/terms/v7/POST": {},
+    "https://gedcom.io/terms/v7/PROB": {},
+    "https://gedcom.io/terms/v7/PROP": {},
+    "https://gedcom.io/terms/v7/PUBL": {},
+    "https://gedcom.io/terms/v7/QUAY": {},
+    "https://gedcom.io/terms/v7/REFN": {},
+    "https://gedcom.io/terms/v7/RELI": {},
+    "https://gedcom.io/terms/v7/REPO": {'type':'Object','Object':Resource,'Args':{'Id':'xref'}},
+    "https://gedcom.io/terms/v7/RESI": {},
+    "https://gedcom.io/terms/v7/RESN": {},
+    "https://gedcom.io/terms/v7/RETI": {},
+    "https://gedcom.io/terms/v7/ROLE": {},
+    "https://gedcom.io/terms/v7/SCHMA": {},
+    "https://gedcom.io/terms/v7/SDATE": {},
+    "https://gedcom.io/terms/v7/SEX": {},
+    "https://gedcom.io/terms/v7/SLGC": {},
+    "https://gedcom.io/terms/v7/SLGS": {},
+    "https://gedcom.io/terms/v7/SNOTE": {},
+    "https://gedcom.io/terms/v7/SOUR": {},
+    "https://gedcom.io/terms/v7/SOUR-DATA": {},
+    "https://gedcom.io/terms/v7/SOUR-EVEN": {},
+    "https://gedcom.io/terms/v7/SPFX": {},
+    "https://gedcom.io/terms/v7/SSN": {},
+    "https://gedcom.io/terms/v7/STAE": {'type':'Propertyof','propertyof':Address,'assign':{'stateOrProvince':'value'}},
+    "https://gedcom.io/terms/v7/STAT": {},
+    "https://gedcom.io/terms/v7/SUBM": {},
+    "https://gedcom.io/terms/v7/SUBM-LANG": {},
+    "https://gedcom.io/terms/v7/SURN": {'class':NamePart, 
+                                        'args':{'type':NamePartType.Surname,'value':'rTextValue'}
+                                         },
+    "https://gedcom.io/terms/v7/TAG": {},
+    "https://gedcom.io/terms/v7/TEMP": {},
+    "https://gedcom.io/terms/v7/TEXT": {},
+    "https://gedcom.io/terms/v7/TIME": {},
+    "https://gedcom.io/terms/v7/TITL": {'type':'PropertyObject','Object':TextValue,'Args':{'value':'value'},'propertyof':[SourceDescription],'method':'add_title'},
+    "https://gedcom.io/terms/v7/TOP": {},
+    "https://gedcom.io/terms/v7/TRAN": {},
+    "https://gedcom.io/terms/v7/TRLR": {},
+    "https://gedcom.io/terms/v7/TYPE": {'type':'Object','Object':Note,'Args':{'text':'value'},'propertyof':[Fact],'method':'add_note'},
+    "https://gedcom.io/terms/v7/UID": {},
+    "https://gedcom.io/terms/v7/VERS": {},
+    "https://gedcom.io/terms/v7/WIDTH": {},
+    "https://gedcom.io/terms/v7/WIFE": {},
+    "https://gedcom.io/terms/v7/WILL": {},
+    "https://gedcom.io/terms/v7/WWW": {},
+    "https://gedcom.io/terms/v7/enumset-ADOP": {},
+    "https://gedcom.io/terms/v7/enumset-EVEN": {},
+    "https://gedcom.io/terms/v7/enumset-EVENATTR": {},
+    "https://gedcom.io/terms/v7/enumset-FAMC-STAT": {},
+    "https://gedcom.io/terms/v7/enumset-MEDI": {},
+    "https://gedcom.io/terms/v7/enumset-NAME-TYPE": {},
+    "https://gedcom.io/terms/v7/enumset-PEDI": {},
+    "https://gedcom.io/terms/v7/enumset-QUAY": {},
+    "https://gedcom.io/terms/v7/enumset-RESN": {},
+    "https://gedcom.io/terms/v7/enumset-ROLE": {},
+    "https://gedcom.io/terms/v7/enumset-SEX": {},
+    "https://gedcom.io/terms/v7/ord-STAT": {},
+    "https://gedcom.io/terms/v7/record-FAM": {'type':'TopLevelObject','Object':Relationship,'Args':{'id':'xref'}},
+    "https://gedcom.io/terms/v7/record-INDI": {'type':'TopLevelObject','Object':Person,'Args':{'id':'xref'}},
+    "https://gedcom.io/terms/v7/record-OBJE": {'type':'TopLevelObject','Object':SourceDescription, 'Args':{'id':'xref'}},
+    "https://gedcom.io/terms/v7/record-REPO": {'type':'TopLevelObject','Object':Agent,'Args':{'id':'xref'}},
+    "https://gedcom.io/terms/v7/record-SNOTE": {},
+    "https://gedcom.io/terms/v7/record-SOUR": {'type':'TopLevelObject','Object':SourceDescription,'Args':{'id':'xref'}},
+    "https://gedcom.io/terms/v7/record-SUBM": {'type':'Object','Object':Resource,'Args':{'Id':'xref'}},
+}
 
 class Translater():
     def __init__(self,gedcom: Gedcom5x) -> None:
@@ -482,7 +319,7 @@ class Translater():
 }
     
     @staticmethod
-    def clean_str(text: str) -> str:
+    def clean_str(text: str) -> str | None:
         # Regular expression to match HTML/XML tags
         if text is None or text.strip() == '':
             return None
@@ -531,7 +368,7 @@ class Translater():
         return {'BIRT':EventType.Birth,
                 'OBIT':FactType.Obituary}
        
-    def parse_record(self,record: GedcomRecord):
+    def parse_record(self,record: Gedcom5xRecord):
                 
         handler_name = 'handle_' + record.tag.lower()
         
@@ -549,7 +386,7 @@ class Translater():
         for sub_record in record.subRecords():
             self.parse_record(sub_record)
     
-    def handle__apid(self, record: GedcomRecord):
+    def handle__apid(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceReference):
             self.object_map[record.level-1].description.add_identifier(Identifier(value=URI.from_url('APID://' + record.value)))
         elif isinstance(self.object_map[record.level-1], SourceDescription):
@@ -557,7 +394,7 @@ class Translater():
         else:
             raise ValueError(f"Could not handle '_APID' tag in record {record.describe()}, last stack object {type(self.object_map[record.level-1])}")
 
-    def handle__meta(self, record: GedcomRecord):
+    def handle__meta(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceDescription):
             gxobject = Note(text=Translater.clean_str(record.value))
             self.object_map[record.level-1].add_note(gxobject)
@@ -566,10 +403,10 @@ class Translater():
         else:
             raise ValueError(f"Could not handle 'WWW' tag in record {record.describe()}, last stack object {self.object_map[record.level-1]}")
 
-    def handle__wlnk(self, record: GedcomRecord):
+    def handle__wlnk(self, record: Gedcom5xRecord):
         return self.handle_sour(record)
 
-    def handle_addr(self, record: GedcomRecord):
+    def handle_addr(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Agent):
             # TODO CHeck if URL?
             if Translater.clean_str(record.value):
@@ -582,70 +419,70 @@ class Translater():
         else:
             raise ValueError(f"I do not know how to handle an 'ADDR' tag for a {type(self.object_map[record.level-1])}")
     
-    def handle_adr1(self, record: GedcomRecord):
+    def handle_adr1(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].street = Translater.clean_str(record.value)        
         else:
             raise ValueError(f"I do not know how to handle an 'ADR1' tag for a {type(self.object_map[record.level-1])}")
     
-    def handle_adr2(self, record: GedcomRecord):
+    def handle_adr2(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].street2 = Translater.clean_str(record.value)        
         else:
             raise ValueError(f"I do not know how to handle an 'ADR2' tag for a {type(self.object_map[record.level-1])}")
     
-    def handle_adr3(self, record: GedcomRecord):
+    def handle_adr3(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].street3 = Translater.clean_str(record.value)        
         else:
             raise ValueError(f"I do not know how to handle an 'ADR3' tag for a {type(self.object_map[record.level-1])}")
     
-    def handle_adr4(self, record: GedcomRecord):
+    def handle_adr4(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].street4 = Translater.clean_str(record.value)        
         else:
             raise ValueError(f"I do not know how to handle an 'ADR4' tag for a {type(self.object_map[record.level-1])}")
     
-    def handle_adr5(self, record: GedcomRecord):
+    def handle_adr5(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].street5 = Translater.clean_str(record.value)        
         else:
             raise ValueError(f"I do not know how to handle an 'ADR5' tag for a {type(self.object_map[record.level-1])}")
     
-    def handle_adr6(self, record: GedcomRecord):
+    def handle_adr6(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].street5 = Translater.clean_str(record.value)        
         else:
             raise ValueError(f"I do not know how to handle an 'ADR6' tag for a {type(self.object_map[record.level-1])}")
         
-    def handle_phon(self, record: GedcomRecord):
+    def handle_phon(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Agent):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].phones.append(Translater.clean_str(record.value))        
         else:
             raise ValueError(f"I do not know how to handle an '{record.tag}' tag for a {type(self.object_map[record.level-1])}")
     
-    def handle_email(self, record: GedcomRecord):
+    def handle_email(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Agent):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].emails.append(Translater.clean_str(record.value))        
         else:
             raise ValueError(f"I do not know how to handle an '{record.tag}' tag for a {type(self.object_map[record.level-1])}")
     
-    def handle_fax(self, record: GedcomRecord):
+    def handle_fax(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Agent):
             if Translater.clean_str(record.value):
                 self.object_map[record.level-1].emails.append('FAX:' + Translater.clean_str(record.value))        
         else:
             raise ValueError(f"I do not know how to handle an '{record.tag}' tag for a {type(self.object_map[record.level-1])}")
 
-    def handle_adop(self, record: GedcomRecord):
+    def handle_adop(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Adoption)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -655,7 +492,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_auth(self, record: GedcomRecord):
+    def handle_auth(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceDescription):
             if self.gedcomx.agents.byName(record.value):
                 gxobject = self.gedcomx.agents.byName(record.value)[0]
@@ -669,7 +506,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_bapm(self, record: GedcomRecord):
+    def handle_bapm(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Baptism)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -679,7 +516,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_birt(self, record: GedcomRecord):
+    def handle_birt(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             #gxobject = Event(type=EventType.BIRTH, roles=[EventRole(person=self.object_map[record.level-1], type=EventRoleType.Principal)])
             gxobject = Fact(type=FactType.Birth)
@@ -691,7 +528,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_buri(self, record: GedcomRecord):
+    def handle_buri(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Burial)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -701,7 +538,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_caln(self, record: GedcomRecord):
+    def handle_caln(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceReference):
             self.object_map[record.level-1].description.add_identifier(Identifier(value=URI.from_url('Call Number:' + record.value)))
         elif isinstance(self.object_map[record.level-1], SourceDescription):
@@ -712,7 +549,7 @@ class Translater():
         else:
             raise ValueError(f"Could not handle 'CALN' tag in record {record.describe()}, last stack object {type(self.object_map[record.level-1])}")
 
-    def handle_chan(self, record: GedcomRecord):
+    def handle_chan(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceDescription):
             self.object_map[record.level-1].created = Date(record.subRecord('DATE'))
         elif isinstance(self.object_map[record.level-1], Agent):
@@ -724,7 +561,7 @@ class Translater():
         else:
             raise ValueError()
 
-    def handle_chr(self, record: GedcomRecord):
+    def handle_chr(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Christening)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -734,13 +571,13 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_city(self, record: GedcomRecord):
+    def handle_city(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             self.object_map[record.level-1].city = Translater.clean_str(record.value)
         else:
             raise ValueError(f"I do not know how to handle an 'CITY' tag for a {type(self.object_map[record.level-1])}")
         
-    def handle_conc(self, record: GedcomRecord):
+    def handle_conc(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Note):
             gxobject = Translater.clean_str(str(record.value))
             self.object_map[record.level-1].append(gxobject)
@@ -761,7 +598,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_cont(self, record: GedcomRecord):
+    def handle_cont(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Note):
             gxobject = str("\n" + record.value if record.value else '')
             self.object_map[record.level-1].append(gxobject)
@@ -780,7 +617,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
     
-    def handle_crea(self, record: GedcomRecord):
+    def handle_crea(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceDescription):
             self.object_map[record.level-1].created = Date(original=record.subRecord('DATE'))
             
@@ -795,18 +632,18 @@ class Translater():
         else:
             raise ValueError(f"Could not handle '{record.tag}' tag in record {record.describe()}, last stack object {self.object_map[record.level-1]}")
     
-    def handle_ctry(self, record: GedcomRecord):
+    def handle_ctry(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             self.object_map[record.level-1].country = Translater.clean_str(record.value)
         else:
             raise ValueError(f"I do not know how to handle an '{record.tag}' tag for a {type(self.object_map[record.level-1])}")
      
-    def handle_data(self, record: GedcomRecord) -> None:
+    def handle_data(self, record: Gedcom5xRecord) -> None:
         if record.value != '' and record.value == 'None':
             assert False
         self.object_map[record.level] = self.object_map[record.level-1]
 
-    def handle_date(self, record: GedcomRecord):
+    def handle_date(self, record: Gedcom5xRecord):
         if record.parent.tag == 'PUBL':
             #gxobject = Date(original=record.value) #TODO Make a parser for solid timestamps
             #self.object_map[0].published = gxobject
@@ -837,7 +674,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_deat(self, record: GedcomRecord):
+    def handle_deat(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Death)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -847,7 +684,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_even(self, record: GedcomRecord):
+    def handle_even(self, record: Gedcom5xRecord):
         # TODO If events in a @S, check if only 1 person matches?
         if record.value and (not record.value.strip() == ''):
             values = [value.strip() for value in record.value.split(",")]
@@ -905,14 +742,14 @@ class Translater():
                 else:
                     assert False
 
-    def handle_exid(self,record: GedcomRecord):
+    def handle_exid(self,record: Gedcom5xRecord):
         gxobject = Identifier(type=IdentifierType.External,value=[record.value])
         self.object_map[record.level-1].add_identifier(gxobject)
 
         self.object_stack.append(gxobject)
         self.object_map[record.level] = gxobject
 
-    def handle_fam(self, record: GedcomRecord) -> None:
+    def handle_fam(self, record: Gedcom5xRecord) -> None:
         if record.tag != 'FAM' or record.level != 0:
             raise ValueError("Invalid record: Must be a level 0 FAM record")
 
@@ -945,13 +782,13 @@ class Translater():
             relationship = Relationship(person1=husband, person2=wife, type=RelationshipType.Couple)
             self.gedcomx.add_relationship(relationship)
 
-    def handle_famc(self, record: GedcomRecord) -> None:
+    def handle_famc(self, record: Gedcom5xRecord) -> None:
         return
 
-    def handle_fams(self, record: GedcomRecord) -> None:
+    def handle_fams(self, record: Gedcom5xRecord) -> None:
         return
 
-    def handle_file(self, record: GedcomRecord):
+    def handle_file(self, record: Gedcom5xRecord):
         if record.value and record.value.strip() != '':
             #raise ValueError(f"I did not expect the 'FILE' tag to have a value: {record.value}")
             #TODO Handle files referenced here
@@ -960,7 +797,7 @@ class Translater():
             ...
         self.object_map[record.level-1].resourceType = ResourceType.DigitalArtifact
            
-    def handle_form(self, record: GedcomRecord):
+    def handle_form(self, record: Gedcom5xRecord):
         if record.parent.tag == 'FILE' and isinstance(self.object_map[record.level-2], SourceDescription):
             if record.value and record.value.strip() != '':
                 mime_type, _ = mimetypes.guess_type('placehold.' + record.value)
@@ -975,20 +812,20 @@ class Translater():
         else:
             convert_log.error(f"raise TagConversionError(record=record,levelstack=self.object_map")
 
-    def handle_givn(self, record: GedcomRecord):
+    def handle_givn(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Name):
             given_name = NamePart(value=record.value, type=NamePartType.Given)
             self.object_map[record.level-1]._add_name_part(given_name)
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_indi(self, record: GedcomRecord):
+    def handle_indi(self, record: Gedcom5xRecord):
         person = Person(id=record.xref.replace('@',''))
         self.gedcomx.add_person(person)
         self.object_stack.append(person)
         self.object_map[record.level] = person
 
-    def handle_immi(self, record: GedcomRecord):
+    def handle_immi(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Immigration)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -998,7 +835,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_marr(self, record: GedcomRecord):
+    def handle_marr(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Marriage)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -1008,7 +845,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_name(self, record: GedcomRecord):
+    def handle_name(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Name.simple(record.value)
             #gxobject = Name(nameForms=[NameForm(fullText=record.value)], type=NameType.BirthName)
@@ -1022,7 +859,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_note(self, record: GedcomRecord):
+    def handle_note(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceDescription):
             gxobject = Note(text=Translater.clean_str(record.value))
             self.object_map[record.level-1].add_note(gxobject)
@@ -1063,14 +900,14 @@ class Translater():
             raise ValueError(f"Could not handle 'NOTE' tag in record {record.describe()}, last stack object {type(self.object_map[record.level-1])}")
             assert False
 
-    def handle_nsfx(self, record: GedcomRecord):
+    def handle_nsfx(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Name):
             surname = NamePart(value=record.value, type=NamePartType.Suffix)
             self.object_map[record.level-1]._add_name_part(surname)
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_occu(self, record: GedcomRecord):
+    def handle_occu(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Occupation)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -1080,10 +917,10 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_obje(self, record: GedcomRecord):
+    def handle_obje(self, record: Gedcom5xRecord):
         self.handle_sour(record)
 
-    def handle_page(self, record: GedcomRecord):
+    def handle_page(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceReference):
             self.object_map[record.level-1].descriptionId = record.value
             self.object_map[record.level-1].add_qualifier(KnownSourceReference(name=str(KnownSourceReference.Page),value=record.value))
@@ -1094,7 +931,7 @@ class Translater():
         else:
             raise ValueError(f"Could not handle 'PAGE' tag in record {record.describe()}, last stack object {self.object_map[record.level-1]}")
 
-    def handle_plac(self, record: GedcomRecord):
+    def handle_plac(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Agent):
             gxobject = Address(value=record.value)
             self.object_map[record.level-1].add_address(gxobject)
@@ -1126,13 +963,13 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_post(self, record: GedcomRecord):
+    def handle_post(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             self.object_map[record.level-1].postalCode = Translater.clean_str(record.value)
         else:
             raise ValueError(f"I do not know how to handle an 'POST' tag for a {type(self.object_map[record.level-1])}")   
     
-    def handle_publ(self, record: GedcomRecord):
+    def handle_publ(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceDescription):
             if record.value and self.gedcomx.agents.byName(record.value):
                 gxobject = self.gedcomx.agents.byName(record.value)[0]
@@ -1146,7 +983,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_prob(self, record: GedcomRecord):
+    def handle_prob(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Probate)
             self.object_map[record.level-1].add_fact(gxobject)
@@ -1156,14 +993,14 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_uid(self, record: GedcomRecord):
+    def handle_uid(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Agent):
             gxobject = Identifier(value=['UID:' + record.value],type=IdentifierType.Primary)
             self.object_map[record.level-1].add_identifier(gxobject) #NOTE GC7
             self.object_stack.append(gxobject)
             self.object_map[record.level] = gxobject
 
-    def handle_refn(self, record: GedcomRecord):
+    def handle_refn(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person) or isinstance(self.object_map[record.level-1], SourceDescription):
             gxobject = Identifier(value=[URI.from_url('Reference Number:' + record.value)])
             self.object_map[record.level-1].add_identifier(gxobject)
@@ -1177,7 +1014,7 @@ class Translater():
         else:
             raise ValueError(f"Could not handle 'REFN' tag in record {record.describe()}, last stack object {type(self.object_map[record.level-1])}")
 
-    def handle_repo(self, record: GedcomRecord):
+    def handle_repo(self, record: Gedcom5xRecord):
 
         if record.level == 0:
             
@@ -1205,7 +1042,7 @@ class Translater():
         self.object_stack.append(gxobject)
         self.object_map[record.level] = gxobject
 
-    def handle_resi(self, record: GedcomRecord):
+    def handle_resi(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Person):
             gxobject = Fact(type=FactType.Residence)
             if record.value and record.value.strip() != '':
@@ -1217,7 +1054,7 @@ class Translater():
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_rin(self, record: GedcomRecord):
+    def handle_rin(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceDescription):
             self.object_map[record.level-1].id = record.value
             self.object_map[record.level-1].add_note(Note(text=f"Source had RIN: of {record.value}"))
@@ -1225,7 +1062,7 @@ class Translater():
         else:
             raise ValueError(f"Could not handle 'RIN' tag in record {record.describe()}, last stack object {type(self.object_map[record.level-1])}")
         
-    def handle_sex(self, record: GedcomRecord):
+    def handle_sex(self, record: Gedcom5xRecord):
         
         if isinstance(self.object_map[record.level-1], Person):
             if record.value == 'M':
@@ -1241,7 +1078,7 @@ class Translater():
         else:
             assert False
 
-    def handle_sour(self, record: GedcomRecord):
+    def handle_sour(self, record: Gedcom5xRecord):
         if record.level == 0 or record.tag == '_WLNK' or (record.level == 0 and record.tag == 'OBJE'):
             source_description = SourceDescription(id=record.xref.replace('@','') if record.xref else None)
             self.gedcomx.add_source_description(source_description)
@@ -1267,20 +1104,20 @@ class Translater():
             self.object_stack.append(gxobject)
             self.object_map[record.level] = gxobject
           
-    def handle_stae(self, record: GedcomRecord):
+    def handle_stae(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Address):
             self.object_map[record.level-1].stateOrProvince = Translater.clean_str(record.value)
         else:
             raise ValueError(f"I do not know how to handle an 'STAE' tag for a {type(self.object_map[record.level-1])}")
         
-    def handle_surn(self, record: GedcomRecord):
+    def handle_surn(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Name):
             surname = NamePart(value=record.value, type=NamePartType.Surname)
             self.object_map[record.level-1]._add_name_part(surname)
         else:
             raise TagConversionError(record=record,levelstack=self.object_map)
 
-    def handle_text(self, record: GedcomRecord):
+    def handle_text(self, record: Gedcom5xRecord):
         if record.parent.tag == 'DATA':
             if isinstance(self.object_map[record.level-2], SourceReference):
                 gxobject = TextValue(value=record.value)
@@ -1293,7 +1130,7 @@ class Translater():
         else:
             assert False
 
-    def handle_titl(self, record: GedcomRecord):
+    def handle_titl(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], SourceDescription):
             
             gxobject = TextValue(value=Translater.clean_str(record.value))
@@ -1315,10 +1152,10 @@ class Translater():
         else:
             convert_log.error(f"raise TagConversionError(record=record,levelstack=self.object_map)")
 
-    def handle_tran(self, record: GedcomRecord):
+    def handle_tran(self, record: Gedcom5xRecord):
         pass
 
-    def handle_type(self, record: GedcomRecord):
+    def handle_type(self, record: Gedcom5xRecord):
         # peek to see if event or fact
         if isinstance(self.object_map[record.level-1], Event):
             if EventType.guess(record.value):
@@ -1341,13 +1178,13 @@ class Translater():
         else:
             raise ValueError(f"I do not know how to handle 'TYPE' tag for {type(self.object_map[record.level-1])}")
 
-    def handle__url(self, record: GedcomRecord):
+    def handle__url(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-2], SourceDescription):
             self.object_map[record.level-2].about = URI.from_url(record.value)
         else:
             raise ValueError(f"Could not handle '_URL' tag in record {record.describe()}, last stack object {self.object_map[record.level-1]}")
             
-    def handle_www(self, record: GedcomRecord):
+    def handle_www(self, record: Gedcom5xRecord):
         if isinstance(self.object_map[record.level-1], Agent):
             self.object_map[record.level-1].homepage = Translater.clean_str(record.value)
         elif isinstance(self.object_map[record.level-2], SourceReference):