ds-caselaw-marklogic-api-client 27.3.0__py3-none-any.whl → 27.4.0__py3-none-any.whl

caselawclient/Client.py

@@ -62,6 +62,8 @@ except importlib.metadata.PackageNotFoundError:
     VERSION = "0"
 DEFAULT_USER_AGENT = f"ds-caselaw-marklogic-api-client/{VERSION}"
 
+DEBUG: bool = bool(os.getenv("DEBUG", default=False))
+
 
 class NoResponse(Exception):
     """A requests HTTPError has no response. We expect this will never happen."""
@@ -728,6 +730,10 @@ class MarklogicApiClient:
             "vars": vars,
         }
         path = "LATEST/eval"
+
+        if DEBUG:
+            print(f"Sending {vars} to {xquery_path}")
+
         response = self.session.request(
             "POST",
             url=self._path_to_request_url(path),

caselawclient/xquery/get_pending_enrichment_for_version.xqy

@@ -11,20 +11,26 @@ xdmp:to-json(xdmp:sql(
   "SELECT process_data.uri, enrich_version_string, minutes_since_enrichment_request
   FROM (
     SELECT
+      propertysummary.published,
       process_data.uri,
       enrich_version_string, enrich_major_version, enrich_minor_version,
       parser_major_version, parser_minor_version,
       DATEDIFF('minute', last_sent_to_enrichment, CURRENT_TIMESTAMP) AS minutes_since_enrichment_request
     FROM documents.process_data
     JOIN documents.process_property_data ON process_data.uri = process_property_data.uri
+    JOIN documents.propertysummary ON process_data.uri = propertysummary.uri
   )
-  WHERE (
-    (enrich_version_string IS NULL) OR
-    (enrich_major_version <= @target_enrichment_major_version AND enrich_minor_version < @target_enrichment_minor_version)
-  ) AND (
-    (parser_major_version = @target_parser_major_version AND parser_minor_version = @target_parser_minor_version)
-  )
-  AND (minutes_since_enrichment_request > 43200 OR minutes_since_enrichment_request IS NULL)
+  WHERE 
+    (minutes_since_enrichment_request > 43200 OR minutes_since_enrichment_request IS NULL) AND
+    (propertysummary.published = 'true') AND
+    ( enrich_version_string IS NULL 
+      OR
+      (
+        (enrich_major_version <= @target_enrichment_major_version AND enrich_minor_version < @target_enrichment_minor_version)
+           AND 
+        (parser_major_version = @target_parser_major_version AND parser_minor_version = @target_parser_minor_version)
+      )
+    )
   ORDER BY enrich_major_version ASC NULLS FIRST, enrich_minor_version ASC
   LIMIT @maximum_records",
   "array",

{ds_caselaw_marklogic_api_client-27.3.0.dist-info → ds_caselaw_marklogic_api_client-27.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ds-caselaw-marklogic-api-client
-Version: 27.3.0
+Version: 27.4.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-27.3.0.dist-info → ds_caselaw_marklogic_api_client-27.4.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-caselawclient/Client.py,sha256=oMWfL0FwKdWyMtk_0qf6uxWJvsHLSps8vxDsAC9GxeI,40668
+caselawclient/Client.py,sha256=05vFmk39Gy23i-Mo04pZk_3EmsTe_2feIiwd7fXjDpM,40797
 caselawclient/__init__.py,sha256=DY-caubLDQWWingSdsBWgovDNXh8KcnkI6kwz08eIFk,612
 caselawclient/client_helpers/__init__.py,sha256=fyDNKCdrTb2N0Ks23YDhmvlXKfLTHnYQCXhnZb-QQbg,3832
 caselawclient/client_helpers/search_helpers.py,sha256=R99HyRLeYHgsw2L3DOidEqlKLLvs6Tga5rKTuWQViig,1525
@@ -41,7 +41,7 @@ caselawclient/xquery/get_judgment.xqy,sha256=8V-sEFKmtpf2LIZD9QKVRfpblEsmDpP4BA6
 caselawclient/xquery/get_judgment_checkout_status.xqy,sha256=mdY9UXLyzQdB7byEERPqentlr0YDLbXRVqH0h4UuZTQ,193
 caselawclient/xquery/get_judgment_version.xqy,sha256=wF9k9-CBrqo8VbxxyTrD-AGzR3-3jMm25tRVCjxPLrU,292
 caselawclient/xquery/get_last_modified.xqy,sha256=8fCm_7o_kkytCEmEeSTLWzLP7iOjuPV01IfHDgf6HaQ,172
-caselawclient/xquery/get_pending_enrichment_for_version.xqy,sha256=S5r5h1iyn_wDQXLEh2MzK8qQ1Jiq-1lRsKgDa8L16yY,1821
+caselawclient/xquery/get_pending_enrichment_for_version.xqy,sha256=8J5Pi-jMXJd_BgtpK4g6C9uR99HP57JpFv5WkoPfNuo,2016
 caselawclient/xquery/get_pending_parse_for_version.xqy,sha256=9cjVZtHeBBjm-a7RMsn1PVJt_Ug78YFlmp5CN8VJ1jQ,1197
 caselawclient/xquery/get_properties_for_search_results.xqy,sha256=Tlv3EKwVV_q-JyQyhjWVHIleicPDpucxP4ScuQjpgSw,625
 caselawclient/xquery/get_property.xqy,sha256=RHlOTrK0aH-S7s_ykYzGmUeKOJxXlI4vE5sKRt556NY,209
@@ -66,7 +66,7 @@ caselawclient/xquery/validate_document.xqy,sha256=PgaDcnqCRJPIVqfmWsNlXmCLNKd21q
 caselawclient/xquery/xslt.xqy,sha256=w57wNijH3dkwHkpKeAxqjlghVflQwo8cq6jS_sm-erM,199
 caselawclient/xquery/xslt_transform.xqy,sha256=smyFFxqmtkuOzBd2l7uw6K2oAsYctudrP8omdv_XNAM,2463
 caselawclient/xquery_type_dicts.py,sha256=AUEmycChASKl8sbqVQWe6WA0s-lIfEqh9mA-GdnUCQ8,5692
-ds_caselaw_marklogic_api_client-27.3.0.dist-info/LICENSE.md,sha256=fGMzyyLuQW-IAXUeDSCrRdsYW536aEWThdbpCjo6ZKg,1108
-ds_caselaw_marklogic_api_client-27.3.0.dist-info/METADATA,sha256=GltSiGOxA1e5fTsNbAdFhCjVwxQe7XAWS__-eZ165AM,4232
-ds_caselaw_marklogic_api_client-27.3.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-ds_caselaw_marklogic_api_client-27.3.0.dist-info/RECORD,,
+ds_caselaw_marklogic_api_client-27.4.0.dist-info/LICENSE.md,sha256=fGMzyyLuQW-IAXUeDSCrRdsYW536aEWThdbpCjo6ZKg,1108
+ds_caselaw_marklogic_api_client-27.4.0.dist-info/METADATA,sha256=9acabO_PzOjK3LScvlra8WgiyVnNRb7ItdcjIBs1zsg,4232
+ds_caselaw_marklogic_api_client-27.4.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+ds_caselaw_marklogic_api_client-27.4.0.dist-info/RECORD,,