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

gedcomx/textvalue.py

@@ -0,0 +1,89 @@
+from typing import Any, Optional, Dict
+
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    textvalue.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-03 _from_json_ refactor
+   - 2025-09-04 added _str_ and _repr_ dunders
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+#=====================================================================
+
+class TextValue:
+    identifier = 'http://gedcomx.org/v1/TextValue'
+    version = 'http://gedcomx.org/conceptual-model/v1'
+
+    def __init__(self, value: Optional[str] = None, lang: Optional[str] = None) -> None:
+        self.lang = lang
+        self.value = value
+    
+    def _append_to_value(self, value_to_append):
+        if not isinstance(value_to_append, str):
+            raise ValueError(f"Cannot append object of type {type(value_to_append)}.")
+        if self.value is None: self.value = value_to_append
+        else: self.value += ' ' + value_to_append
+    
+    @property
+    def _as_dict_(self):
+        from .serialization import Serialization
+        return Serialization.serialize(self)
+        type_as_dict = {}
+        if self.lang is not None: type_as_dict['lang'] = self.lang
+        if self.value is not None: type_as_dict['value'] = self.value
+        return type_as_dict if type_as_dict != {} else None
+    
+    def __str__(self):
+        return f"{self.value} ({self.lang})"
+    
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other,TextValue):
+            if self.value.strip() == other.value.strip():
+                return True
+        return False
+    
+    # ...existing code...
+
+    @classmethod
+    def _from_json_(cls, data: Any, context: Any = None) -> "TextValue":
+        """
+        Create a TextValue from JSON.
+        - Accepts a dict like {"value": "...", "lang": "en"} or a plain string shorthand.
+        - Defaults lang to "en" if not provided.
+        """
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict or str, got {type(data)}")
+
+        text_value_data: Dict[str, Any] = {}       
+            
+        if (v := data.get("value")) is None:
+            text_value_data["value"] = v
+        if (l := data.get("lang")) is None:
+            text_value_data["lang"] = l
+
+        return cls(**text_value_data)
+    
+    def __repr__(self) -> str:
+        # Debug-friendly: unambiguous constructor-style representation
+        cls = self.__class__.__name__
+        return f"{cls}(value={self.value!r}, lang={self.lang!r})"

gedcomx/{Translation.py → translation.py}

@@ -1,5 +1,5 @@
 from . import *
-from .Mutations import GedcomXEventOrFact
+from .mutations import GedcomXEventOrFact
 import re
 '''
 {'type': 'Object | Objects | Propertyof',
@@ -334,7 +334,7 @@ class Translater():
         print(f"Translated {len(self.gedcomx.agents)} 'REPO' records to Agents")
         for source in self.gedcom.sources:
             self.parse_record(source)
-        print(f"Translated {len(self.gedcomx.source_descriptions)} 'SOUR' records to SourceDescription")
+        print(f"Translated {len(self.gedcomx.sourceDescriptions)} 'SOUR' records to SourceDescription")
 
         for object in self.gedcom.objects:
             self.parse_record(object)
@@ -1089,8 +1089,8 @@ class Translater():
             if record.xref and record.xref.strip() == '':
                 import_log.warning(f"SOUR points to nothing: {record.describe()}")
                 return False
-            if self.gedcomx.source_descriptions.byId(record.xref):
-                gxobject = SourceReference(descriptionId=record.xref, description=self.gedcomx.source_descriptions.byId(record.xref))
+            if self.gedcomx.sourceDescriptions.byId(record.xref):
+                gxobject = SourceReference(descriptionId=record.xref, description=self.gedcomx.sourceDescriptions.byId(record.xref))
             else:
                 import_log.warning(f'Could not find source with id: {record.xref}')
                 source_description = SourceDescription(id=record.xref)

gedcomx/uri.py

@@ -0,0 +1,273 @@
+from __future__ import annotations
+from dataclasses import dataclass, field
+from typing import Mapping, Sequence, Tuple, Union, Iterable
+from urllib.parse import urlsplit, urlunsplit, urlencode, parse_qsl, SplitResult
+from urllib.parse import urlunparse
+
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    uri.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-03: _from_json_ refactor 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+#=====================================================================
+
+_DEFAULT_SCHEME = "gedcomx"
+
+# ---------- typing helpers for urlencode (Option A) ----------
+QuerySeq = Sequence[Tuple[str, str]]
+QueryMap = Mapping[str, str]
+QueryLike = Union[str, QueryMap, QuerySeq]
+
+def _encode_query(q: QueryLike) -> str:
+    """Return a properly encoded query string."""
+    if isinstance(q, str):
+        return q
+    if isinstance(q, Mapping):
+        return urlencode(q, doseq=True)          # mapping is fine
+    return urlencode(list(q), doseq=True)        # coerce iterable to a sequence
+
+
+class URI():
+    def __init__(self,
+                 
+                 target=None,
+                 scheme: str | None = None,
+                 authority: str | None = None,
+                 path: str | None = None,
+                 params: str | None = None,
+                 query: str | None = None,
+                 fragment: str | None = None,
+                 value: str | None = None
+                 ) -> None:
+        
+        self.target = target
+
+        self.scheme = scheme 
+        self.authority = authority
+        self.path = path
+        self.params = params
+        self.query = query
+        self.fragment = fragment     
+        
+        self._value = value
+
+        if self._value:
+            s = urlsplit(self._value)
+            self.scheme = s.scheme or _DEFAULT_SCHEME
+            self.authority=s.netloc
+            self.path=s.path
+            self.query=s.query
+            self.fragment=s.fragment
+
+        if self.target is not None:
+            #log.debug(f"Creating URI from Target {target}, most likely for serialization")
+            if hasattr(self.target,'id'):
+                log.debug(f"'{target}.id' found {target.id}, using as fragment")
+                self.fragment = self.target.id
+            if hasattr(self.target,'uri'):
+                #log.debug(f"'{target}.uri' found, copying")
+                self._value = target.uri._value
+                self.scheme = target.uri.scheme
+                self.authority = target.uri.authority 
+                self.path = target.uri.path 
+                self.query = target.uri.query
+                self.fragment = target.uri.fragment
+            elif isinstance(target,URI):
+                #log.debug(f"'{target} is a URI, copying")
+                self._value = target._value
+                self.scheme = target.scheme
+                self.authority = target.authority 
+                self.path = target.path 
+                self.query = target.query
+                self.fragment = target.fragment
+            
+            
+            
+            elif isinstance(self.target,str):
+                #log.warning(f"Creating a URI from target type {type(target)} with data: {target}.")
+                s = urlsplit(self.target)
+                self.scheme = s.scheme or _DEFAULT_SCHEME
+                self.authority=s.netloc
+                self.path=s.path
+                self.query=s.query
+                self.fragment=s.fragment
+            else:
+                #log.warning(f"Unable to create URI from target type {type(target)} with data: {target}.")
+                self._value = target
+        #log.info(f"self.scheme = {self.scheme} self.authority={self.authority} self.path={self.path} self.query={self.query}  self.fragment={self.fragment}")
+
+        parts = [
+        self.scheme or "",
+        self.authority or "",
+        self.path or "",
+        self.params or "",
+        self.query or "",
+        self.fragment or "",
+        ]
+        if not any(parts):
+            raise ValueError()   
+
+    @property
+    def value(self) -> str:
+        parts = [
+        self.scheme or "",
+        self.authority or "",
+        self.path or "",
+        self.params or "",
+        self.query or "",
+        self.fragment or "",
+        ]
+        if not any(parts):
+            return None
+        return str(urlunparse(parts))
+
+    def split(self) -> SplitResult:
+        return SplitResult(self.scheme, self.authority, self.path, self.query, self.fragment)
+
+    def __str__(self) -> str:
+        return urlunsplit(self.split())
+    
+    def __repr__(self) -> str:
+        return (f"scheme = {self.scheme}, authority={self.authority}, path={self.path}, query={self.query}, fragment={self.fragment}")
+    
+    @property
+    def _as_dict_(self):
+        return self.value or self._value    
+    
+    @property
+    def uri(self):
+        return self
+    
+    @classmethod
+    def from_url(cls,url):
+        return cls(target=url)
+    
+    @classmethod
+    def _from_json_(cls,data,context=None):
+        return cls(value=data)
+    
+
+    
+@dataclass(slots=True)
+class _URI:
+    scheme: str = field(default=_DEFAULT_SCHEME)
+    authority: str = field(default="")
+    path: str = field(default="")
+    query: str = field(default="")
+    fragment: str = field(default="")
+
+    # ---------- constructors ----------
+    @classmethod
+    def from_url(cls, url: str, *, default_scheme: str = _DEFAULT_SCHEME) -> URI:
+        s = urlsplit(url)
+        scheme = s.scheme or default_scheme
+        return cls(scheme=scheme, authority=s.netloc, path=s.path, query=s.query, fragment=s.fragment)
+
+    @classmethod
+    def parse(cls, value: str) -> URI:
+        return cls.from_url(value)
+
+    @classmethod
+    def from_parts(
+        cls,
+        *,
+        scheme: str | None = None,
+        authority: str = "",
+        path: str = "",
+        query: QueryLike = "",
+        fragment: str = "",
+    ) -> URI:
+        q = _encode_query(query)
+        return cls(scheme=scheme or _DEFAULT_SCHEME, authority=authority, path=path, query=q, fragment=fragment)
+
+    # ---------- views ----------
+    @property
+    def uri(self) -> str:
+        return str(self)
+    
+    @property
+    def value(self) -> str:
+        return str(self)
+
+    def split(self) -> SplitResult:
+        return SplitResult(self.scheme, self.authority, self.path, self.query, self.fragment)
+
+    def __str__(self) -> str:
+        return urlunsplit(self.split())
+
+    @property
+    def _as_dict_(self) -> dict[str, object]:
+        return {
+            "scheme": self.scheme,
+            "authority": self.authority,
+            "path": self.path,
+            "query": self.query,
+            "fragment": self.fragment,
+            "value": str(self),
+        }
+
+    # Accepts {'resource': '...'} or a plain string
+    @classmethod
+    def _from_json_(cls, data: str | Mapping[str, object],context=None) -> URI:
+        return cls.from_parts(fragment="NOT IMPLIMENTED")
+        if isinstance(data, str):
+            return cls.from_parts(fragment="NOT IMPLIMENTED")
+        if isinstance(data, Mapping):
+            raw = data.get("resource") or data.get("value") or ""
+            if isinstance(raw, str) and raw:
+                return cls.from_url(raw)
+        raise ValueError(f"Cannot build URI from: {data!r}")
+
+    # ---------- functional updaters ----------
+    def with_scheme(self, scheme: str) -> URI: return self.replace(scheme=scheme)
+    def with_authority(self, authority: str) -> URI: return self.replace(authority=authority)
+    def with_path(self, path: str, *, join: bool = False) -> URI:
+        new_path = (self.path.rstrip("/") + "/" + path.lstrip("/")) if join else path
+        return self.replace(path=new_path)
+    def with_fragment(self, fragment: str | None) -> URI:
+        return self.replace(fragment=(fragment or ""))
+    def without_fragment(self) -> URI: return self.replace(fragment="")
+    def with_query(self, query: QueryLike) -> URI:
+        return self.replace(query=_encode_query(query))
+    def add_query_params(self, params: Mapping[str, Union[str, Iterable[str]]]) -> URI:
+        existing = parse_qsl(self.query, keep_blank_values=True)
+        for k, v in params.items():
+            if isinstance(v, str):
+                existing.append((k, v))
+            else:
+                for vv in v:
+                    existing.append((k, vv))
+        return self.replace(query=urlencode(existing, doseq=True))
+
+    # ---------- helpers ----------
+    def replace(self, **kwargs) -> URI:
+        cls = type(self)
+        return cls(
+            scheme=kwargs.get("scheme", self.scheme or _DEFAULT_SCHEME),
+            authority=kwargs.get("authority", self.authority),
+            path=kwargs.get("path", self.path),
+            query=kwargs.get("query", self.query),
+            fragment=kwargs.get("fragment", self.fragment),
+        )

gedcom_x-0.5.7.dist-info/RECORD

@@ -1,49 +0,0 @@
-gedcomx/Address.py,sha256=HPh-YZEkcxhzGGUxDWrrmAvKsyL__RthMJl6vXcMA80,4865
-gedcomx/Agent.py,sha256=u7zIr6SNYREDhceOkj09uS6zjl3RXbix5QlQB7mxjz4,8844
-gedcomx/Attribution.py,sha256=JESWw3U_momYDkQ6vknvaAW9DdIWwRRdQJwdD0UPAEI,3381
-gedcomx/Conclusion.py,sha256=9VWEu6lphB0Y8L3YH3t2QcXt5xW5NdnSKXpa9eujU30,8781
-gedcomx/Converter.py,sha256=aM8i8qIhzc9pJ3k75hFQSBkeRax2brucTefPYxENQHI,50968
-gedcomx/Coverage.py,sha256=VR_lQDUgJ9rI-hHzOA8GxS_I1C_Du_3SvG57dzulXNI,1361
-gedcomx/Date.py,sha256=I11mm2YEqUenxt-skphCHO-GWKPQrpMomOL_Utapzy0,2344
-gedcomx/Document.py,sha256=DjL3HwpyCF9cOCdvpvrLu4Mxp7ZIYT1AkQEJGB3TSjY,2967
-gedcomx/Event.py,sha256=j34nM5pZcmfSthdI87be6cGKGemHJky5xVaajmeSVK4,13321
-gedcomx/EvidenceReference.py,sha256=WXZpmcKzwb3lYQmGVf-TY2IsbNG3fIInPY1khRjtOSg,348
-gedcomx/Exceptions.py,sha256=0OdPM3euhBMgX8o61ZwPuKeN8zPuSuuDcSBFflVGFqk,587
-gedcomx/ExtensibleEnum.py,sha256=DftCZLMBNul3C9hwh-rf0GE3SVdvylvyd5mt7bX_l6o,6535
-gedcomx/Fact.py,sha256=r1Ct96moCIXCAd24Ho2aLCI12PGH2AoKIyjACtJT7go,24458
-gedcomx/Gedcom.py,sha256=l_BuLBynQacDtpLjhs2Afrabfiqt2Opoo_5_7myI7Z4,1709
-gedcomx/Gedcom5x.py,sha256=lbIEvK3h2b-IJoO9Fgmq_qc3nItzB_qTonqLafxYfXk,23137
-gedcomx/GedcomX.py,sha256=p0PeJqS4bKXGsXY487JOdGNK4vIwARX7YeTDIqPeNNw,19000
-gedcomx/Gender.py,sha256=vBkYJqhf1mN58Wrw9MvhbVJDNw1pM4-ktFW6mYja_Rw,2285
-gedcomx/Group.py,sha256=VNI_cI_-YnJ9cHzwMmHD8qwDNMe89kEocPuQ67rwStA,1606
-gedcomx/Identifier.py,sha256=1uhNO4Ll-_xLyVM-IYdywz7wTEwHEH44xx4JQId9F9c,8491
-gedcomx/Logging.py,sha256=vBDOjawVXc4tCge1laYjy6_2Ves-fnGzG0m6NnLZejE,624
-gedcomx/LoggingHub.py,sha256=f4z1r6WL3TdL1kg1eaCfCk7XEn9epCH5zUCXd1OT4mc,7793
-gedcomx/Mutations.py,sha256=wtmoaiVS9Vw7Dzpfq34VQETBAVFvQnIlD5rbtSTopfs,6314
-gedcomx/Name.py,sha256=esVS1nqvo5F5ggKQhnW4DYvww_hjXQF91oayLGG4LuU,18661
-gedcomx/Note.py,sha256=hCwLDJYEQ-kR1-3rknHTx_nLq6ytBzi23sQukD8HHlg,2547
-gedcomx/OnlineAccount.py,sha256=P24o98IXo_8XQoICYZPgALjdzS0q8t2l4DU3Od9KxyI,291
-gedcomx/Person.py,sha256=tygyfHWqhbrH3z7TKPAyjJK14M7qu04mCGgXMgi7J_g,8057
-gedcomx/PlaceDescription.py,sha256=oUih1T8jsUVcxdevPGuFpQOc34t4HoYc9ldr87ZH0IA,5591
-gedcomx/PlaceReference.py,sha256=20HmaQUAlPrTjsra38j22NBsNqDBnvHZ5NuP6YzlizA,2111
-gedcomx/Qualifier.py,sha256=iivgraoayJTYZUlkbSAKPzQ7msPYpBvTlmsEsXxz3zw,1778
-gedcomx/Relationship.py,sha256=Et_72kRohBmWpWra2fS_-ha0YvEDZTZqkoD8HrerQW0,3693
-gedcomx/Resource.py,sha256=HIOoKlVZtEp13j7sn4xkqRwRrYadqpiXswKpdJRe2Ns,2674
-gedcomx/Serialization.py,sha256=ZIECHrG-PRZuS2SHGtfv1eg_2Rt-PHPbz4ivF7eH4p8,34041
-gedcomx/SourceCitation.py,sha256=aW-lEb7bT9QU49GiBjJppFMBvtisR6fhVVuXjr5y4vQ,742
-gedcomx/SourceDescription.py,sha256=yUBJXsn64OL0MAWSc3QPWrLt8RKYa1omGGp0FOLo-n8,14929
-gedcomx/SourceReference.py,sha256=d5kNxqalCFlbRWD2kSJAMCexOrH_s1oXu9y_RUmCGa0,5189
-gedcomx/Subject.py,sha256=2xPZiNjZDYSwLkloUPKDRa7F8_ql5zYMFJLS_9ayUtk,2609
-gedcomx/TextValue.py,sha256=6B0wMxL0nigFNzhXZDhbTONvFGbnM2t2NcDZiZuu4Zw,1112
-gedcomx/TopLevelTypeCollection.py,sha256=nvTO6GwFwEZk9jX4fVqhy75ygsshomNb20tnlExKqyY,1495
-gedcomx/Translation.py,sha256=TZZTfuzjsx2glnUJwPrs0TrrShvLjygYUQ6cxhZXnMc,61398
-gedcomx/URI.py,sha256=AuIECTwHUkp-2z0Q9iuA3Me1PiawFKZKCR4sAA64FE8,4270
-gedcomx/Zip.py,sha256=lBxcv-Vip45884EHj56wZJJ5I36Q38UuHUidDxQBoS8,14
-gedcomx/__init__.py,sha256=DfKVj46fhYtpM45NZnK333iDpt2WQ1XJXWsLcVCARNo,1704
-gedcomx/Extensions/__init__.py,sha256=MQzi_whzlxiLiknUNh10hG8OVrNqJE38l6n-AwCssx8,24
-gedcomx/Extensions/rs10/__init__.py,sha256=nSHoZiD8hsCAyE-KyRTuWSLqSJSFh12kSz7hqilAMps,26
-gedcomx/Extensions/rs10/rsLink.py,sha256=uVmdTJl_atheO-pRpP3a5uUrazudf4R_tZvWSZIQdNk,4353
-gedcom_x-0.5.7.dist-info/METADATA,sha256=bLAwaXozcWmQ0blAY2igIeEa3Lh-gQjX7NiPHuGESNs,4332
-gedcom_x-0.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gedcom_x-0.5.7.dist-info/top_level.txt,sha256=smVBF4nxSU-mzCd6idtRYTbYjPICMMi8pTqewEmqF8Y,8
-gedcom_x-0.5.7.dist-info/RECORD,,

gedcomx/Address.py

@@ -1,131 +0,0 @@
-from typing import Optional
-import json
-
-
-
-class Address:
-    """A GedcomX Address Data Type
-    A GedcomX Address Data Type.
-
-    Represents a postal address according to the GedcomX conceptual model.
-
-    Args:
-        value (str, optional): A complete address as a single string.
-        city (str, optional): Name of the city or town.
-        country (str, optional): Name of the country.
-        postalCode (str, optional): Postal or ZIP code.
-        stateOrProvince (str, optional): Name of the state, province, or region.
-        street (str, optional): First street address line.
-        street2 (str, optional): Second street address line.
-        street3 (str, optional): Third street address line.
-        street4 (str, optional): Fourth street address line.
-        street5 (str, optional): Fifth street address line.
-        street6 (str, optional): Sixth street address line.
-    """
-
-    identifier = "http://gedcomx.org/v1/Address"
-    version = 'http://gedcomx.org/conceptual-model/v1'
-
-    def __init__(self, value: Optional[str] = None,
-                 city: Optional[str] = None,
-                 country: Optional[str] = None,
-                 postalCode: Optional[str] = None,
-                 stateOrProvince: Optional[str] = None,
-                 street: Optional[str] = None,
-                 street2: Optional[str] = None,
-                 street3: Optional[str] = None,
-                 street4: Optional[str] = None,
-                 street5: Optional[str] = None,
-                 street6: Optional[str] = None):
-        
-        self._value = value #TODO impliment a parser for date strings.
-        self.city = city
-        self.country = country
-        self.postalCode = postalCode
-        self.stateOrProvince = stateOrProvince
-        self.street = street
-        self.street2 = street2
-        self.street3 = street3
-        self.street4 = street4
-        self.street5 = street5
-        self.street6 = street6
-
-    @property
-    def value(self) -> str: 
-        return ', '.join(filter(None, [
-            self.street, self.street2, self.street3,
-            self.street4, self.street5, self.street6,
-            self.city, self.stateOrProvince,
-            self.postalCode, self.country
-        ]))
-    
-    @value.setter
-    def value(self,value: str):
-        self._value = value
-        return
-        raise NotImplementedError("Parsing of a full address is not implimented.")
-    
-    def _append(self,value):
-        if self._value:
-            self._value = self._value + ' ' + value
-        else:
-            self._value = value
-             
-    def __eq__(self, other):
-        if not isinstance(other, self.__class__):
-            return False
-        
-        return (
-            self.value == other.value and
-            self.city == other.city and
-            self.country == other.country and
-            self.postalCode == other.postalCode and
-            self.stateOrProvince == other.stateOrProvince and
-            self.street == other.street and
-            self.street2 == other.street2 and
-            self.street3 == other.street3 and
-            self.street4 == other.street4 and
-            self.street5 == other.street5 and
-            self.street6 == other.street6
-        )
-    
-    def __str__(self) -> str:
-        # Combine non-empty address components into a formatted string
-        parts = [
-            self._value,
-            self.street,
-            self.street2,
-            self.street3,
-            self.street4,
-            self.street5,
-            self.street6,
-            self.city,
-            self.stateOrProvince,
-            self.postalCode,
-            self.country
-        ]
-
-        # Filter out any parts that are None or empty strings
-        filtered_parts = [str(part) for part in parts if part]
-
-        # Join the remaining parts with a comma and space
-        return ', '.join(filtered_parts)
-    
-    @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)
-
-

gedcomx/Attribution.py

@@ -1,91 +0,0 @@
-
-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
-   
-======================================================================
-"""
-
-"""
-======================================================================
-GEDCOM Module Types
-======================================================================
-"""
-
-from .Agent import Agent
-from .Resource import Resource
-#=====================================================================
-
-
-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]:
-        """
-        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
-                    
-        return Serialization.serialize_dict(type_as_dict)
-
-    @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)