ds-caselaw-marklogic-api-client 26.0.0__tar.gz → 27.0.0__tar.gz

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ds-caselaw-marklogic-api-client
-Version: 26.0.0
+Version: 27.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
@@ -14,7 +14,7 @@ Requires-Dist: boto3 (>=1.26.112,<2.0.0)
 Requires-Dist: certifi (>=2024.8.30,<2024.9.0)
 Requires-Dist: charset-normalizer (>=3.0.0,<4.0.0)
 Requires-Dist: django-environ (>=0.11.0,<0.12.0)
-Requires-Dist: ds-caselaw-utils (>=1.4.1,<2.0.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)
 Requires-Dist: memoization (>=0.4.0,<0.5.0)

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ds-caselaw-marklogic-api-client"
-version = "26.0.0"
+version = "27.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"
@@ -20,7 +20,7 @@ requests = "^2.28.2"
 requests-toolbelt = ">=0.10.1,<1.1.0"
 memoization = "^0.4.0"
 lxml = "^5.0.0"
-ds-caselaw-utils = "^1.4.1"
+ds-caselaw-utils = "^2.0.0"
 boto3 = "^1.26.112"
 typing-extensions = "^4.7.1"
 mypy-boto3-s3 = "^1.26.104"
@@ -64,9 +64,9 @@ line-length = 120
 
 [tool.ruff.lint]
 ignore = ["E501", "G004", "PLR2004", "RUF005", "RUF012", "UP040"] # longlines, fstrings in logs, magic values, consider not concat, mutable classbits, type instead of TypeAlias
-extend-select = ["W", "I", "SLF"]
+extend-select = ["W", "I", "SLF", "SIM"]
 # extend-select = [ "B", "Q", "C90", "I", "UP", "YTT", "ASYNC", "S", "BLE", "A", "COM", "C4", "DTZ", "T10", "DJ", "EM", "EXE", "FA",
-#                  "ISC", "ICN", "G", "INP", "PIE", "T20", "PYI", "PT", "Q", "RSE", "RET", "SLOT", "SIM", "TID", "TCH", "INT", "PTH",
+#                  "ISC", "ICN", "G", "INP", "PIE", "T20", "PYI", "PT", "Q", "RSE", "RET", "SLOT", "TID", "TCH", "INT", "PTH",
 #                  "FIX", "PGH", "PL", "TRY", "FLY", "PERF", "RUF"]
 unfixable = ["ERA"]
 

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/Client.py

@@ -12,6 +12,7 @@ from xml.etree.ElementTree import Element, ParseError, fromstring
 
 import environ
 import requests
+from ds_caselaw_utils.types import NeutralCitationString
 from requests.auth import HTTPBasicAuth
 from requests.structures import CaseInsensitiveDict
 from requests_toolbelt.multipart import decoder
@@ -800,10 +801,7 @@ class MarklogicApiClient:
             else None
         )
 
-        if os.getenv("XSLT_IMAGE_LOCATION"):
-            image_location = os.getenv("XSLT_IMAGE_LOCATION")
-        else:
-            image_location = ""
+        image_location = os.getenv("XSLT_IMAGE_LOCATION", "")
 
         show_unpublished = self.verify_show_unpublished(show_unpublished)
 
@@ -1038,12 +1036,7 @@ class MarklogicApiClient:
         search_parameters.collections = [DOCUMENT_COLLECTION_URI_JUDGMENT]
         return self.search_and_decode_response(search_parameters)
 
