ds-caselaw-marklogic-api-client 36.0.2__tar.gz → 37.0.0__tar.gz

{ds_caselaw_marklogic_api_client-36.0.2 → ds_caselaw_marklogic_api_client-37.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ds-caselaw-marklogic-api-client
-Version: 36.0.2
+Version: 37.0.0
 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

{ds_caselaw_marklogic_api_client-36.0.2 → ds_caselaw_marklogic_api_client-37.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ds-caselaw-marklogic-api-client"
-version = "36.0.2"
+version = "37.0.0"
 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"

{ds_caselaw_marklogic_api_client-36.0.2 → ds_caselaw_marklogic_api_client-37.0.0}/src/caselawclient/models/documents/__init__.py

@@ -1,4 +1,5 @@
 import datetime
+import os
 import warnings
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Optional
@@ -529,3 +530,7 @@ class Document:
             Document(resolution.document_uri.as_document_uri(), api_client=self.api_client)
             for resolution in resolutions
         ]
+
+    def content_as_html(self) -> str | None:
+        xlst_image_location = os.getenv("XSLT_IMAGE_LOCATION", "")
+        return self.body.content_html(f"{xlst_image_location}/{self.uri}")

{ds_caselaw_marklogic_api_client-36.0.2 → ds_caselaw_marklogic_api_client-37.0.0}/src/caselawclient/models/documents/body.py

@@ -137,8 +137,11 @@ class DocumentBody:
         return False
 
     @cache
-    def content_as_html(self, image_base_url: Optional[str] = None) -> Optional[str]:
+    def content_html(self, image_prefix: str) -> Optional[str]:
         """Convert the XML representation of the Document into HTML for rendering."""
+        """This used to be called content_as_html but we have changed the parameter passed to it from the
+        domain of the assets to the path in which the assets are stored (from assets to assets/d-a1b2c3)
+        and made the image_prefix mandatory"""
         if not self.has_content:
             return None
 
@@ -150,8 +153,8 @@ class DocumentBody:
 
             executable = xslt_processor.compile_stylesheet(stylesheet_file=html_xslt_location)
 
-            if image_base_url:
-                executable.set_parameter("image-base", proc.make_string_value(image_base_url))
+            if image_prefix:
+                executable.set_parameter("image-prefix", proc.make_string_value(image_prefix))
 
             return str(executable.transform_to_string(xdm_node=document))
 

{ds_caselaw_marklogic_api_client-36.0.2 → ds_caselaw_marklogic_api_client-37.0.0}/src/caselawclient/models/documents/transforms/html.xsl

@@ -13,7 +13,7 @@
 <xsl:strip-space elements="*" />
 <xsl:preserve-space elements="p block num heading span a courtType date docDate docTitle docketNumber judge lawyer location neutralCitation party role time" />
 
-<xsl:param name="image-base" as="xs:string" select="'https://assets.caselaw.nationalarchives.gov.uk/'" />
+<xsl:param name="image-prefix" as="xs:string" />
 
 <xsl:function name="uk:link-is-supported" as="xs:boolean">
 	<xsl:param name="href" as="attribute()?" />
@@ -741,7 +741,7 @@
 </xsl:template>
 <xsl:template match="img/@src">
 	<xsl:attribute name="src">
-		<xsl:sequence select="concat($image-base, $doc-id, '/', .)" />
+		<xsl:sequence select="concat($image-prefix, '/', .)" />
 	</xsl:attribute>
 </xsl:template>