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

gedcomx/{Agent.py → agent.py}

@@ -1,17 +1,41 @@
 import base64
 import uuid
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    agent.py
+ Author:  David J. Cartwright
+ Purpose: 
 
-from .Address import Address
-#from .Attribution import Attribution
-from .Identifier import Identifier, IdentifierList
-
-from .OnlineAccount import OnlineAccount
-from .TextValue import TextValue
-from .Resource import Resource
-from .URI import URI
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-03: _from_json_ refactor
+   
+======================================================================
+"""
 
+"""
+======================================================================
+GEDCOM Module Type Imports
+======================================================================
+"""
+from .address import Address
+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:
@@ -46,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]] = [], 
@@ -71,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
@@ -83,7 +96,7 @@ class Agent:
         self.phones = phones or []
         self.addresses = addresses if addresses else []
         self.person = person
-        self.notes = []
+        self.xnotes = []
         self.attribution = attribution or None
         self.uri = URI(fragment=self.id) if self.id else None
   
@@ -115,7 +128,7 @@ class Agent:
             raise ValueError(f'name must be of type str or TextValue, recived {type(name_to_add)}')
     
     def add_note(self, note_to_add):
-        from .Note import Note
+        from .note import Note
         if note_to_add and isinstance(note_to_add,Note):
             self.xnotes.append(note_to_add)
         else:
@@ -126,7 +139,7 @@ class Agent:
     
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
+        from .serialization import Serialization
         type_as_dict = {}
 
         if self.id:
@@ -147,17 +160,77 @@ class Agent:
             type_as_dict["phones"] = self.phones
         if self.addresses:
             type_as_dict["addresses"] = [address._as_dict_ for address in self.addresses if address]
-        if self.notes:
-            type_as_dict["notes"] = [note._as_dict_() for note in self.notes if note]
+        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).
-        """
-        type_as_dict = Serialization.get_class_fields('Agent')
-        return Serialization.deserialize(data, type_as_dict)
+    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

@@ -0,0 +1,115 @@
+
+from datetime import datetime
+from typing import Optional, Dict, Any
+
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    Attribution.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ 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
+
+   
+======================================================================
+"""
+
+"""
+======================================================================
+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"
+#=====================================================================
+
+
+class Attribution:
+    """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/Attribution'
+    version = 'http://gedcomx.org/conceptual-model/v1'
+
+    def __init__(self,contributor: Optional[Agent | Resource] = None,
+                 modified: Optional[datetime] = None,
+                 changeMessage: Optional[str] = None,
+                 creator: Optional[Agent | Resource] = None,
+                 created: Optional[datetime] = None) -> None:
+               
+        self.contributor = contributor
+        self.modified = modified
+        self.changeMessage = changeMessage
+        self.creator = creator
+        self.created = created
+        
+    @property
+    def _as_dict_(self) -> Dict[str, Any] | None:
+        """
+        Serialize Attribution to a JSON-ready dict, skipping None values.
+        """
+        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
+                    
+            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],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)

gedcomx/{Conclusion.py → conclusion.py}

@@ -1,19 +1,46 @@
-import base64
-import uuid
+
 import warnings
 
-from typing import List, Optional
+from typing import Any, Optional, List
+
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    conclusion.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-03: _from_json_ refactor 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Type Imports
+======================================================================
+"""
+from .attribution import Attribution
+from .Extensions.rs10.rsLink import _rsLinks, rsLink
+from .identifier import make_uid
+from .note import Note
+from .qualifier import Qualifier
+from .resource import Resource, URI
+from .source_reference import SourceReference
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+#=====================================================================
 
-from .Attribution import Attribution
-#from .Document import Document
-from .Note import Note
-from .Qualifier import Qualifier
 
-from .SourceReference import SourceReference
-from .Resource import Resource, URI
-from .Extensions.rs10.rsLink import _rsLinkList, rsLink
 
-from collections.abc import Sized
 
 class ConfidenceLevel(Qualifier):
     High = "http://gedcomx.org/High"
