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

gedcomx/SourceDescription.py

@@ -78,7 +78,7 @@ class SourceDescription:
                  notes: Optional[List[Note]] = None,
                  attribution: Optional[Attribution] = None,
                  rights: Optional[List[Resource]] = [],
-                 coverage: Optional[Coverage] = None, # Coverage
+                 coverage: Optional[List[Coverage]] = None, # Coverage
                  descriptions: Optional[List[TextValue]] = None,
                  identifiers: Optional[IdentifierList] = None,
                  created: Optional[Date] = None,
@@ -180,18 +180,15 @@ class SourceDescription:
     
     @property
     def _as_dict_(self) -> Dict[str, Any]:
-        
-
-        
         type_as_dict = {
             'id': self.id,
             'about': self.about._as_dict_ if self.about else None,
             'resourceType': self.resourceType.value if self.resourceType else None,
             'citations': [c._as_dict_ for c in self.citations] or None,
             'mediaType': self.mediaType,
-            'mediator': get_resource_as_dict(self.mediator),
-            'publisher': get_resource_as_dict(self.publisher),
-            'authors': [get_resource_as_dict(a) for a in self.authors] or None,
+            'mediator': self.mediator._as_dict_ if self.mediator else None,
+            'publisher': self.publisher._as_dict_ if self.publisher else None,
+            'authors': self.authors and [a._as_dict_ for a in self.authors] or None,
             'sources': [s._as_dict_ for s in self.sources] or None,
             'analysis': self.analysis._as_dict_ if self.analysis else None,
             'componentOf': self.componentOf._as_dict_ if self.componentOf else None,
@@ -199,13 +196,13 @@ class SourceDescription:
             'notes': [n._as_dict_ for n in self.notes] or None,
             'attribution': self.attribution._as_dict_ if self.attribution else None,
             'rights': [r._as_dict_ for r in self.rights] or None,
-            'coverage': self.coverage._as_dict_ if self.coverage else None,
+            'coverage': [c._as_dict_ for c in self.coverage] or None,
             'descriptions': [d._as_dict_ for d in self.descriptions] or None,
             'identifiers': self.identifiers._as_dict_ if self.identifiers else None,
             'created': self.created if self.created else None,
             'modified': self.modified if self.modified else None,
             'published': self.published if self.published else None,
-            'repository': get_resource_as_dict(self.repository),
+            'repository': self.repository._as_dict_ if self.repository else None,
             'uri': self.uri.value
         }
         

gedcomx/SourceReference.py

@@ -4,6 +4,7 @@ from .Attribution import Attribution
 from .Qualifier import Qualifier
 
 from .Resource import Resource
+from .Serialization import Serialization
 from .URI import URI
 
 from collections.abc import Sized
@@ -53,34 +54,21 @@ class SourceReference:
                  qualifiers: Optional[List[Qualifier]] = None
                  ) -> None:
         
-        #if not isinstance(description,URI): raise ValueError(f"description is of type {type(description)}")
-        '''from .SourceDescription import SourceDescription
-        self._description_object = None
-        if isinstance(description,URI):
-            #TODO See if Local, If not try to resolve,
-            self._description_object = description
-            
-        elif isinstance(description,SourceDescription):
-            self._description_object = description
-            if hasattr(description,'_uri'):
-                self.description = description._uri
-            else:
-                assert False
-                self.description = Resource(object=description)
-                description._uri = self.description
-                description._object = description
-        else:
-            raise ValueError(f"'description' must be of type 'SourceDescription' or 'URI', type: {type(description)} was provided")'''
-        
-        
         self.description = description
         self.descriptionId = descriptionId
         self.attribution = attribution
-        self.qualifiers = qualifiers
+        self.qualifiers = qualifiers if qualifiers and isinstance(qualifiers, list) else [] 
 
     def add_qualifier(self, qualifier: Qualifier):
-        if isinstance(qualifier, Qualifier):
+        if isinstance(qualifier, (Qualifier,KnownSourceReference)):
+            if self.qualifiers:
+                #TODO Prevent Duplicates
+                for current_qualifier in self.qualifiers:
+                    if qualifier == current_qualifier:
+                        return
             self.qualifiers.append(qualifier)
+            return
+        raise ValueError("The 'qualifier' must be type 'Qualifier' or 'KnownSourceReference', not " + str(type(qualifier))) 
     
     def append(self, text_to_add: str):
         if text_to_add and isinstance(text_to_add, str):
@@ -93,82 +81,28 @@ class SourceReference:
     
     @property    
     def _as_dict_(self):
