gedcom-x 0.5.9__py3-none-any.whl → 0.5.11__py3-none-any.whl

gedcomx/source_description.py

@@ -1,7 +1,8 @@
+from __future__ import annotations
 import warnings
 
 from enum import Enum
-from typing import Any, Dict, List, Optional, TYPE_CHECKING
+from typing import Any, Dict, List, Optional, Union, TYPE_CHECKING
 if TYPE_CHECKING:
     from .document import Document
 
@@ -17,6 +18,7 @@ if TYPE_CHECKING:
  Updated:
    - 2025-08-31: _as_dict_ refactored to ignore empty fields, changed id creation to make_uid()
     - 2025-09-01: filename PEP8 standard, imports changed accordingly
+    - 2025-09-09: added schema_class
  
    
 ======================================================================
@@ -35,6 +37,7 @@ from .identifier import Identifier, IdentifierList, make_uid
 from .logging_hub import hub, logging
 from .note import Note
 from .resource import Resource
+from .schemas import schema_class
 from .source_citation import SourceCitation
 from .source_reference import SourceReference
 from .textvalue import TextValue
@@ -66,7 +69,8 @@ class ResourceType(Enum):
             ResourceType.Record: "A historical record, such as a census record or a vital record."
         }
         return descriptions.get(self, "No description available.")
-    
+
+@schema_class(toplevel=True)    
 class SourceDescription:
     """Description of a genealogical information source.
 
@@ -123,11 +127,11 @@ class SourceDescription:
                  citations: Optional[List[SourceCitation]] = [],
                  mediaType: Optional[str] = None,
                  about: Optional[URI] = None,
-                 mediator: Optional[Agent|Resource] = None,
-                 publisher: Optional[Agent|Resource] = None,
+                 mediator: Optional[Union[Resource,Agent]] = None,
+                 publisher: Optional[Union[Resource,Agent]] = None,
                  authors: Optional[List[Resource]] = None,
                  sources: Optional[List[SourceReference]] = None, # SourceReference
-                 analysis: Optional["Document|Resource"] = None,  #TODO add type checker so its a document
+                 analysis: Optional[Union[Resource,Document]] = None,  #TODO add type checker so its a document
                  componentOf: Optional[SourceReference] = None, # SourceReference
                  titles: Optional[List[TextValue]] = None,
                  notes: Optional[List[Note]] = None,
@@ -140,7 +144,7 @@ class SourceDescription:
                  modified: Optional[Date] = None,
                  published: Optional[Date] = None,
                  repository: Optional[Agent] = None,
-                 max_note_count: int = 20):
+                 ):
         
         self.id = id if id else make_uid()
         self.resourceType = resourceType
@@ -164,19 +168,19 @@ class SourceDescription:
         self.modified = modified
         self.published = published
         self.repository = repository
-        self.max_note_count = max_note_count
+  
 
         self.uri = URI(fragment=id) if id else None #TODO Should i take care of this in the collections?
 
         self._place_holder = False
     
     @property
-    def publisher(self) -> Resource | Agent | None:
+    def publisher(self) -> Union[Resource, Agent, None]:
         return self._publisher
     
-
     @publisher.setter
-    def publisher(self, value: Resource | Agent):
+    def publisher(self,
+                  value: Union[Resource, Agent]):
         if value is None:
             self._publisher = None
         elif isinstance(value,Resource):
@@ -198,14 +202,14 @@ class SourceDescription:
             self.identifiers.append(identifier_to_add)
     
     def add_note(self,note_to_add: Note):
-        if len(self.notes) >= self.max_note_count:
-            warnings.warn(f"Max not count of {self.max_note_count} reached for id: {self.id}")
-            return False
-        if note_to_add and isinstance(note_to_add,Note):
-            for existing in self.notes:
-                if note_to_add == existing:
-                    return False
-            self.notes.append(note_to_add)
+        if note_to_add is not None and note_to_add.text is not None and note_to_add.text != '':
+            if note_to_add and isinstance(note_to_add,Note):
+                for existing in self.notes:
+                    if note_to_add == existing:
+                        return False
+                self.notes.append(note_to_add)
+            return
+        
     
     def add_source_reference(self, source_to_add: SourceReference):
         if source_to_add and isinstance(object,SourceReference):

gedcomx/source_reference.py

@@ -1,6 +1,26 @@
 from __future__ import annotations
-from typing import List, Optional, TYPE_CHECKING
+from typing import List, Optional, Union, TYPE_CHECKING
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    Person.py
+ Author:  David J. Cartwright
+ Purpose: Python Object representation of GedcomX Person Type
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-08-31: _as_dict_ to only create entries in dict for fields that hold data
+   - 2025-09-03: _from_json_ refactor
+   - 2025-09-09: added schema_class
+   
+======================================================================
+"""
 
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
 if TYPE_CHECKING:
     from .source_description import SourceDescription
 
