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

{gedcom_x-0.5.8.dist-info → gedcom_x-0.5.9.dist-info}/METADATA

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

gedcom_x-0.5.9.dist-info/RECORD

@@ -0,0 +1,56 @@
+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/Extensions/rs10/rsLink.py

@@ -1,19 +1,35 @@
-'''
-The "Link" Data Type
-The Link data type defines a representation of an available transition from one application state to another. 
-The base definition of a link is provided by RFC 5988.
-
-Instances of Link can be reasonably expected as extension elements to any GEDCOM X data type,
-except data types that are defined by the GEDCOM X Conceptual Model to explicitly restrict extension properties.
-'''
-
-'''
-8/25/25, 0.5.5, built serialization, type checking in init for href
-'''
-
-from typing import List, Optional
-from ...uri import URI
+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():
@@ -47,7 +63,7 @@ class rsLink():
     """
     identifier = "http://gedcomx.org/v1/Link"
 
-    def __init__(self,rel: Optional[URI] = None,
+    def __init__(self,
                  href:  Optional[URI] = None,
                  template: Optional[str] = None,
                  type: Optional[str] = None,
@@ -56,7 +72,7 @@ class rsLink():
                  hreflang: Optional[str] = None,
                  title: Optional[str] = None) -> None:
         
-        self.rel = rel
+      
         self.href = href if isinstance(href,URI) else URI.from_url(href) if isinstance(href,str) else None
         self.template = template
         self.type = type
@@ -65,52 +81,86 @@ class rsLink():
         self.hreflang = hreflang
         self.title = title
     
-        if self.href is None and self.template is None:
+        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__    
+            
     
-    @property
-    def _as_dict_(self):
-        from ...serialization import Serialization
-        type_as_dict = {
-            "rel": self.rel._as_dict_ if self.rel else None,
-            "href": self.href._as_dict_ if self.href else None,
-            "template": self.template,   # RFC 6570 template if used
-            "type": self.type,           # media type (note: shadows built-in 'type')
-            "accept": self.accept,
-            "allow": self.allow,
-            "hreflang": self.hreflang,
-            "title": self.title,
-        }
-        return Serialization.serialize_dict(type_as_dict)
     
-    @property
-    def json(self):
-        import json
-        return json.dumps(self._as_dict_)
-
-class _rsLinkList():
-    def __init__(self) -> None:
-        self.links = {}
-
-    def add(self,link: rsLink):
-        if link and isinstance(link,rsLink):
-            if link.rel in self.links.keys():
-                self.links[link.rel].append(link.href)
-            else:
-                self.links[link.rel] = [link.href]
-        
-
     @classmethod
-    def _from_json_(cls,data: dict):
+    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
         
-        link_list = _rsLinkList()
-        for rel in data.keys():
-            link_list.add(rsLink(rel,data[rel]))
-        return link_list
-    
-    @property
-    def _as_dict_(self) -> dict:
-        return self.links
+        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

gedcomx/__init__.py

@@ -43,7 +43,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
 
 

gedcomx/address.py

@@ -1,7 +1,33 @@
-from typing import Optional
-import json
+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
@@ -113,19 +139,79 @@ class Address:
     
     @property
     def _as_dict_(self):
-        from .serialization import Serialization
-        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
-
-        return Serialization.serialize_dict(type_as_dict)
+        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)
 
 

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):
         """

gedcomx/attribution.py

@@ -12,6 +12,8 @@ from typing import Optional, Dict, Any
  Created: 2025-08-25
  Updated:
    - 2025-08-31: fixed _as_dict_ to deal with Resources and ignore empty fields
+   - 2025-09-03: _from_json_ refactor
+
    
 ======================================================================
 """
@@ -21,9 +23,16 @@ from typing import Optional, Dict, Any
 GEDCOM Module Types
 ======================================================================
 """
-
 from .agent import Agent
 from .resource import Resource
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
 #=====================================================================
 
 
@@ -56,36 +65,51 @@ class Attribution:
         self.created = created
         
     @property
-    def _as_dict_(self) -> Dict[str, Any]:
+    def _as_dict_(self) -> Dict[str, Any] | None:
         """
         Serialize Attribution to a JSON-ready dict, skipping None values.
         """
-        from Serialization import Serialization
-        type_as_dict: Dict[str, Any] = {}
-        if self.contributor:
-            type_as_dict['contributor'] = Resource(target=self.contributor)._as_dict_  
-        if self.modified:     
-            type_as_dict['modified'] = self.modified if self.modified else None
-        if self.changeMessage:
-            type_as_dict['changeMessage'] = self.changeMessage if self.changeMessage else None 
-        if self.creator:
-            type_as_dict['creator'] = Resource(target=self.creator)._as_dict_   
-        if self.created:      
-            type_as_dict['created'] = self.created if self.created else None
+        with hub.use(serial_log):
+            log.debug(f"Serializing 'Attribution'")
+            type_as_dict: Dict[str, Any] = {}
+            if self.contributor:
+                type_as_dict['contributor'] = Resource(target=self.contributor)._as_dict_  
+            if self.modified:     
+                type_as_dict['modified'] = self.modified if self.modified else None
+            if self.changeMessage:
+                type_as_dict['changeMessage'] = self.changeMessage if self.changeMessage else None 
+            if self.creator:
+                type_as_dict['creator'] = Resource(target=self.creator)._as_dict_   
+            if self.created:      
+                type_as_dict['created'] = self.created if self.created else None
                     
-        return Serialization.serialize_dict(type_as_dict)
+            log.debug(f"'Attribution' serialized with fields: {type_as_dict.keys()}") 
+            if type_as_dict == {}: log.warning("serializing and empty 'Attribution'")
+        return type_as_dict if type_as_dict != {} else None
 
     @classmethod
-    def _from_json_(cls, data: Dict[str, Any]) -> 'Attribution':
-        """
-        Construct Attribution from a dict (as parsed from JSON).
-        Handles 'created' and 'modified' as ISO strings or epoch ms ints.
-        """
-        # contributor
-        
-        """
-        Create a Person instance from a JSON-dict (already parsed).
-        """
-        from .serialization import Serialization
-        
-        return Serialization.deserialize(data, Attribution)
+    def _from_json_(cls, data: Dict[str, Any],context) -> 'Attribution':
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict or str, got {type(data)}")
+
+        attribution_data: Dict[str, Any] = {}
+
+        # contributor: Agent | Resource | URI string
+        if (contrib := data.get("contributor")) is not None:
+            attribution_data["contributor"] = Resource._from_json_(contrib, context)
+
+        # creator: Agent | Resource | URI string
+        if (creator := data.get("creator")) is not None:
+            attribution_data["creator"] = Resource._from_json_(creator, context)
+
+        # changeMessage: str
+        if (cm := data.get("changeMessage")) is not None:
+            attribution_data["changeMessage"] = cm
+
+        # created/modified: datetime
+        if (created := data.get("created")) is not None:
+            attribution_data["created"] = created
+        if (modified := data.get("modified")) is not None:
+            attribution_data["modified"] = modified
+
+        return cls(**attribution_data)