-        
-        def _serialize(value):
-            if isinstance(value, (str, int, float, bool, type(None))):
-                return value
-            elif isinstance(value, dict):
-                return {k: _serialize(v) for k, v in value.items()}
-            elif isinstance(value, (list, tuple, set)):
-                return [_serialize(v) for v in value]
-            elif hasattr(value, "_as_dict_"):
-                return value._as_dict_
-            else:
-                return str(value)  # fallback for unknown objects
-
         # Only add Relationship-specific fields
-        sourcereference_fields = {
-            'description':self.description.uri if self.description else None,
+        type_as_dict = {
+            'description':self.description._as_dict_ if self.description else None,
             'descriptionId': self.descriptionId.replace("\n"," ").replace("\r"," ") if self.descriptionId else None,
             'attribution': self.attribution._as_dict_ if self.attribution else None,
             'qualifiers':[qualifier.value for qualifier in self.qualifiers ] if self.qualifiers else None
             }
+        return Serialization.serialize_dict(type_as_dict)
 
-        # Serialize and exclude None values
-        for key, value in sourcereference_fields.items():
-            if value is not None:
-                sourcereference_fields[key] = _serialize(value)
-
-        return {
-            k: v
-            for k, v in sourcereference_fields.items()
-            if v is not None and not (isinstance(v, Sized) and len(v) == 0)
-        }
+        
         
 
     @classmethod
-    def _from_json_(cls, data: dict):
-                
+    def _from_json_(cls, data: dict):         
         """
-        Rehydrate a SourceReference from the dict form produced by _as_dict_.
+        Rehydrate a SourceReference from the dict passed down from JSON deserialization.
+        NOTE: This does not resolve references to SourceDescription objects.
         """
-        from .SourceDescription import SourceDescription
-
-        # 1) Reconstruct the SourceDescription object
-        desc_json = data.get('description')
-        #if not desc_json:
-        #    raise ValueError("SourceReference JSON missing 'description'")
-        #desc_obj = SourceDescription._from_json_(desc_json)
-        desc_obj = URI.from_url_(data.get('description')) #TODO <--- URI Reference
-        
-
-        # 2) Simple fields
-        description_id = data.get('descriptionId')
-        
-        # 3) Attribution (if present)
-        attrib = None
-        if data.get('attribution') is not None:
-            attrib = Attribution._from_json_(data['attribution'])
+        from .Serialization import Serialization
+        return Serialization.deserialize(data, SourceReference)
+    
         
-        # 4) Qualifiers list
-        raw_quals = data.get('qualifiers', [])
-        qualifiers: List[Qualifier] = []
-        for q in raw_quals:
-            try:
-                # Try the known‐source enum first
-                qualifiers.append(KnownSourceReference(q))
-            except ValueError:
-                # Fallback to generic Qualifier
-                qualifiers.append(Qualifier(q))
-
-        # 5) Instantiate via your existing __init__
-        inst = cls(
-            description=desc_obj,
-            descriptionId=description_id,
-            attribution=attrib,
-            qualifiers=qualifiers
-        )
-        return inst
 
     def __eq__(self, other):
         if not isinstance(other, self.__class__):

gedcomx/Subject.py

@@ -9,7 +9,7 @@ from .Note import Note
 from .Serialization import Serialization
 from .SourceReference import SourceReference
 from .Resource import Resource
-from ._Links import _LinkList
+from .Extensions.rs10.rsLink import _rsLinkList
 
 class Subject(Conclusion):
     identifier = 'http://gedcomx.org/v1/Subject'
@@ -28,14 +28,14 @@ class Subject(Conclusion):
                  media: Optional[List[SourceReference]] = [],
                  identifiers: Optional[IdentifierList] = None,
                  uri: Optional[Resource] = None,
-                 links: Optional[_LinkList] = None) -> None:
+                 links: Optional[_rsLinkList] = None) -> None:
         super().__init__(id, lang, sources, analysis, notes, confidence, attribution,links=links)
         self.extracted = extracted
         self.evidence = evidence
         self.media = media
-        self.identifiers = identifiers
+        self.identifiers = identifiers if identifiers else IdentifierList()
+        self.uri = uri
         
-    
     def add_identifier(self, identifier_to_add: Identifier):
         if identifier_to_add and isinstance(identifier_to_add,Identifier):
             for current_identifier in self.identifiers:

gedcomx/Translation.py

@@ -0,0 +1,219 @@
+from . import *
+from .Mutations import GedcomXEventOrFact
+
+'''
+{'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
+}
+
+'''
+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'}},
+}
+

gedcomx/URI.py

@@ -51,6 +51,7 @@ class URI:
     @property
     def _as_dict_(self) -> dict:
         # Keeps a simple, explicit structure