-    def overwrite_document(self, old_uri: str, new_citation: str) -> str:
-        """Move the judgment at old_uri on top of the new citation, which must already exist
-        Compare to update_document_uri"""
-        return move.overwrite_document(old_uri, new_citation, api_client=self)
-
-    def update_document_uri(self, old_uri: str, new_citation: str) -> str:
+    def update_document_uri(self, old_uri: DocumentURIString, new_citation: NeutralCitationString) -> DocumentURIString:
         """
         Move the document at old_uri to the correct location based on the neutral citation
         The new neutral citation *must* not already exist (that is handled elsewhere)

ds_caselaw_marklogic_api_client-27.0.0/src/caselawclient/factories.py

@@ -0,0 +1,165 @@
+import datetime
+from typing import Any, Optional, cast
+from unittest.mock import Mock, patch
+
+from typing_extensions import TypeAlias
+
+from caselawclient.Client import MarklogicApiClient
+from caselawclient.models.documents import Document
+from caselawclient.models.documents.body import DocumentBody
+from caselawclient.models.judgments import Judgment
+from caselawclient.models.press_summaries import PressSummary
+from caselawclient.responses.search_result import SearchResult, SearchResultMetadata
+
+DEFAULT_DOCUMENT_BODY_XML = "<akomantoso>This is some XML of a judgment.</akomantoso>"
+
+
+class DocumentBodyFactory:
+    # "name_of_attribute": "default value"
+    PARAMS_MAP: dict[str, Any] = {
+        "name": "Judgment v Judgement",
+        "court": "Court of Testing",
+        "document_date_as_string": "2023-02-03",
+    }
+
+    @classmethod
+    def build(cls, xml_string: str = DEFAULT_DOCUMENT_BODY_XML, **kwargs: Any) -> DocumentBody:
+        document_body = DocumentBody(
+            xml_bytestring=xml_string.encode(encoding="utf-8"),
+        )
+
+        for param_name, default_value in cls.PARAMS_MAP.items():
+            value = kwargs.get(param_name, default_value)
+            setattr(document_body, param_name, value)
+
+        return document_body
+
+
+class DocumentFactory:
+    # "name_of_attribute": "default value"
+    PARAMS_MAP: dict[str, Any] = {
+        "is_published": False,
+        "is_sensitive": False,
+        "is_anonymised": False,
+        "is_failure": False,
+        "source_name": "Example Uploader",
+        "source_email": "uploader@example.com",
+        "consignment_reference": "TDR-12345",
+        "assigned_to": "",
+        "versions": [],
+    }
+
+    target_class: TypeAlias = Document
+
+    @classmethod
+    def build(
+        cls,
+        uri: str = "test/2023/123",
+        html: str = "<p>This is a judgment.</p>",
+        api_client: Optional[MarklogicApiClient] = None,
+        **kwargs: Any,
+    ) -> target_class:
+        if not api_client:
+            api_client = Mock(spec=MarklogicApiClient)
+            api_client.get_judgment_xml_bytestring.return_value = DEFAULT_DOCUMENT_BODY_XML.encode(encoding="utf-8")
+
+        with patch.object(cls.target_class, "content_as_html") as mock_content_as_html:
+            mock_content_as_html.return_value = html
+            document = cls.target_class(uri, api_client=api_client)
+
+        document.body = kwargs.pop("body") if "body" in kwargs else DocumentBodyFactory.build()
+
+        for param_name, default_value in cls.PARAMS_MAP.items():
+            value = kwargs.get(param_name, default_value)
+            setattr(document, param_name, value)
+
+        return document
+
+
+class JudgmentFactory(DocumentFactory):
+    target_class = Judgment
+
+    def __init__(self) -> None:
+        self.PARAMS_MAP = self.PARAMS_MAP | {
+            "neutral_citation": "[2023] Test 123",
+            "best_human_identifier": "[2023] Test 123",
+        }
+
+        super().__init__()
+
+    @classmethod
+    def build(
+        cls,
+        uri: str = "test/2023/123",
+        html: str = "<p>This is a judgment.</p>",
+        api_client: Optional[MarklogicApiClient] = None,
+        **kwargs: Any,
+    ) -> Judgment:
+        return cast(Judgment, super().build(uri, html, api_client, **kwargs))
+
+
+class PressSummaryFactory(DocumentFactory):
+    target_class = PressSummary
+
+    def __init__(self) -> None:
+        self.PARAMS_MAP = self.PARAMS_MAP | {
+            "neutral_citation": "[2023] Test 123",
+            "best_human_identifier": "[2023] Test 123",
+        }
+
+        super().__init__()
+
+    @classmethod
+    def build(
+        cls,
+        uri: str = "test/2023/123/press-summary/1",
+        html: str = "<p>This is a judgment.</p>",
+        api_client: Optional[MarklogicApiClient] = None,
+        **kwargs: Any,
+    ) -> PressSummary:
+        return cast(PressSummary, super().build(uri, html, api_client, **kwargs))
+
+
+class SimpleFactory:
+    # "name_of_attribute": "default value"
+    PARAMS_MAP: dict[str, Any]
+
+    target_class: TypeAlias = object
+
+    @classmethod
+    def build(cls, **kwargs: Any) -> target_class:
+        mock_object = Mock(spec=cls.target_class, autospec=True)
+
+        for param, default in cls.PARAMS_MAP.items():
+            if param in kwargs:
+                setattr(mock_object.return_value, param, kwargs[param])
+            else:
+                setattr(mock_object.return_value, param, default)
+
+        return mock_object()
+
+
+class SearchResultMetadataFactory(SimpleFactory):
+    target_class = SearchResultMetadata
+    # "name_of_attribute": "default value"
+    PARAMS_MAP = {
+        "author": "Fake Name",
+        "author_email": "fake.email@gov.invalid",
+        "consignment_reference": "TDR-2023-ABC",
+        "submission_datetime": datetime.datetime(2023, 2, 3, 9, 12, 34),
+    }
+
+
+class SearchResultFactory(SimpleFactory):
+    target_class = SearchResult
+
+    # "name_of_attribute": ("name of incoming param", "default value")
+    PARAMS_MAP = {
+        "uri": "test/2023/123",
+        "name": "Judgment v Judgement",
+        "neutral_citation": "[2023] Test 123",
+        "court": "Court of Testing",
+        "date": datetime.date(2023, 2, 3),
+        "metadata": SearchResultMetadataFactory.build(),
+        "is_failure": False,
+    }

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/models/documents/__init__.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING, Any, NewType, Optional
 
 from ds_caselaw_utils import courts
 from ds_caselaw_utils.courts import CourtNotFoundException
+from ds_caselaw_utils.types import NeutralCitationString
 from lxml import html as html_parser
 from requests_toolbelt.multipart import decoder
 
@@ -281,22 +282,15 @@ class Document:
 
         :return: `True` if this document is in a 'failure' state, otherwise `False`
         """
