groundx 2.5.1__tar.gz → 2.5.3__tar.gz

{groundx-2.5.1 → groundx-2.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: groundx
-Version: 2.5.1
+Version: 2.5.3
 Summary: 
 License: MIT
 Requires-Python: >=3.8,<4.0

{groundx-2.5.1 → groundx-2.5.3}/pyproject.toml

@@ -3,7 +3,7 @@ name = "groundx"
 
 [tool.poetry]
 name = "groundx"
-version = "2.5.1"
+version = "2.5.3"
 description = ""
 readme = "README.md"
 authors = []
@@ -136,3 +136,7 @@ ignore_missing_imports = true
 [[tool.mypy.overrides]]
 module = ["groundx.extract.classes.document"]
 disable_error_code = ["call-arg"]
+
+[[tool.mypy.overrides]]
+module = ["groundx.extract.tasks.utility"]
+disable_error_code = ["call-arg"]

{groundx-2.5.1 → groundx-2.5.3}/src/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.1",
+            "User-Agent": "groundx/2.5.3",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "groundx",
-            "X-Fern-SDK-Version": "2.5.1",
+            "X-Fern-SDK-Version": "2.5.3",
         }
         headers["X-API-Key"] = self.api_key
         return headers

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/__init__.py

@@ -1,19 +1,25 @@
 from .agents import AgentCode, AgentTool
 from .classes import (
     AgentRequest,
-    AgentSettings,
-    ContainerSettings,
-    ContainerUploadSettings,
     Document,
     DocumentRequest,
     ExtractedField,
     GroundXDocument,
-    GroundXSettings,
     ProcessResponse,
     Prompt,
+    TestChunk,
+    TestDocumentPage,
+    TestField,
+    TestXRay,
     XRayDocument,
 )
 from .services import Logger, RateLimit, SheetsClient, Status, Upload