@@ -114,17 +141,7 @@ class Conclusion:
     """
     identifier = 'http://gedcomx.org/v1/Conclusion'
     version = 'http://gedcomx.org/conceptual-model/v1'
-
-    @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,
                  lang: Optional[str] = None,
@@ -135,11 +152,10 @@ class Conclusion:
                  attribution: Optional[Attribution] = None,
                  uri: Optional[Resource] = None,
                  _max_note_count: int = 20,
-                 links: Optional[_rsLinkList] = None) -> None:
+                 links: Optional[_rsLinks] = None) -> None:
         
-        self._id_generator = Conclusion.default_id_generator
-
-        self.id = id if id else None
+        
+        self.id = id if id else make_uid()
         self.lang = lang
         self.sources = sources if sources else []
         self.analysis = analysis
@@ -147,8 +163,7 @@ class Conclusion:
         self.confidence = confidence
         self.attribution = attribution
         self.max_note_count = _max_note_count
-        self.uri = uri if uri else URI(fragment=id if id else self.id)
-        self.links = links if links else _rsLinkList()    #NOTE This is not in specification, following FS format
+        self.links = links if links else _rsLinks()    #NOTE This is not in specification, following FS format
     
     def add_note(self,note_to_add: Note):
         if self.notes and len(self.notes) >= self.max_note_count:
@@ -160,7 +175,7 @@ class Conclusion:
                     return False
             self.notes.append(note_to_add)
 
-    def add_source(self, source_to_add: SourceReference):
+    def add_source_reference(self, source_to_add: SourceReference):
         if source_to_add and isinstance(source_to_add,SourceReference):
             for current_source in self.sources:
                 if source_to_add == current_source:
@@ -188,30 +203,84 @@ class Conclusion:
     
     @property
     def _as_dict_(self):
-        from .Serialization import Serialization
-        type_as_dict = {}
-
-        if self.id:
-            type_as_dict['id'] = self.id
-        if self.lang:
-            type_as_dict['lang'] = self.lang
-        if self.sources:
-            type_as_dict['sources'] = [s._as_dict_ for s in self.sources if s]
-        if self.analysis:
-            type_as_dict['analysis'] = getattr(self.analysis, '_as_dict_', self.analysis)
-        if self.notes:
-            type_as_dict['notes'] = [
-                (n._as_dict_ if hasattr(n, '_as_dict_') else n) for n in self.notes if n
-            ]
-        if self.confidence is not None:
-            type_as_dict['confidence'] = self.confidence
-        if self.attribution:
-            type_as_dict['attribution'] = getattr(self.attribution, '_as_dict_', self.attribution)
-        if self.links:
-            type_as_dict['links'] = self.links._as_dict_
+        with hub.use(serial_log):
+            log.debug(f"Serializing 'Conclusion' with id: {self.id}")
+            type_as_dict = {}
+
+            if self.id:
+                type_as_dict['id'] = self.id
+            if self.lang:
+                type_as_dict['lang'] = self.lang
+            if self.sources and self.sources != []:
+                type_as_dict['sources'] = [s._as_dict_ for s in self.sources if s]
+            if self.analysis:
+                type_as_dict['analysis'] = getattr(self.analysis, '_as_dict_', self.analysis)
+            if self.notes and self.notes != []:
+                type_as_dict['notes'] = [
+                    (n._as_dict_ if hasattr(n, '_as_dict_') else n) for n in self.notes if n
+                ]
+            if self.confidence is not None:
+                type_as_dict['confidence'] = self.confidence
+            if self.attribution is not None:
+                type_as_dict['attribution'] = self.attribution._as_dict_ 
+            if self.links is not None:
+                print(self.links)
+                type_as_dict['links'] = self.links._as_dict_
+            log.debug(f"'Conclusion' serialized with fields: {type_as_dict.keys()}") 
+            if type_as_dict == {}: log.warning("serializing and empty 'Conclusion'")
       
-        return Serialization.serialize_dict(type_as_dict) 
+        return type_as_dict if type_as_dict != {} else None
+        
+    
     
+
+    @classmethod
+    def _dict_from_json_(cls, data: dict, context=None) -> dict:
+        conclusion = {}
+
+        # Scalars
+        if (id_ := data.get("id")) is not None:
+            conclusion["id"] = id_
+
+        if (lang := data.get("lang")) is not None:
+            conclusion["lang"] = lang
+
+        # Lists
+        if (sources := data.get("sources")) is not None:
+            conclusion["sources"] = [
+                SourceReference._from_json_(x, context) for x in sources
+            ]
+
+        if (notes := data.get("notes")) is not None:
+            conclusion["notes"] = [
+                Note._from_json_(x, context) for x in notes
+            ]
+
+        # Objects
+        if (analysis := data.get("analysis")) is not None:
+            # depending on your model, analysis might be a Resource or Document
+            conclusion["analysis"] = Resource._from_json_(analysis, context)
+
+        if (confidence := data.get("confidence")) is not None:
+            conclusion["confidence"] = ConfidenceLevel._from_json_(confidence, context)
+
+        if (attribution := data.get("attribution")) is not None:
+            conclusion["attribution"] = Attribution._from_json_(attribution, context)
+
+        if (uri := data.get("uri")) is not None:
+            conclusion["uri"] = URI(uri)
+
+        if (links := data.get("links")) is not None:
+            conclusion["links"] = _rsLinks._from_json_(links, context)
+            if isinstance(conclusion["links"],dict): assert False
+
+        # Constant / defaults
+        #conclusion["_max_note_count"] = 20
+
+        #return cls(**conclusion)
+        return conclusion
+
+
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
             return False