-        if self.body.failed_to_parse:
-            return True
-        return False
+        return self.body.failed_to_parse
 
     @cached_property
     def is_parked(self) -> bool:
-        if "parked" in self.uri:
-            return True
-        return False
+        return "parked" in self.uri
 
     @cached_property
     def has_name(self) -> bool:
-        if not self.body.name:
-            return False
-
-        return True
+        return bool(self.body.name)
 
     @cached_property
     def has_valid_court(self) -> bool:
@@ -373,9 +367,7 @@ class Document:
         """
         Is it sensible to enrich this document?
         """
-        if (self.enriched_recently is False) and self.validates_against_schema:
-            return True
-        return False
+        return (self.enriched_recently is False) and self.validates_against_schema
 
     @cached_property
     def enriched_recently(self) -> bool:
@@ -388,9 +380,8 @@ class Document:
             return False
 
         now = datetime.datetime.now(tz=datetime.timezone.utc)
-        if now - last_enrichment < MINIMUM_ENRICHMENT_TIME:
-            return True
-        return False
+
+        return now - last_enrichment < MINIMUM_ENRICHMENT_TIME
 
     @cached_property
     def validates_against_schema(self) -> bool:
@@ -451,10 +442,7 @@ class Document:
         else:
             raise DocumentNotSafeForDeletion
 
-    def overwrite(self, new_citation: str) -> None:
-        self.api_client.overwrite_document(self.uri, new_citation)
-
-    def move(self, new_citation: str) -> None:
+    def move(self, new_citation: NeutralCitationString) -> None:
         self.api_client.update_document_uri(self.uri, new_citation)
 
     def force_reparse(self) -> None:
@@ -506,6 +494,4 @@ class Document:
         """
         Is it sensible to reparse this document?
         """
-        if self.docx_exists():
-            return True
-        return False
+        return self.docx_exists()

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/models/documents/body.py

@@ -1,16 +1,15 @@
 import datetime
 import warnings
 from functools import cached_property