+from .settings import (
+    AgentSettings,
+    ContainerSettings,
+    ContainerUploadSettings,
+    GroundXSettings,
+)
 
 __all__ = [
     "AgentCode",
@@ -33,6 +39,10 @@ __all__ = [
     "RateLimit",
     "SheetsClient",
     "Status",
+    "TestChunk",
+    "TestDocumentPage",
+    "TestField",
+    "TestXRay",
     "Upload",
     "XRayDocument",
 ]

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/agents/agent.py

@@ -13,9 +13,9 @@ from smolagents.models import (  # pyright: ignore[reportMissingTypeStubs]
     OpenAIServerModel,
 )
 
-from ..classes.settings import AgentSettings
-from ..classes.utility import clean_json
 from ..services.logger import Logger
+from ..settings.settings import AgentSettings
+from ..utility.classes import clean_json
 
 
 prompt_suffix = """

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/classes/__init__.py

@@ -4,24 +4,21 @@ from .document import Document, DocumentRequest
 from .field import ExtractedField
 from .groundx import GroundXDocument, XRayDocument
 from .prompt import Prompt
-from .settings import (
-    AgentSettings,
-    ContainerSettings,
-    ContainerUploadSettings,
-    GroundXSettings,
-)
+from .test_field import TestField
+from .test_groundx import TestChunk, TestDocumentPage, TestXRay
+
 
 __all__ = [
     "AgentRequest",
-    "AgentSettings",
-    "ContainerSettings",
-    "ContainerUploadSettings",
     "Document",
     "DocumentRequest",
     "ExtractedField",
     "GroundXDocument",
-    "GroundXSettings",
     "ProcessResponse",
     "Prompt",
+    "TestChunk",
+    "TestDocumentPage",
+    "TestField",
+    "TestXRay",
     "XRayDocument",
 ]

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/classes/document.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel, ConfigDict, Field, PrivateAttr
 
 from .groundx import GroundXDocument
 from ..services.logger import Logger
-from .utility import clean_json
+from ..utility.classes import clean_json
 
 
 DocT = typing.TypeVar("DocT", bound="Document")
@@ -116,6 +116,14 @@ class Document(BaseModel):
             self.logger.debug_msg(msg, self.file_name, self.document_id, self.task_id)
 
 
+def _new_page_image_dict() -> typing.Dict[str, int]:
+    return {}
+
+
+def _new_page_images() -> typing.List[Image.Image]:
+    return []
+
+
 class DocumentRequest(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     callback_url: str = Field(alias="callbackURL", default="")
@@ -131,10 +139,10 @@ class DocumentRequest(BaseModel):
     _clear_cache: bool = PrivateAttr(default_factory=bool)
     _debug_path: typing.Optional[str] = PrivateAttr(default=None)
     _page_image_dict: typing.Dict[str, int] = PrivateAttr(
-        default_factory=typing.Dict[str, int]
+        default_factory=_new_page_image_dict
     )
     _page_images: typing.List[Image.Image] = PrivateAttr(
-        default_factory=typing.List[Image.Image]
+        default_factory=_new_page_images
     )
     _start: int = PrivateAttr(
         default_factory=lambda: int(datetime.now(timezone.utc).timestamp())

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/classes/prompt.py

@@ -2,7 +2,7 @@ import typing
 
 from pydantic import BaseModel
 
-from .utility import str_to_type_sequence
+from ..utility.classes import str_to_type_sequence
 
 
 class Prompt(BaseModel):

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/classes/test_document.py

@@ -7,6 +7,7 @@ from PIL import Image
 from unittest.mock import patch
 
 from .document import Document, DocumentRequest
+from .test_groundx import TestXRay
 
 
 def DR(**data: typing.Any) -> DocumentRequest:
@@ -17,32 +18,6 @@ def test_request() -> DocumentRequest:
     return DR(documentID="D", fileName="F", modelID=1, processorID=1, taskID="T")
 
 
-class DummyChunk:
-    def __init__(self, json_str: str):
-        self.sectionSummary = None
-        self.suggestedText = json_str
-
-
-class DummyDocumentPage:
-    def __init__(self, page_url: str):
-        self.pageUrl = page_url
-
-
-class DummyXRay:
-    def __init__(
-        self,
-        source_url: str,
-        chunks: typing.Optional[typing.List[DummyChunk]] = [],
-        document_pages: typing.Optional[typing.List[str]] = [],
-    ):
-        self.chunks = chunks
-        self.documentPages: typing.List[DummyDocumentPage] = []
-        if document_pages is not None:
-            for p in document_pages:
-                self.documentPages.append(DummyDocumentPage(p))
-        self.sourceUrl = source_url
-
-
 class TestDocument(unittest.TestCase):
     def setUp(self) -> None:
         patcher = patch(
@@ -50,7 +25,7 @@ class TestDocument(unittest.TestCase):
         )
         self.mock_xray = patcher.start()
         self.addCleanup(patcher.stop)
-        self.mock_xray.return_value = DummyXRay("http://test.co", [])
+        self.mock_xray.return_value = TestXRay("http://test.co", [])
 
     def test_init_name(self) -> None:
         st1: Document = Document.from_request(
@@ -101,13 +76,13 @@ class TestDocumentRequest(unittest.TestCase):
         red_img.save(buf, format="PNG")
         img_bytes = buf.getvalue()
 
-        class DummyResp:
+        class TestResp:
             content = img_bytes
 
             def raise_for_status(self) -> None:
                 pass
 
-        with patch("requests.get", return_value=DummyResp()):
+        with patch("requests.get", return_value=TestResp()):
             st = test_request()
             st.load_images(urls)
 

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/classes/test_groundx.py

@@ -12,6 +12,32 @@ from .groundx import (
 )
 
 
+class TestChunk:
+    def __init__(self, json_str: str):
+        self.sectionSummary = None
+        self.suggestedText = json_str
+
+
+class TestDocumentPage:
+    def __init__(self, page_url: str):
+        self.pageUrl = page_url
+
+
+class TestXRay:
+    def __init__(
+        self,
+        source_url: str,
+        chunks: typing.Optional[typing.List[TestChunk]] = [],
+        document_pages: typing.Optional[typing.List[str]] = [],
+    ):
+        self.chunks = chunks
+        self.documentPages: typing.List[TestDocumentPage] = []
+        if document_pages is not None:
+            for p in document_pages:
+                self.documentPages.append(TestDocumentPage(p))
+        self.sourceUrl = source_url
+
+
 def GD(**data: typing.Any) -> GroundXDocument:
     return GroundXDocument.model_validate(data)
 

groundx-2.5.3/src/groundx/extract/post_process/__init__.py

@@ -0,0 +1,7 @@
+from .post_process import check_map, check_valid
+
+
+__all__ = [
+    "check_map",
+    "check_valid",
+]

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/services/ratelimit.py

@@ -7,9 +7,9 @@ from starlette.responses import JSONResponse, Response
 from starlette.types import ASGIApp
 
 from ..classes.api import ProcessResponse
-from ..classes.settings import ContainerSettings
 from .logger import Logger
 from .status import Status
+from ..settings.settings import ContainerSettings
 from .utility import get_gunicorn_threads, get_thread_id, get_worker_id
 
 

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/services/sheets_client.py

@@ -7,7 +7,7 @@ from googleapiclient.discovery import (
 )
 import gspread
 
-from ..classes.settings import ContainerSettings, GCP_CREDENTIALS
+from ..settings.settings import ContainerSettings, GCP_CREDENTIALS
 
 SPREADSHEET_MIME = "application/vnd.google-apps.spreadsheet"
 

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/services/status.py

@@ -2,8 +2,8 @@ import typing
 
 from fastapi import Response
 
-from ..classes.settings import ContainerSettings
 from .logger import Logger
+from ..settings.settings import ContainerSettings
 
 
 class Status:

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/services/upload.py

@@ -1,7 +1,7 @@
 import typing
 
-from ..classes.settings import ContainerSettings
 from .logger import Logger
+from ..settings.settings import ContainerSettings
 
 
 @typing.runtime_checkable

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/services/upload_minio.py

@@ -1,7 +1,7 @@
 import typing
 
-from ..classes.settings import ContainerSettings
 from .logger import Logger
+from ..settings.settings import ContainerSettings
 
 
 class MinIOClient:

{groundx-2.5.1 → groundx-2.5.3}/src/groundx/extract/services/upload_s3.py

@@ -1,7 +1,7 @@
 import typing
 
-from ..classes.settings import ContainerSettings
 from .logger import Logger
+from ..settings.settings import ContainerSettings
 
 
 class S3Client:

groundx-2.5.3/src/groundx/extract/settings/__init__.py

@@ -0,0 +1,15 @@
+from .settings import (
+    AgentSettings,
+    ContainerSettings,
+    ContainerUploadSettings,
+    GroundXSettings,
+    GCP_CREDENTIALS,
+)
+
+__all__ = [
+    "AgentSettings",
+    "ContainerSettings",
+    "ContainerUploadSettings",
+    "GroundXSettings",
+    "GCP_CREDENTIALS",
+]

groundx-2.5.3/src/groundx/extract/tasks/__init__.py

@@ -0,0 +1,6 @@
+from .utility import error_response, success_response
+
+__all__ = [
+    "error_response",
+    "success_response",
+]

groundx-2.5.3/src/groundx/extract/tasks/utility.py

@@ -0,0 +1,27 @@
+import typing
+
+from ..classes.api import ErrorResponse
+from ..classes.document import DocumentRequest
+from ..classes.groundx import GroundXResponse
+
+
+def error_response(req: DocumentRequest, msg: str) -> typing.Dict[str, typing.Any]:
+    return ErrorResponse(
+        code=500,
+        documentID=req.document_id,
+        message=msg,
+        taskID=req.task_id,
+    ).model_dump(by_alias=True)
+
+
+def success_response(
+    req: DocumentRequest, result_url: str
+) -> typing.Dict[str, typing.Any]:
+    return GroundXResponse(
+        code=200,
+        documentID=req.document_id,
+        modelID=req.model_id,
+        processorID=req.processor_id,
+        resultURL=result_url,
+        taskID=req.task_id,
+    ).model_dump(by_alias=True)

groundx-2.5.3/src/groundx/extract/utility/__init__.py

@@ -0,0 +1,15 @@
+from .classes import (
+    class_fields,
+    clean_json,
+    coerce_numeric_string,
+    from_attr_name,
+    from_key,
+)
+
+__all__ = [
+    "class_fields",
+    "clean_json",
+    "coerce_numeric_string",
+    "from_attr_name",
+    "from_key",
+]

groundx-2.5.1/src/groundx/extract/classes/utility.py → groundx-2.5.3/src/groundx/extract/utility/classes.py

@@ -1,7 +1,7 @@
 import typing
 
 if typing.TYPE_CHECKING:
-    from .prompt import Prompt
+    from ..classes.prompt import Prompt
 
 
 def class_fields(cls: typing.Any) -> typing.Set[str]:

{groundx-2.5.1/src/groundx/extract/classes → groundx-2.5.3/src/groundx/extract/utility}/test_utility.py

@@ -1,6 +1,6 @@
 import typing, unittest
 
-from .utility import class_fields, coerce_numeric_string
+from .classes import class_fields, coerce_numeric_string
 
 
 class DummyModelFields: