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

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/gedcomx.py

@@ -20,6 +20,7 @@ from typing import Any, Dict, List, Optional
     - 2025-08-31: _as_dict_ to only create entries in dict for fields that hold data,
     id_index functionality, will be used for resolution of Resources
     - 2025-09-03: _from_json_ refactor
+    - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -40,6 +41,7 @@ from .person import Person
 from .place_description import PlaceDescription
 from .relationship import Relationship, RelationshipType
 from .resource import Resource
+from .schemas import schema_class
 from .source_description import ResourceType, SourceDescription
 from .textvalue import TextValue
 from .uri import URI
@@ -228,6 +230,7 @@ def TypeCollection(item_type):
 
     return Collection()
 
+@schema_class()
 class GedcomX:
     """
     Main GedcomX Object representing a Genealogy. Stores collections of Top Level Gedcom-X Types.

gedcomx/gender.py

@@ -10,6 +10,7 @@ from typing import List, Optional
  Created: 2025-08-25
  Updated:
    - 2025-09-03: _from_json_ refactor 
+   - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -24,6 +25,7 @@ from .conclusion import ConfidenceLevel, Conclusion
 from .Extensions.rs10.rsLink import _rsLinks
 from .note import Note
 from .resource import Resource
+from .schemas import schema_class
 from .source_reference import SourceReference
 from .logging_hub import hub, logging
 """
@@ -51,7 +53,8 @@ class GenderType(Enum):
             GenderType.Intersex: "Intersex (assignment at birth)."
         }
         return descriptions.get(self, "No description available.")
-    
+
+@schema_class()    
 class Gender(Conclusion):
     identifier = 'http://gedcomx.org/v1/Gender'
     version = 'http://gedcomx.org/conceptual-model/v1'
@@ -69,6 +72,7 @@ class Gender(Conclusion):
                  ) -> None:
         super().__init__(id=id, lang=lang, sources=sources, analysis=analysis, notes=notes, confidence=confidence, attribution=attribution, links=links)
         self.type = type
+        self.id = id if id else None # No need for id unless provided
     
     @property
     def _as_dict_(self):

gedcomx/group.py

@@ -10,6 +10,7 @@ from typing import List, Optional
  Created: 2025-08-25
  Updated:
    - 2025-09-01: Updating basic structure, identify TODO s 
+   - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -29,8 +30,8 @@ from .note import Note
 from .place_reference import PlaceReference
 from .source_reference import SourceReference
 from .resource import Resource
-
 from .textvalue import TextValue
+from .schemas import schema_class
 from .subject import Subject
 from .logging_hub import hub, logging
 """
@@ -53,6 +54,7 @@ class GroupRole:                                        #TODO Impliment
     def __init__(self, person: Resource,type: Optional[Enum], date: Optional[Date],details: Optional[str]) -> None:
         pass
 
+@schema_class(toplevel=True)
 class Group(Subject):                                   #TODO Impliment
     identifier = 'http://gedcomx.org/v1/Group'
     version = 'http://gedcomx.org/conceptual-model/v1'
@@ -60,7 +62,14 @@ class Group(Subject):                                   #TODO Impliment
     def __init__(self,
                  id: str | None, lang: str | None,
                  sources: List[SourceReference] | None,
-                 analysis: Document | Resource | None, notes: List[Note] | None, confidence: ConfidenceLevel | None, attribution: Attribution | None, extracted: bool | None, evidence: List[EvidenceReference] | None, media: List[SourceReference] | None, identifiers: List[Identifier] | None,
+                 analysis: Document | Resource | None,
+                 notes: List[Note] | None,
+                 confidence: ConfidenceLevel | None,
+                 attribution: Attribution | None,
+                 extracted: bool | None,
+                 evidence: List[EvidenceReference] | None,
+                 media: List[SourceReference] | None,
+                 identifiers: List[Identifier] | None,
                  names: List[TextValue],
                  date: Optional[Date],
                  place: Optional[PlaceReference],

gedcomx/identifier.py

@@ -16,6 +16,7 @@ import json
  Updated:
    - 2025-09-03: _from_json_ refactor 
    - 2025-09-04: fixe identifier and identifieList json deserialization
+   - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -27,6 +28,7 @@ GEDCOM Module Types
 """
 from .extensible_enum import _EnumItem
 from .resource import Resource
