ds-caselaw-marklogic-api-client 44.3.0__tar.gz → 44.4.1__tar.gz

{ds_caselaw_marklogic_api_client-44.3.0 → ds_caselaw_marklogic_api_client-44.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ds-caselaw-marklogic-api-client
-Version: 44.3.0
+Version: 44.4.1
 Summary: An API client for interacting with the underlying data in Find Caselaw.
 Keywords: national archives,caselaw
 Author: The National Archives

{ds_caselaw_marklogic_api_client-44.3.0 → ds_caselaw_marklogic_api_client-44.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ds-caselaw-marklogic-api-client"
-version = "44.3.0"
+version = "44.4.1"
 description = "An API client for interacting with the underlying data in Find Caselaw."
 authors = ["The National Archives"]
 homepage = "https://github.com/nationalarchives/ds-caselaw-custom-api-client"
@@ -33,14 +33,14 @@ defusedxml = "^0.7.1"
 pydantic = "^2.12.3"
 
 [tool.poetry.group.dev.dependencies]
-coverage = "7.13.0"
+coverage = "7.13.1"
 pytest = "9.0.2"
 pytest-cov = "7.0.0"
 beautifulsoup4 = "4.14.3"
 responses = "0.25.8"
 python-dotenv = "1.2.1"
-time-machine = "3.1.0"
-moto = {version = "5.1.18", extras = ["all"]}
+time-machine = "3.2.0"
+moto = {version = "5.1.19", extras = ["all"]}
 
 [tool.poetry.group.docs]
 optional = true

{ds_caselaw_marklogic_api_client-44.3.0 → ds_caselaw_marklogic_api_client-44.4.1}/src/caselawclient/models/documents/body.py

@@ -11,14 +11,10 @@ from saxonche import PySaxonProcessor
 
 from caselawclient.models.utilities.dates import parse_string_date_as_utc
 from caselawclient.types import DocumentCategory
+from caselawclient.xml_helpers import DEFAULT_NAMESPACES
 
 from .xml import XML
 
-DEFAULT_NAMESPACES = {
-    "uk": "https://caselaw.nationalarchives.gov.uk/akn",
-    "akn": "http://docs.oasis-open.org/legaldocml/ns/akn/3.0",
-}
-
 
 class UnparsableDate(Warning):
     pass
@@ -176,10 +172,11 @@ class DocumentBody:
     @cached_property
     def has_content(self) -> bool:
         """If we do not have a word document, the XML will not contain
-        the contents of the judgment, but will contain a preamble (a header if a judgment or a preface if a press summary)"""
+        the contents of the judgment, but will have content in the header if a judgment.
+        All press summaries (which have <doc> not <judgment> tags) are assumed to have content"""
         return bool(
             self._xml.xml_as_tree.xpath("//akn:header[normalize-space(string(.))]", namespaces=DEFAULT_NAMESPACES)
-            or self._xml.xml_as_tree.xpath("//akn:preface[normalize-space(string(.))]", namespaces=DEFAULT_NAMESPACES)
+            or self._xml.xml_as_tree.xpath("//akn:doc", namespaces=DEFAULT_NAMESPACES)
         )
 
     @cached_property

{ds_caselaw_marklogic_api_client-44.3.0 → ds_caselaw_marklogic_api_client-44.4.1}/src/caselawclient/models/documents/stub.py

@@ -8,7 +8,7 @@ from typing_extensions import TypedDict
 
 
 class PartyData(TypedDict):
-    role: Literal["Claimant", "Defendant"]
+    role: Literal["Claimant", "Respondent", "Appellant", "Defendant"]
     name: str
 
 

{ds_caselaw_marklogic_api_client-44.3.0 → ds_caselaw_marklogic_api_client-44.4.1}/src/caselawclient/models/documents/transforms/html.xsl

@@ -734,7 +734,7 @@
 </xsl:template>
 
 <xsl:template match="img">
-	<img>
+	<img loading="lazy">
 		<xsl:apply-templates select="@*" />
 		<xsl:apply-templates />
 	</img>

ds_caselaw_marklogic_api_client-44.4.1/src/caselawclient/xquery/check_content_hash_unique_by_uri.xqy

@@ -0,0 +1,18 @@
+xquery version "1.0-ml";
+declare namespace akn = "http://docs.oasis-open.org/legaldocml/ns/akn/3.0";
+declare namespace uk = "https://caselaw.nationalarchives.gov.uk/akn";
+declare variable $uri as xs:string external;
+
+let $doc := doc($uri)
+let $hash := $doc//uk:hash/text()
+let $count :=
+  if (not($hash)) then 1
+  else
+    count(cts:uris(
+      (), (),
+      cts:and-query((
+        cts:element-value-query(xs:QName("uk:hash"), $hash),
+        cts:collection-query("http://marklogic.com/collections/dls/latest-version")
+      ))
+    ))
+return ($count = 1)

{ds_caselaw_marklogic_api_client-44.3.0 → ds_caselaw_marklogic_api_client-44.4.1}/src/caselawclient/xquery/set_metadata_jurisdiction.xqy

@@ -34,4 +34,4 @@ cts:search(doc($uri),
 cts:element-query(xs:QName('uk:jurisdiction'),cts:and-query(()))))) then
     if ($content = "") then local:delete($uri) else local:edit($uri, $content)
 else
-    local:add($uri, $content)
+    if ($content != "") then local:add($uri, $content) else ()

ds_caselaw_marklogic_api_client-44.3.0/src/caselawclient/xquery/check_content_hash_unique_by_uri.xqy

@@ -1,15 +0,0 @@
-xquery version "1.0-ml";
-declare namespace akn = "http://docs.oasis-open.org/legaldocml/ns/akn/3.0";
-declare namespace uk = "https://caselaw.nationalarchives.gov.uk/akn";
-declare variable $uri as xs:string external;
-
-let $doc := doc($uri)
-let $hash := $doc//uk:hash/text()
-let $count := count(cts:uris(
-  (), (),
-  cts:and-query((
-    cts:element-value-query(xs:QName("uk:hash"), $hash),
-    cts:collection-query("http://marklogic.com/collections/dls/latest-version")
-  ))
-))
-return $count = 1