ds-caselaw-marklogic-api-client 21.0.0__tar.gz → 22.0.1__tar.gz

{ds_caselaw_marklogic_api_client-21.0.0 → ds_caselaw_marklogic_api_client-22.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ds-caselaw-marklogic-api-client
-Version: 21.0.0
+Version: 22.0.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
@@ -14,7 +14,7 @@ Requires-Dist: boto3 (>=1.26.112,<2.0.0)
 Requires-Dist: certifi (>=2022.12.7,<2024.0.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.3.3,<2.0.0)
+Requires-Dist: ds-caselaw-utils (>=1.4.1,<2.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-21.0.0 → ds_caselaw_marklogic_api_client-22.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ds-caselaw-marklogic-api-client"
-version = "21.0.0"
+version = "22.0.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"
@@ -21,7 +21,7 @@ requests-toolbelt = ">=0.10.1,<1.1.0"
 urllib3 = "^1.26.15"
 memoization = "^0.4.0"
 lxml = "^5.0.0"
-ds-caselaw-utils = "^1.3.3"
+ds-caselaw-utils = "^1.4.1"
 boto3 = "^1.26.112"
 typing-extensions = "^4.7.1"
 mypy-boto3-s3 = "^1.26.104"

{ds_caselaw_marklogic_api_client-21.0.0 → ds_caselaw_marklogic_api_client-22.0.1}/src/caselawclient/models/documents.py

@@ -62,6 +62,7 @@ if TYPE_CHECKING:
 
 
 DocumentURIString = NewType("DocumentURIString", str)
+CourtIdentifierString = NewType("CourtIdentifierString", str)
 
 
 class CannotPublishUnpublishableDocument(Exception):
@@ -209,8 +210,11 @@ class Document:
         )
 
     @property
-    def court_and_jurisdiction(self) -> str:
-        return "/".join((self.court, self.jurisdiction))
+    def court_and_jurisdiction_identifier_string(self) -> CourtIdentifierString:
+        if self.jurisdiction != "":
+            return CourtIdentifierString("/".join((self.court, self.jurisdiction)))
+        else:
+            return CourtIdentifierString(self.court)
 
     @cached_property
     def document_date_as_string(self) -> str:
@@ -435,7 +439,9 @@ class Document:
     @cached_property
     def has_valid_court(self) -> bool:
         try:
-            return bool(courts.get_by_code(self.court))
+            return bool(
+                courts.get_by_code(self.court_and_jurisdiction_identifier_string)
+            )
         except CourtNotFoundException:
             return False
 

{ds_caselaw_marklogic_api_client-21.0.0 → ds_caselaw_marklogic_api_client-22.0.1}/src/caselawclient/responses/search_result.py

@@ -192,13 +192,29 @@ class SearchResult:
         """
         :return: The court of the search result
         """
-
+        court = None
         court_code = self._get_xpath_match_string("search:extracted/uk:court/text()")
-        try:
-            court = courts.get_by_code(court_code)
-        except CourtNotFoundException:
-            court = None
-
+        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)
+            except CourtNotFoundException:
+                logging.warning(
+                    "Court not found with court code %s and jurisdiction code %s for judgment with NCN %s, falling back to court."
+                    % (court_code, jurisdiction_code, self.neutral_citation)
+                )
+        if court is None:
+            try:
+                court = courts.get_by_code(court_code)
+            except CourtNotFoundException:
+                logging.warning(
+                    "Court not found with court code %s for judgment with NCN %s, returning None."
+                    % (court_code, self.neutral_citation)
+                )
+                court = None
         return court
 
     @property