ds-caselaw-marklogic-api-client 21.0.0__py3-none-any.whl → 22.0.1__py3-none-any.whl

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
 

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

{ds_caselaw_marklogic_api_client-21.0.0.dist-info → ds_caselaw_marklogic_api_client-22.0.1.dist-info}/METADATA

@@ -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.dist-info → ds_caselaw_marklogic_api_client-22.0.1.dist-info}/RECORD

@@ -5,7 +5,7 @@ caselawclient/client_helpers/search_helpers.py,sha256=DYgUltPq8fFI2KkLRqH1-8zpbb
 caselawclient/content_hash.py,sha256=DF7ujrQPNf1bTSbK0mIIaC5qx6CmF5I0xlQ7uIG0zYI,2236
 caselawclient/errors.py,sha256=3rsbOQ11hIhm7-UABcHNMcs9XgcrIzytAP0koyZBLWM,3195
 caselawclient/models/__init__.py,sha256=kd23EUpvaC7aLHdgk8farqKAQEx3lf7RvNT2jEatvlg,68
-caselawclient/models/documents.py,sha256=6w_U3Lwuve0ffJLJW78Lt5uojIbzD6I3PKWGWWLYFUU,20365
+caselawclient/models/documents.py,sha256=NZautWi38T-hlhyyotiHr31hafFL4obCSHc7NuZW_e4,20658
 caselawclient/models/judgments.py,sha256=TcAsn27K--QQAfaaUZ8biybB9OeVS__91FRlwaG16HY,1020
 caselawclient/models/neutral_citation_mixin.py,sha256=G9QS5XZ0tf_VXTxt4Uryy_gZ4eBDsmChqEClLAntIwI,1810
 caselawclient/models/press_summaries.py,sha256=5c1jpVhVtmIMN8AeHMywGXvz4H55kKAIUaaaVims6Tw,994
@@ -15,7 +15,7 @@ caselawclient/models/utilities/move.py,sha256=_SKzO1UVXHFIVvWfT4nuCwdov7acp8tYzz
 caselawclient/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 caselawclient/responses/__init__.py,sha256=2-5NJn_PXPTje_W4dHeHYaNRN6vXK4UcB9eLLNUAKa4,67
 caselawclient/responses/search_response.py,sha256=OlzXOEnCg-4HdfOYfeIMdk-UfROOI_Nz-etfznFffok,1335
-caselawclient/responses/search_result.py,sha256=M6BSzkGRn0TY2Qs17bplv1RbhBHECAypUjnXnoslltc,7198
+caselawclient/responses/search_result.py,sha256=BSVE2zBy-sy93fghd_kqwkhgwcnx1mFHY1_HTj-qO70,8096
 caselawclient/responses/xsl/search_match.xsl,sha256=4Sv--MrwBd7J48E9aI7jlFSXGlNi4dBqgzJ3bdMJ_ZU,1018
 caselawclient/search_parameters.py,sha256=nR-UC1aWZbdXzXBrVDaHECU4Ro8Zi4JZATtgrpAVsKY,3342
 caselawclient/xml_helpers.py,sha256=Ihy6OxdEHm7LFePX0XF6uzpyp6yo7U13zyP0nhpBguU,582
@@ -58,7 +58,7 @@ caselawclient/xquery/validate_all_documents.xqy,sha256=z_0YEXmRcZ-FaJM0ouKiTjdI4
 caselawclient/xquery/xslt.xqy,sha256=w57wNijH3dkwHkpKeAxqjlghVflQwo8cq6jS_sm-erM,199
 caselawclient/xquery/xslt_transform.xqy,sha256=smyFFxqmtkuOzBd2l7uw6K2oAsYctudrP8omdv_XNAM,2463
 caselawclient/xquery_type_dicts.py,sha256=A7yNusrb3lMKg6tmMrTOPZcjuJEijWHiBk4hk6eKCMM,5278
-ds_caselaw_marklogic_api_client-21.0.0.dist-info/LICENSE.md,sha256=fGMzyyLuQW-IAXUeDSCrRdsYW536aEWThdbpCjo6ZKg,1108
-ds_caselaw_marklogic_api_client-21.0.0.dist-info/METADATA,sha256=OTHWjjgvwMlUUY-YxoHCgoSBclZSlwjYs6FfXf-xrgc,4006
-ds_caselaw_marklogic_api_client-21.0.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-ds_caselaw_marklogic_api_client-21.0.0.dist-info/RECORD,,
+ds_caselaw_marklogic_api_client-22.0.1.dist-info/LICENSE.md,sha256=fGMzyyLuQW-IAXUeDSCrRdsYW536aEWThdbpCjo6ZKg,1108
+ds_caselaw_marklogic_api_client-22.0.1.dist-info/METADATA,sha256=g3BQ1XWePR6qvtg4VFpuy9hhJGFmWHammOcJtnatxC4,4006
+ds_caselaw_marklogic_api_client-22.0.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+ds_caselaw_marklogic_api_client-22.0.1.dist-info/RECORD,,