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

gedcomx/{Serialization.py → serialization.py}

@@ -1,13 +1,11 @@
 from __future__ import annotations
+from collections.abc import Sized
 from functools import lru_cache
+from typing import Any, Callable, Dict, ForwardRef, List, Set, Tuple, Union, get_args, get_origin
 
 import enum
 import logging
 import types
-from collections.abc import Sized
-from typing import Any, Dict, List, Set, Tuple, Union, Annotated, ForwardRef, get_args, get_origin
-from typing import Any, Callable, Mapping, List, Dict, Tuple, Set
-from typing import List, Optional
 
 """
 ======================================================================
@@ -19,6 +17,7 @@ from typing import List, Optional
  Created: 2025-08-25
  Updated:
    - 2025-08-31: cleaned up imports and documentation
+   - 2025-09-01: filename PEP8 standard, imports changed accordingly
    
 ======================================================================
 """
@@ -28,32 +27,32 @@ from typing import List, Optional
 GEDCOM Module Types
 ======================================================================
 """
-from .Address import Address
-from .Agent import Agent
-from .Attribution import Attribution
-from .Conclusion import ConfidenceLevel
-from .Date import Date
-from .Document import Document, DocumentType, TextType
-from .EvidenceReference import EvidenceReference
-from .Event import Event, EventType, EventRole, EventRoleType
+from .address import Address
+from .agent import Agent
+from .attribution import Attribution
+from .conclusion import ConfidenceLevel
+from .date import Date
+from .document import Document, DocumentType, TextType
+from .evidence_reference import EvidenceReference
+from .event import Event, EventType, EventRole, EventRoleType
 from .Extensions.rs10.rsLink import _rsLinkList
-from .Fact import Fact, FactType, FactQualifier
-from .Gender import Gender, GenderType
-from .Identifier import IdentifierList, Identifier
-from .LoggingHub import hub, ChannelConfig
-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 .Resource import Resource
-from .SourceDescription import SourceDescription, ResourceType, SourceCitation, Coverage
-from .SourceReference import SourceReference
-from .TextValue import TextValue
-from .URI import URI
+from .fact import Fact, FactType, FactQualifier
+from .gender import Gender, GenderType
+from .identifier import IdentifierList, Identifier
+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_description import SourceDescription, ResourceType, SourceCitation, Coverage
+from .source_reference import SourceReference
+from .textvalue import TextValue
+from .uri import URI
 #======================================================================
 
 log = logging.getLogger("gedcomx")
@@ -481,9 +480,9 @@ class Serialization:
         # Late imports to reduce circulars (and to allow logging if they aren't available)
         '''
         try:
-            from gedcomx.Resource import Resource
-            from gedcomx.URI import URI
-            from gedcomx.Identifier import IdentifierList
+            from gedcomx.resource import Resource
+            from gedcomx.uri import URI
+            from gedcomx.identifier import IdentifierList
             _gx_import_ok = True
         except Exception as _imp_err:
             _gx_import_ok = False

gedcomx/{SourceDescription.py → source_description.py}

@@ -1,11 +1,9 @@
 import warnings
 
 from enum import Enum
-from typing import List, Optional, Dict, Any
-
-from typing import Optional, TYPE_CHECKING
+from typing import Any, Dict, List, Optional, TYPE_CHECKING
 if TYPE_CHECKING:
-    from .Document import Document
+    from .document import Document
 
 """
 ======================================================================
@@ -17,6 +15,7 @@ if TYPE_CHECKING:
  Created: 2025-07-25
  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
  
    
 ======================================================================