+        return urlunsplit(self.split())
         return {
             "scheme": self.scheme,
             "authority": self.authority,

gedcomx/__init__.py

@@ -7,6 +7,7 @@ from .Date import Date
 from .Document import Document
 from .Document import DocumentType
 from .EvidenceReference import EvidenceReference
+from .ExtensibleEnum import ExtensibleEnum
 from .Event import Event
 from .Event import EventType
 from .Event import EventRole
@@ -14,6 +15,7 @@ from .Fact import Fact
 from .Fact import FactQualifier
 from .Fact import FactType
 from .Gedcom import Gedcom
+from .Gedcom5x import Gedcom5x
 from .GedcomX import GedcomX, Translater
 from .Gender import Gender, GenderType
 from .Group import Group, GroupRole
@@ -22,7 +24,7 @@ from .Logging import get_logger
 from .Name import Name, NameForm, NamePart, NamePartType, NameType, NamePartQualifier
 from .Note import Note
 from .OnlineAccount import OnlineAccount
-from .Person import Person
+from .Person import Person, QuickPerson
 from .PlaceDescription import PlaceDescription
 from .PlaceReference import PlaceReference
 from .Qualifier import Qualifier
@@ -37,5 +39,10 @@ from .TextValue import TextValue
 from .Resource import Resource
 from .URI import URI
 
+from .Extensions.rs10.rsLink import rsLink
+
+from .gedcom7 import Gedcom7, GedcomStructure
+from .Translation import g7toXtable
+
 
 

gedcom_x-0.5.2.dist-info/METADATA

@@ -1,17 +0,0 @@
-Metadata-Version: 2.4
-Name: gedcom-x
-Version: 0.5.2
-Summary: Python implimentation of gedcom-x standard
-Author-email: "David J. Cartwright" <davidcartwright@hotmail.com>
-License: MIT
-Keywords: gedcom,gedcomx,ged
-Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python :: 3
-Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Utilities
-Classifier: Topic :: Software Development :: User Interfaces
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-Dynamic: requires-python

gedcom_x-0.5.2.dist-info/RECORD

@@ -1,42 +0,0 @@
-gedcomx/Address.py,sha256=b_4X1w_FX6vPwpo4dVez7QlI5jn8w3dC0bWUlv_0IjM,4810
-gedcomx/Agent.py,sha256=4o1Gi_l_QsEgLLZzvFZ4SNUvla0O01jzUBXPniNcQ1g,8304
-gedcomx/Attribution.py,sha256=FVEjOiJorne1gxbL6CBwThC4CUfynVklpOsfVSO-pCg,3800
-gedcomx/Conclusion.py,sha256=lpMGr_S-KdVAB5L0h9L1d0qZOMJZGeCy90YplB1F3i8,6490
-gedcomx/Coverage.py,sha256=FuVsLDAhzS4HjNHKOHCjwQcvnxd4Uf_EeF3QcDEbems,912
-gedcomx/Date.py,sha256=N6-gDOLLCT_3_5bhS_4REP25LzEnOJpE6hNlMaYqxMA,2216
-gedcomx/Document.py,sha256=uSTEgtu1s8V_2IJaCxVS6A20Ho06FOUUZ7GWLeOmV8w,2231
-gedcomx/Event.py,sha256=x2jpWu27WCaksvNAGzsJ499rsugcbJ1DVELc-rBnFXo,9563
-gedcomx/EvidenceReference.py,sha256=WXZpmcKzwb3lYQmGVf-TY2IsbNG3fIInPY1khRjtOSg,348
-gedcomx/Exceptions.py,sha256=fzYtJ8d9C3oN-NMl0VMBc3U6ED41yu23dN885-_9brI,383
-gedcomx/Fact.py,sha256=emh3WsN-4mzSFXHt-3DffRLK9JPctG-PzRcrJkIcuao,24396
-gedcomx/Gedcom.py,sha256=v7XM0x8VX77uPPe5T3vB8AIxDhV65evXXW_kvH_HtXo,14954
-gedcomx/GedcomX.py,sha256=jaLLYA4J6k9jFOKfLeus0g0RWyKtmqycKkDrrp6iZLs,62456
-gedcomx/Gender.py,sha256=SH7ZyjSQ2Vi9PEQKN0uTZrKOma79QO7a_dJ-2lpMp0c,3925
-gedcomx/Group.py,sha256=VNI_cI_-YnJ9cHzwMmHD8qwDNMe89kEocPuQ67rwStA,1606
-gedcomx/Identifier.py,sha256=PIk2NedDm9a3XHJiX_hHv17xYqVpR2OVEIrxPM7jV88,6617
-gedcomx/Logging.py,sha256=vBDOjawVXc4tCge1laYjy6_2Ves-fnGzG0m6NnLZejE,624
-gedcomx/Name.py,sha256=xQWdvtSjd6jr-OnG73oMqqz0zaCcy-R3ChJ5KYnNECc,12733
-gedcomx/Note.py,sha256=cvV4-fCZ0oh2zXfzD-YYoIM_WTox-fk2_bfl3i4CoNc,2251
-gedcomx/OnlineAccount.py,sha256=P24o98IXo_8XQoICYZPgALjdzS0q8t2l4DU3Od9KxyI,291
-gedcomx/Person.py,sha256=IwCyxcbqdKxo0uN8O6R3FznES27ZSvM_kAIPcZwLoTg,9298
-gedcomx/PlaceDescription.py,sha256=doU2sAMZQIpfTi-sKAeo_mCitUfOOgy_G5OrRJ8YjBk,2934
-gedcomx/PlaceReference.py,sha256=ti7cFxKTd-1sTB5tGmPyTnYIxLZ7CF7_YCHbF9m-4K0,1137
-gedcomx/Qualifier.py,sha256=mZ_GWT3gca8g9nWidlXIRTN5dEtf_rmnLHYl1jJkQYs,728
-gedcomx/Relationship.py,sha256=2Ng6eNYHisusWUE-ufHfgGjU99dDBMx6ySRRsp3prnk,4959
-gedcomx/Resource.py,sha256=iBymUXv1-2u6qVVKsS16NaU6I_pYFZpN9mDz2vVUzLY,1650
-gedcomx/Serialization.py,sha256=wy-XRSM7Q9MyQ_dVP8gv8mwZ8a-bS7znSS-2DV6XOLU,2819
-gedcomx/SourceCitation.py,sha256=aW-lEb7bT9QU49GiBjJppFMBvtisR6fhVVuXjr5y4vQ,742
-gedcomx/SourceDescription.py,sha256=LBYp2s5WfH0jENYIog53OnnuzTPXwqjOy4CxsMT6Ud0,11883
-gedcomx/SourceReference.py,sha256=rHq0aD8wkNFj1hlm2cwd-RQe1C5GosDLDwg6-8fl9VU,7571
-gedcomx/Subject.py,sha256=1EqvKvudtZ8ky9QYFqQqAeaPzSsdWpAeeorvW05vxCM,3223
-gedcomx/TextValue.py,sha256=6B0wMxL0nigFNzhXZDhbTONvFGbnM2t2NcDZiZuu4Zw,1112
-gedcomx/TopLevelTypeCollection.py,sha256=nvTO6GwFwEZk9jX4fVqhy75ygsshomNb20tnlExKqyY,1495
-gedcomx/URI.py,sha256=SSxp8QWdxgEmD4sOgfjBFWG3kqoDtWg0IHSTQXbfhU8,4230
-gedcomx/Zip.py,sha256=lBxcv-Vip45884EHj56wZJJ5I36Q38UuHUidDxQBoS8,14
-gedcomx/_Links.py,sha256=--7d7PA80EeKCLtDOGOMp8QjLB679qnmVmHHakucEoo,972
-gedcomx/__init__.py,sha256=Bv5g_0UT2dHfzpD4k-AuVDfUgbJHqj5ee16ExFvQxXs,1439
-gedcomx/g7interop.py,sha256=KO4EQrvoGBSEPzLkWtO7E8-oZHmzL-q-_QRLQjhUNo4,9944
-gedcom_x-0.5.2.dist-info/METADATA,sha256=4GZGTw_sws2qevHyOPaFE6WuPmz8C-PWWNIXg42DCLY,633
-gedcom_x-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gedcom_x-0.5.2.dist-info/top_level.txt,sha256=smVBF4nxSU-mzCd6idtRYTbYjPICMMi8pTqewEmqF8Y,8
-gedcom_x-0.5.2.dist-info/RECORD,,

gedcomx/_Links.py

@@ -1,37 +0,0 @@
-from typing import List, Optional
-
-class _Link():
-    def __init__(self,category: str, key_val_pairs:  dict) -> None:
-        self._category = category
-        self._kvps: dict = key_val_pairs if key_val_pairs else {}
-    
-    def _add_kvp(self, key, value):
-        pass
-
-class _LinkList():
-    def __init__(self) -> None:
-        self.links = {}
-
-    def add(self,link: _Link):
-        if link and isinstance(link,_Link):
-            if link._category in self.links.keys():
-                self.links[link._category].append(link._kvps)
-            else:
-                self.links[link._category] = [link._kvps]
-        
-
-    @classmethod
-    def _from_json_(cls,data: dict):
-        
-        link_list = _LinkList()
-        for category in data.keys():
-            link_list.add(_Link(category,data[category]))
-        
-        return link_list
-    
-    @property
-    def _as_dict_(self) -> dict:
-        return self.links
-
-
-