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

gedcomx/evidence_reference.py

@@ -1,7 +1,29 @@
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    evidence_reference.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+    - 2025-09-09: added schema_class
+   
+   
+======================================================================
+"""
 
+"""
+======================================================================
+GEDCOM Module Type Imports
+======================================================================
+"""
 from .attribution import Attribution
 from .resource import Resource
+from .schemas import schema_class
+if TYPE_CHECKING:
+    from .subject import Subject
 from .logging_hub import hub, logging
 """
 ======================================================================
@@ -12,9 +34,14 @@ log = logging.getLogger("gedcomx")
 serial_log = "gedcomx.serialization"
 #=====================================================================
 
+@schema_class()
 class EvidenceReference:
     identifier = 'http://gedcomx.org/v1/EvidenceReference'
     version = 'http://gedcomx.org/conceptual-model/v1'
 
-    def __init__(self, resource: Resource, attribution: Optional[Attribution]) -> None:
-        pass
+    def __init__(self, resource: "Resource | Subject", attribution: Optional[Attribution]) -> None:
+        self.resource = resource
+        self.attribution: Attribution = attribution
+    
+    def _validate(self):
+        raise NotImplemented

gedcomx/extensible.py

@@ -0,0 +1,86 @@
+# extensible.py
+from __future__ import annotations
+from dataclasses import dataclass, field
+from typing import Any, Dict, Optional, Callable
+
+from .schemas import SCHEMA
+# If you're using the earlier schema registry:
+#from .serialization_schema import SCHEMA
+
+
+
+class Extensible:
+    # class-level registry of declared extras
+    _declared_extras: Dict[str, Any] = {}
+
+    def __init_subclass__(cls, **kw):
+        super().__init_subclass__(**kw)
+        # each subclass gets its own dict (copy, not shared)
+        cls._declared_extras = dict(getattr(cls, "_declared_extras", {}))
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)  # cooperative
+        self.extras: Dict[str, Any] = {}
+        # seed declared defaults
+        for k, default in type(self)._declared_extras.items():
+            self.extras[k] = _copy_default(default)
+
+    @classmethod
+    def define_ext(
+        cls,
+        name: str,
+        *,
+        typ: type | None = None,
+        default: Any = None,
+        overwrite: bool = False,
+    ) -> None:
+        """
+        Declare an extra field on the CLASS.
+
+        Args:
+            name: field name
+            typ: Python type (used to update schema registry)
+            default: default value for new instances
+            overwrite: if True, replaces existing definition
+        """
+        if name in getattr(cls, "__dataclass_fields__", {}):
+            raise AttributeError(f"{name!r} already exists on {cls.__name__}")
+
+        already = hasattr(cls, name)
+        if already and not overwrite:
+            return
+
+        # Attach descriptor
+        setattr(cls, name, _ExtraField(name, default))
+        cls._declared_extras[name] = default
+
+        # Register with schema
+        if typ is None and default is not None:
+            typ = type(default)
+        SCHEMA.register_extra(cls, name, typ or type(None))
+
+    @classmethod
+    def declared_extras(cls) -> Dict[str, Any]:
+        return dict(getattr(cls, "_declared_extras", {}))
+
+
+class _ExtraField:
+    def __init__(self, name: str, default: Any):
+        self.name = name
+        self.default = default
+    def __get__(self, obj, owner):
+        if obj is None:
+            return self
+        return obj.extras.get(self.name, self.default)
+    def __set__(self, obj, value):
+        obj.extras[self.name] = value
+
+
+def _copy_default(v: Any) -> Any:
+    if isinstance(v, (list, dict, set)):
+        return v.copy()
+    return v
+    # avoid shared mutable defaults
+    if isinstance(v, (list, dict, set)):
+        return v.copy()
+    return v

gedcomx/fact.py

@@ -2,7 +2,7 @@ import difflib
 import re
 
 from enum import Enum
-from typing import List, Optional, Dict, Any
+from typing import List, Optional, Dict, Any, Union, TYPE_CHECKING
 """
 ======================================================================
  Project: Gedcom-X
@@ -13,6 +13,7 @@ from typing import List, Optional, Dict, Any
  Created: 2025-08-25
  Updated:
    - 2025-09-03: _from_json_ refactor 
+   - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -31,6 +32,7 @@ from .note import Note
 from .place_reference import PlaceReference
 from .qualifier import Qualifier
 from .resource import Resource
+from .schemas import schema_class
 from .source_reference import SourceReference
 from .logging_hub import hub, logging
 """
@@ -406,6 +408,7 @@ class FactQualifier(Enum):
         }
         return descriptions.get(self, "No description available.")
 
+@schema_class()
 class Fact(Conclusion):
     identifier = 'http://gedcomx.org/v1/Fact'
     version = 'http://gedcomx.org/conceptual-model/v1'
@@ -414,7 +417,7 @@ class Fact(Conclusion):
                  id: Optional[str] = None,
                  lang: Optional[str] = None,
                  sources: Optional[List[SourceReference]] = None,
-                 analysis: Optional[Resource | Document] = None,
+                 analysis: Optional[Union[Resource,Document]] = None,
                  notes: Optional[List[Note]] = None,
                  confidence: Optional[ConfidenceLevel] = None,
                  attribution: Optional[Attribution] = None,
@@ -430,6 +433,7 @@ class Fact(Conclusion):
         self.place = place
         self.value = value
         self._qualifiers = qualifiers if qualifiers else []
+        self.id = id if id else None # No need for id on 'Fact' unless provided
     
 
     @property

gedcomx/gedcom5x.py

@@ -7,10 +7,28 @@ from typing import List, Optional, Tuple, Any
 import re
 from collections import defaultdict
 from typing import Iterable, Iterator, List, Optional, Tuple, Union
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    gedcom5x.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-03: 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+#import logging
+from .logging_hub import hub, ChannelConfig, logging
 
-import logging
-from .logging_hub import hub, ChannelConfig
-from .logging_hub import hub, logging
 """
 ======================================================================
 Logging

gedcomx/gedcom7/GedcomStructure.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Dict, Any
 import warnings
-from . import Specification as g7
+from . import specification as g7
 
 from typing import Dict, List,Optional,Any
 
@@ -19,8 +19,6 @@ gedcom_top_level_terms = ['https://gedcom.io/terms/v7/CONT',
                           'https://gedcom.io/terms/v7/record-SOUR']
 
 
-
-
 class GedcomStructure:
     version = 'v7'
 

gedcomx/gedcom7/__init__.py

@@ -21,6 +21,6 @@ GEDCOM Module Types
 """
 from .GedcomStructure import GedcomStructure
 from .logger import get_logger
-from .Specification import structure_specs
+from .specification import g7_structure_specs
 from .gedcom7 import Gedcom7
 __all__ = ["Gedcom7"]

gedcomx/gedcom7/gedcom7.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 
 
 from .GedcomStructure import GedcomStructure
-from . import Specification as g7specs
+from . import specification as g7specs
 from .logger import get_logger
 
 
@@ -114,8 +114,8 @@ class Gedcom7:
 
         if tag == 'TAG':
             xtag, uri = value.split()
-            g7specs.structure_specs[xtag] = uri
-            g7specs.structure_specs[uri] = {'label': 'Extension_' + xtag}
+            g7specs.g7_structure_specs[xtag] = uri
+            g7specs.g7_structure_specs[uri] = {'label': 'Extension_' + xtag}
             
         return {
             "level": level,