@@ -27,19 +26,20 @@ if TYPE_CHECKING:
 GEDCOM Module Types
 ======================================================================
 """
-from .Agent import Agent
-from .Attribution import Attribution
-from .Coverage import Coverage
-from .Date import Date
-from .Identifier import Identifier, IdentifierList, make_uid
-from .Note import Note
-from .Resource import Resource
-from .SourceCitation import SourceCitation
-from .SourceReference import SourceReference
-from .TextValue import TextValue
-from .URI import URI
+from .agent import Agent
+from .attribution import Attribution
+from .coverage import Coverage
+from .date import Date
+from .identifier import Identifier, IdentifierList, make_uid
+from .note import Note
+from .resource import Resource
+from .source_citation import SourceCitation
+from .source_reference import SourceReference
+from .textvalue import TextValue
+from .uri import URI
 #=====================================================================
 
+
 class ResourceType(Enum):
     Collection = "http://gedcomx.org/Collection"
     PhysicalArtifact = "http://gedcomx.org/PhysicalArtifact"
@@ -214,7 +214,7 @@ class SourceDescription:
             
     @property
     def _as_dict_(self) -> Dict[str, Any]:
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = {}
 
         if self.id:

gedcomx/{SourceReference.py → source_reference.py}

@@ -2,14 +2,14 @@ from __future__ import annotations
 from typing import List, Optional, TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from .SourceDescription import SourceDescription
+    from .source_description import SourceDescription
 
-from .Attribution import Attribution
-from .Qualifier import Qualifier
+from .attribution import Attribution
+from .qualifier import Qualifier
 
-from .Resource import Resource
+from .resource import Resource
 
-from .URI import URI
+from .uri import URI
 
 from collections.abc import Sized
 
@@ -85,7 +85,7 @@ class SourceReference:
     
     @property    
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = {
             'description':self.description._as_dict_ if self.description else None,
             'descriptionId': self.descriptionId.replace("\n"," ").replace("\r"," ") if self.descriptionId else None,
@@ -100,7 +100,7 @@ class SourceReference:
         Rehydrate a SourceReference from the dict passed down from JSON deserialization.
         NOTE: This does not resolve references to SourceDescription objects.
         """
-        from .Serialization import Serialization
+        from .serialization import Serialization
         return Serialization.deserialize(data, SourceReference)
     
         

gedcomx/{Subject.py → subject.py}

@@ -1,15 +1,33 @@
 import warnings
 from typing import List, Optional
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    subject.py
+ Author:  David J. Cartwright
+ Purpose: 
 
