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

gedcomx/coverage.py

@@ -0,0 +1,55 @@
+from typing import Optional
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    coverage.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-08-31: 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .date import Date
+from .place_reference import PlaceReference
+
+
+class Coverage:
+    identifier = 'http://gedcomx.org/v1/Coverage'
+    version = 'http://gedcomx.org/conceptual-model/v1'
+
+    def __init__(self,spatial: Optional[PlaceReference], temporal: Optional[Date]) -> None:
+        self.spatial = spatial
+        self.temporal = temporal    
+    
+    # ...existing code...
+
+    @property
+    def _as_dict_(self):
+        from .serialization import Serialization
+        type_as_dict = {}
+        if self.spatial:
+            type_as_dict['spatial'] = getattr(self.spatial, '_as_dict_', self.spatial)
+        if self.temporal:  # (fixed: no space after the dot)
+            type_as_dict['temporal'] = getattr(self.temporal, '_as_dict_', self.temporal)
+        return Serialization.serialize_dict(type_as_dict) 
+
+    @classmethod
+    def _from_json_(cls, data: dict):
+        """
+        Create a Coverage instance from a JSON-dict (already parsed).
+        """
+        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
+        return cls(spatial=spatial, temporal=temporal)

gedcomx/{Date.py → date.py}

@@ -4,6 +4,8 @@ from dateutil import parser
 import time
 
 
+
+
 class DateFormat:
     def __init__(self) -> None:
         pass
@@ -16,18 +18,23 @@ class Date:
     version = 'http://gedcomx.org/conceptual-model/v1'
 
     def __init__(self, original: Optional[str],normalized: Optional[DateNormalization] = None ,formal: Optional[str | DateFormat] = None) -> None:
-        self.orginal = original
+        self.original = original
         self.formal = formal
 
         self.normalized: DateNormalization | None = normalized if normalized else None
     
     @property
     def _as_dict_(self):
-        return {'original': self.orginal,
-                'formal': self.formal}
+        from .serialization import Serialization
+        type_as_dict = {}
+        if self.original:
+            type_as_dict['original'] = self.original
+        if self.formal:
+            type_as_dict['formal'] = self.formal
+        return Serialization.serialize_dict(type_as_dict)
 
     @classmethod
-    def _from_json_(obj,data):
+    def _from_json_(cls,data):
         original = data.get('original',None)
         formal = data.get('formal',None)
         

gedcomx/{Document.py → document.py}

@@ -1,13 +1,30 @@
 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: 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+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
 
-from .Conclusion import Conclusion
-from .Serialization import Serialization
 
 class DocumentType(Enum):
     Abstract = "http://gedcomx.org/Abstract"
@@ -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,6 +70,7 @@ class Document(Conclusion):
     
     @property
     def _as_dict(self):
+        from .serialization import Serialization
         type_as_dict = super()._as_dict_
         if self.type:
             type_as_dict['type'] = self.type.value
@@ -69,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)

gedcomx/{Event.py → event.py}

@@ -1,18 +1,37 @@
 from enum import Enum
 from typing import List, Optional
 
