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

gedcomx/translation.py

@@ -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

@@ -2,6 +2,36 @@ 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"
 
@@ -19,8 +49,129 @@ def _encode_query(q: QueryLike) -> str:
     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:
+class _URI:
     scheme: str = field(default=_DEFAULT_SCHEME)
     authority: str = field(default="")
     path: str = field(default="")
@@ -79,9 +230,10 @@ class URI:
 
     # Accepts {'resource': '...'} or a plain string
     @classmethod
-    def from_jsonish(cls, data: str | Mapping[str, object]) -> URI:
+    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_url(data)
+            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:

gedcom_x-0.5.8.dist-info/RECORD

@@ -1,56 +0,0 @@
-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=bQs2gL9GfLTFJbDppCIhxn8HTwuJUBo1PUjeEqQuHFE,1723
-gedcomx/address.py,sha256=zwvsA6N6edR3FJ31kraGfv250e70TAsi2AB-grZTkF8,4865
-gedcomx/agent.py,sha256=voUM3pxxr3DTTwZUCZgkqONAux2FsoIIJAErlEofbZ4,9321
-gedcomx/attribution.py,sha256=cGvRyzofLSORzgtv7dFWAh8EKwWfd_I7oxpKeyqNBU0,3381
-gedcomx/conclusion.py,sha256=yU0eul3rj6VBb5lFAPTAY9138x15yYQVjO6dN2gcdKo,9187
-gedcomx/converter.py,sha256=yP3xw1vo0uVaM74_fyE51UQA0lq2eBzfcnasLyo-DfU,51508
-gedcomx/coverage.py,sha256=E6Oa9O3ahbE81zTLgX2QQ-VbnLdzjWvqeRpY_KO2v_s,1837
-gedcomx/date.py,sha256=rkvpVtziwvzsbGip8OkyeJXsi1spc4S6uWpRcNSSxCo,2344
-gedcomx/document.py,sha256=iS3eANznPx8TxBytPa3CtwHS4QuPs80skQNdL-Rwis4,3519
-gedcomx/event.py,sha256=YJhaWp42RCQdELIYzjZVrZKdb5E9qjs-MfUrujZLIbU,13324
-gedcomx/evidence_reference.py,sha256=9Wo2iF8G8BIni5EvuqFj78KKbIBbSs1ZJQJ0pGiUoM4,348
-gedcomx/exceptions.py,sha256=0OdPM3euhBMgX8o61ZwPuKeN8zPuSuuDcSBFflVGFqk,587
-gedcomx/extensible_enum.py,sha256=DftCZLMBNul3C9hwh-rf0GE3SVdvylvyd5mt7bX_l6o,6535
-gedcomx/fact.py,sha256=vYS4yweXGN6gX02sQXZbIiye_SLO3f3mRoCvKmgQ5po,24871
-gedcomx/gedcom.py,sha256=l_BuLBynQacDtpLjhs2Afrabfiqt2Opoo_5_7myI7Z4,1709
-gedcomx/gedcom5x.py,sha256=V4kLW-TJobJbaVRYPJVApMUYI2pPbEBHWetXQ-mwzbM,23138
-gedcomx/gedcomx.py,sha256=dIbPas65wWcj3BeCqqRauE6WK2iGgjSj7olekF5H0pU,19019
-gedcomx/gender.py,sha256=3om8xY-mjAx1lGUs9XZwNR5x-Dmqxvsh9NDcw8vy2K0,2698
-gedcomx/group.py,sha256=8yuQuZb6XE56A3J57pqISPIsZwfY0zWyvQcBn0-3zLs,2531
-gedcomx/identifier.py,sha256=_o821Y1dIkcC9knb4GeSD691o9Nj-A_bS2MHHNft--0,8492
-gedcomx/logging_hub.py,sha256=f4z1r6WL3TdL1kg1eaCfCk7XEn9epCH5zUCXd1OT4mc,7793
-gedcomx/mutations.py,sha256=3TSNZggB6kNsys7XLojgzwiHPNGnmz-XBK2Fnuqg6KA,7224
-gedcomx/name.py,sha256=1DffrckDP0_A05bHDxV9KgMhGlXPIP5SNgtZQEA84Nw,18643
-gedcomx/note.py,sha256=URgLdSmrSCSA9hx4eZzAUPDSWph0pMoUyRQp9qafGss,2547
-gedcomx/online_account.py,sha256=zZliLAmrtQnPJH0z-UgfqBdKDhq8Y3eBbViKsJnRrkg,291
-gedcomx/person.py,sha256=71zig0D708qGQmLhHZct9xAnp9uVdQ4E0sd7WFVwO5Y,8103
-gedcomx/place_description.py,sha256=rXYQnYcyZemJtZnkMxqd8-4AXm8Ez_e09PvBQG_9ucc,5563
-gedcomx/place_reference.py,sha256=sEo_8PIEeuO0VzBCYhORhxvN4opuGk4RweOlPTjTqVY,2112
-gedcomx/qualifier.py,sha256=nM02EW8uEpZXUhejX9YTZk1sD0Why-_27RgUdJrZWkM,1778
-gedcomx/relationship.py,sha256=D2qsgUZ-s3HJWI8IlSahissFVyfa6-YhSb6P0QIReVk,4265
-gedcomx/resource.py,sha256=c1nID0mzDMNyq8vQWZmISLlGm765Ku_m6BJmPA9yanI,2674
-gedcomx/serialization.py,sha256=RvrIQkAJJNmIk6qHomEbikkuudk9ei9Tc_C17xr-GJs,34015
-gedcomx/source_citation.py,sha256=aW-lEb7bT9QU49GiBjJppFMBvtisR6fhVVuXjr5y4vQ,742
-gedcomx/source_description.py,sha256=9rrFVgFXIPF-M2suRQmJy_-e3uOak2kE_Bc3ZAtwTTs,14973
-gedcomx/source_reference.py,sha256=fvAvhi046d82gQ53v64moq9o11VulHQbZ1FPErjHDjw,5190
-gedcomx/subject.py,sha256=AQkC2fZOdEIXjIfoKIh7bI3heqkupeCo5j6pFAdrbms,3084
-gedcomx/textvalue.py,sha256=6B0wMxL0nigFNzhXZDhbTONvFGbnM2t2NcDZiZuu4Zw,1112
-gedcomx/translation.py,sha256=nCs6jAXHBg9qCePcCnY0S2uw-c8GfEn7IJhHHmDVe6s,61398
-gedcomx/uri.py,sha256=0k6NySntsZoyAeEkTthNM-fcd49_3hPDanaKXLaYYzA,4558
-gedcomx/Extensions/__init__.py,sha256=MQzi_whzlxiLiknUNh10hG8OVrNqJE38l6n-AwCssx8,24
-gedcomx/Extensions/rs10/__init__.py,sha256=nSHoZiD8hsCAyE-KyRTuWSLqSJSFh12kSz7hqilAMps,26
-gedcomx/Extensions/rs10/rsLink.py,sha256=yZhd-XIqERhBD4w1-VsIFJ7IeR09W0JYK8fAbkIR0zs,4353
-gedcomx/gedcom7/Exceptions.py,sha256=xeKr4x8b7r8pOqJ9yMpsCVTyxPeOlREDGgKoM5rX4U0,149
-gedcomx/gedcom7/Gedcom7.py,sha256=i_g9W0qsZQYLMoD2sBCA13ibKRYFnSf4uj9-ix_tE4Q,5614
-gedcomx/gedcom7/GedcomStructure.py,sha256=ZKNoEcXc41KdrCLPx-A8ohOU9VYmXAkFc4xuZExsBPw,3435
-gedcomx/gedcom7/Specification.py,sha256=qIBe9wzL1GB0l0NyetS1ncbhz5C44b9nMyjAxHuqMt8,9245
-gedcomx/gedcom7/__init__.py,sha256=8ELFZJ_j8RbRDKG9i6Sqb8s_CSxU9iM3bMN_0779rgI,679
-gedcomx/gedcom7/g7interop.py,sha256=hSzwqeok2n7xziEvN2QiJY7bVCWrOnZIZWXubnkrv7w,9945
-gedcomx/gedcom7/logger.py,sha256=QM1SySyh91UEhs90d2DMhH-s9qGF8XS8I8gr1eOcmfw,617
-gedcom_x-0.5.8.dist-info/METADATA,sha256=E7gYz4fVbIoNVtFf9Mce6i5f4Nxj1mtKrpBNJnDqrps,4332
-gedcom_x-0.5.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gedcom_x-0.5.8.dist-info/top_level.txt,sha256=smVBF4nxSU-mzCd6idtRYTbYjPICMMi8pTqewEmqF8Y,8
-gedcom_x-0.5.8.dist-info/RECORD,,