-from .Attribution import Attribution
-from .Conclusion import Conclusion, ConfidenceLevel
-from .EvidenceReference import EvidenceReference
-from .Identifier import Identifier, IdentifierList
-from .Note import Note
+ Created: 2025-08-25
+ Updated:
+   - 2025-08-31: 
+   
+======================================================================
+"""
 
-from .SourceReference import SourceReference
-from .Resource import Resource
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .attribution import Attribution
+from .conclusion import ConfidenceLevel, Conclusion
+from .evidence_reference import EvidenceReference
 from .Extensions.rs10.rsLink import _rsLinkList
+from .identifier import Identifier, IdentifierList
+from .note import Note
+from .resource import Resource
+from .source_reference import SourceReference
+
 
 class Subject(Conclusion):
     identifier = 'http://gedcomx.org/v1/Subject'
@@ -45,7 +63,7 @@ class Subject(Conclusion):
    
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
 
         type_as_dict = super()._as_dict_  # Start with base class fields
         # Only add Relationship-specific fields

gedcomx/{Translation.py → translation.py}

@@ -1,5 +1,5 @@
 from . import *
-from .Mutations import GedcomXEventOrFact
+from .mutations import GedcomXEventOrFact
 import re
 '''
 {'type': 'Object | Objects | Propertyof',

gedcomx/{URI.py → uri.py}

@@ -1,11 +1,25 @@
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import Mapping, Optional, Union, Iterable, Tuple
+from typing import Mapping, Sequence, Tuple, Union, Iterable
 from urllib.parse import urlsplit, urlunsplit, urlencode, parse_qsl, SplitResult
 
 _DEFAULT_SCHEME = "gedcomx"
 
-@dataclass(frozen=False, slots=True)
+# ---------- typing helpers for urlencode (Option A) ----------
+QuerySeq = Sequence[Tuple[str, str]]
+QueryMap = Mapping[str, str]
+QueryLike = Union[str, QueryMap, QuerySeq]
+
+def _encode_query(q: QueryLike) -> str:
+    """Return a properly encoded query string."""
+    if isinstance(q, str):
+        return q
+    if isinstance(q, Mapping):
+        return urlencode(q, doseq=True)          # mapping is fine
+    return urlencode(list(q), doseq=True)        # coerce iterable to a sequence
+
+
+@dataclass(slots=True)
 class URI:
     scheme: str = field(default=_DEFAULT_SCHEME)
     authority: str = field(default="")
@@ -15,29 +29,33 @@ class URI:
 
     # ---------- constructors ----------
     @classmethod
-    def from_url(cls, url: str, *, default_scheme: str = _DEFAULT_SCHEME) -> "URI":
+    def from_url(cls, url: str, *, default_scheme: str = _DEFAULT_SCHEME) -> URI:
         s = urlsplit(url)
         scheme = s.scheme or default_scheme
         return cls(scheme=scheme, authority=s.netloc, path=s.path, query=s.query, fragment=s.fragment)
 
     @classmethod
-    def parse(cls, value: str) -> "URI":
+    def parse(cls, value: str) -> URI:
         return cls.from_url(value)
 
     @classmethod
     def from_parts(
         cls,
         *,
-        scheme: Optional[str] = None,
+        scheme: str | None = None,
         authority: str = "",
         path: str = "",
-        query: Union[str, Mapping[str, str], Iterable[Tuple[str, str]]] = "",
-        fragment: str = ""
-    ) -> "URI":
-        q = query if isinstance(query, str) else urlencode(query, doseq=True)
+        query: QueryLike = "",
+        fragment: str = "",
+    ) -> URI:
+        q = _encode_query(query)
         return cls(scheme=scheme or _DEFAULT_SCHEME, authority=authority, path=path, query=q, fragment=fragment)
 
     # ---------- views ----------
+    @property
+    def uri(self) -> str:
+        return str(self)
+    
     @property
     def value(self) -> str:
         return str(self)
@@ -49,9 +67,7 @@ class URI:
         return urlunsplit(self.split())
 
     @property
-    def _as_dict_(self) -> str:
-        # Keeps a simple, explicit structure
-        return urlunsplit(self.split())
+    def _as_dict_(self) -> dict[str, object]:
         return {
             "scheme": self.scheme,
             "authority": self.authority,
@@ -61,30 +77,29 @@ class URI:
             "value": str(self),
         }
 
-    # Accepts {'resource': '...'} or a plain string, mirroring your original
+    # Accepts {'resource': '...'} or a plain string
     @classmethod
-    def from_jsonish(cls, data: Union[str, Mapping[str, str]]) -> "URI":
+    def from_jsonish(cls, data: str | Mapping[str, object]) -> URI:
         if isinstance(data, str):
             return cls.from_url(data)
         if isinstance(data, Mapping):
             raw = data.get("resource") or data.get("value") or ""
-            if raw:
+            if isinstance(raw, str) and raw:
                 return cls.from_url(raw)
         raise ValueError(f"Cannot build URI from: {data!r}")
 
     # ---------- functional updaters ----------
-    def with_scheme(self, scheme: str) -> "URI": return self.replace(scheme=scheme)
-    def with_authority(self, authority: str) -> "URI": return self.replace(authority=authority)
-    def with_path(self, path: str, *, join: bool = False) -> "URI":
+    def with_scheme(self, scheme: str) -> URI: return self.replace(scheme=scheme)
+    def with_authority(self, authority: str) -> URI: return self.replace(authority=authority)
+    def with_path(self, path: str, *, join: bool = False) -> URI:
         new_path = (self.path.rstrip("/") + "/" + path.lstrip("/")) if join else path
         return self.replace(path=new_path)
-    def with_fragment(self, fragment: str | None) -> "URI":
+    def with_fragment(self, fragment: str | None) -> URI:
         return self.replace(fragment=(fragment or ""))
-    def without_fragment(self) -> "URI": return self.replace(fragment="")
-    def with_query(self, query: Union[str, Mapping[str, str], Iterable[Tuple[str, str]]]) -> "URI":
-        q = query if isinstance(query, str) else urlencode(query, doseq=True)
-        return self.replace(query=q)
-    def add_query_params(self, params: Mapping[str, Union[str, Iterable[str]]]) -> "URI":
+    def without_fragment(self) -> URI: return self.replace(fragment="")
+    def with_query(self, query: QueryLike) -> URI:
+        return self.replace(query=_encode_query(query))
+    def add_query_params(self, params: Mapping[str, Union[str, Iterable[str]]]) -> URI:
         existing = parse_qsl(self.query, keep_blank_values=True)
         for k, v in params.items():
             if isinstance(v, str):
@@ -95,8 +110,9 @@ class URI:
         return self.replace(query=urlencode(existing, doseq=True))
 
     # ---------- helpers ----------
-    def replace(self, **kwargs) -> "URI":
-        return URI(
+    def replace(self, **kwargs) -> URI:
+        cls = type(self)
+        return cls(
             scheme=kwargs.get("scheme", self.scheme or _DEFAULT_SCHEME),
             authority=kwargs.get("authority", self.authority),
             path=kwargs.get("path", self.path),

gedcom_x-0.5.7.dist-info/RECORD

@@ -1,49 +0,0 @@
-gedcomx/Address.py,sha256=HPh-YZEkcxhzGGUxDWrrmAvKsyL__RthMJl6vXcMA80,4865
-gedcomx/Agent.py,sha256=u7zIr6SNYREDhceOkj09uS6zjl3RXbix5QlQB7mxjz4,8844
-gedcomx/Attribution.py,sha256=JESWw3U_momYDkQ6vknvaAW9DdIWwRRdQJwdD0UPAEI,3381
-gedcomx/Conclusion.py,sha256=9VWEu6lphB0Y8L3YH3t2QcXt5xW5NdnSKXpa9eujU30,8781
-gedcomx/Converter.py,sha256=aM8i8qIhzc9pJ3k75hFQSBkeRax2brucTefPYxENQHI,50968
-gedcomx/Coverage.py,sha256=VR_lQDUgJ9rI-hHzOA8GxS_I1C_Du_3SvG57dzulXNI,1361
-gedcomx/Date.py,sha256=I11mm2YEqUenxt-skphCHO-GWKPQrpMomOL_Utapzy0,2344
-gedcomx/Document.py,sha256=DjL3HwpyCF9cOCdvpvrLu4Mxp7ZIYT1AkQEJGB3TSjY,2967
-gedcomx/Event.py,sha256=j34nM5pZcmfSthdI87be6cGKGemHJky5xVaajmeSVK4,13321
-gedcomx/EvidenceReference.py,sha256=WXZpmcKzwb3lYQmGVf-TY2IsbNG3fIInPY1khRjtOSg,348
-gedcomx/Exceptions.py,sha256=0OdPM3euhBMgX8o61ZwPuKeN8zPuSuuDcSBFflVGFqk,587
-gedcomx/ExtensibleEnum.py,sha256=DftCZLMBNul3C9hwh-rf0GE3SVdvylvyd5mt7bX_l6o,6535
-gedcomx/Fact.py,sha256=r1Ct96moCIXCAd24Ho2aLCI12PGH2AoKIyjACtJT7go,24458
-gedcomx/Gedcom.py,sha256=l_BuLBynQacDtpLjhs2Afrabfiqt2Opoo_5_7myI7Z4,1709
-gedcomx/Gedcom5x.py,sha256=lbIEvK3h2b-IJoO9Fgmq_qc3nItzB_qTonqLafxYfXk,23137
-gedcomx/GedcomX.py,sha256=p0PeJqS4bKXGsXY487JOdGNK4vIwARX7YeTDIqPeNNw,19000
-gedcomx/Gender.py,sha256=vBkYJqhf1mN58Wrw9MvhbVJDNw1pM4-ktFW6mYja_Rw,2285
-gedcomx/Group.py,sha256=VNI_cI_-YnJ9cHzwMmHD8qwDNMe89kEocPuQ67rwStA,1606
-gedcomx/Identifier.py,sha256=1uhNO4Ll-_xLyVM-IYdywz7wTEwHEH44xx4JQId9F9c,8491
-gedcomx/Logging.py,sha256=vBDOjawVXc4tCge1laYjy6_2Ves-fnGzG0m6NnLZejE,624
-gedcomx/LoggingHub.py,sha256=f4z1r6WL3TdL1kg1eaCfCk7XEn9epCH5zUCXd1OT4mc,7793
-gedcomx/Mutations.py,sha256=wtmoaiVS9Vw7Dzpfq34VQETBAVFvQnIlD5rbtSTopfs,6314
-gedcomx/Name.py,sha256=esVS1nqvo5F5ggKQhnW4DYvww_hjXQF91oayLGG4LuU,18661
-gedcomx/Note.py,sha256=hCwLDJYEQ-kR1-3rknHTx_nLq6ytBzi23sQukD8HHlg,2547
-gedcomx/OnlineAccount.py,sha256=P24o98IXo_8XQoICYZPgALjdzS0q8t2l4DU3Od9KxyI,291
-gedcomx/Person.py,sha256=tygyfHWqhbrH3z7TKPAyjJK14M7qu04mCGgXMgi7J_g,8057
-gedcomx/PlaceDescription.py,sha256=oUih1T8jsUVcxdevPGuFpQOc34t4HoYc9ldr87ZH0IA,5591
-gedcomx/PlaceReference.py,sha256=20HmaQUAlPrTjsra38j22NBsNqDBnvHZ5NuP6YzlizA,2111
-gedcomx/Qualifier.py,sha256=iivgraoayJTYZUlkbSAKPzQ7msPYpBvTlmsEsXxz3zw,1778
-gedcomx/Relationship.py,sha256=Et_72kRohBmWpWra2fS_-ha0YvEDZTZqkoD8HrerQW0,3693
-gedcomx/Resource.py,sha256=HIOoKlVZtEp13j7sn4xkqRwRrYadqpiXswKpdJRe2Ns,2674
-gedcomx/Serialization.py,sha256=ZIECHrG-PRZuS2SHGtfv1eg_2Rt-PHPbz4ivF7eH4p8,34041
-gedcomx/SourceCitation.py,sha256=aW-lEb7bT9QU49GiBjJppFMBvtisR6fhVVuXjr5y4vQ,742
-gedcomx/SourceDescription.py,sha256=yUBJXsn64OL0MAWSc3QPWrLt8RKYa1omGGp0FOLo-n8,14929
-gedcomx/SourceReference.py,sha256=d5kNxqalCFlbRWD2kSJAMCexOrH_s1oXu9y_RUmCGa0,5189
-gedcomx/Subject.py,sha256=2xPZiNjZDYSwLkloUPKDRa7F8_ql5zYMFJLS_9ayUtk,2609
-gedcomx/TextValue.py,sha256=6B0wMxL0nigFNzhXZDhbTONvFGbnM2t2NcDZiZuu4Zw,1112
-gedcomx/TopLevelTypeCollection.py,sha256=nvTO6GwFwEZk9jX4fVqhy75ygsshomNb20tnlExKqyY,1495
-gedcomx/Translation.py,sha256=TZZTfuzjsx2glnUJwPrs0TrrShvLjygYUQ6cxhZXnMc,61398
-gedcomx/URI.py,sha256=AuIECTwHUkp-2z0Q9iuA3Me1PiawFKZKCR4sAA64FE8,4270
-gedcomx/Zip.py,sha256=lBxcv-Vip45884EHj56wZJJ5I36Q38UuHUidDxQBoS8,14
-gedcomx/__init__.py,sha256=DfKVj46fhYtpM45NZnK333iDpt2WQ1XJXWsLcVCARNo,1704
-gedcomx/Extensions/__init__.py,sha256=MQzi_whzlxiLiknUNh10hG8OVrNqJE38l6n-AwCssx8,24
-gedcomx/Extensions/rs10/__init__.py,sha256=nSHoZiD8hsCAyE-KyRTuWSLqSJSFh12kSz7hqilAMps,26
-gedcomx/Extensions/rs10/rsLink.py,sha256=uVmdTJl_atheO-pRpP3a5uUrazudf4R_tZvWSZIQdNk,4353
-gedcom_x-0.5.7.dist-info/METADATA,sha256=bLAwaXozcWmQ0blAY2igIeEa3Lh-gQjX7NiPHuGESNs,4332
-gedcom_x-0.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gedcom_x-0.5.7.dist-info/top_level.txt,sha256=smVBF4nxSU-mzCd6idtRYTbYjPICMMi8pTqewEmqF8Y,8
-gedcom_x-0.5.7.dist-info/RECORD,,

gedcomx/Group.py

@@ -1,37 +0,0 @@
-from enum import Enum
-from typing import List, Optional
-
-from .Attribution import Attribution
-from .Conclusion import ConfidenceLevel
-from .Date import Date
-from .EvidenceReference import EvidenceReference
-from .Identifier import Identifier
-from .Note import Note
-from .PlaceReference import PlaceReference
-from .SourceReference import SourceReference
-from .Resource import Resource
-
-from .TextValue import TextValue
-from .Subject import Subject
-
-class GroupRoleType(Enum):
-    def __init__(self) -> None:
-        super().__init__()
-
-class GroupRole:
-    identifier = 'http://gedcomx.org/v1/GroupRole'
-    version = 'http://gedcomx.org/conceptual-model/v1'
-
-    def __init__(self, person: Resource,type: Optional[Enum], date: Optional[Date],details: Optional[str]) -> None:
-        pass
-
-class Group(Subject):
-    identifier = 'http://gedcomx.org/v1/Group'
-    version = 'http://gedcomx.org/conceptual-model/v1'
-
-    def __init__(self, id: str | None, lang: str | None, sources: SourceReference | None, analysis: Resource | None, notes: Note | None, confidence: ConfidenceLevel | None, attribution: Attribution | None, extracted: bool | None, evidence: List[EvidenceReference] | None, media: List[SourceReference] | None, identifiers: List[Identifier] | None,
-                 names: TextValue,
-                 date: Optional[Date],
-                 place: Optional[PlaceReference],
-                 roles: Optional[List[GroupRole]]) -> None:
-        super().__init__(id, lang, sources, analysis, notes, confidence, attribution, extracted, evidence, media, identifiers)