-from gedcomx.EvidenceReference import EvidenceReference
-from gedcomx.Identifier import Identifier
-
-from .Attribution import Attribution
-from .Conclusion import Conclusion, ConfidenceLevel
-from .Date import Date
-from .Note import Note
-from .PlaceReference import PlaceReference
-from .Serialization import Serialization
-from .SourceReference import SourceReference
-from .Subject import Subject
-from .Resource import Resource
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    Event.py
+ Author:  David J. Cartwright
+ Purpose: Python Object representation of GedcomX Event Type, EventType, EventRole, EventRoleType Types
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-08-31: fixed mutible [] in init, replaced List[Identifer] with IdentifierList
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Type Imports
+======================================================================
+"""
+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
+
+#=====================================================================
 
 class EventRoleType(Enum):
     Principal = "http://gedcomx.org/Principal"
@@ -23,10 +42,10 @@ class EventRoleType(Enum):
     @property
     def description(self):
         descriptions = {
-            EventRole.Principal: "The person is the principal person of the event. For example, the principal of a birth event is the person that was born.",
-            EventRole.Participant: "A participant in the event.",
-            EventRole.Official: "A person officiating the event.",
-            EventRole.Witness: "A witness of the event."
+            EventRoleType.Principal: "The person is the principal person of the event. For example, the principal of a birth event is the person that was born.",
+            EventRoleType.Participant: "A participant in the event.",
+            EventRoleType.Official: "A person officiating the event.",
+            EventRoleType.Witness: "A witness of the event."
         }
         return descriptions.get(self, "No description available.")
 
@@ -36,19 +55,64 @@ class EventRole(Conclusion):
 
     def __init__(self,
                  id: Optional[str] = None,
-                 lang: Optional[str] = 'en',
+                 lang: Optional[str] = None,
                  sources: Optional[List[SourceReference]] = [],
                  analysis: Optional[Resource] = None,
                  notes: Optional[List[Note]] = [],
                  confidence: Optional[ConfidenceLevel] = None,
                  attribution: Optional[Attribution] = None,
-                 person: Resource = None,
+                 person: Optional[Resource] = None,
                  type: Optional[EventRoleType] = None,
                  details: Optional[str] = None) -> None:
         super().__init__(id, lang, sources, analysis, notes, confidence, attribution)
         self.person = person
         self.type = type
         self.details = details
+        
+    def __str__(self) -> str:
+        parts = []
+        if self.type is not None:
+            # assume enums expose .name
+            parts.append(f"type={getattr(self.type, 'name', str(self.type))}")
+        if self.person is not None:
+            # assume classes have meaningful __str__
+            parts.append(f"person={self.person}")
+        if self.details:
+            parts.append(f"details={self.details!r}")
+        if getattr(self, "id", None):
+            parts.append(f"id={self.id!r}")
+        return f"EventRole({', '.join(parts)})" if parts else "EventRole()"
+
+    def __repr__(self) -> str:
+        # assume enums expose .name and .value
+        if self.type is not None:
+            tcls = self.type.__class__.__name__
+            tname = getattr(self.type, "name", str(self.type))
+            tval = getattr(self.type, "value", self.type)
+            type_repr = f"<{tcls}.{tname}: {tval!r}>"
+        else:
+            type_repr = "None"
+        return (
+            f"{self.__class__.__name__}("
+            f"id={getattr(self, 'id', None)!r}, "
+            f"lang={getattr(self, 'lang', None)!r}, "
+            f"type={type_repr}, "
+            f"person={self.person!r}, "
+            f"details={self.details!r})"
+        )
+    
+    @property
+    def _as_dict_(self):
+        from .serialization import Serialization
+        type_as_dict = super()._as_dict_
+        if self.person:
+            type_as_dict['person'] = Resource(target=self.person)._as_dict_
+        if self.type is not None:
+            type_as_dict['type'] = getattr(self.type, 'value', self.type)
+        if self.details:
+            type_as_dict['details'] = self.details
+
+        return Serialization.serialize_dict(type_as_dict)
 
 class EventType(Enum):
     Adoption = "http://gedcomx.org/Adoption"
@@ -180,16 +244,17 @@ class Event(Subject):
 
     def __init__(self,
                  id: Optional[str] = None,
-                 lang: Optional[str] = 'en',
-                 sources: Optional[List[SourceReference]] = [],
+                 lang: Optional[str] = None,
+                 sources: Optional[List[SourceReference]] = None,
                  analysis: Optional[Resource] = None,
-                 notes: Optional[List[Note]] = [],
+                 notes: Optional[List[Note]] = None,
                  confidence: Optional[ConfidenceLevel] = None,
                  attribution: Optional[Attribution] = None,
                  extracted: Optional[bool] = False,
-                 evidence: Optional[List[EvidenceReference]] = [],
-                 media: Optional[List[SourceReference]] = [],
-                 identifiers: Optional[List[Identifier]] = [],
+                 evidence: Optional[List[EvidenceReference]] = None,
+                 media: Optional[List[SourceReference]] = None,
+                 #identifiers: Optional[List[Identifier]] = [],
+                 identifiers: Optional[IdentifierList] = None,
                  type: Optional[EventType] = None,
                  date: Optional[Date] = None,
                  place: Optional[PlaceReference] = None,
@@ -203,12 +268,22 @@ class Event(Subject):
     
     @property
     def _as_dict_(self):
-        raise NotImplementedError("Not implemented yet")
+        from .serialization import Serialization
+        type_as_dict = super()._as_dict_
+        type_as_dict.update({
+            'type': self.type.value if self.type else None,
+            'date': self.date,
+            'place': self.place._as_dict_ if self.place else None,
+            'roles': [role._as_dict_ for role in self.roles],
+        })
+
+        return Serialization.serialize_dict(type_as_dict)
     
     @classmethod
     def _from_json_(cls, data: dict):
         """
         Create a Person instance from a JSON-dict (already parsed).
         """
-        type_as_dict = Serialization.get_class_fields('Event')
-        return Serialization.deserialize(data, type_as_dict)
+        #type_as_dict = Serialization.get_class_fields('Event')
+        from .serialization import Serialization
+        return Serialization.deserialize(data, Event)

gedcomx/{EvidenceReference.py → 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'

gedcomx/{Fact.py → fact.py}

@@ -1,28 +1,38 @@
 import difflib
 import re
 
-from datetime import datetime
 from enum import Enum
 from typing import List, Optional, Dict, Any
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    fact.py
+ Author:  David J. Cartwright
+ Purpose: 
 
-from .Attribution import Attribution
-from .Conclusion import ConfidenceLevel
-from .Document import Document
-from .Date import Date
-from .Note import Note
-from .PlaceReference import PlaceReference
-from .SourceReference import SourceReference
-from .Serialization import Serialization
-from .Resource import Resource
+ Created: 2025-08-25
+ Updated:
+   - 2025-08-31: 
+   
+======================================================================
+"""
 
