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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gedcom-x
-Version: 0.5.7
+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.7 → 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.7
+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.7 → gedcom_x-0.5.8}/gedcomx/Extensions/rs10/rsLink.py

@@ -12,8 +12,8 @@ except data types that are defined by the GEDCOM X Conceptual Model to explicitl
 '''
 
 from typing import List, Optional
-from ...URI import URI
-from ...Exceptions import GedcomClassAttributeError
+from ...uri import URI
+from ...exceptions import GedcomClassAttributeError
 
 
 class rsLink():
@@ -70,7 +70,7 @@ class rsLink():
     
     @property
     def _as_dict_(self):
-        from ...Serialization import Serialization
+        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,

{gedcom_x-0.5.7 → 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.7/gedcomx/Address.py → gedcom_x-0.5.8/gedcomx/address.py

@@ -113,7 +113,7 @@ class Address:
     
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        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

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

@@ -2,16 +2,31 @@ import base64
 import uuid
 
 from typing import List, Optional
-
-from .Address import Address
-#from .Attribution import Attribution
-from .Identifier import Identifier, IdentifierList
-
-from .OnlineAccount import OnlineAccount
-from .TextValue import TextValue
-from .Resource import Resource
-from .URI import URI
-
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    agent.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+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:
@@ -83,7 +98,7 @@ class Agent:
         self.phones = phones or []
         self.addresses = addresses if addresses else []
         self.person = person
-        self.notes = []
+        self.xnotes = []
         self.attribution = attribution or None
         self.uri = URI(fragment=self.id) if self.id else None
   
@@ -115,7 +130,7 @@ class Agent:
             raise ValueError(f'name must be of type str or TextValue, recived {type(name_to_add)}')
     
     def add_note(self, note_to_add):
-        from .Note import Note
+        from .note import Note
         if note_to_add and isinstance(note_to_add,Note):
             self.xnotes.append(note_to_add)
         else:
@@ -126,7 +141,7 @@ class Agent:
     
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = {}
 
         if self.id:
@@ -147,8 +162,8 @@ class Agent:
             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.notes:
-            type_as_dict["notes"] = [note._as_dict_() for note in self.notes if note]
+        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
@@ -156,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.7/gedcomx/Attribution.py → gedcom_x-0.5.8/gedcomx/attribution.py

@@ -22,8 +22,8 @@ GEDCOM Module Types
 ======================================================================
 """
 
-from .Agent import Agent
-from .Resource import Resource
+from .agent import Agent
+from .resource import Resource
 #=====================================================================
 
 
@@ -86,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.7/gedcomx/Conclusion.py → gedcom_x-0.5.8/gedcomx/conclusion.py

@@ -3,17 +3,34 @@ import uuid
 import warnings
 
 from typing import List, Optional
+"""
+======================================================================
+ 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 .Attribution import Attribution
-#from .Document import Document
-from .Note import Note
-from .Qualifier import Qualifier
 
-from .SourceReference import SourceReference
-from .Resource import Resource, URI
-from .Extensions.rs10.rsLink import _rsLinkList, rsLink
 
-from collections.abc import Sized
 
 class ConfidenceLevel(Qualifier):
     High = "http://gedcomx.org/High"
@@ -188,7 +205,7 @@ class Conclusion:
     
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = {}
 
         if self.id:

gedcom_x-0.5.7/gedcomx/Converter.py → gedcom_x-0.5.8/gedcomx/converter.py

@@ -1,50 +1,65 @@
 DEBUG = False
-import base64
-import json
+import logging
 import mimetypes
 import re
-import uuid
 import xml.etree.ElementTree as ET
-
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    converter.py
+ Author:  David J. Cartwright
+ Purpose: convert gedcom versions
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-01: added docs and fixed imports for lowercase module names
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
 from typing import List, Optional, Any
 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, Gedcom5xRecord
-from .GedcomX import GedcomX
-from .Gender import Gender, GenderType
-from .Group import Group
-from .Identifier import Identifier, IdentifierType, make_uid, IdentifierList
+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 .evidence_reference 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, Gedcom5xRecord
+from .gedcomx import GedcomX
+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
+from .logging_hub import hub, ChannelConfig
+from .name import Name, NameType, NameForm, NamePart, NamePartType, NamePartQualifier
+from .note import Note
+from .online_account import OnlineAccount
+from .person import Person
+from .place_description import PlaceDescription
+from .place_reference import PlaceReference
+from .qualifier import Qualifier
+from .relationship import Relationship, RelationshipType
+from .resource import Resource
+from .source_citation import SourceCitation
+from .source_description import SourceDescription, ResourceType
+from .source_reference import SourceReference, KnownSourceReference
+# from .subject import Subject
+from .textvalue import TextValue
+#from .topleveltypecollection import TopLevelTypeCollection
+from .uri import URI
 
-
-import logging
-from .LoggingHub import hub, ChannelConfig
 log = logging.getLogger("gedcomx")
 job_id = "gedcomx.convert.GEDCOM5x"
 

gedcom_x-0.5.7/gedcomx/Coverage.py → gedcom_x-0.5.8/gedcomx/coverage.py

@@ -1,7 +1,25 @@
 from typing import Optional
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    coverage.py
+ Author:  David J. Cartwright
+ Purpose: 
 
-from .Date import Date
-from .PlaceReference import PlaceReference
+ Created: 2025-08-25
+ Updated:
+   - 2025-08-31: 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .date import Date
+from .place_reference import PlaceReference
 
 
 class Coverage:
@@ -16,7 +34,7 @@ class Coverage:
 
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = {}
         if self.spatial:
             type_as_dict['spatial'] = getattr(self.spatial, '_as_dict_', self.spatial)
@@ -29,8 +47,8 @@ class Coverage:
         """
         Create a Coverage instance from a JSON-dict (already parsed).
         """
-        from .PlaceReference import PlaceReference
-        from .Date import Date
+        from .place_reference import PlaceReference
+        from .date import Date
 
         spatial = PlaceReference._from_json_(data.get('spatial')) if data.get('spatial') else None
         temporal = Date._from_json_(data.get('temporal')) if data.get('temporal') else None

gedcom_x-0.5.7/gedcomx/Date.py → gedcom_x-0.5.8/gedcomx/date.py

@@ -25,7 +25,7 @@ class Date:
     
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = {}
         if self.original:
             type_as_dict['original'] = self.original

gedcom_x-0.5.7/gedcomx/Document.py → gedcom_x-0.5.8/gedcomx/document.py

@@ -1,12 +1,29 @@
 from enum import Enum
 from typing import Optional, List
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    document.py
+ Author:  David J. Cartwright
+ Purpose: 
 
-from .Attribution import Attribution
-from .Note import Note
-from .SourceReference import SourceReference
-from .Resource import Resource
+ Created: 2025-08-25
+ Updated:
+   - 2025-08-31: 
+   
+======================================================================
+"""
 
-from .Conclusion import Conclusion
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .attribution import Attribution
+from .conclusion import Conclusion, ConfidenceLevel
+from .note import Note
+from .resource import Resource
+from .source_reference import SourceReference
 
 
 class DocumentType(Enum):
@@ -38,7 +55,7 @@ class Document(Conclusion):
                  sources: Optional[List[SourceReference]] = None,
                  analysis: Optional[Resource] = None,
                  notes: Optional[List[Note]] = None,
-                 confidence: Optional[object] = None, # ConfidenceLevel
+                 confidence: Optional[ConfidenceLevel] = None, # ConfidenceLevel
                  attribution: Optional[Attribution] = None,
                  type: Optional[DocumentType] = None,
                  extracted: Optional[bool] = None, # Default to False
@@ -53,7 +70,7 @@ class Document(Conclusion):
     
     @property
     def _as_dict(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = super()._as_dict_
         if self.type:
             type_as_dict['type'] = self.type.value
@@ -70,5 +87,6 @@ class Document(Conclusion):
         """
         Create a Person instance from a JSON-dict (already parsed).
         """
+        from .serialization import Serialization
         type_as_dict = Serialization.get_class_fields('Document')
-        return Serialization.deserialize(data, type_as_dict)
+        return Serialization.deserialize(type_as_dict,Document)

gedcom_x-0.5.7/gedcomx/Event.py → gedcom_x-0.5.8/gedcomx/event.py

@@ -20,16 +20,16 @@ from typing import List, Optional
 GEDCOM Module Type Imports
 ======================================================================
 """
-from .Attribution import Attribution
-from .Conclusion import ConfidenceLevel, Conclusion
-from .Date import Date
-from .EvidenceReference import EvidenceReference
-from .Identifier import IdentifierList
-from .Note import Note
-from .PlaceReference import PlaceReference
-from .Resource import Resource
-from .SourceReference import SourceReference
-from .Subject import Subject
+from .attribution import Attribution
+from .conclusion import ConfidenceLevel, Conclusion
+from .date import Date
+from .evidence_reference import EvidenceReference
+from .identifier import IdentifierList
+from .note import Note
+from .place_reference import PlaceReference
+from .resource import Resource
+from .source_reference import SourceReference
+from .subject import Subject
 
 #=====================================================================
 
@@ -103,7 +103,7 @@ class EventRole(Conclusion):
     
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = super()._as_dict_
         if self.person:
             type_as_dict['person'] = Resource(target=self.person)._as_dict_
@@ -268,7 +268,7 @@ class Event(Subject):
     
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = super()._as_dict_
         type_as_dict.update({
             'type': self.type.value if self.type else None,
@@ -285,5 +285,5 @@ class Event(Subject):
         Create a Person instance from a JSON-dict (already parsed).
         """
         #type_as_dict = Serialization.get_class_fields('Event')
-        from .Serialization import Serialization
+        from .serialization import Serialization
         return Serialization.deserialize(data, Event)

gedcom_x-0.5.7/gedcomx/EvidenceReference.py → gedcom_x-0.5.8/gedcomx/evidence_reference.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
-from .Attribution import Attribution
-from .Resource import Resource
+from .attribution import Attribution
+from .resource import Resource
 
 class EvidenceReference:
     identifier = 'http://gedcomx.org/v1/EvidenceReference'