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

gedcomx/relationship.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import List, Optional
+from typing import Any, Dict, Optional, List
 """
 ======================================================================
  Project: Gedcom-X
@@ -10,6 +10,7 @@ from typing import List, Optional
  Created: 2025-08-25
  Updated:
    - 2025-09-31: filename PEP8 standard
+   - 2025-09-03: _from_json_ refactor
    
 ======================================================================
 """
@@ -22,13 +23,22 @@ GEDCOM Module Types
 from .attribution import Attribution
 from .conclusion import ConfidenceLevel
 from .evidence_reference import EvidenceReference
+from .Extensions.rs10.rsLink import _rsLinks #new
 from .fact import Fact
-from .identifier import Identifier
+from .identifier import Identifier, make_uid
 from .note import Note
 from .person import Person
 from .resource import Resource
 from .source_reference import SourceReference
 from .subject import Subject
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
 #=====================================================================
 
 
@@ -74,18 +84,20 @@ class Relationship(Subject):
              media: Optional[List[SourceReference]] = None,
              identifiers: Optional[List[Identifier]] = None,
              type: Optional[RelationshipType] = None,
+             links: Optional[_rsLinks] = None,
              ) -> None:
     
         # Call superclass initializer if required
-        super().__init__(id, lang, sources, analysis, notes, confidence, attribution, extracted, evidence, media, identifiers)
+        super().__init__(id, lang, sources, analysis, notes, confidence, attribution, extracted, evidence, media, identifiers,links=links)
         
+        self.id = id if id else make_uid()
         self.type = type
         self.person1 = person1
         self.person2 = person2
         self.facts = facts if facts else []
     
     def add_fact(self,fact: Fact):
-        if fact is not None and isinstance(fact,Fact):
+        if (fact is not None) and isinstance(fact,Fact):
             for existing_fact in self.facts:
                 if fact == existing_fact:
                     return
@@ -96,20 +108,49 @@ class Relationship(Subject):
     @property
     def _as_dict_(self):
         from .serialization import Serialization
-        type_as_dict = super()._as_dict_
-        type_as_dict.update({
-            "type": self.type.value if isinstance(self.type, RelationshipType) else self.type,
+        return Serialization.serialize(self)
+        
+        type_as_dict = (super()._as_dict_ or {}).copy()
+
+        extras = {
+            "type": getattr(self.type, "value", None),
             "person1": Resource(target=self.person1)._as_dict_ if self.person1 else None,
-            "person2": Resource(target=self.person1)._as_dict_ if self.person2 else None,
-            "facts": [fact for fact in self.facts] if self.facts else None
-        })
-        return Serialization.serialize_dict(type_as_dict)
+            "person2": Resource(target=self.person2)._as_dict_ if self.person2 else None,
+            "facts": [f._as_dict_ for f in self.facts if f] if getattr(self, "facts", None) else None,
+        }
+
+        # only keep non-empty values
+        type_as_dict.update({k: v for k, v in extras.items() if v not in (None, [], {}, ())})
+
+        return type_as_dict or None
 
     @classmethod
-    def _from_json_(cls, data: dict):
+    def _from_json_(cls, data: Dict[str, Any], context: Any = None) -> "Relationship":
         """
         Create a Person instance from a JSON-dict (already parsed).
         """
-        from .serialization import Serialization
-        return Serialization.deserialize(data, Relationship)
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict, got {type(data)}")
+        
+        relationship_data: Dict[str, Any] = {}
+        relationship_data = Subject._dict_from_json_(data,context)
+
+        if (id_ := data.get("id")) is not None:
+            relationship_data["id"] = id_
+        
+        if (type_ := data.get("type")) is not None:
+            relationship_data["type"] = RelationshipType(type_)
+        
+        # person1 / person2
+        if (p1 := data.get("person1")) is not None:
+            relationship_data["person1"] = Resource._from_json_(p1,context)
+
+        if (p2 := data.get("person2")) is not None:
+            relationship_data["person2"] = Resource._from_json_(p2,context)
+
+        # facts
+        if (facts := data.get("facts")) is not None:
+            relationship_data["facts"] = [Fact._from_json_(f, context) for f in facts]
+        
+        return cls(**relationship_data)
     

gedcomx/resource.py

@@ -10,6 +10,7 @@ from typing import Optional
  Created: 2025-08-25
  Updated:
    - 2025-08-31: working on target=Resource and deserialization issues
+   - 2025-09-03: _from_json_ refactor, arguments changed
    
 ======================================================================
 """
@@ -21,6 +22,15 @@ GEDCOM Module Types
 """
 
 from .uri import URI
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+#=====================================================================
     
 class Resource:
     """
@@ -35,10 +45,14 @@ class Resource:
         If `id` is not a valid UUID.
     """
     # TODO, Deal with a resouce being passed, as it may be unresolved.
-    def __init__(self,uri: Optional[URI|str] = None, id:Optional[str] = None,top_lvl_object: Optional[object] = None,target= None) -> None:
+    def __init__(self,resource: URI | None = None,resourceId: str | None = None, target: object = None) -> None:
         
-        self.resource = URI.from_url(uri.value) if isinstance(uri,URI) else URI.from_url(uri) if isinstance(uri,str) else None
-        self.Id = id
+        #if (resource is None) and (target is None): #TODO
+        #    raise ValueError('Resource object must point to something.')
+
+        self.resource = resource
+        self.resourceId = resourceId
+        self.Id = None
 
         self.type = None
         self.resolved = False
@@ -48,12 +62,15 @@ class Resource:
         if target:
             if isinstance(target,Resource):
                 self.resource = target.resource
-                self.Id = target.Id
+                self.resourceId = target.resourceId
                 self.target = target.target
             else:
-                self.resource = target.uri
-                self.Id = target.id
-                self.type = type(target)
+                log.debug(f"Target of type: {type(target)}, {target}")
+                if hasattr(target,'uri'):
+                    self.resource = target.uri
+                else:
+                    self.resourceId = URI(fragment=target.id)
+                self.resourceId = target.id
    
     @property
     def uri(self):
@@ -62,24 +79,34 @@ class Resource:
     @property
     def _as_dict_(self):
         from .serialization import Serialization
+        return Serialization.serialize(self)
         typ_as_dict = {}
-        if self.resource:
-            typ_as_dict['resource'] = self.resource.value if self.resource else None
-        if self.Id:
-            typ_as_dict['resourceId'] = self.Id
-        return Serialization.serialize_dict(typ_as_dict)
+        if self.resource is not None:
+            typ_as_dict["resource"] = self.resource
+        if self.resourceId is not None:
+            typ_as_dict["resourceId"] = self.resourceId,
+        
+        return typ_as_dict or None
+
+    
     
     @classmethod
-    def _from_json_(cls,data):
-        # TODO This is not used but taken care of in Serialization
-        r = Resource(uri=data.get('resource'),id=data.get('resourceId',None))
-        #return r
+    def _from_json_(cls, data: dict, context=None) -> "Resource":
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict, got {type(data)} {data}")
+        resource = {}
+
+        # Scalars
+        if (res := data.get("resource")) is not None:
+            resource["resource"] = res
+
+        return cls(**resource)
 
     def __repr__(self) -> str:
-        return f"Resource(uri={self.resource}, id={self.Id}, target={self.target})"
+        return f"Resource(resource={self.resource}, resourceId={self.resourceId}, target={self.target})"
     
     def __str__(self) -> str:
-        return f"{self.resource}{f', id={self.Id}' if self.Id else ''}"
+        return f"resource={self.resource}{f', resourceId={self.resourceId}' if self.resourceId else ''}"