+from .schemas import schema_class
 from .uri import URI
 from .extensible_enum import ExtensibleEnum
 from .logging_hub import hub, logging
@@ -65,7 +67,8 @@ IdentifierType.register("Persistent", "http://gedcomx.org/Persistent")
 IdentifierType.register("External", "https://gedcom.io/terms/v7/EXID")
 IdentifierType.register("Other", "user provided")
 IdentifierType.register("ChildAndParentsRelationship","http://familysearch.org/v1/ChildAndParentsRelationship")
-    
+
+@schema_class()    
 class Identifier:
     identifier = 'http://gedcomx.org/v1/Identifier'
     version = 'http://gedcomx.org/conceptual-model/v1'
@@ -231,7 +234,7 @@ class IdentifierList:
             raise ValueError("Data must be a dict of identifiers.")
 
     @property
-    def _as_dict_(self):
+    def _serializer(self):
         type_as_dict = {}
         for k in self.identifiers.keys():
             #print(k,self.identifiers[k],type(self.identifiers[k]))

gedcomx/logging_hub.py

@@ -1,3 +1,17 @@
+
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    logging_hub.py
+ Author:  David J. Cartwright
+ Purpose: provide module wide logging at context/channel level
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-09: added global kill
+   
+======================================================================
+"""
 # logging_hub.py
 from __future__ import annotations
 import logging
@@ -8,8 +22,12 @@ from dataclasses import dataclass
 from logging.handlers import RotatingFileHandler, TimedRotatingFileHandler
 from typing import Dict, Optional
 
-# Context key: which "channel" (log) is current?
-_current_channel: contextvars.ContextVar[str] = contextvars.ContextVar("current_log_channel", default="default")
+# ──────────────────────────────────────────────────────────────────────────────
+# Context: which "channel" (log) is current?
+# ──────────────────────────────────────────────────────────────────────────────
+_current_channel: contextvars.ContextVar[str] = contextvars.ContextVar(
+    "current_log_channel", default="default"
+)
 
 def get_current_channel() -> str:
     return _current_channel.get()
@@ -17,16 +35,36 @@ def get_current_channel() -> str:
 def set_current_channel(name: str) -> None:
     _current_channel.set(name)
 
+# ──────────────────────────────────────────────────────────────────────────────
+# Filters and Handlers
+# ──────────────────────────────────────────────────────────────────────────────
 class ChannelFilter(logging.Filter):
     """Injects the current channel into every LogRecord."""
     def filter(self, record: logging.LogRecord) -> bool:
         record.log_channel = get_current_channel()
         return True
 
+class KillSwitchFilter(logging.Filter):
+    """Fast global on/off. Returning False drops the record early."""
+    def __init__(self) -> None:
+        super().__init__()
+        self._enabled: bool = True
+
+    @property
+    def enabled(self) -> bool:
+        return self._enabled
+
+    @enabled.setter
+    def enabled(self, value: bool) -> None:
+        self._enabled = bool(value)
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        return self._enabled
+
 class DispatchingHandler(logging.Handler):
     """
-    Routes records to a per-channel handler (file/stream), based on LogRecord.log_channel
-    which is set by ChannelFilter.
+    Routes records to a per-channel handler (file/stream),
+    based on LogRecord.log_channel (set by ChannelFilter).
     """
     def __init__(self):
         super().__init__()
@@ -69,6 +107,9 @@ class DispatchingHandler(logging.Handler):
             return  # channel muted
         handler.emit(record)
 
+# ──────────────────────────────────────────────────────────────────────────────
+# Configuration model
+# ──────────────────────────────────────────────────────────────────────────────
 @dataclass
 class ChannelConfig:
     name: str
@@ -82,18 +123,21 @@ class ChannelConfig:
     #   "size:10MB:3"            -> RotatingFileHandler(maxBytes=10MB, backupCount=3)
     #   "time:midnight:7"        -> TimedRotatingFileHandler(when="midnight", backupCount=7)
 
+# ──────────────────────────────────────────────────────────────────────────────
+# Hub
+# ──────────────────────────────────────────────────────────────────────────────
 class LoggingHub:
     """