@@ -8,6 +28,7 @@ from .attribution import Attribution
 from .qualifier import Qualifier
 
 from .resource import Resource
+from .schemas import schema_class
 
 from .uri import URI
 from .logging_hub import hub, logging
@@ -55,13 +76,14 @@ class KnownSourceReference(Qualifier):
             )
         }
         return descriptions.get(self, "No description available.")
-    
+
+@schema_class()
 class SourceReference:
     identifier = 'http://gedcomx.org/v1/SourceReference'
     version = 'http://gedcomx.org/conceptual-model/v1'
     
     def __init__(self,
-                 description: SourceDescription | URI | None = None,
+                 description: Union[URI, SourceDescription] = None,
                  descriptionId: Optional[str] = None,
                  attribution: Optional[Attribution] = None,
                  qualifiers: Optional[List[Qualifier]] = None

gedcomx/subject.py

@@ -1,5 +1,5 @@
 import warnings
-from typing import List, Optional
+from typing import List, Optional 
 """
 ======================================================================
  Project: Gedcom-X
@@ -55,14 +55,13 @@ class Subject(Conclusion):
                  evidence: Optional[List[EvidenceReference]] = [],
                  media: Optional[List[SourceReference]] = [],
                  identifiers: Optional[IdentifierList] = None,
-                 uri: Optional[Resource] = None,
                  links: Optional[_rsLinks] = 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 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):

gedcomx/textvalue.py

@@ -11,6 +11,7 @@ from typing import Any, Optional, Dict
  Updated:
    - 2025-09-03 _from_json_ refactor
    - 2025-09-04 added _str_ and _repr_ dunders
+   - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -21,6 +22,7 @@ GEDCOM Module Types
 ======================================================================
 """
 from .logging_hub import hub, logging
+from .schemas import schema_class
 """
 ======================================================================
 Logging
@@ -30,6 +32,7 @@ log = logging.getLogger("gedcomx")
 serial_log = "gedcomx.serialization"
 #=====================================================================
 
+@schema_class()
 class TextValue:
     identifier = 'http://gedcomx.org/v1/TextValue'
     version = 'http://gedcomx.org/conceptual-model/v1'
@@ -37,6 +40,9 @@ class TextValue:
     def __init__(self, value: Optional[str] = None, lang: Optional[str] = None) -> None:
         self.lang = lang
         self.value = value
+        if value is None or value == '':
+            assert False
+
     
     def _append_to_value(self, value_to_append):
         if not isinstance(value_to_append, str):
@@ -56,11 +62,20 @@ class TextValue:
     def __str__(self):
         return f"{self.value} ({self.lang})"
     
+    # --- identity & hashing -------------------------------------------------
+    def _key(self) -> tuple[str, str]:
+        # Normalize for equality/hash:
+        # - treat missing lang as ""
+        # - casefold lang to compare 'EN' == 'en'
+        # - strip value to ignore surrounding whitespace
+        return ((self.lang or "").casefold(), (self.value or "").strip())
+
     def __eq__(self, other: object) -> bool:
-        if isinstance(other,TextValue):
-            if self.value.strip() == other.value.strip():
-                return True
-        return False
+        if not isinstance(other, TextValue):
+            return NotImplemented
+        return self._key() == other._key()
+
+    
     
     # ...existing code...
 

gedcomx/uri.py

@@ -24,6 +24,7 @@ GEDCOM Module Types
 ======================================================================
 """
 from .logging_hub import hub, logging
+from .schemas import schema_class, SCHEMA
 """
 ======================================================================
 Logging
@@ -49,6 +50,9 @@ def _encode_query(q: QueryLike) -> str:
     return urlencode(list(q), doseq=True)        # coerce iterable to a sequence
 
 
+
+
+@schema_class()
 class URI():
     def __init__(self,
                  
@@ -84,7 +88,7 @@ class URI():
         if self.target is not None:
             #log.debug(f"Creating URI from Target {target}, most likely for serialization")
             if hasattr(self.target,'id'):
-                log.debug(f"'{target}.id' found {target.id}, using as fragment")
+                if hub.logEnabled:log.debug(f"'{type(target).__name__}.id' found {target.id}, using as fragment")
                 self.fragment = self.target.id
             if hasattr(self.target,'uri'):
                 #log.debug(f"'{target}.uri' found, copying")
@@ -156,10 +160,7 @@ class URI():
     def _as_dict_(self):
         return self.value or self._value    
     
-    @property
-    def uri(self):
-        return self
-    
+       
     @classmethod
     def from_url(cls,url):
         return cls(target=url)
@@ -167,7 +168,8 @@ class URI():
     @classmethod
     def _from_json_(cls,data,context=None):
         return cls(value=data)
-    
+
+#SCHEMA.set_uri_class(URI)    
 
     
 @dataclass(slots=True)

gedcom_x-0.5.9.dist-info/RECORD

@@ -1,56 +0,0 @@
-gedcomx/Logging.py,sha256=vBDOjawVXc4tCge1laYjy6_2Ves-fnGzG0m6NnLZejE,624
-gedcomx/TopLevelTypeCollection.py,sha256=p99i-O5LXiXe3GlC6jWuz4nH1TAcKxOLbe0VRxWbSFY,1495
-gedcomx/Zip.py,sha256=lBxcv-Vip45884EHj56wZJJ5I36Q38UuHUidDxQBoS8,14
-gedcomx/__init__.py,sha256=8qEa_oYCC1nMyeMt0zNmsqXnocfA2q6VNUlp0cCnMLI,1723
-gedcomx/address.py,sha256=7tGUPRItlSiUZ6-WaDNj4sbjvU8W_f2kw-I8s_nntTU,8049
-gedcomx/agent.py,sha256=HxDRB8axhReUmTDtn0XFNemG6znjJQezi-qxO2JRfCg,12803
-gedcomx/attribution.py,sha256=S648H7it_780WLA0c4dkBSrjeXIMz_YVMk1eJ6wZk6Q,4586
-gedcomx/conclusion.py,sha256=BpLFZY0p02yGa3H9Fis2eZz8NYBi7YsiLbaX6N7ZICM,11167
-gedcomx/converter.py,sha256=_VzdkjS52AVXrtKUAzgI6VGDaw7Wysa76B1Vt1XnNEs,57637
-gedcomx/coverage.py,sha256=XmBiTGxuH9WoeXumrgu03EMWtccHe982hFJu2Coxceo,2206
-gedcomx/date.py,sha256=xiAatY25DXTW8usmhbyx_6rmEae3FJnmR5FriGkCN80,3560
-gedcomx/document.py,sha256=quaa1N1XcqhMdpTwCzpvnZfRgygK1mRhFPWyX09ZrWw,4555
-gedcomx/event.py,sha256=7Iogi3eVmR4_-qg6seIo7orAmVS1ENvUQcJO3_tZGlc,15417
-gedcomx/evidence_reference.py,sha256=vtP0rYpehfuu4Jugf1V9u5V_wgPu-2EPb7mqPLS_9cI,696
-gedcomx/exceptions.py,sha256=0OdPM3euhBMgX8o61ZwPuKeN8zPuSuuDcSBFflVGFqk,587
-gedcomx/extensible_enum.py,sha256=DftCZLMBNul3C9hwh-rf0GE3SVdvylvyd5mt7bX_l6o,6535
-gedcomx/fact.py,sha256=bEAUKvLpn7ZAJjyOE57dcvOnvkdzZ63GqF3yb2nGhX0,24972
-gedcomx/gedcom.py,sha256=A8GQ670E6_knfP37kOGHdVl_cC9RXQoc4Dk6D_qlnuQ,2059
-gedcomx/gedcom5x.py,sha256=ajjLeTlncrSgw3JSBRo8Ip9aZik2NHnUt1iDhjc9-mE,23645
-gedcomx/gedcomx.py,sha256=PunMwjHIE4fp7O7sjuNrI8p44_4Y3pI43FQSCh7pyqE,19329
-gedcomx/gender.py,sha256=d2AEvTSa28sfQ1910X-Ysfi7MNDRMQ35EA7jcBYsLck,3178
-gedcomx/group.py,sha256=I4vdBBsdMdqAMigkzGg4mRxrCAjvsJJ-bIa_aR6CDhA,2879
-gedcomx/identifier.py,sha256=hCLfBuHVTVwa2VGD_2NFsiftFkqS3-7W8XMnyjmPZbM,9603
-gedcomx/logging_hub.py,sha256=DbYGwMdVD_nEj0xpVzHjsMVTi_WjttLLRexiebezfzM,8307
-gedcomx/mutations.py,sha256=ugQgfQh0o9r8FIB_dz5s6KqPyIDMHn2YSP7DvAHsDv0,7236
-gedcomx/name.py,sha256=5UpNgFPBfTfzC5yLQDqmeSJ-Fg1T6Nio9vEa6f5kA2Y,19501
-gedcomx/note.py,sha256=joDgKrDS9pbOEEve9LGopP2Gz48kFKqMeHYR72Z7bA0,3813
-gedcomx/online_account.py,sha256=EYMW-CepfwppaJu5RiPQOK63YKxnjE8bVOPUNQqbrMM,639
-gedcomx/person.py,sha256=QALVxY2NlZ93BU0QR9Q4Ykm4kZ-7j4j4QTVXo4hpO60,8993
-gedcomx/place_description.py,sha256=vFCVW37tKBosYCGttkXppR7yDXA-L8YVLpixSN-8b4E,7564
-gedcomx/place_reference.py,sha256=XE-tyRsvfXVK--vdiA_Pvj0ZrUecl72JldbV-c-k_PU,2939
-gedcomx/qualifier.py,sha256=Lg5D_CRLKxaUHcCGLzXhKmpMkmdOeQso0V-XN3yH2n4,2352
-gedcomx/relationship.py,sha256=_wA1NujEqQO0HzSfjlfLcl-yCFWBcOsRyxs3klr0HfE,5852
-gedcomx/resource.py,sha256=ShK3sQOaNI4ZlrIUcepL7_uLd_QX4zMx-A1SU2In_m4,3608
-gedcomx/serialization.py,sha256=Pg_tDO5wUXDgyMqVGPwAlm2WdBBNUA0L-TBaRSWhaNo,30308
-gedcomx/source_citation.py,sha256=QSh1zHK9DsgjQu6oHPDTCReLVs2HP8YDR-NlLAG-pek,1237
-gedcomx/source_description.py,sha256=A2R1T26HYqpk8Q4W8BYp7zlvHYqycHkUMX94uQRpwV8,19258
-gedcomx/source_reference.py,sha256=iakI-vLMXbSMuZLDU2c4J5s-XDanOCUJvV2Mz8uRP_8,6895
-gedcomx/subject.py,sha256=dgStcWiI3a3VX2QEgUIQNbo8HELD2sFUhYT-VI46ND8,5117
-gedcomx/textvalue.py,sha256=Y-SDRpHR2gGpWIyaOvTYrM5EbfOUeX7Tnh_7iOITAbk,3135
-gedcomx/translation.py,sha256=4REL68WaWqcC5f3XcBCZ1dn0gtaZftQJTCkvl1Sf-NA,61395
-gedcomx/uri.py,sha256=ceCcbbrx99QekivhQ_xfMvkmaUKiW_IF21WKTOFBtJg,9693
-gedcomx/Extensions/__init__.py,sha256=MQzi_whzlxiLiknUNh10hG8OVrNqJE38l6n-AwCssx8,24
-gedcomx/Extensions/rs10/__init__.py,sha256=nSHoZiD8hsCAyE-KyRTuWSLqSJSFh12kSz7hqilAMps,26
-gedcomx/Extensions/rs10/rsLink.py,sha256=IdmcG1pVicxX91ZMu9fUPwKYoXCl0Q60inGwiThDAVE,6004
-gedcomx/gedcom7/Exceptions.py,sha256=xeKr4x8b7r8pOqJ9yMpsCVTyxPeOlREDGgKoM5rX4U0,149
-gedcomx/gedcom7/GedcomStructure.py,sha256=ZKNoEcXc41KdrCLPx-A8ohOU9VYmXAkFc4xuZExsBPw,3435
-gedcomx/gedcom7/Specification.py,sha256=qIBe9wzL1GB0l0NyetS1ncbhz5C44b9nMyjAxHuqMt8,9245
-gedcomx/gedcom7/__init__.py,sha256=tPHWW9kchPFEZ5sfURWPPzK8ZBimsQn7SRDULAW1Yc4,679
-gedcomx/gedcom7/g7interop.py,sha256=hSzwqeok2n7xziEvN2QiJY7bVCWrOnZIZWXubnkrv7w,9945
-gedcomx/gedcom7/gedcom7.py,sha256=i_g9W0qsZQYLMoD2sBCA13ibKRYFnSf4uj9-ix_tE4Q,5614
-gedcomx/gedcom7/logger.py,sha256=QM1SySyh91UEhs90d2DMhH-s9qGF8XS8I8gr1eOcmfw,617
-gedcom_x-0.5.9.dist-info/METADATA,sha256=Wn8DcPMkZvmTZRrnNlo4GzUlwRYGSRbKJABN7oVYTaw,4332
-gedcom_x-0.5.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gedcom_x-0.5.9.dist-info/top_level.txt,sha256=smVBF4nxSU-mzCd6idtRYTbYjPICMMi8pTqewEmqF8Y,8
-gedcom_x-0.5.9.dist-info/RECORD,,

gedcomx/Logging.py

@@ -1,19 +0,0 @@
-import logging
-
-def get_logger(name='gedcomx.log'):
-    logger = logging.getLogger(name)
-    if not logger.handlers:
-        logger.setLevel(logging.DEBUG)
-
-        formatter = logging.Formatter('[%(asctime)s] %(levelname)s - %(name)s - %(message)s')
-
-        console_handler = logging.StreamHandler()
-        console_handler.setFormatter(formatter)
-        logger.addHandler(console_handler)
-
-        # Optional: file logging
-        file_handler = logging.FileHandler(f"{name}.log", encoding="utf-8")
-        file_handler.setFormatter(formatter)
-        logger.addHandler(file_handler)
-
-    return logger