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

{gedcom_x-0.5.7.dist-info → gedcom_x-0.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gedcom-x
-Version: 0.5.7
+Version: 0.5.9
 Summary: Python implimentation of gedcom-x standard
 Author-email: "David J. Cartwright" <davidcartwright@hotmail.com>
 License: MIT

gedcom_x-0.5.9.dist-info/RECORD

@@ -0,0 +1,56 @@
+gedcomx/Logging.py,sha256=vBDOjawVXc4tCge1laYjy6_2Ves-fnGzG0m6NnLZejE,624
+gedcomx/TopLevelTypeCollection.py,sha256=p99i-O5LXiXe3GlC6jWuz4nH1TAcKxOLbe0VRxWbSFY,1495
+gedcomx/Zip.py,sha256=lBxcv-Vip45884EHj56wZJJ5I36Q38UuHUidDxQBoS8,14
+gedcomx/__init__.py,sha256=8qEa_oYCC1nMyeMt0zNmsqXnocfA2q6VNUlp0cCnMLI,1723
+gedcomx/address.py,sha256=7tGUPRItlSiUZ6-WaDNj4sbjvU8W_f2kw-I8s_nntTU,8049
+gedcomx/agent.py,sha256=HxDRB8axhReUmTDtn0XFNemG6znjJQezi-qxO2JRfCg,12803
+gedcomx/attribution.py,sha256=S648H7it_780WLA0c4dkBSrjeXIMz_YVMk1eJ6wZk6Q,4586
+gedcomx/conclusion.py,sha256=BpLFZY0p02yGa3H9Fis2eZz8NYBi7YsiLbaX6N7ZICM,11167
+gedcomx/converter.py,sha256=_VzdkjS52AVXrtKUAzgI6VGDaw7Wysa76B1Vt1XnNEs,57637
+gedcomx/coverage.py,sha256=XmBiTGxuH9WoeXumrgu03EMWtccHe982hFJu2Coxceo,2206
+gedcomx/date.py,sha256=xiAatY25DXTW8usmhbyx_6rmEae3FJnmR5FriGkCN80,3560
+gedcomx/document.py,sha256=quaa1N1XcqhMdpTwCzpvnZfRgygK1mRhFPWyX09ZrWw,4555
+gedcomx/event.py,sha256=7Iogi3eVmR4_-qg6seIo7orAmVS1ENvUQcJO3_tZGlc,15417
+gedcomx/evidence_reference.py,sha256=vtP0rYpehfuu4Jugf1V9u5V_wgPu-2EPb7mqPLS_9cI,696
+gedcomx/exceptions.py,sha256=0OdPM3euhBMgX8o61ZwPuKeN8zPuSuuDcSBFflVGFqk,587
+gedcomx/extensible_enum.py,sha256=DftCZLMBNul3C9hwh-rf0GE3SVdvylvyd5mt7bX_l6o,6535
+gedcomx/fact.py,sha256=bEAUKvLpn7ZAJjyOE57dcvOnvkdzZ63GqF3yb2nGhX0,24972
+gedcomx/gedcom.py,sha256=A8GQ670E6_knfP37kOGHdVl_cC9RXQoc4Dk6D_qlnuQ,2059
+gedcomx/gedcom5x.py,sha256=ajjLeTlncrSgw3JSBRo8Ip9aZik2NHnUt1iDhjc9-mE,23645
+gedcomx/gedcomx.py,sha256=PunMwjHIE4fp7O7sjuNrI8p44_4Y3pI43FQSCh7pyqE,19329
+gedcomx/gender.py,sha256=d2AEvTSa28sfQ1910X-Ysfi7MNDRMQ35EA7jcBYsLck,3178
+gedcomx/group.py,sha256=I4vdBBsdMdqAMigkzGg4mRxrCAjvsJJ-bIa_aR6CDhA,2879
+gedcomx/identifier.py,sha256=hCLfBuHVTVwa2VGD_2NFsiftFkqS3-7W8XMnyjmPZbM,9603
+gedcomx/logging_hub.py,sha256=DbYGwMdVD_nEj0xpVzHjsMVTi_WjttLLRexiebezfzM,8307
+gedcomx/mutations.py,sha256=ugQgfQh0o9r8FIB_dz5s6KqPyIDMHn2YSP7DvAHsDv0,7236
+gedcomx/name.py,sha256=5UpNgFPBfTfzC5yLQDqmeSJ-Fg1T6Nio9vEa6f5kA2Y,19501
+gedcomx/note.py,sha256=joDgKrDS9pbOEEve9LGopP2Gz48kFKqMeHYR72Z7bA0,3813
+gedcomx/online_account.py,sha256=EYMW-CepfwppaJu5RiPQOK63YKxnjE8bVOPUNQqbrMM,639
+gedcomx/person.py,sha256=QALVxY2NlZ93BU0QR9Q4Ykm4kZ-7j4j4QTVXo4hpO60,8993
+gedcomx/place_description.py,sha256=vFCVW37tKBosYCGttkXppR7yDXA-L8YVLpixSN-8b4E,7564
+gedcomx/place_reference.py,sha256=XE-tyRsvfXVK--vdiA_Pvj0ZrUecl72JldbV-c-k_PU,2939
+gedcomx/qualifier.py,sha256=Lg5D_CRLKxaUHcCGLzXhKmpMkmdOeQso0V-XN3yH2n4,2352
+gedcomx/relationship.py,sha256=_wA1NujEqQO0HzSfjlfLcl-yCFWBcOsRyxs3klr0HfE,5852
+gedcomx/resource.py,sha256=ShK3sQOaNI4ZlrIUcepL7_uLd_QX4zMx-A1SU2In_m4,3608
+gedcomx/serialization.py,sha256=Pg_tDO5wUXDgyMqVGPwAlm2WdBBNUA0L-TBaRSWhaNo,30308
+gedcomx/source_citation.py,sha256=QSh1zHK9DsgjQu6oHPDTCReLVs2HP8YDR-NlLAG-pek,1237
+gedcomx/source_description.py,sha256=A2R1T26HYqpk8Q4W8BYp7zlvHYqycHkUMX94uQRpwV8,19258
+gedcomx/source_reference.py,sha256=iakI-vLMXbSMuZLDU2c4J5s-XDanOCUJvV2Mz8uRP_8,6895
+gedcomx/subject.py,sha256=dgStcWiI3a3VX2QEgUIQNbo8HELD2sFUhYT-VI46ND8,5117
+gedcomx/textvalue.py,sha256=Y-SDRpHR2gGpWIyaOvTYrM5EbfOUeX7Tnh_7iOITAbk,3135
+gedcomx/translation.py,sha256=4REL68WaWqcC5f3XcBCZ1dn0gtaZftQJTCkvl1Sf-NA,61395
+gedcomx/uri.py,sha256=ceCcbbrx99QekivhQ_xfMvkmaUKiW_IF21WKTOFBtJg,9693
+gedcomx/Extensions/__init__.py,sha256=MQzi_whzlxiLiknUNh10hG8OVrNqJE38l6n-AwCssx8,24
+gedcomx/Extensions/rs10/__init__.py,sha256=nSHoZiD8hsCAyE-KyRTuWSLqSJSFh12kSz7hqilAMps,26
+gedcomx/Extensions/rs10/rsLink.py,sha256=IdmcG1pVicxX91ZMu9fUPwKYoXCl0Q60inGwiThDAVE,6004
+gedcomx/gedcom7/Exceptions.py,sha256=xeKr4x8b7r8pOqJ9yMpsCVTyxPeOlREDGgKoM5rX4U0,149
+gedcomx/gedcom7/GedcomStructure.py,sha256=ZKNoEcXc41KdrCLPx-A8ohOU9VYmXAkFc4xuZExsBPw,3435
+gedcomx/gedcom7/Specification.py,sha256=qIBe9wzL1GB0l0NyetS1ncbhz5C44b9nMyjAxHuqMt8,9245
+gedcomx/gedcom7/__init__.py,sha256=tPHWW9kchPFEZ5sfURWPPzK8ZBimsQn7SRDULAW1Yc4,679
+gedcomx/gedcom7/g7interop.py,sha256=hSzwqeok2n7xziEvN2QiJY7bVCWrOnZIZWXubnkrv7w,9945
+gedcomx/gedcom7/gedcom7.py,sha256=i_g9W0qsZQYLMoD2sBCA13ibKRYFnSf4uj9-ix_tE4Q,5614
+gedcomx/gedcom7/logger.py,sha256=QM1SySyh91UEhs90d2DMhH-s9qGF8XS8I8gr1eOcmfw,617
+gedcom_x-0.5.9.dist-info/METADATA,sha256=Wn8DcPMkZvmTZRrnNlo4GzUlwRYGSRbKJABN7oVYTaw,4332
+gedcom_x-0.5.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gedcom_x-0.5.9.dist-info/top_level.txt,sha256=smVBF4nxSU-mzCd6idtRYTbYjPICMMi8pTqewEmqF8Y,8
+gedcom_x-0.5.9.dist-info/RECORD,,

gedcomx/Extensions/rs10/rsLink.py

@@ -1,19 +1,35 @@
-'''
-The "Link" Data Type
-The Link data type defines a representation of an available transition from one application state to another. 
-The base definition of a link is provided by RFC 5988.
-
-Instances of Link can be reasonably expected as extension elements to any GEDCOM X data type,
-except data types that are defined by the GEDCOM X Conceptual Model to explicitly restrict extension properties.
-'''
-
-'''
-8/25/25, 0.5.5, built serialization, type checking in init for href
-'''
-
-from typing import List, Optional
-from ...URI import URI
-from ...Exceptions import GedcomClassAttributeError
+from typing import Any, Dict, Iterable, Iterator, List, Optional, Tuple, Union
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    rsLink.py
+ Author:  David J. Cartwright
+ Purpose: Link type of GedcomX RS (Extension)
+
+ Created: 2025-08-25
+ Updated:
+   - 
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from ...exceptions import GedcomClassAttributeError
+from ...logging_hub import hub, logging
+from ...uri import URI
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+deserial_log = "gedcomx.deserialization"
+#=====================================================================
 
 
 class rsLink():
@@ -47,7 +63,7 @@ class rsLink():
     """
     identifier = "http://gedcomx.org/v1/Link"
 
-    def __init__(self,rel: Optional[URI] = None,
+    def __init__(self,
                  href:  Optional[URI] = None,
                  template: Optional[str] = None,
                  type: Optional[str] = None,
@@ -56,7 +72,7 @@ class rsLink():
                  hreflang: Optional[str] = None,
                  title: Optional[str] = None) -> None:
         
-        self.rel = rel
+      
         self.href = href if isinstance(href,URI) else URI.from_url(href) if isinstance(href,str) else None
         self.template = template
         self.type = type
@@ -65,52 +81,86 @@ class rsLink():
         self.hreflang = hreflang
         self.title = title
     
-        if self.href is None and self.template is None:
+        if self.href is None: # and self.template is None:
             raise GedcomClassAttributeError("href or template are required")
+        
+    def __str__(self) -> str:
+        def to_text(v):
+            if v is None:
+                return None
+            # unwrap URI-like objects
+            if isinstance(v, URI):
+                return getattr(v, "value", None) or str(v)
+            # normalize strings (skip empty/whitespace-only)
+            if isinstance(v, str):
+                s = v.strip()
+                return s or None
+            return str(v)
+
+        parts = []
+
+        # show href as the primary bit if present
+        href_s = to_text(self.href)
+        if href_s:
+            parts.append(href_s)
+
+        # show other fields as key=value
+        for name in ("template", "type", "accept", "allow", "hreflang", "title"):
+            val = to_text(getattr(self, name, None))
+            if val:
+                parts.append(f"{name}={val}")
+
+        return " | ".join(parts) if parts else self.__class__.__name__    
+            
     
-    @property
-    def _as_dict_(self):
-        from ...Serialization import Serialization
-        type_as_dict = {
-            "rel": self.rel._as_dict_ if self.rel else None,
-            "href": self.href._as_dict_ if self.href else None,
-            "template": self.template,   # RFC 6570 template if used
-            "type": self.type,           # media type (note: shadows built-in 'type')
-            "accept": self.accept,
-            "allow": self.allow,
-            "hreflang": self.hreflang,
-            "title": self.title,
-        }
-        return Serialization.serialize_dict(type_as_dict)
     
-    @property
-    def json(self):
-        import json
-        return json.dumps(self._as_dict_)
-
-class _rsLinkList():
-    def __init__(self) -> None:
-        self.links = {}
-
-    def add(self,link: rsLink):
-        if link and isinstance(link,rsLink):
-            if link.rel in self.links.keys():
-                self.links[link.rel].append(link.href)
-            else:
-                self.links[link.rel] = [link.href]
-        
-
     @classmethod
-    def _from_json_(cls,data: dict):
+    def _from_json_(cls, data: Any, context: Any = None) -> "rsLink":
+        """
+        Build an rsLink from JSON.
+
+        Accepted shapes:
+          - {"rel": "self", "href": "https://..."}
+          - {"rel": {...}, "href": {...}}  # URI objects as dicts
+          - {"href": "https://...", "type": "...", ...}  # rel optional
+          - {"uri": "https://..."} or {"url": "..."}     # href aliases
+          - "https://example.com"                         # shorthand -> href only
+
+        Note:
+          - `rel` is coerced to a URI if possible.
+          - `href` is coerced to a URI (string/dict supported).
+          - If both `href` and `template` are missing, __init__ will raise.
+        """
+        # Shorthand: bare string is an href
         
-        link_list = _rsLinkList()
-        for rel in data.keys():
-            link_list.add(rsLink(rel,data[rel]))
-        return link_list
-    
-    @property
-    def _as_dict_(self) -> dict:
-        return self.links
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict or str, got {type(data)}")
+
+        print("LINK DATA:",data)
+        # Extract with common aliases
+        rel = data.get("rel")
+        href = data.get("href")
+                    
+
 
+        return cls(
+            rel=rel,
+            href=href,
+            template=data.get("template"),
+            type=data.get("type"),
+            accept=data.get("accept"),
+            allow=data.get("allow"),
+            hreflang=data.get("hreflang"),
+            title=data.get("title"),
+        )
 
-        
+
+class _rsLinks():
+    
+    def __init__(self,
+                 person: rsLink | None = None,
+                 portrait: rsLink | None= None
+                 ) -> None:
+        
+        self.person = person
+        self.portrait = portrait

gedcomx/TopLevelTypeCollection.py

@@ -1,4 +1,4 @@
-from .TextValue import TextValue
+from .textvalue import TextValue
 
 class TopLevelTypeCollection:
     def __init__(self):

gedcomx/__init__.py

@@ -1,49 +1,50 @@
-from .Agent import Agent
-from .Address import Address
-from .Attribution import Attribution
-from .Conclusion import Conclusion
-from .Converter import GedcomConverter
-from .Coverage import Coverage
-from .Date import Date
-from .Document import Document
-from .Document import DocumentType
-from .EvidenceReference import EvidenceReference
-from .ExtensibleEnum import ExtensibleEnum
-from .Event import Event
-from .Event import EventType
-from .Event import EventRole
-from .Fact import Fact
-from .Fact import FactQualifier
-from .Fact import FactType
-from .Gedcom import Gedcom
-from .Gedcom5x import Gedcom5x, Gedcom5xRecord
-from .GedcomX import GedcomX
-from .Gender import Gender, GenderType
-from .Group import Group, GroupRole
-from .Identifier import Identifier, IdentifierType, IdentifierList
+from .agent import Agent
+from .address import Address
+from .attribution import Attribution
+from .conclusion import Conclusion
+from .converter import GedcomConverter
+from .coverage import Coverage
+from .date import Date
+from .document import Document
+from .document import DocumentType
+from .evidence_reference import EvidenceReference
+from .extensible_enum import ExtensibleEnum
+from .event import Event
+from .event import EventType
+from .event import EventRole
+from .fact import Fact
+from .fact import FactQualifier
+from .fact import FactType
+from .gedcom import Gedcom
+from .gedcom5x import Gedcom5x, Gedcom5xRecord
+from .gedcomx import GedcomX
+from .gender import Gender, GenderType
+from .group import Group, GroupRole
+from .identifier import Identifier, IdentifierType, IdentifierList
 from .Logging import get_logger
-from .Name import Name, NameForm, NamePart, NamePartType, NameType, NamePartQualifier
-from .Note import Note
-from .OnlineAccount import OnlineAccount
-from .Person import Person, QuickPerson
-from .PlaceDescription import PlaceDescription
-from .PlaceReference import PlaceReference
-from .Qualifier import Qualifier
-from .Relationship import Relationship, RelationshipType
-from .Serialization import Serialization
-from .SourceCitation import SourceCitation
-from .SourceDescription import SourceDescription
-from .SourceDescription import ResourceType
-from .SourceReference import SourceReference
-from .Subject import Subject
-from .TextValue import TextValue
-from .Resource import Resource
-from .URI import URI
+from .name import Name, NameForm, NamePart, NamePartType, NameType, NamePartQualifier
+from .note import Note
+from .online_account import OnlineAccount
+from .person import Person, QuickPerson
+from .place_description import PlaceDescription
+from .place_reference import PlaceReference
+from .qualifier import Qualifier
+from .relationship import Relationship, RelationshipType
+from .serialization import Serialization
+from .source_citation import SourceCitation
+from .source_description import SourceDescription
+from .source_description import ResourceType
+from .source_reference import SourceReference
+from .subject import Subject
+from .textvalue import TextValue
+from .resource import Resource
+from .uri import URI
+
 
 from .Extensions.rs10.rsLink import rsLink
 
-from .gedcom7 import Gedcom7, GedcomStructure
-from .Translation import g7toXtable
+from .gedcom7.gedcom7 import Gedcom7, GedcomStructure
+from .translation import g7toXtable
 
 
 

gedcomx/address.py

@@ -0,0 +1,217 @@
+from typing import Any, Dict, Optional, List
+
+"""
+======================================================================
+ Project: Gedcom-X
+ File:    address.py
+ Author:  David J. Cartwright
+ Purpose: 
+
+ Created: 2025-08-25
+ Updated:
+   - 2025-09-03: _from_json_ refactoring
+   
+======================================================================
+"""
+
+"""
+======================================================================
+GEDCOM Module Types
+======================================================================
+"""
+from .logging_hub import hub, logging
+"""
+======================================================================
+Logging
+======================================================================
+"""
+log = logging.getLogger("gedcomx")
+serial_log = "gedcomx.serialization"
+#=====================================================================
+
+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):
+        with hub.use(serial_log):
+            log.debug(f"Serializing 'Address' with value: '{self.value}'")
+            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
+            log.debug(f"'Address' serialized with fields: '{type_as_dict.keys()}'") 
+            if type_as_dict == {} or len(type_as_dict.keys()) == 0: log.warning("serializing and empty 'Address' Object")
+
+        return type_as_dict if type_as_dict != {} else None
+        
+    
+    @classmethod
+    def _from_json_(cls, data: Any, context: Any = None) -> "Address":
+        """
+        Build an Address from JSON.
+        Supports:
+          - Shorthand string -> value
+          - Aliases: postal_code/postal -> postalCode; state/province -> stateOrProvince
+          - Line aliases: line1..line6 / address1..address6 / addr1..addr6 -> street..street6
+          - 'lines': [..] list -> street..street6
+        """
+        if data is None: return None
+        
+        if not isinstance(data, dict):
+            raise TypeError(f"{cls.__name__}._from_json_ expected dict or str, got {type(data)}")
+
+        address_data: Dict[str, Any] = {}
+
+        # Freeform value (accept a few aliases)
+        if (v := data.get("value")) is None:
+            address_data["value"] = str(v)
+
+        # Simple scalars
+        if (city := data.get("city")) is not None:
+            address_data["city"] = city
+        if (country := data.get("country")) is not None:
+            address_data["country"] = country
+
+        # Postal code (aliases)
+        if (postal := data.get("postalCode")) is not None:
+            address_data["postalCode"] = postal
+
+        # State / Province (aliases)
+        if (stateprov := data.get("stateOrProvince")) is not None:
+            address_data["stateOrProvince"] = stateprov
+
+        if data.get("street") is not None:
+            address_data["street"] = data["street"]
+
+        if data.get("street2") is not None:
+            address_data["street2"] = data["street2"]
+
+        if data.get("street3") is not None:
+            address_data["street3"] = data["street3"]
+
+        if data.get("street4") is not None:
+            address_data["street4"] = data["street4"]
+
+        if data.get("street5") is not None:
+            address_data["street5"] = data["street5"]
+
+        if data.get("street6") is not None:
+            address_data["street6"] = data["street6"]
+
+
+        return cls(**address_data)
+
+