groundx 2.5.6__py3-none-any.whl → 2.5.8__py3-none-any.whl

groundx/core/client_wrapper.py

@@ -14,10 +14,10 @@ class BaseClientWrapper:
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "groundx/2.5.6",
+            "User-Agent": "groundx/2.5.8",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "groundx",
-            "X-Fern-SDK-Version": "2.5.6",
+            "X-Fern-SDK-Version": "2.5.8",
         }
         headers["X-API-Key"] = self.api_key
         return headers

groundx/extract/classes/document.py

@@ -1,6 +1,7 @@
 import json, os, shutil, requests, time, typing
 from datetime import datetime, timezone
 from io import BytesIO
+from pathlib import Path
 from PIL import Image
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr
 
@@ -41,6 +42,7 @@ class Document(BaseModel):
     def from_request(
         cls: typing.Type[DocT],
         base_url: str,
+        cache_dir: Path,
         req: "DocumentRequest",
         **data: typing.Any,
     ) -> DocT:
@@ -54,7 +56,7 @@ class Document(BaseModel):
             base_url=base_url,
             documentID=req.document_id,
             taskID=req.task_id,
-        ).xray(clear_cache=req.clear_cache)
+        ).xray(cache_dir=cache_dir, clear_cache=req.clear_cache)
 
         for page in xray_doc.documentPages:
             st.page_images.append(page.pageUrl)

groundx/extract/classes/groundx.py

@@ -19,12 +19,17 @@ class GroundXDocument(BaseModel):
 
     def xray(
         self,
+        cache_dir: Path,
         clear_cache: bool = False,
         is_test: bool = False,
         base: typing.Optional[str] = None,
     ) -> "XRayDocument":
         return XRayDocument.download(
-            self, base=base, clear_cache=clear_cache, is_test=is_test
+            self,
+            cache_dir=cache_dir,
+            base=base,
+            clear_cache=clear_cache,
+            is_test=is_test,
         )
 
 
@@ -81,11 +86,11 @@ class XRayDocument(BaseModel):
     def download(
         cls,
         gx_doc: GroundXDocument,
+        cache_dir: Path,
         clear_cache: bool = False,
         is_test: bool = False,
         base: typing.Optional[str] = None,
     ) -> "XRayDocument":
-        cache_dir = Path(__file__).resolve().parent.parent / "cache"
         cache_dir.mkdir(parents=True, exist_ok=True)
         cache_file = cache_dir / f"{gx_doc.document_id}-xray.json"
 

groundx/extract/classes/test_document.py

@@ -3,6 +3,7 @@ import pytest, typing, unittest
 pytest.importorskip("PIL")
 
 from io import BytesIO
+from pathlib import Path
 from PIL import Image
 from unittest.mock import patch
 
@@ -14,6 +15,14 @@ def DR(**data: typing.Any) -> DocumentRequest:
     return DocumentRequest.model_validate(data)
 
 
+def test_doc() -> Document:
+    return Document.from_request(
+        cache_dir=Path("./cache"),
+        base_url="",
+        req=test_request(),
+    )
+
+
 def test_request() -> DocumentRequest:
     return DR(documentID="D", fileName="F", modelID=1, processorID=1, taskID="T")
 
@@ -28,12 +37,10 @@ class TestDocument(unittest.TestCase):
         self.mock_xray.return_value = TestXRay("http://test.co", [])
 
     def test_init_name(self) -> None:
