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

gedcomx/place_reference.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Optional, TYPE_CHECKING
+from typing import Optional, Union, TYPE_CHECKING
 if TYPE_CHECKING:
     from .place_description import PlaceDescription
 
@@ -14,6 +14,7 @@ if TYPE_CHECKING:
  Updated:
    - 2025-08-31: _as_dict_ to only create entries in dict for fields that hold data
    - 2025-09-03: _from_json refactored
+   - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -24,6 +25,7 @@ GEDCOM Module Types
 ======================================================================
 """
 from .resource import Resource
+from .schemas import schema_class
 from .logging_hub import hub, logging
 from .uri import URI
 """
@@ -35,6 +37,7 @@ log = logging.getLogger("gedcomx")
 serial_log = "gedcomx.serialization"
 #=====================================================================
 
+@schema_class()
 class PlaceReference:
     """defines a reference to a PlaceDescription.
 
@@ -50,7 +53,7 @@ class PlaceReference:
     
     def __init__(self,
                  original: Optional[str] = None,
-                 description: Optional["URI | PlaceDescription"] = None) -> None:
+                 description: Optional[Union[URI, PlaceDescription]] = None) -> None:
         self.original = original
         self.description = description # descriptionRef
 

gedcomx/qualifier.py

@@ -16,6 +16,7 @@ from typing import Optional
 ======================================================================
 """
 from .logging_hub import hub, logging
+from .schemas import schema_class
 """
 ======================================================================
 Logging
@@ -25,6 +26,7 @@ log = logging.getLogger("gedcomx")
 serial_log = "gedcomx.serialization"
 #=====================================================================
 
+@schema_class()
 class Qualifier:
     """defines the data structure used to supply additional details, annotations,
     tags, or other qualifying data to a specific data element.

gedcomx/relationship.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Any, Dict, Optional, List
+from typing import Any, Dict, Optional, List, Union
 """
 ======================================================================
  Project: Gedcom-X
@@ -11,6 +11,7 @@ from typing import Any, Dict, Optional, List
  Updated:
    - 2025-09-31: filename PEP8 standard
    - 2025-09-03: _from_json_ refactor
+   - 2025-09-09: added schema_class
    
 ======================================================================
 """
@@ -29,6 +30,7 @@ from .identifier import Identifier, make_uid
 from .note import Note
 from .person import Person
 from .resource import Resource
+from .schemas import schema_class
 from .source_reference import SourceReference
 from .subject import Subject
 from .logging_hub import hub, logging
@@ -53,7 +55,8 @@ class RelationshipType(Enum):
             RelationshipType.ParentChild: "A relationship from a parent to a child."
         }
         return descriptions.get(self, "No description available.")
-    
+
+@schema_class(toplevel=True)    
 class Relationship(Subject):
     """Represents a relationship between two Person(s)
 
@@ -69,8 +72,8 @@ class Relationship(Subject):
     version = 'http://gedcomx.org/conceptual-model/v1'
 
     def __init__(self,
-             person1: Optional[Person | Resource] = None,
-             person2: Optional[Person | Resource] = None,
+             person1: Optional[Union[Resource,Person]] = None,
+             person2: Optional[Union[Resource,Person]] = None,
              facts: Optional[List[Fact]] = None,  
              id: Optional[str] = None,
              lang: Optional[str] = None,
@@ -90,7 +93,7 @@ class Relationship(Subject):
         # Call superclass initializer if required
         super().__init__(id, lang, sources, analysis, notes, confidence, attribution, extracted, evidence, media, identifiers,links=links)
         
-        self.id = id if id else make_uid()
+        #self.id = id if id else make_uid()
         self.type = type
         self.person1 = person1
         self.person2 = person2

gedcomx/resource.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Union
 
 """
 ======================================================================
@@ -23,6 +23,7 @@ GEDCOM Module Types
 
 from .uri import URI
 from .logging_hub import hub, logging
+from .schemas import schema_class, SCHEMA
 """
 ======================================================================
 Logging
@@ -31,7 +32,9 @@ Logging
 log = logging.getLogger("gedcomx")
 serial_log = "gedcomx.serialization"
 #=====================================================================
-    
+
+
+@schema_class()    
 class Resource:
     """
     Class used to track and resolve URIs and references between datastores.
@@ -45,7 +48,7 @@ class Resource:
         If `id` is not a valid UUID.
     """
     # TODO, Deal with a resouce being passed, as it may be unresolved.
-    def __init__(self,resource: URI | None = None,resourceId: str | None = None, target: object = None) -> None:
+    def __init__(self,resource: Union[URI, None] = None,resourceId: str | None = None, target: object = None) -> None:
         
         #if (resource is None) and (target is None): #TODO
         #    raise ValueError('Resource object must point to something.')
@@ -64,18 +67,29 @@ class Resource:
                 self.resource = target.resource
                 self.resourceId = target.resourceId
                 self.target = target.target
+            elif isinstance(target,URI):
+                if hub.logEnabled: log.debug(f"Making a 'Resource' from '{type(target).__name__}': {target.value} ")
+                assert False
             else:
-                log.debug(f"Target of type: {type(target)}, {target}")
+                if hub.logEnabled: log.debug(f"Target of type: {type(target)}")
                 if hasattr(target,'uri'):
                     self.resource = target.uri
                 else:
                     self.resourceId = URI(fragment=target.id)
-                self.resourceId = target.id
+                    self.resourceId = target.id
+            if hub.logEnabled: log.debug(f"Resource '{self.value} ")
    
     @property
     def uri(self):
         return self.resource
     
+    @property
+    def value(self):
+        res_dict = {}
+        if self.resource: res_dict['resource'] = self.resource
+        if self.resourceId: res_dict['resourceId'] = self.resourceId
+        return res_dict if res_dict != {} else None
+    
     @property
     def _as_dict_(self):
         from .serialization import Serialization
@@ -108,5 +122,5 @@ class Resource:
     def __str__(self) -> str:
         return f"resource={self.resource}{f', resourceId={self.resourceId}' if self.resourceId else ''}"
     
-
+#SCHEMA.set_resource_class(Resource)