gedcom-x 0.5.6__tar.gz → 0.5.8__tar.gz

{gedcom_x-0.5.6 → gedcom_x-0.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gedcom-x
-Version: 0.5.6
+Version: 0.5.8
 Summary: Python implimentation of gedcom-x standard
 Author-email: "David J. Cartwright" <davidcartwright@hotmail.com>
 License: MIT

{gedcom_x-0.5.6 → gedcom_x-0.5.8}/gedcom_x.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gedcom-x
-Version: 0.5.6
+Version: 0.5.8
 Summary: Python implimentation of gedcom-x standard
 Author-email: "David J. Cartwright" <davidcartwright@hotmail.com>
 License: MIT

gedcom_x-0.5.8/gedcom_x.egg-info/SOURCES.txt

@@ -0,0 +1,88 @@
+README.md
+pyproject.toml
+setup.py
+gedcom_x.egg-info/PKG-INFO
+gedcom_x.egg-info/SOURCES.txt
+gedcom_x.egg-info/dependency_links.txt
+gedcom_x.egg-info/top_level.txt
+gedcomx/Address.py
+gedcomx/Agent.py
+gedcomx/Attribution.py
+gedcomx/Conclusion.py
+gedcomx/Converter.py
+gedcomx/Coverage.py
+gedcomx/Date.py
+gedcomx/Document.py
+gedcomx/Event.py
+gedcomx/Exceptions.py
+gedcomx/Fact.py
+gedcomx/Gedcom.py
+gedcomx/Gedcom5x.py
+gedcomx/GedcomX.py
+gedcomx/Gender.py
+gedcomx/Group.py
+gedcomx/Identifier.py
+gedcomx/Logging.py
+gedcomx/Mutations.py
+gedcomx/Name.py
+gedcomx/Note.py
+gedcomx/Person.py
+gedcomx/Qualifier.py
+gedcomx/Relationship.py
+gedcomx/Resource.py
+gedcomx/Serialization.py
+gedcomx/Subject.py
+gedcomx/TextValue.py
+gedcomx/TopLevelTypeCollection.py
+gedcomx/Translation.py
+gedcomx/URI.py
+gedcomx/Zip.py
+gedcomx/__init__.py
+gedcomx/address.py
+gedcomx/agent.py
+gedcomx/attribution.py
+gedcomx/conclusion.py
+gedcomx/converter.py
+gedcomx/coverage.py
+gedcomx/date.py
+gedcomx/document.py
+gedcomx/event.py
+gedcomx/evidence_reference.py
+gedcomx/exceptions.py
+gedcomx/extensible_enum.py
+gedcomx/fact.py
+gedcomx/gedcom.py
+gedcomx/gedcom5x.py
+gedcomx/gedcomx.py
+gedcomx/gender.py
+gedcomx/group.py
+gedcomx/identifier.py
+gedcomx/logging_hub.py
+gedcomx/mutations.py
+gedcomx/name.py
+gedcomx/note.py
+gedcomx/online_account.py
+gedcomx/person.py
+gedcomx/place_description.py
+gedcomx/place_reference.py
+gedcomx/qualifier.py
+gedcomx/relationship.py
+gedcomx/resource.py
+gedcomx/serialization.py
+gedcomx/source_citation.py
+gedcomx/source_description.py
+gedcomx/source_reference.py
+gedcomx/subject.py
+gedcomx/textvalue.py
+gedcomx/translation.py
+gedcomx/uri.py
+gedcomx/Extensions/__init__.py
+gedcomx/Extensions/rs10/__init__.py
+gedcomx/Extensions/rs10/rsLink.py
+gedcomx/gedcom7/Exceptions.py
+gedcomx/gedcom7/Gedcom7.py
+gedcomx/gedcom7/GedcomStructure.py
+gedcomx/gedcom7/Specification.py
+gedcomx/gedcom7/__init__.py
+gedcomx/gedcom7/g7interop.py
+gedcomx/gedcom7/logger.py

gedcom_x-0.5.8/gedcomx/Extensions/__init__.py

@@ -0,0 +1 @@
+from .rs10 import rsLink

gedcom_x-0.5.8/gedcomx/Extensions/rs10/__init__.py

@@ -0,0 +1 @@
+from .rsLink import rsLink

gedcom_x-0.5.8/gedcomx/Extensions/rs10/rsLink.py

@@ -0,0 +1,116 @@
+'''
+The "Link" Data Type
+The Link data type defines a representation of an available transition from one application state to another. 
+The base definition of a link is provided by RFC 5988.
+
+Instances of Link can be reasonably expected as extension elements to any GEDCOM X data type,
+except data types that are defined by the GEDCOM X Conceptual Model to explicitly restrict extension properties.
+'''
+
+'''
+8/25/25, 0.5.5, built serialization, type checking in init for href
+'''
+
+from typing import List, Optional
+from ...uri import URI
+from ...exceptions import GedcomClassAttributeError
+
+
+class rsLink():
+    """A link description object. RS Extension to GedcomX by FamilySearch.
+
+    Args:
+        rel (str): Link relation identifier. Required.
+        href (str, optional): Link target URI. If omitted, provide `template`.
+        template (str, optional): URI Template (see RFC 6570). If omitted, provide `href`.
+        type (str, optional): Media type(s) of the linked resource (RFC 2616 §3.7).
+        accept (str, optional): Acceptable media type(s) for updating the linked resource (RFC 2616 §3.7).
+        allow (str, optional): Allowable HTTP methods to transition to the linked resource (RFC 2616 §14.7).
+        hreflang (str, optional): Language of the linked resource (e.g., BCP-47 tag).
+        title (str, optional): Human-readable label for the link.
+
+    Raises:
+        ValueError: If neither `href` nor `template` is provided.
+    """
+
+    """Attribution Information for a Genealogy, Conclusion, Subject and child classes
+
+    Args:
+        contributor (Agent, optional):            Contributor to object being attributed.
+        modified (timestamp, optional):           timestamp for when this record was modified.
+        changeMessage (str, optional):            Birth date (YYYY-MM-DD).
+        creator (Agent, optional):      Creator of object being attributed.
+        created (timestamp, optional):            timestamp for when this record was created
+
+    Raises:
+        
+    """
+    identifier = "http://gedcomx.org/v1/Link"
+
+    def __init__(self,rel: Optional[URI] = None,
+                 href:  Optional[URI] = None,
+                 template: Optional[str] = None,
+                 type: Optional[str] = None,
+                 accept: Optional[str] = None,
+                 allow: Optional[str] = None,
+                 hreflang: Optional[str] = None,
+                 title: Optional[str] = None) -> None:
+        
+        self.rel = rel
+        self.href = href if isinstance(href,URI) else URI.from_url(href) if isinstance(href,str) else None
+        self.template = template
+        self.type = type
+        self.accept = accept
+        self.allow = allow
+        self.hreflang = hreflang
+        self.title = title
+    
+        if self.href is None and self.template is None:
+            raise GedcomClassAttributeError("href or template are required")
+    
+    @property
+    def _as_dict_(self):
+        from ...serialization import Serialization
+        type_as_dict = {
+            "rel": self.rel._as_dict_ if self.rel else None,
+            "href": self.href._as_dict_ if self.href else None,
+            "template": self.template,   # RFC 6570 template if used
+            "type": self.type,           # media type (note: shadows built-in 'type')
+            "accept": self.accept,
+            "allow": self.allow,
+            "hreflang": self.hreflang,
+            "title": self.title,
+        }
+        return Serialization.serialize_dict(type_as_dict)
+    
+    @property
+    def json(self):
+        import json
+        return json.dumps(self._as_dict_)
+
+class _rsLinkList():
+    def __init__(self) -> None:
+        self.links = {}
+
+    def add(self,link: rsLink):
+        if link and isinstance(link,rsLink):
+            if link.rel in self.links.keys():
+                self.links[link.rel].append(link.href)
+            else:
+                self.links[link.rel] = [link.href]
+        
+
+    @classmethod
+    def _from_json_(cls,data: dict):
+        
+        link_list = _rsLinkList()
+        for rel in data.keys():
+            link_list.add(rsLink(rel,data[rel]))
+        return link_list
+    
+    @property
+    def _as_dict_(self) -> dict:
+        return self.links
+
+
+        

{gedcom_x-0.5.6 → gedcom_x-0.5.8}/gedcomx/TopLevelTypeCollection.py

@@ -1,4 +1,4 @@
-from .TextValue import TextValue
+from .textvalue import TextValue
 
 class TopLevelTypeCollection:
     def __init__(self):

gedcom_x-0.5.8/gedcomx/__init__.py

@@ -0,0 +1,50 @@
+from .agent import Agent
+from .address import Address
+from .attribution import Attribution
+from .conclusion import Conclusion
+from .converter import GedcomConverter
+from .coverage import Coverage
+from .date import Date
+from .document import Document
+from .document import DocumentType
+from .evidence_reference import EvidenceReference
+from .extensible_enum import ExtensibleEnum
+from .event import Event
+from .event import EventType
+from .event import EventRole
+from .fact import Fact
+from .fact import FactQualifier
+from .fact import FactType
+from .gedcom import Gedcom
+from .gedcom5x import Gedcom5x, Gedcom5xRecord
+from .gedcomx import GedcomX
+from .gender import Gender, GenderType
+from .group import Group, GroupRole
+from .identifier import Identifier, IdentifierType, IdentifierList
+from .Logging import get_logger
+from .name import Name, NameForm, NamePart, NamePartType, NameType, NamePartQualifier
+from .note import Note
+from .online_account import OnlineAccount
+from .person import Person, QuickPerson
+from .place_description import PlaceDescription
+from .place_reference import PlaceReference
+from .qualifier import Qualifier
+from .relationship import Relationship, RelationshipType
+from .serialization import Serialization
+from .source_citation import SourceCitation
+from .source_description import SourceDescription
+from .source_description import ResourceType
+from .source_reference import SourceReference
+from .subject import Subject
+from .textvalue import TextValue
+from .resource import Resource
+from .uri import URI
+
+
+from .Extensions.rs10.rsLink import rsLink
+
+from .gedcom7.Gedcom7 import Gedcom7, GedcomStructure
+from .translation import g7toXtable
+
+
+

gedcom_x-0.5.6/gedcomx/Address.py → gedcom_x-0.5.8/gedcomx/address.py

@@ -1,7 +1,7 @@
 from typing import Optional
 import json
 
-from .Serialization import Serialization
+
 
 class Address:
     """A GedcomX Address Data Type
@@ -113,18 +113,18 @@ class Address:
     
     @property
     def _as_dict_(self):
-        type_as_dict =  {
-            "city": self.city if self.city else None,
-            "country": self.country if self.country else None,
-            "postalCode": self.postalCode if self.postalCode else None,
-            "stateOrProvince": self.stateOrProvince if self.stateOrProvince else None,
-            "street": self.street if self.street else None,
-            "street2": self.street2 if self.street2 else None,
-            "street3": self.street3 if self.street3 else None,
-            "street4": self.street4 if self.street4 else None,
-            "street5": self.street5 if self.street5 else None,
-            "street6": self.street6 if self.street6 else None
-        }
+        from .serialization import Serialization
+        type_as_dict = {}
+        if self.city: type_as_dict["city"] = self.city
+        if self.country: type_as_dict["country"] = self.country
+        if self.postalCode: type_as_dict["postalCode"] = self.postalCode
+        if self.stateOrProvince: type_as_dict["stateOrProvince"] = self.stateOrProvince
+        if self.street: type_as_dict["street"] = self.street
+        if self.street2: type_as_dict["street2"] = self.street2
+        if self.street3: type_as_dict["street3"] = self.street3
+        if self.street4: type_as_dict["street4"] = self.street4
+        if self.street5: type_as_dict["street5"] = self.street5
+        if self.street6: type_as_dict["street6"] = self.street6
 
         return Serialization.serialize_dict(type_as_dict)
 

gedcom_x-0.5.6/gedcomx/Agent.py → gedcom_x-0.5.8/gedcomx/agent.py

@@ -2,16 +2,31 @@ import base64
 import uuid
 
 from typing import List, Optional
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    agent.py
+ Author:  David J. Cartwright
+ Purpose: 
 
-from .Address import Address
-#from .Attribution import Attribution
-from .Identifier import Identifier, IdentifierList
+ Created: 2025-08-25
+ Updated:
+   - 
+   
+======================================================================
+"""
 
-from .OnlineAccount import OnlineAccount
-from .TextValue import TextValue
-from .Resource import Resource
-from .URI import URI
-from .Serialization import Serialization
+"""
+======================================================================
+GEDCOM Module Type Imports
+======================================================================
+"""
+from .address import Address
+from .identifier import Identifier, IdentifierList
+from .online_account import OnlineAccount
+from .resource import Resource
+from .textvalue import TextValue
+from .uri import URI
 
 
 class Agent:
@@ -82,9 +97,10 @@ class Agent:
         self.emails = emails or []
         self.phones = phones or []
         self.addresses = addresses if addresses else []
+        self.person = person
         self.xnotes = []
         self.attribution = attribution or None
-        self.uri = URI(fragment=self.id)
+        self.uri = URI(fragment=self.id) if self.id else None
   
     def _append_to_name(self, text_to_append: str):
         if self.names and self.names[0] and self.names[0].value:
@@ -113,8 +129,8 @@ class Agent:
         else:
             raise ValueError(f'name must be of type str or TextValue, recived {type(name_to_add)}')
     
-    def add_note(self, note_to_add: 'Note'):
-        from .Note import Note
+    def add_note(self, note_to_add):
+        from .note import Note
         if note_to_add and isinstance(note_to_add,Note):
             self.xnotes.append(note_to_add)
         else:
@@ -125,18 +141,29 @@ class Agent:
     
     @property
     def _as_dict_(self):
-        type_as_dict = {
-            "id": self.id if self.id else None,
-            "identifiers": self.identifiers._as_dict_ if self.identifiers else None,
-            "names": [name._as_dict_ for name in self.names],
-            "homepage": self.homepage if self.homepage else None,
-            "openid": self.openid if self.openid else None,
-            "accounts": self.accounts if self.accounts else None,
-            "emails": self.emails if self.emails else None,
-            "phones": self.phones if self.phones else None,
-            "addresses": [address._as_dict_ for address in self.addresses],
-            "notes": [note._as_dict_ for note in self.xnotes]
-        }
+        from .serialization import Serialization
+        type_as_dict = {}
+
+        if self.id:
+            type_as_dict["id"] = self.id
+        if self.identifiers:
+            type_as_dict["identifiers"] = self.identifiers._as_dict_
+        if self.names:
+            type_as_dict["names"] = [name._as_dict_ for name in self.names if name]
+        if self.homepage:
+            type_as_dict["homepage"] = self.homepage
+        if self.openid:
+            type_as_dict["openid"] = self.openid
+        if self.accounts:
+            type_as_dict["accounts"] = self.accounts
+        if self.emails:
+            type_as_dict["emails"] = self.emails
+        if self.phones:
+            type_as_dict["phones"] = self.phones
+        if self.addresses:
+            type_as_dict["addresses"] = [address._as_dict_ for address in self.addresses if address]
+        if self.xnotes:
+            type_as_dict["notes"] = [note._as_dict_() for note in self.xnotes if note]
         return Serialization.serialize_dict(type_as_dict)
     
     @classmethod
@@ -144,8 +171,9 @@ class Agent:
         """
         Create a Person instance from a JSON-dict (already parsed).
         """
+        from .serialization import Serialization
         type_as_dict = Serialization.get_class_fields('Agent')
-        return Serialization.deserialize(data, type_as_dict)
+        return Serialization.deserialize(type_as_dict,Agent)
     
     def __str__(self):
         """

gedcom_x-0.5.6/gedcomx/Attribution.py → gedcom_x-0.5.8/gedcomx/attribution.py

@@ -2,9 +2,30 @@
 from datetime import datetime
 from typing import Optional, Dict, Any
 
-from .Agent import Agent
-from .Resource import Resource, get_resource_as_dict
-from .Serialization import Serialization
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    Attribution.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-08-31: fixed _as_dict_ to deal with Resources and ignore empty fields
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+
+from .agent import Agent
+from .resource import Resource
+#=====================================================================
+
 
 class Attribution:
     """Attribution Information for a Genealogy, Conclusion, Subject and child classes
@@ -39,12 +60,18 @@ class Attribution:
         """
         Serialize Attribution to a JSON-ready dict, skipping None values.
         """
+        from Serialization import Serialization
         type_as_dict: Dict[str, Any] = {}
-        type_as_dict['contributor'] = get_resource_as_dict(self.contributor)       
-        type_as_dict['modified'] = self.modified if self.modified else None
-        type_as_dict['changeMessage'] = self.changeMessage if self.changeMessage else None 
-        type_as_dict['creator'] = get_resource_as_dict(self.creator)         
-        type_as_dict['created'] = self.created if self.created else None
+        if self.contributor:
+            type_as_dict['contributor'] = Resource(target=self.contributor)._as_dict_  
+        if self.modified:     
+            type_as_dict['modified'] = self.modified if self.modified else None
+        if self.changeMessage:
+            type_as_dict['changeMessage'] = self.changeMessage if self.changeMessage else None 
+        if self.creator:
+            type_as_dict['creator'] = Resource(target=self.creator)._as_dict_   
+        if self.created:      
+            type_as_dict['created'] = self.created if self.created else None
                     
         return Serialization.serialize_dict(type_as_dict)
 
@@ -59,6 +86,6 @@ class Attribution:
         """
         Create a Person instance from a JSON-dict (already parsed).
         """
-        from .Serialization import Serialization
+        from .serialization import Serialization
         
         return Serialization.deserialize(data, Attribution)

gedcom_x-0.5.6/gedcomx/Conclusion.py → gedcom_x-0.5.8/gedcomx/conclusion.py

@@ -3,17 +3,34 @@ import uuid
 import warnings
 
 from typing import List, Optional
-
-from .Attribution import Attribution
-#from .Document import Document
-from .Note import Note
-from .Qualifier import Qualifier
-from .Serialization import Serialization
-from .SourceReference import SourceReference
-from .Resource import Resource, URI
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    conclusion.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Type Imports
+======================================================================
+"""
+from .attribution import Attribution
 from .Extensions.rs10.rsLink import _rsLinkList, rsLink
+from .note import Note
+from .qualifier import Qualifier
+from .resource import Resource, URI
+from .source_reference import SourceReference
+
+
 
-from collections.abc import Sized
 
 class ConfidenceLevel(Qualifier):
     High = "http://gedcomx.org/High"
@@ -96,7 +113,7 @@ class Conclusion:
     Args:
         id (str, optional): A unique identifier for the conclusion. If not provided, 
             a UUID-based identifier will be automatically generated.
-        lang (str, optional): The language code of the conclusion. Defaults to 'en'.
+        lang (str, optional): The language code of the conclusion. 
         sources (list[SourceReference], optional): A list of source references that 
             support the conclusion.
         analysis (Document | Resource, optional): A reference to an analysis document 
@@ -127,7 +144,7 @@ class Conclusion:
     
     def __init__(self,
                  id: Optional[str] = None,
-                 lang: Optional[str] = 'en',
+                 lang: Optional[str] = None,
                  sources: Optional[List[SourceReference]] = None,
                  analysis: Optional[object | Resource] = None,
                  notes: Optional[List[Note]] = None,
@@ -188,16 +205,27 @@ class Conclusion:
     
     @property
     def _as_dict_(self):
-        type_as_dict = {
-            'id':self.id,
-            'lang':self.lang,
-            'sources': [source._as_dict_ for source in self.sources] if self.sources else None,
-            'analysis': self.analysis if self.analysis else None,
-            'notes': [note for note in self.notes] if self.notes else None,
-            'confidence':self.confidence,
-            'attribution':self.attribution,
-            'links':self.links._as_dict_ if self.links else None
-        }
+        from .serialization import Serialization
+        type_as_dict = {}
+
+        if self.id:
+            type_as_dict['id'] = self.id
+        if self.lang:
+            type_as_dict['lang'] = self.lang
+        if self.sources:
+            type_as_dict['sources'] = [s._as_dict_ for s in self.sources if s]
+        if self.analysis:
+            type_as_dict['analysis'] = getattr(self.analysis, '_as_dict_', self.analysis)
+        if self.notes:
+            type_as_dict['notes'] = [
+                (n._as_dict_ if hasattr(n, '_as_dict_') else n) for n in self.notes if n
+            ]
+        if self.confidence is not None:
+            type_as_dict['confidence'] = self.confidence
+        if self.attribution:
+            type_as_dict['attribution'] = getattr(self.attribution, '_as_dict_', self.attribution)
+        if self.links:
+            type_as_dict['links'] = self.links._as_dict_
       
         return Serialization.serialize_dict(type_as_dict)