-    A centralized, context-aware logging hub.
-    Usage:
+    Centralized, context-aware logging hub.
+
+    Example:
         hub = LoggingHub()
-        hub.init_root()  # do once at startup
-        hub.start_channel(ChannelConfig(name="default", path="logs/default.log"))
-        hub.set_current("default")
+        hub.init_root()
+        hub.start_channel(ChannelConfig(name="default", path="logs/app.log"), make_current=True)
 
-        # In any module:
-        log = logging.getLogger("gedcomx")
-        log.info("hello")  # goes to current channel
+        log = hub.get_logger("gedcomx")
+        if hub.loggingenable:               # <— cheap guard to avoid formatting
+            log.info("hello %s", "world")
 
         with hub.use("import-job-42"):
             log.info("within job 42")
@@ -102,9 +146,10 @@ class LoggingHub:
         self.root_name = root_logger_name
         self._root = logging.getLogger(self.root_name)
         self._dispatch = DispatchingHandler()
-        self._root.setLevel(logging.DEBUG)  # Let handlers control final level
+        self._root.setLevel(logging.DEBUG)  # Handlers/filters determine final behavior
 
         self._filter = ChannelFilter()
+        self._killswitch = KillSwitchFilter()
         self._initialized = False
 
     # -------- Initialization --------
@@ -114,10 +159,19 @@ class LoggingHub:
         # Clean existing handlers on the root logger (optional safety)
         for h in list(self._root.handlers):
             self._root.removeHandler(h)
+
+        # Order matters: kill-switch first for fastest early exit.
+        self._root.addFilter(self._killswitch)
         self._root.addFilter(self._filter)
         self._root.addHandler(self._dispatch)
         self._initialized = True
 
+        # Optional: env bootstrap
+        if os.getenv("GEDCOMX_LOG", "1").lower() in {"0", "false", "off"}:
+            self.disable_all()
+        if os.getenv("GEDCOMX_LOG_HARD", "0") == "1":
+            self.hard_disable()
+
     # -------- Channel Management --------
     def start_channel(self, cfg: ChannelConfig, make_current: bool = False, enabled: bool = True) -> None:
         """Create/replace a channel with a file/rotating handler."""
@@ -125,7 +179,6 @@ class LoggingHub:
         formatter = logging.Formatter(cfg.fmt, datefmt=cfg.datefmt)
 
         if cfg.path is None:
-            # StreamHandler to stdout if no path provided
             handler = logging.StreamHandler()
         else:
             # Rotation options
@@ -133,7 +186,7 @@ class LoggingHub:
                 # "size:10MB:3"
                 _, size_str, backups_str = cfg.rotation.split(":")
                 size_str = size_str.upper().replace("MB", "*1024*1024").replace("KB", "*1024")
-                max_bytes = int(eval(size_str))  # safe for the limited substitutions we made
+                max_bytes = int(eval(size_str))  # simple controlled eval of KB/MB
                 backup_count = int(backups_str)
                 handler = RotatingFileHandler(cfg.path, maxBytes=max_bytes, backupCount=backup_count, encoding="utf-8")
             elif cfg.rotation and cfg.rotation.startswith("time:"):
@@ -182,11 +235,66 @@ class LoggingHub:
         finally:
             _current_channel.reset(token)
 
