ds-caselaw-marklogic-api-client 29.1.0__tar.gz → 29.1.1__tar.gz

{ds_caselaw_marklogic_api_client-29.1.0 → ds_caselaw_marklogic_api_client-29.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ds-caselaw-marklogic-api-client
-Version: 29.1.0
+Version: 29.1.1
 Summary: An API client for interacting with the underlying data in Find Caselaw.
 Home-page: https://github.com/nationalarchives/ds-caselaw-custom-api-client
 Keywords: national archives,caselaw
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: boto3 (>=1.26.112,<2.0.0)
 Requires-Dist: certifi (>=2024.12.14,<2024.13.0)
 Requires-Dist: charset-normalizer (>=3.0.0,<4.0.0)
-Requires-Dist: django-environ (>=0.11.0,<0.12.0)
+Requires-Dist: django-environ (>=0.12.0)
 Requires-Dist: ds-caselaw-utils (>=2.0.0,<3.0.0)
 Requires-Dist: idna (>=3.4,<4.0)
 Requires-Dist: lxml (>=5.0.0,<6.0.0)

{ds_caselaw_marklogic_api_client-29.1.0 → ds_caselaw_marklogic_api_client-29.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ds-caselaw-marklogic-api-client"
-version = "29.1.0"
+version = "29.1.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"
@@ -14,7 +14,7 @@ packages = [
 python = "^3.9"
 certifi = ">=2024.12.14,<2024.13.0"
 charset-normalizer = "^3.0.0"
-django-environ = "^0.11.0"
+django-environ = ">=0.12.0"
 idna = "^3.4"
 requests = "^2.28.2"
 requests-toolbelt = ">=0.10.1,<1.1.0"

{ds_caselaw_marklogic_api_client-29.1.0 → ds_caselaw_marklogic_api_client-29.1.1}/src/caselawclient/errors.py

@@ -37,9 +37,7 @@ class MarklogicResourceUnmanagedError(MarklogicAPIError):
 
     status_code = 404
     default_message = (
-        "The resource isn't managed. "
-        "It probably doesn't exist, and if it does, that's a problem. "
-        "Please report it."
+        "The resource isn't managed. It probably doesn't exist, and if it does, that's a problem. Please report it."
     )
 
 

{ds_caselaw_marklogic_api_client-29.1.0 → ds_caselaw_marklogic_api_client-29.1.1}/src/caselawclient/models/documents/body.py

@@ -91,8 +91,7 @@ class DocumentBody:
     ) -> list[datetime.datetime]:
         name_filter = f"[@name='{name}']" if name else ""
         iso_datetimes = self._xml.get_xpath_match_strings(
-            "/akn:akomaNtoso/akn:*/akn:meta/akn:identification/akn:FRBRManifestation"
-            f"/akn:FRBRdate{name_filter}/@date",
+            f"/akn:akomaNtoso/akn:*/akn:meta/akn:identification/akn:FRBRManifestation/akn:FRBRdate{name_filter}/@date",
             {"akn": "http://docs.oasis-open.org/legaldocml/ns/akn/3.0"},
         )
 

{ds_caselaw_marklogic_api_client-29.1.0 → ds_caselaw_marklogic_api_client-29.1.1}/src/caselawclient/models/utilities/aws.py

@@ -95,7 +95,7 @@ def check_docx_exists(uri: str) -> bool:
 
 def generate_docx_key(uri: str) -> str:
     """from a canonical caselaw URI (eat/2022/1) return the S3 key of the associated docx"""
-    return f'{uri}/{uri.replace("/", "_")}.docx'
+    return f"{uri}/{uri.replace('/', '_')}.docx"
 
 
 def generate_docx_url(uri: str) -> str:
@@ -104,7 +104,7 @@ def generate_docx_url(uri: str) -> str:
 
 
 def generate_pdf_url(uri: str) -> str:
-    key = f'{uri}/{uri.replace("/", "_")}.pdf'
+    key = f"{uri}/{uri.replace('/', '_')}.pdf"
 
     return generate_signed_asset_url(key)
 

{ds_caselaw_marklogic_api_client-29.1.0 → ds_caselaw_marklogic_api_client-29.1.1}/src/caselawclient/xquery/get_judgment.xqy

@@ -14,6 +14,7 @@ declare variable $search_query as xs:string? external;
 let $number_marks_xslt := (
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                   xmlns:uk="https://caselaw.nationalarchives.gov.uk/akn"
+                  xmlns:akn="http://docs.oasis-open.org/legaldocml/ns/akn/3.0"
                   version="2.0">
     <xsl:output method="xml" />
     <xsl:template match="@*|node()">
@@ -21,12 +22,15 @@ let $number_marks_xslt := (
         <xsl:apply-templates select="@*|node()"/>
       </xsl:copy>
     </xsl:template>
+    <xsl:template match="//akn:meta//uk:mark">
+          <xsl:apply-templates />
+    </xsl:template>
     <xsl:template match="uk:mark">
       <xsl:copy>
           <xsl:copy-of select="@*" />
           <xsl:attribute name="id">
               <xsl:text>mark_</xsl:text>
-              <xsl:value-of select="count(preceding::uk:mark)"/>
+              <xsl:number count="//uk:mark" level="any" from="//*[ancestor::akn:meta]" />
           </xsl:attribute>
           <xsl:apply-templates />
       </xsl:copy>
@@ -62,5 +66,4 @@ let $transformed := if($search_query) then
     else
       $raw_xml
 
-
 return $transformed