gedcom-x 0.5.8__tar.gz → 0.5.10__tar.gz

{gedcom_x-0.5.8 → gedcom_x-0.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gedcom-x
-Version: 0.5.8
+Version: 0.5.10
 Summary: Python implimentation of gedcom-x standard
 Author-email: "David J. Cartwright" <davidcartwright@hotmail.com>
 License: MIT

{gedcom_x-0.5.8 → gedcom_x-0.5.10}/gedcom_x.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gedcom-x
-Version: 0.5.8
+Version: 0.5.10
 Summary: Python implimentation of gedcom-x standard
 Author-email: "David J. Cartwright" <davidcartwright@hotmail.com>
 License: MIT

{gedcom_x-0.5.8 → gedcom_x-0.5.10}/gedcom_x.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ gedcomx/document.py
 gedcomx/event.py
 gedcomx/evidence_reference.py
 gedcomx/exceptions.py
+gedcomx/extensible.py
 gedcomx/extensible_enum.py
 gedcomx/fact.py
 gedcomx/gedcom.py
@@ -68,6 +69,7 @@ gedcomx/place_reference.py
 gedcomx/qualifier.py
 gedcomx/relationship.py
 gedcomx/resource.py
+gedcomx/schemas.py
 gedcomx/serialization.py
 gedcomx/source_citation.py
 gedcomx/source_description.py
@@ -85,4 +87,6 @@ gedcomx/gedcom7/GedcomStructure.py
 gedcomx/gedcom7/Specification.py
 gedcomx/gedcom7/__init__.py
 gedcomx/gedcom7/g7interop.py
-gedcomx/gedcom7/logger.py
+gedcomx/gedcom7/gedcom7.py
+gedcomx/gedcom7/logger.py
+gedcomx/gedcom7/specification.py

gedcom_x-0.5.10/gedcomx/Extensions/rs10/rsLink.py

@@ -0,0 +1,166 @@
+from typing import Any, Dict, Iterable, Iterator, List, Optional, Tuple, Union
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    rsLink.py
+ Author:  David J. Cartwright
+ Purpose: Link type of GedcomX RS (Extension)
+
+ Created: 2025-08-25
+ Updated:
+   - 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from ...exceptions import GedcomClassAttributeError
+from ...logging_hub import hub, logging
+from ...uri import URI
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+deserial_log = "gedcomx.deserialization"
+#=====================================================================
+
+
+class rsLink():
+    """A link description object. RS Extension to GedcomX by FamilySearch.
+
+    Args:
+        rel (str): Link relation identifier. Required.
+        href (str, optional): Link target URI. If omitted, provide `template`.
+        template (str, optional): URI Template (see RFC 6570). If omitted, provide `href`.
+        type (str, optional): Media type(s) of the linked resource (RFC 2616 §3.7).
+        accept (str, optional): Acceptable media type(s) for updating the linked resource (RFC 2616 §3.7).
+        allow (str, optional): Allowable HTTP methods to transition to the linked resource (RFC 2616 §14.7).
+        hreflang (str, optional): Language of the linked resource (e.g., BCP-47 tag).
+        title (str, optional): Human-readable label for the link.
+
+    Raises:
+        ValueError: If neither `href` nor `template` is provided.
+    """
+
+    """Attribution Information for a Genealogy, Conclusion, Subject and child classes
+
+    Args:
+        contributor (Agent, optional):            Contributor to object being attributed.
+        modified (timestamp, optional):           timestamp for when this record was modified.
+        changeMessage (str, optional):            Birth date (YYYY-MM-DD).
+        creator (Agent, optional):      Creator of object being attributed.
+        created (timestamp, optional):            timestamp for when this record was created
+
+    Raises:
+        
+    """
+    identifier = "http://gedcomx.org/v1/Link"
+
+    def __init__(self,
+                 href:  Optional[URI] = None,
+                 template: Optional[str] = None,
+                 type: Optional[str] = None,
+                 accept: Optional[str] = None,
+                 allow: Optional[str] = None,
+                 hreflang: Optional[str] = None,
+                 title: Optional[str] = None) -> None:
+        
+      
+        self.href = href if isinstance(href,URI) else URI.from_url(href) if isinstance(href,str) else None
+        self.template = template
+        self.type = type
+        self.accept = accept
+        self.allow = allow
+        self.hreflang = hreflang
+        self.title = title
+    
+        if self.href is None: # and self.template is None:
+            raise GedcomClassAttributeError("href or template are required")
+        
+    def __str__(self) -> str:
+        def to_text(v):
+            if v is None:
+                return None
+            # unwrap URI-like objects
+            if isinstance(v, URI):
+                return getattr(v, "value", None) or str(v)
+            # normalize strings (skip empty/whitespace-only)
+            if isinstance(v, str):
+                s = v.strip()
+                return s or None
+            return str(v)
+
+        parts = []
+
+        # show href as the primary bit if present
+        href_s = to_text(self.href)
+        if href_s:
+            parts.append(href_s)
+
+        # show other fields as key=value
+        for name in ("template", "type", "accept", "allow", "hreflang", "title"):
+            val = to_text(getattr(self, name, None))
+            if val:
+                parts.append(f"{name}={val}")
+
+        return " | ".join(parts) if parts else self.__class__.__name__    
+            
+    
+    
+    @classmethod
+    def _from_json_(cls, data: Any, context: Any = None) -> "rsLink":
+        """
+        Build an rsLink from JSON.
+
+        Accepted shapes:
+          - {"rel": "self", "href": "https://..."}
+          - {"rel": {...}, "href": {...}}  # URI objects as dicts
+          - {"href": "https://...", "type": "...", ...}  # rel optional
+          - {"uri": "https://..."} or {"url": "..."}     # href aliases
+          - "https://example.com"                         # shorthand -> href only
+
+        Note:
+          - `rel` is coerced to a URI if possible.
+          - `href` is coerced to a URI (string/dict supported).
+          - If both `href` and `template` are missing, __init__ will raise.
+        """
+        # Shorthand: bare string is an href
+        
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict or str, got {type(data)}")
+
+        print("LINK DATA:",data)
+        # Extract with common aliases
+        rel = data.get("rel")
+        href = data.get("href")
+                    
+
+
+        return cls(
+            rel=rel,
+            href=href,
+            template=data.get("template"),
+            type=data.get("type"),
+            accept=data.get("accept"),
+            allow=data.get("allow"),
+            hreflang=data.get("hreflang"),
+            title=data.get("title"),
+        )
+
+
+class _rsLinks():
+    
+    def __init__(self,
+                 person: rsLink | None = None,
+                 portrait: rsLink | None= None
+                 ) -> None:
+        
+        self.person = person
+        self.portrait = portrait

{gedcom_x-0.5.8 → gedcom_x-0.5.10}/gedcomx/__init__.py

@@ -1,3 +1,4 @@
+from .schemas import SCHEMA
 from .agent import Agent
 from .address import Address
 from .attribution import Attribution
@@ -12,6 +13,8 @@ from .extensible_enum import ExtensibleEnum
 from .event import Event
 from .event import EventType
 from .event import EventRole
+from .extensible import Extensible
+from. extensible import _ExtraField
 from .fact import Fact
 from .fact import FactQualifier
 from .fact import FactType
@@ -43,7 +46,7 @@ from .uri import URI
 
 from .Extensions.rs10.rsLink import rsLink
 
-from .gedcom7.Gedcom7 import Gedcom7, GedcomStructure
+from .gedcom7.gedcom7 import Gedcom7, GedcomStructure
 from .translation import g7toXtable
 
 

gedcom_x-0.5.10/gedcomx/address.py

@@ -0,0 +1,217 @@
+from typing import Any, Dict, Optional, List
+
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    address.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-03: _from_json_ refactoring
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+#=====================================================================
+
+class Address:
+    """A GedcomX Address Data Type
+    A GedcomX Address Data Type.
+
+    Represents a postal address according to the GedcomX conceptual model.
+
+    Args:
+        value (str, optional): A complete address as a single string.
+        city (str, optional): Name of the city or town.
+        country (str, optional): Name of the country.
+        postalCode (str, optional): Postal or ZIP code.
+        stateOrProvince (str, optional): Name of the state, province, or region.
+        street (str, optional): First street address line.
+        street2 (str, optional): Second street address line.
+        street3 (str, optional): Third street address line.
+        street4 (str, optional): Fourth street address line.
+        street5 (str, optional): Fifth street address line.
+        street6 (str, optional): Sixth street address line.
+    """
+
+    identifier = "http://gedcomx.org/v1/Address"
+    version = 'http://gedcomx.org/conceptual-model/v1'
+
+    def __init__(self, value: Optional[str] = None,
+                 city: Optional[str] = None,
+                 country: Optional[str] = None,
+                 postalCode: Optional[str] = None,
+                 stateOrProvince: Optional[str] = None,
+                 street: Optional[str] = None,
+                 street2: Optional[str] = None,
+                 street3: Optional[str] = None,
+                 street4: Optional[str] = None,
+                 street5: Optional[str] = None,
+                 street6: Optional[str] = None):
+        
+        self._value = value #TODO impliment a parser for date strings.
+        self.city = city
+        self.country = country
+        self.postalCode = postalCode
+        self.stateOrProvince = stateOrProvince
+        self.street = street
+        self.street2 = street2
+        self.street3 = street3
+        self.street4 = street4
+        self.street5 = street5
+        self.street6 = street6
+
+    @property
+    def value(self) -> str: 
+        return ', '.join(filter(None, [
+            self.street, self.street2, self.street3,
+            self.street4, self.street5, self.street6,
+            self.city, self.stateOrProvince,
+            self.postalCode, self.country
+        ]))
+    
+    @value.setter
+    def value(self,value: str):
+        self._value = value
+        return
+        raise NotImplementedError("Parsing of a full address is not implimented.")
+    
+    def _append(self,value):
+        if self._value:
+            self._value = self._value + ' ' + value
+        else:
+            self._value = value
+             
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return False
+        
+        return (
+            self.value == other.value and
+            self.city == other.city and
+            self.country == other.country and
+            self.postalCode == other.postalCode and
+            self.stateOrProvince == other.stateOrProvince and
+            self.street == other.street and
+            self.street2 == other.street2 and
+            self.street3 == other.street3 and
+            self.street4 == other.street4 and
+            self.street5 == other.street5 and
+            self.street6 == other.street6
+        )
+    
+    def __str__(self) -> str:
+        # Combine non-empty address components into a formatted string
+        parts = [
+            self._value,
+            self.street,
+            self.street2,
+            self.street3,
+            self.street4,
+            self.street5,
+            self.street6,
+            self.city,
+            self.stateOrProvince,
+            self.postalCode,
+            self.country
+        ]
+
+        # Filter out any parts that are None or empty strings
+        filtered_parts = [str(part) for part in parts if part]
+
+        # Join the remaining parts with a comma and space
+        return ', '.join(filtered_parts)
+    
+    @property
+    def _as_dict_(self):
+        with hub.use(serial_log):
+            log.debug(f"Serializing 'Address' with value: '{self.value}'")
+            type_as_dict = {}
+            if self.city: type_as_dict["city"] = self.city
+            if self.country: type_as_dict["country"] = self.country
+            if self.postalCode: type_as_dict["postalCode"] = self.postalCode
+            if self.stateOrProvince: type_as_dict["stateOrProvince"] = self.stateOrProvince
+            if self.street: type_as_dict["street"] = self.street
+            if self.street2: type_as_dict["street2"] = self.street2
+            if self.street3: type_as_dict["street3"] = self.street3
+            if self.street4: type_as_dict["street4"] = self.street4
+            if self.street5: type_as_dict["street5"] = self.street5
+            if self.street6: type_as_dict["street6"] = self.street6
+            log.debug(f"'Address' serialized with fields: '{type_as_dict.keys()}'") 
+            if type_as_dict == {} or len(type_as_dict.keys()) == 0: log.warning("serializing and empty 'Address' Object")
+
+        return type_as_dict if type_as_dict != {} else None
+        
+    
+    @classmethod
+    def _from_json_(cls, data: Any, context: Any = None) -> "Address":
+        """
+        Build an Address from JSON.
+        Supports:
+          - Shorthand string -> value
+          - Aliases: postal_code/postal -> postalCode; state/province -> stateOrProvince
+          - Line aliases: line1..line6 / address1..address6 / addr1..addr6 -> street..street6
+          - 'lines': [..] list -> street..street6
+        """
+        if data is None: return None
+        
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict or str, got {type(data)}")
+
+        address_data: Dict[str, Any] = {}
+
+        # Freeform value (accept a few aliases)
+        if (v := data.get("value")) is None:
+            address_data["value"] = str(v)
+
+        # Simple scalars
+        if (city := data.get("city")) is not None:
+            address_data["city"] = city
+        if (country := data.get("country")) is not None:
+            address_data["country"] = country
+
+        # Postal code (aliases)
+        if (postal := data.get("postalCode")) is not None:
+            address_data["postalCode"] = postal
+
+        # State / Province (aliases)
+        if (stateprov := data.get("stateOrProvince")) is not None:
+            address_data["stateOrProvince"] = stateprov
+
+        if data.get("street") is not None:
+            address_data["street"] = data["street"]
+
+        if data.get("street2") is not None:
+            address_data["street2"] = data["street2"]
+
+        if data.get("street3") is not None:
+            address_data["street3"] = data["street3"]
+
+        if data.get("street4") is not None:
+            address_data["street4"] = data["street4"]
+
+        if data.get("street5") is not None:
+            address_data["street5"] = data["street5"]
+
+        if data.get("street6") is not None:
+            address_data["street6"] = data["street6"]
+
+
+        return cls(**address_data)
+
+

{gedcom_x-0.5.8 → gedcom_x-0.5.10}/gedcomx/agent.py

@@ -1,7 +1,7 @@
 import base64
 import uuid
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 """
 ======================================================================
  Project: Gedcom-X
@@ -11,7 +11,7 @@ from typing import List, Optional
 
  Created: 2025-08-25
  Updated:
-   - 
+   - 2025-09-03: _from_json_ refactor
    
 ======================================================================
 """
@@ -22,11 +22,20 @@ GEDCOM Module Type Imports
 ======================================================================
 """
 from .address import Address
-from .identifier import Identifier, IdentifierList
+from .identifier import Identifier, IdentifierList, make_uid
 from .online_account import OnlineAccount
 from .resource import Resource
 from .textvalue import TextValue
 from .uri import URI
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+#=====================================================================
 
 
 class Agent:
@@ -61,17 +70,7 @@ class Agent:
         attribution (Attribution, optional): Attribution information related to the agent.
         uri (Resource, optional): A URI reference for this agent.
     """
-    
-    @staticmethod
-    def default_id_generator():
-        # Generate a standard UUID
-        standard_uuid = uuid.uuid4()
-        # Convert UUID to bytes
-        uuid_bytes = standard_uuid.bytes
-        # Encode bytes to a Base64 string
-        short_uuid = base64.urlsafe_b64encode(uuid_bytes).rstrip(b'=').decode('utf-8')
-        return short_uuid
-    
+        
     def __init__(self, id: Optional[str] = None,
                     identifiers: Optional[IdentifierList] = None, 
                     names: Optional[List[TextValue]] = [], 
@@ -86,9 +85,8 @@ class Agent:
                     attribution: Optional[object] = None, # Added for compatibility with GEDCOM5/7 Imports
                     uri: Optional[URI | Resource] = None): 
         
-        self._id_generator = Agent.default_id_generator
-
-        self.id = id if id else None #TODO self._id_generator()
+        
+        self.id = id if id else make_uid()
         self.identifiers = identifiers or IdentifierList()
         self.names = names if names else []
         self.homepage = homepage or None
@@ -164,16 +162,75 @@ class Agent:
             type_as_dict["addresses"] = [address._as_dict_ for address in self.addresses if address]
         if self.xnotes:
             type_as_dict["notes"] = [note._as_dict_() for note in self.xnotes if note]
+        return type_as_dict if type_as_dict != {} else None
         return Serialization.serialize_dict(type_as_dict)
     
     @classmethod
-    def _from_json_(cls, data: dict):
-        """
-        Create a Person instance from a JSON-dict (already parsed).
-        """
-        from .serialization import Serialization
-        type_as_dict = Serialization.get_class_fields('Agent')
-        return Serialization.deserialize(type_as_dict,Agent)
+    def _from_json_(cls, data: Any, context: Any = None) -> "Agent":
+        
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict or str, got {type(data)}")
+
+        agent_data: Dict[str, Any] = {}
+
+        # ── Scalars ──────────────────────────────────────────────────────────────
+        if (id_ := data.get("id")) is not None:
+            agent_data["id"] = id_
+
+        # ── Objects ─────────────────────────────────────────────────────────────
+        if (identifiers := data.get("identifiers")) is not None:
+            agent_data["identifiers"] = IdentifierList._from_json_(identifiers, context)
+
+        # homepage / openid / uri: accept string or dict
+        if (homepage := data.get("homepage")) is not None:
+            agent_data["homepage"] = URI.from_url_(homepage) if isinstance(homepage, str) else URI._from_json_(homepage, context)
+
+        if (openid := data.get("openid")) is not None:
+            agent_data["openid"] = URI.from_url_(openid) if isinstance(openid, str) else URI._from_json_(openid, context)
+
+        if (uri := data.get("uri")) is not None:
+            if isinstance(uri, str):
+                agent_data["uri"] = URI.from_url_(uri)
+            else: raise ValueError()
+
+        # person can be a full Person object or a Resource/URI reference
+        if (person := data.get("person")) is not None:
+            if isinstance(person, dict):
+                agent_data["person"] = Resource._from_json_(person, context)
+            else:
+                raise ValueError()
+
+        # attribution (GEDCOM5/7 compatibility): try Attribution if shape matches; otherwise store as-is
+        if (attr := data.get("attribution")) is not None:
+            """
+            ======================================================================
+            GEDCOM Module Type Imports
+            ======================================================================
+            """
+            from .attribution import Attribution
+            #======================================================================
+            if isinstance(attr, dict) and any(k in attr for k in ("contributor", "created", "modified")):
+                agent_data["attribution"] = Attribution._from_json_(attr, context)
+            else:
+                raise ValueError()
+
+        # ── Lists ───────────────────────────────────────────────────────────────
+        if (names := data.get("names")) is not None:
+            agent_data["names"] = [TextValue._from_json_(n, context) if isinstance(n, (dict,)) else TextValue(n) for n in names]
+
+        if (accounts := data.get("accounts")) is not None:
+            agent_data["accounts"] = [OnlineAccount._from_json_(a, context) for a in accounts]
+
+        if (emails := data.get("emails")) is not None:
+            agent_data["emails"] = [URI.from_url_(e) if isinstance(e, str) else URI._from_json_(e, context) for e in emails]
+
+        if (phones := data.get("phones")) is not None:
+            agent_data["phones"] = [URI.from_url_(p) if isinstance(p, str) else URI._from_json_(p, context) for p in phones]
+
+        if (addresses := data.get("addresses")) is not None:
+            agent_data["addresses"] = [Address._from_json_(a, context) for a in addresses]
+
+        return cls(**agent_data)
     
     def __str__(self):
         """