-    # -------- Utilities --------
+    # -------- Global kill switch (soft) --------
+    def enable_all(self) -> None:
+        self._killswitch.enabled = True
+
+    def disable_all(self) -> None:
+        self._killswitch.enabled = False
+
+    def is_enabled(self) -> bool:
+        return self._killswitch.enabled
+
+    @property
+    def logging_enabled(self) -> bool:
+        """Preferred property name."""
+        return self._killswitch.enabled
+
+    @logging_enabled.setter
+    def logging_enabled(self, value: bool) -> None:
+        self._killswitch.enabled = bool(value)
+
+    # Alias to match your requested spelling: hub.loggingenable
+    @property
+    def logEnabled(self) -> bool:
+        return self.logging_enabled
+
+    @logEnabled.setter
+    def logEnabled(self, value: bool) -> None:
+        self.logging_enabled = bool(value)
+
+    @contextmanager
+    def muted(self):
+        """Temporarily mute all logging in a with-block."""
+        prev = self._killswitch.enabled
+        try:
+            self._killswitch.enabled = False
+            yield
+        finally:
+            self._killswitch.enabled = prev
+
+    # -------- Hard nuke (affects 3rd-party libs too) --------
+    def hard_disable(self) -> None:
+        # Drop all messages of all loggers by using a level above CRITICAL
+        logging.disable(100)
+
+    def hard_enable(self) -> None:
+        logging.disable(0)
+
+    # -------- Convenience --------
     def set_default_channel(self, name: str) -> None:
         self._dispatch.set_default_channel(name)
 
-hub = LoggingHub("gedcomx")     # this becomes your app logger root
+    def get_logger(self, name: Optional[str] = None) -> logging.Logger:
+        """Get a named logger under the hub root."""
+        if not name:
+            return self._root
+        return logging.getLogger(f"{self.root_name}.{name}")
+
+# ──────────────────────────────────────────────────────────────────────────────
+# Hub instance & sample bootstrap
+# ──────────────────────────────────────────────────────────────────────────────
+hub = LoggingHub("gedcomx")     # app logger root
 hub.init_root()                 # do this ONCE at startup
 
 os.makedirs("logs", exist_ok=True)
@@ -211,16 +319,18 @@ hub.start_channel(
         name=serial_log,
         path=f"logs/{serial_log}.log",
         level=logging.DEBUG,
-        rotation="size:10MB:3",   # rotate by size, keep 3 backups
-    ))
+        rotation="size:10MB:3",
+    )
+)
 
 hub.start_channel(
     ChannelConfig(
         name=deserial_log,
         path=f"logs/{deserial_log}.log",
         level=logging.DEBUG,
-        rotation="size:10MB:3",   # rotate by size, keep 3 backups
-    ))
+        rotation="size:10MB:3",
+    )
+)
 
 # (optional) Also a console channel you can switch to
-hub.start_channel(ChannelConfig(name="console", path=None, level=logging.DEBUG))
+hub.start_channel(ChannelConfig(name="console", path=None, level=logging.DEBUG))

gedcomx/name.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import List,Optional
+from typing import List,Optional, Union
 
 """
 ======================================================================
@@ -12,6 +12,7 @@ from typing import List,Optional
  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
    
 ======================================================================
 """
@@ -29,6 +30,7 @@ from .document import Document
 from .Extensions.rs10.rsLink import _rsLinks
 from .note import Note
 from .resource import Resource
+from .schemas import schema_class
 from .source_reference import SourceReference
 from .logging_hub import hub, logging
 """
@@ -119,7 +121,8 @@ class NamePartType(Enum):
             NamePartType.Surname: "A surname."
         }
         return descriptions.get(self, "No description available.")
-    
+
+@schema_class()    
 class NamePart:
     """Used to model a portion of a full name
         including the terms that make up that portion. Some name parts may have qualifiers
@@ -219,6 +222,7 @@ class NamePart:
             f"qualifiers={self.qualifiers!r})"
         )
 
+@schema_class()
 class NameForm:
     """A representation of a name (a "name form") 
         within a given cultural context, such as a given language and script.
@@ -285,6 +289,7 @@ class NameForm:
     def _fulltext_parts(self):
         pass
 
+@schema_class()
 class Name(Conclusion):
     """**Defines a name of a person.**
 
@@ -334,11 +339,13 @@ class Name(Conclusion):
             #given = given.replace('/', '')
             #surname = surname.replace('/', '')
 
-            given_name_part = NamePart(type = NamePartType.Given, value=given)
-            surname_part = NamePart(type = NamePartType.Surname, value=surname)
+            parts =[]
+            if given: parts.append(NamePart(type = NamePartType.Given, value=given)) 
+            if surname: parts.append(NamePart(type = NamePartType.Surname, value=surname))
 