-from typing import NewType, Optional
+from typing import Optional
 
 import pytz
+from ds_caselaw_utils.types import CourtCode
 
 from caselawclient.models.utilities.dates import parse_string_date_as_utc
 
 from .xml import XML
 
-CourtIdentifierString = NewType("CourtIdentifierString", str)
-
 
 class UnparsableDate(Warning):
     pass
@@ -56,10 +55,10 @@ class DocumentBody:
         )
 
     @property
-    def court_and_jurisdiction_identifier_string(self) -> CourtIdentifierString:
+    def court_and_jurisdiction_identifier_string(self) -> CourtCode:
         if self.jurisdiction != "":
-            return CourtIdentifierString("/".join((self.court, self.jurisdiction)))
-        return CourtIdentifierString(self.court)
+            return CourtCode("/".join((self.court, self.jurisdiction)))
+        return CourtCode(self.court)
 
     @cached_property
     def document_date_as_string(self) -> str:
@@ -137,6 +136,4 @@ class DocumentBody:
 
         :return: `True` if there was a complete parser failure, otherwise `False`
         """
-        if "error" in self._xml.root_element:
-            return True
-        return False
+        return "error" in self._xml.root_element

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/models/judgments.py

@@ -2,6 +2,8 @@ import importlib
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Optional
 
+from ds_caselaw_utils.types import NeutralCitationString
+
 from caselawclient.errors import DocumentNotFoundError
 from caselawclient.models.neutral_citation_mixin import NeutralCitationMixin
 
@@ -20,16 +22,18 @@ class Judgment(NeutralCitationMixin, Document):
     document_noun_plural = "judgments"
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super(Judgment, self).__init__(self.document_noun, *args, **kwargs)
+        super().__init__(self.document_noun, *args, **kwargs)
 
     @cached_property
-    def neutral_citation(self) -> str:
-        return self.body.get_xpath_match_string(
-            "/akn:akomaNtoso/akn:*/akn:meta/akn:proprietary/uk:cite/text()",
-            {
-                "uk": "https://caselaw.nationalarchives.gov.uk/akn",
-                "akn": "http://docs.oasis-open.org/legaldocml/ns/akn/3.0",
-            },
+    def neutral_citation(self) -> NeutralCitationString:
+        return NeutralCitationString(
+            self.body.get_xpath_match_string(
+                "/akn:akomaNtoso/akn:*/akn:meta/akn:proprietary/uk:cite/text()",
+                {
+                    "uk": "https://caselaw.nationalarchives.gov.uk/akn",
+                    "akn": "http://docs.oasis-open.org/legaldocml/ns/akn/3.0",
+                },
+            )
         )
 
     @property

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/models/neutral_citation_mixin.py

@@ -1,10 +1,12 @@
+from abc import ABC, abstractmethod
 from functools import cached_property
 from typing import Any
 
 from ds_caselaw_utils import neutral_url
+from ds_caselaw_utils.types import NeutralCitationString
 
 
-class NeutralCitationMixin:
+class NeutralCitationMixin(ABC):
     """
     A mixin class that provides functionality related to neutral citation.
 
@@ -35,19 +37,13 @@ class NeutralCitationMixin:
         super(NeutralCitationMixin, self).__init__(*args, **kwargs)
 
     @cached_property
-    def neutral_citation(self) -> str:
-        return ""
+    @abstractmethod
+    def neutral_citation(self) -> NeutralCitationString: ...
 
     @cached_property
     def has_ncn(self) -> bool:
-        if not self.neutral_citation:
-            return False
-
-        return True
+        return bool(self.neutral_citation)
 
     @cached_property
     def has_valid_ncn(self) -> bool:
-        if not self.has_ncn or not neutral_url(self.neutral_citation):
-            return False
-
-        return True
+        return self.has_ncn and neutral_url(self.neutral_citation) is not None

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/models/press_summaries.py

@@ -4,6 +4,8 @@ import importlib
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Optional
 
+from ds_caselaw_utils.types import NeutralCitationString
+
 from caselawclient.errors import DocumentNotFoundError
 from caselawclient.models.neutral_citation_mixin import NeutralCitationMixin
 