-        st1: Document = Document.from_request(
-            base_url="",
-            req=test_request(),
-        )
+        st1: Document = test_doc()
         self.assertEqual(st1.file_name, "F")
         st2: Document = Document.from_request(
+            cache_dir=Path("./cache"),
             base_url="",
             req=DR(
                 documentID="D", fileName="F.pdf", modelID=1, processorID=1, taskID="T"
@@ -41,6 +48,7 @@ class TestDocument(unittest.TestCase):
         )
         self.assertEqual(st2.file_name, "F.pdf")
         st3: Document = Document.from_request(
+            cache_dir=Path("./cache"),
             base_url="",
             req=DR(documentID="D", fileName="F.", modelID=1, processorID=1, taskID="T"),
         )

groundx/extract/classes/test_groundx.py

@@ -1,4 +1,5 @@
 import requests, typing, unittest
+from pathlib import Path
 from unittest.mock import patch
 
 from pydantic import ValidationError
@@ -42,6 +43,12 @@ def GD(**data: typing.Any) -> GroundXDocument:
     return GroundXDocument.model_validate(data)
 
 
+def test_xray(gx: GroundXDocument) -> XRayDocument:
+    return XRayDocument.download(
+        gx, cache_dir=Path("./cache"), base="https://upload.test", is_test=True
+    )
+
+
 class TestGroundX(unittest.TestCase):
     def make_dummy_response(
         self,
@@ -75,7 +82,7 @@ class TestGroundX(unittest.TestCase):
         dummy = self.make_dummy_response(payload=payload, status_ok=True)
         with patch("requests.get", return_value=dummy):
             gx = GD(base_url="", documentID="D", taskID="T")
-            xdoc = XRayDocument.download(gx, base="https://upload.test", is_test=True)
+            xdoc = test_xray(gx)
             self.assertIsInstance(xdoc, XRayDocument)
             self.assertEqual(xdoc.chunks, [])
             self.assertEqual(xdoc.documentPages, [])
@@ -85,7 +92,7 @@ class TestGroundX(unittest.TestCase):
         with patch("requests.get", side_effect=requests.RequestException("no network")):
             gx = GD(base_url="", documentID="D", taskID="T")
             with self.assertRaises(RuntimeError) as cm:
-                XRayDocument.download(gx, base="https://upload.test", is_test=True)
+                test_xray(gx)
             self.assertIn("Error fetching X-ray JSON", str(cm.exception))
 
     def test_download_http_error(self):
@@ -93,7 +100,7 @@ class TestGroundX(unittest.TestCase):
         with patch("requests.get", return_value=dummy):
             gx = GD(base_url="", documentID="D", taskID="T")
             with self.assertRaises(RuntimeError) as cm:
-                XRayDocument.download(gx, base="https://upload.test", is_test=True)
+                test_xray(gx)
             self.assertIn("HTTP error!", str(cm.exception))
 
     def test_download_json_error(self):
@@ -101,7 +108,7 @@ class TestGroundX(unittest.TestCase):
         with patch("requests.get", return_value=dummy):
             gx = GD(base_url="", documentID="D", taskID="T")
             with self.assertRaises(RuntimeError) as cm:
-                XRayDocument.download(gx, base="https://upload.test", is_test=True)
+                test_xray(gx)
             self.assertIn("Invalid JSON returned", str(cm.exception))
 
     def test_validation_error_on_missing_required_fields(self) -> None:
@@ -113,7 +120,7 @@ class TestGroundX(unittest.TestCase):
         with patch("requests.get", return_value=dummy):
             gx = GD(base_url="", documentID="D", taskID="T")
             with self.assertRaises(ValidationError) as cm:
-                XRayDocument.download(gx, base="https://upload.test", is_test=True)
+                test_xray(gx)
             self.assertIn("Field required", str(cm.exception))
 
     def test_xray_method_delegates_to_download(self) -> None:
@@ -121,7 +128,9 @@ class TestGroundX(unittest.TestCase):
 
         sentinel = object()
         with patch.object(XRayDocument, "download", return_value=sentinel):
-            result = gx.xray(base="https://upload.test", is_test=True)
+            result = gx.xray(
+                cache_dir=Path("./cache"), base="https://upload.test", is_test=True
+            )
             self.assertIs(result, sentinel)
 
     def test_chunk_json_alias(self) -> None:
@@ -186,7 +195,7 @@ class TestGroundX(unittest.TestCase):
         dummy = self.make_dummy_response(payload=payload, status_ok=True)
         with patch("requests.get", return_value=dummy):
             gx = GD(base_url="", documentID="D", taskID="T")
-            xdoc = XRayDocument.download(gx, base="https://upload.test", is_test=True)
+            xdoc = test_xray(gx)
 
             self.assertEqual(xdoc.fileType, "pdf")
             self.assertEqual(xdoc.fileName, "file.pdf")

groundx/extract/settings/settings.py

@@ -54,6 +54,7 @@ class AgentSettings(BaseModel):
 
 class ContainerSettings(BaseModel):
     broker: str
+    cache_dir: str = "./cache"
     cache_to: int = 300
     google_sheets_drive_id: typing.Optional[str] = None
     google_sheets_template_id: typing.Optional[str] = None

{groundx-2.5.6.dist-info → groundx-2.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: groundx
-Version: 2.5.6
+Version: 2.5.8
 Summary: 
 License: MIT
 Requires-Python: >=3.8,<4.0
@@ -33,6 +33,7 @@ Requires-Dist: google-auth-stubs ; extra == "extract"
 Requires-Dist: gspread ; extra == "extract"
 Requires-Dist: httpx (>=0.21.2)
 Requires-Dist: minio ; extra == "extract"
+Requires-Dist: pillow ; extra == "extract"
 Requires-Dist: pydantic (>=1.9.2)
 Requires-Dist: pydantic-core (>=2.18.2,<3.0.0)
 Requires-Dist: pytest ; extra == "extract"

{groundx-2.5.6.dist-info → groundx-2.5.8.dist-info}/RECORD

@@ -5,7 +5,7 @@ groundx/buckets/raw_client.py,sha256=T2Ty5obN7eHbaxHGAimzjM8MGOmSOQEckhciyZkzcjE
 groundx/client.py,sha256=FsVhPSZ1kd70pOVv37zTbNSwBM7XdttSx4aEPobPoew,6412
 groundx/core/__init__.py,sha256=lTcqUPXcx4112yLDd70RAPeqq6tu3eFMe1pKOqkW9JQ,1562
 groundx/core/api_error.py,sha256=44vPoTyWN59gonCIZMdzw7M1uspygiLnr3GNFOoVL2Q,614
-groundx/core/client_wrapper.py,sha256=iKOVCzXchOzhx2co-Qzd9GMkgzbNTkKG6QW7ppnrzDs,1822
+groundx/core/client_wrapper.py,sha256=COudBfgaFeeQHgz4J4jQKzLHsnPFOF4wVGquUuOd_Y8,1822
 groundx/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 groundx/core/file.py,sha256=d4NNbX8XvXP32z8KpK2Xovv33nFfruIrpz0QWxlgpZk,2663
 groundx/core/force_multipart.py,sha256=awxh5MtcRYe74ehY8U76jzv6fYM_w_D3Rur7KQQzSDk,429
@@ -34,13 +34,13 @@ groundx/extract/agents/agent.py,sha256=vFvYv0_lHz4auejiCxz4bX0QG5JxHTEHOuBBcIOXW
 groundx/extract/classes/__init__.py,sha256=i7gl0O6K2THXwS8oszYlQ6lzvG4iglmvcuebqLvYH6A,574
 groundx/extract/classes/agent.py,sha256=4Uo6vca9s_1AcDv8Y2XSQiu5awOhQECgE55-kWUx2-8,677
 groundx/extract/classes/api.py,sha256=fgCwua4xf8oK2J8p-LYAFyeEpbGg1kETEUAGSH60lr4,345
-groundx/extract/classes/document.py,sha256=f-V1L95tBEOSMiTQEDBG4pVv2GgCba9oDnFOdzMvG2A,9880
+groundx/extract/classes/document.py,sha256=lJcWKvP60Zo4W9UYjqAG-BBO_etq8jVp1QbvO4E12z8,9951
 groundx/extract/classes/field.py,sha256=x8Y8MIytoeWeU6tpvczw2sLaIlQzCEvfRiO_-PjWEXE,2764
-groundx/extract/classes/groundx.py,sha256=lsOS9rkVqpZBZ8VsJaf06pyEv1Vk6BIoOKSRlQ2ei5k,3961
+groundx/extract/classes/groundx.py,sha256=oGavoYI7pPwHOIZLY1JUNRPvvmyebNpU6maFmMuabnA,4012
 groundx/extract/classes/prompt.py,sha256=yfngqn6C1uIVBLjDdDigq9aW1mnpQ3o12LI9zjPXh9c,950
-groundx/extract/classes/test_document.py,sha256=I5HhSiASpqeCVg1y1gDUu0KY8O9KMQq4EXhx6H97z3Q,3198
+groundx/extract/classes/test_document.py,sha256=U0ukVvbdB-CYWOw0eSippf5HANz6VUGXDk4RjlulZ9s,3376
 groundx/extract/classes/test_field.py,sha256=QVUGxRGOGl16kOmRHPg0RBCh9o5CB7GNN1h1GBNKLd8,1232
-groundx/extract/classes/test_groundx.py,sha256=s1WSjOLHyqMOnAMFjSwV_UeTwYLpt4sGpzls0KoB9MY,8129
+groundx/extract/classes/test_groundx.py,sha256=sXdwbYwK-m8CsY4RjgvhMkP8Jje8oYXqczrxgJP0mA4,8061
 groundx/extract/classes/test_prompt.py,sha256=U8rKlxrDUMr4MpwKnurD1v1Ngw6NLPHRS8dOn2h0JcU,2240
 groundx/extract/post_process/__init__.py,sha256=hbiiouYIkC2-LNOz5LYywpEfhX4VvI_9wBKZ-T_XPdU,101
 groundx/extract/post_process/post_process.py,sha256=K558NRMBYSfxfrAQrCYw9Ay5p57A6fRJWpzT9e_CN9U,669
@@ -57,7 +57,7 @@ groundx/extract/services/upload_minio.py,sha256=i4i5-_ER9_WvEKhYPIuqsg6oZckZdbA4
 groundx/extract/services/upload_s3.py,sha256=0jUC0V2qz4W-cavt4HaAxkOKAj5SdeGt1L-Dv4A5e50,2310
 groundx/extract/services/utility.py,sha256=nlAVgSFpzo0LPrm5dqexn2dmDa3cFmAmJpVHFE2rgnM,1321
 groundx/extract/settings/__init__.py,sha256=1YJcL6whtsHNVd9AuOzdIx3vM5xeu5m6e4U5V39McmA,277
-groundx/extract/settings/settings.py,sha256=oyw7cWgwqhPUx4d7sokp7MuCwyO_waZDbR9zFYWOb1k,4287
+groundx/extract/settings/settings.py,sha256=5J0H8Dvw_6XYLIoQhoj9zRxz9lU2lixBkVPgDeuOGLo,4318
 groundx/extract/settings/test_settings.py,sha256=n56UMaIcK7_rN5dUx1CNXsn0Yy7CI4g9jWDwLdl9NKE,18861
 groundx/extract/tasks/__init__.py,sha256=fEtUoLXI2vNlbcogE5FmRk2t0ZRuM4xjFK7S4BF1Rws,115
 groundx/extract/tasks/utility.py,sha256=6pJG0SLsj_zTtdFbMqXIUmbIH3kGLbYpOTQKweIIQcY,736
@@ -126,7 +126,7 @@ groundx/types/subscription_detail.py,sha256=GEEivqyiLsZtd8Ow7mqqwF1y0m0tHD-t9r9d
 groundx/types/subscription_detail_meters.py,sha256=vGqiR2uupVh5177DfOghjoe5mwzVhoWljKzPF-twUc0,794
 groundx/types/website_source.py,sha256=53jWDBtSrJVOsBVtVbZbjhEAsd0QGkXa7IuKO4AooLs,1542
 groundx/version.py,sha256=1yVogKaq260fQfckM2RYN2144SEw0QROsZW8ICtkG4U,74
-groundx-2.5.6.dist-info/LICENSE,sha256=dFE6nY1bHnSn6NqmdlghlU1gQqLqYNphrceGVehSa7o,1065
-groundx-2.5.6.dist-info/METADATA,sha256=zePA9kY6U5B4-MZ1iBFz5IJ4ESnag_xqmIBUMaSaqe4,5876
-groundx-2.5.6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-groundx-2.5.6.dist-info/RECORD,,
+groundx-2.5.8.dist-info/LICENSE,sha256=dFE6nY1bHnSn6NqmdlghlU1gQqLqYNphrceGVehSa7o,1065
+groundx-2.5.8.dist-info/METADATA,sha256=0DiBvETwsqtwl-E3ZM5GrsVxIkxQ7agSknwUIYNJvJI,5919
+groundx-2.5.8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+groundx-2.5.8.dist-info/RECORD,,