-            name_form = NameForm(fullText=text,parts=[given_name_part,surname_part])
+            name_form = NameForm(fullText=text)
             name = Name(type=NameType.BirthName,nameForms=[name_form])
+            
         else:
             name = Name()
         return name
@@ -346,7 +353,7 @@ class Name(Conclusion):
     def __init__(self, id: Optional[str] = None,
                  lang: Optional[str] = None,
                  sources: Optional[List[SourceReference]] = None,
-                 analysis: Optional[Document |Resource] = None,
+                 analysis: Optional[Union[Resource,Document]] = None,
                  notes: Optional[List[Note]] = None,
                  confidence: Optional[ConfidenceLevel] = None,
                  attribution: Optional[Attribution] = None,
@@ -358,6 +365,7 @@ class Name(Conclusion):
         self.type = type
         self.nameForms = nameForms if nameForms else []
         self.date = date
+        self.id = id if id else None # no need for id
     
     def _add_name_part(self, namepart: NamePart):
         if namepart and isinstance(namepart, NamePart):
@@ -418,6 +426,7 @@ class Name(Conclusion):
             f"date={self.date!r})"
     )
 
+
 class QuickName():
     def __new__(cls,name: str) -> Name:
         obj = Name(nameForms=[NameForm(fullText=name)])

gedcomx/note.py

@@ -9,6 +9,7 @@ from typing import Any, Optional
  Created: 2025-08-25
  Updated:
    - 2025-09-03: _from_json_ refactor
+   - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -19,6 +20,7 @@ GEDCOM Module Types
 ======================================================================
 """
 from .attribution import Attribution
+from .schemas import schema_class
 from .logging_hub import hub, logging
 """
 ======================================================================
@@ -29,6 +31,7 @@ log = logging.getLogger("gedcomx")
 serial_log = "gedcomx.serialization"
 #=====================================================================
 
+@schema_class()
 class Note:
     identifier = 'http://gedcomx.org/v1/Note'
     version = 'http://gedcomx.org/conceptual-model/v1'
@@ -65,19 +68,31 @@ class Note:
         return type_as_dict if type_as_dict != {} else None
         return Serialization.serialize_dict(type_as_dict)    
     
-    def __eq__(self, other):
+    # ---- hashing & equality ----
+    @staticmethod
+    def _norm(s: str | None) -> str:
+        # normalize None -> "", strip outer whitespace
+        return (s or "").strip()
+
+    def _key(self) -> tuple:
+        # Base identity: language (case-insensitive), subject, text
+        base = (
+            self._norm(self.lang).casefold(),
+            self._norm(self.subject),
+            self._norm(self.text),
+        )
+        # If you want attribution to affect identity AND it has a stable id,
+        # uncomment the next 3 lines:
+        # a = self.attribution
+        # a_id = getattr(a, "id", None) if a is not None else None
+        # return base + (a_id,)
+        return base
+
+    def __eq__(self, other: object) -> bool:
         if not isinstance(other, Note):
             return NotImplemented
+        return self._key() == other._key()
 
-        def safe_str(val):
-            return val.strip() if isinstance(val, str) else ''
-
-        return (
-            #safe_str(self.lang) == safe_str(other.lang) and
-            #safe_str(self.subject) == safe_str(other.subject) and
-            safe_str(self.text) == safe_str(other.text) #and
-           # self.attribution == other.attribution  # Assumes Attribution defines __eq__
-        )
     
     @classmethod
     def _from_json_(cls, data: Any, context=None) -> "Note":

gedcomx/online_account.py

@@ -1,6 +1,25 @@
 from typing import Optional
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    online_account.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-09: added schema_class
+   
+======================================================================
+"""
 
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
 from .resource import Resource
+from .schemas import schema_class
 from .logging_hub import hub, logging
 """
 ======================================================================
@@ -11,6 +30,7 @@ log = logging.getLogger("gedcomx")
 serial_log = "gedcomx.serialization"
 #=====================================================================
 
+@schema_class()
 class OnlineAccount:
     identifier = 'http://gedcomx.org/v1/OnlineAccount'
     version = 'http://gedcomx.org/conceptual-model/v1'