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

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)

gedcomx/conclusion.py

@@ -1,8 +1,8 @@
-import base64
-import uuid
+
 import warnings
 
-from typing import List, Optional
+from typing import Any, Optional, List
+
 """
 ======================================================================
  Project: Gedcom-X
@@ -12,7 +12,7 @@ from typing import List, Optional
 
  Created: 2025-08-25
  Updated:
-   - 
+   - 2025-09-03: _from_json_ refactor 
    
 ======================================================================
 """
@@ -23,11 +23,21 @@ GEDCOM Module Type Imports
 ======================================================================
 """
 from .attribution import Attribution
-from .Extensions.rs10.rsLink import _rsLinkList, rsLink
+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"
+#=====================================================================
 
 
 
@@ -103,7 +113,7 @@ class ConfidenceLevel(Qualifier):
         return descriptions.get(key, "No description available.")
 
     
-class Conclusion:
+class Conclusion():
     """
     Represents a conclusion in the GEDCOM X conceptual model. A conclusion is a 
     genealogical assertion about a person, relationship, or event, derived from 
@@ -131,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,
@@ -152,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
@@ -164,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:
@@ -177,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:
@@ -205,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