@@ -22,15 +24,17 @@ class PressSummary(NeutralCitationMixin, Document):
     document_noun_plural = "press summaries"
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super(PressSummary, self).__init__(self.document_noun, *args, **kwargs)
+        super().__init__(self.document_noun, *args, **kwargs)
 
     @cached_property
-    def neutral_citation(self) -> str:
-        return self.body.get_xpath_match_string(
-            "/akn:akomaNtoso/akn:doc/akn:preface/akn:p/akn:neutralCitation/text()",
-            {
-                "akn": "http://docs.oasis-open.org/legaldocml/ns/akn/3.0",
-            },
+    def neutral_citation(self) -> NeutralCitationString:
+        return NeutralCitationString(
+            self.body.get_xpath_match_string(
+                "/akn:akomaNtoso/akn:doc/akn:preface/akn:p/akn:neutralCitation/text()",
+                {
+                    "akn": "http://docs.oasis-open.org/legaldocml/ns/akn/3.0",
+                },
+            )
         )
 
     @property

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/models/utilities/dates.py

@@ -9,11 +9,7 @@ def parse_string_date_as_utc(iso_string: str, timezone: tzinfo.BaseTzInfo) -> da
     ensure that it is converted to a UTC-aware datetime"""
 
     mixed_date = isoparse(iso_string)
-    if not mixed_date.tzinfo:
-        # it is an unaware time
-        aware_date = timezone.localize(mixed_date)
-    else:
-        aware_date = mixed_date
+    aware_date = mixed_date if mixed_date.tzinfo else timezone.localize(mixed_date)
 
     # make UTC
     utc_date = aware_date.astimezone(UTC)

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/models/utilities/move.py

@@ -1,16 +1,17 @@
-from typing import Any, Optional
+from typing import TYPE_CHECKING, Any, Optional
 
 import ds_caselaw_utils as caselawutils
+from ds_caselaw_utils.types import NeutralCitationString
 
 from caselawclient.errors import MarklogicAPIError
+from caselawclient.models.documents import DocumentURIString
 from caselawclient.models.utilities.aws import copy_assets
 
-
-class NeutralCitationToUriError(Exception):
-    pass
+if TYPE_CHECKING:
+    from caselawclient.Client import MarklogicApiClient
 
 
-class OverwriteJudgmentError(Exception):
+class NeutralCitationToUriError(Exception):
     pass
 
 
@@ -18,62 +19,9 @@ class MoveJudgmentError(Exception):
     pass
 
 
-def overwrite_document(
-    source_uri: str,
-    target_citation: str,
-    api_client: Any,
-) -> str:
-    """Move the document at source_uri on top of the new citation, which must already exist
-    Compare to update_document_uri
-
-    :param source_uri: The URI with the contents of the document to be written. (possibly a failure url)
-    :param target_citation: The NCN (implying a URL) whose contents will be overwritten
-    :param api_client: An instance of MarklogicApiClient used to make the search request
-    :return: The URL associated with the `target_citation`
-    """
-
-    new_uri: Optional[str] = caselawutils.neutral_url(target_citation.strip())
-
-    if new_uri == source_uri:
-        raise RuntimeError(
-            f"Attempted to overwrite document {source_uri} with itself, which is not permitted.",
-        )
-    if new_uri is None:
-        raise NeutralCitationToUriError(
-            f"Unable to form new URI for {source_uri} from neutral citation: {target_citation}",
-        )
-    if not api_client.document_exists(new_uri):
-        raise OverwriteJudgmentError(
-            f"The URI {new_uri} generated from {target_citation} does not already exist, so cannot be overwritten",
-        )
-    old_doc = api_client.get_document_by_uri_or_404(source_uri)
-    try:
-        old_doc_xml = old_doc.content_as_xml
-        api_client.update_document_xml(
-            new_uri,
-            old_doc_xml,
-            annotation=f"overwritten from {source_uri}",
-        )
-        set_metadata(source_uri, new_uri, api_client)
-        # TODO: consider deleting existing public assets at that location
-        copy_assets(source_uri, new_uri)
-        api_client.set_judgment_this_uri(new_uri)
-    except MarklogicAPIError as e:
-        raise OverwriteJudgmentError(
-            f"Failure when attempting to copy judgment from {source_uri} to {new_uri}: {e}",
-        )
-
-    try:
-        api_client.delete_judgment(source_uri)
-    except MarklogicAPIError as e:
-        raise OverwriteJudgmentError(
-            f"Failure when attempting to delete judgment from {source_uri}: {e}",
-        )
-
-    return new_uri
-
-
-def update_document_uri(source_uri: str, target_citation: str, api_client: Any) -> str:
+def update_document_uri(
+    source_uri: DocumentURIString, target_citation: NeutralCitationString, api_client: "MarklogicApiClient"
+) -> DocumentURIString:
     """
     Move the document at source_uri to the correct location based on the neutral citation
     The new neutral citation *must* not already exist (that is handled elsewhere)
@@ -83,7 +31,8 @@ def update_document_uri(source_uri: str, target_citation: str, api_client: Any)
     :param api_client: An instance of MarklogicApiClient used to make the search request
     :return: The URL associated with the `target_citation`
     """
-    new_uri: Optional[str] = caselawutils.neutral_url(target_citation.strip())
+    new_ncn_based_uri = caselawutils.neutral_url(target_citation)
+    new_uri: Optional[DocumentURIString] = DocumentURIString(new_ncn_based_uri) if new_ncn_based_uri else None
     if new_uri is None:
         raise NeutralCitationToUriError(
             f"Unable to form new URI for {source_uri} from neutral citation: {target_citation}",
@@ -115,7 +64,7 @@ def update_document_uri(source_uri: str, target_citation: str, api_client: Any)
     return new_uri
 
 
-def set_metadata(old_uri: str, new_uri: str, api_client: Any) -> None:
+def set_metadata(old_uri: DocumentURIString, new_uri: DocumentURIString, api_client: Any) -> None:
     source_organisation = api_client.get_property(old_uri, "source-organisation")
     source_name = api_client.get_property(old_uri, "source-name")
     source_email = api_client.get_property(old_uri, "source-email")

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/responses/search_response.py

@@ -24,13 +24,13 @@ class SearchResponse:
         self.client = client
 
     @property
-    def total(self) -> str:
+    def total(self) -> int:
         """
         The total number of search results.
 
         :return: The total number of search results
         """
-        return str(
+        return int(
             self.node.xpath("//search:response/@total", namespaces=self.NAMESPACES)[0],
         )
 

{ds_caselaw_marklogic_api_client-26.0.0 → ds_caselaw_marklogic_api_client-27.0.0}/src/caselawclient/responses/search_result.py

@@ -8,6 +8,7 @@ from typing import Dict, Optional
 from dateutil import parser as dateparser
 from dateutil.parser import ParserError
 from ds_caselaw_utils.courts import Court, CourtNotFoundException, courts
+from ds_caselaw_utils.types import CourtCode, JurisdictionCode
 from lxml import etree
 
 from caselawclient.Client import MarklogicApiClient
@@ -193,15 +194,16 @@ class SearchResult:
         """
         :return: The court of the search result
         """
-        court = None
+        court: Optional[Court] = None
         court_code = self._get_xpath_match_string("search:extracted/uk:court/text()")
         jurisdiction_code = self._get_xpath_match_string(
             "search:extracted/uk:jurisdiction/text()",
         )
         if jurisdiction_code:
-            court_code_with_jurisdiction = "%s/%s" % (court_code, jurisdiction_code)
             try:
-                court = courts.get_by_code(court_code_with_jurisdiction)
+                court = courts.get_court_with_jurisdiction_by_code(
+                    CourtCode(court_code), JurisdictionCode(jurisdiction_code)
+                )
             except CourtNotFoundException:
                 logging.warning(
                     "Court not found with court code %s and jurisdiction code %s for judgment with NCN %s, falling back to court."
@@ -209,7 +211,7 @@ class SearchResult:
                 )
         if court is None:
             try:
-                court = courts.get_by_code(court_code)
+                court = courts.get_by_code(CourtCode(court_code))
             except CourtNotFoundException:
                 logging.warning(
                     "Court not found with court code %s for judgment with NCN %s, returning None."