-from .Conclusion import Conclusion
-from .Qualifier import Qualifier
-
-from enum import Enum
-
-from collections.abc import Sized
-
-from .Extensions.rs10.rsLink import rsLink, _rsLinkList
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .attribution import Attribution
+from .conclusion import Conclusion, ConfidenceLevel
+from .date import Date
+from .document import Document
+from .Extensions.rs10.rsLink import _rsLinkList
+from .note import Note
+from .place_reference import PlaceReference
+from .qualifier import Qualifier
+from .resource import Resource
+from .source_reference import SourceReference
+#=====================================================================
 
 
 class FactType(Enum):
@@ -367,11 +377,9 @@ class FactType(Enum):
         for word in words:
             matches = difflib.get_close_matches(word, keywords_to_fact_type.keys(), n=1, cutoff=0.8)
             if matches:
-                print(f"Guessed '{description} to be of fact type: {keywords_to_fact_type[matches[0]]}")
                 return keywords_to_fact_type[matches[0]]
         return None
 
-
 class FactQualifier(Enum):
     Age = "http://gedcomx.org/Age"
     Cause = "http://gedcomx.org/Cause"
@@ -390,17 +398,16 @@ class FactQualifier(Enum):
         }
         return descriptions.get(self, "No description available.")
 
-
 class Fact(Conclusion):
     identifier = 'http://gedcomx.org/v1/Fact'
     version = 'http://gedcomx.org/conceptual-model/v1'
 
     def __init__(self,
                  id: Optional[str] = None,
-                 lang: str = 'en',
-                 sources: Optional[List[SourceReference]] = [],
+                 lang: Optional[str] = None,
+                 sources: Optional[List[SourceReference]] = None,
                  analysis: Optional[Resource | Document] = None,
-                 notes: Optional[List[Note]] = [],
+                 notes: Optional[List[Note]] = None,
                  confidence: Optional[ConfidenceLevel] = None,
                  attribution: Optional[Attribution] = None,
                  type: Optional[FactType] = None,
@@ -429,24 +436,28 @@ class Fact(Conclusion):
 
     @property
     def _as_dict_(self):
-        fact_dict = super()._as_dict_
+        from .serialization import Serialization
+        type_as_dcit = super()._as_dict_
         # Only add Relationship-specific fields
-        fact_dict.update( {
-            'type': self.type.value if self.type else None,
-            'date': self.date._as_dict_ if self.date else None,
-            'place': self.place._as_dict_ if self.place else None,
-            'value': self.value,
-            'qualifiers': [q.value for q in self.qualifiers] if self.qualifiers else []
-        })
+        if self.type:
+            type_as_dcit['type'] = getattr(self.type, 'value', self.type)
+        if self.date:
+            type_as_dcit['date'] = self.date._as_dict_
+        if self.place:
+            type_as_dcit['place'] = self.place._as_dict_
+        if self.value:
+            type_as_dcit['value'] = self.value
+        if self.qualifiers:
+            type_as_dcit['qualifiers'] = [getattr(q, 'value', q) for q in self.qualifiers]
         
-        return Serialization.serialize_dict(fact_dict)
+        return Serialization.serialize_dict(type_as_dcit)
     
     @classmethod
     def _from_json_(cls, data: Dict[str, Any]) -> 'Fact':
         
         # Extract fields, no trailing commas!
         id_          = data.get('id')
-        lang         = data.get('lang', 'en')
+        lang         = data.get('lang', None)
         sources      = [SourceReference._from_json_(s) for s in data.get('sources',[])]
         analysis     = (Resource._from_json_(data['analysis'])
                         if data.get('analysis') else None)