evo-objects 0.6.5__tar.gz → 0.6.6__tar.gz

{evo_objects-0.6.5 → evo_objects-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: evo-objects
-Version: 0.6.5
+Version: 0.6.6
 Summary: Python SDK for using the Seequent Evo Geoscience Object API
 Project-URL: Source, https://github.com/SeequentEvo/evo-python-sdk
 Project-URL: Tracker, https://github.com/SeequentEvo/evo-python-sdk/issues
@@ -9,7 +9,7 @@ Project-URL: Documentation, https://developer.seequent.com/
 Author-email: Seequent <support@seequent.com>
 License-File: LICENSE.md
 Requires-Python: >=3.10
-Requires-Dist: evo-sdk-common[jmespath]>=0.5.28
+Requires-Dist: evo-sdk-common[jmespath]>=0.5.31
 Requires-Dist: pydantic<3,>=2
 Provides-Extra: aiohttp
 Requires-Dist: evo-sdk-common[aiohttp]; extra == 'aiohttp'

{evo_objects-0.6.5 → evo_objects-0.6.6}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "evo-objects"
 description = "Python SDK for using the Seequent Evo Geoscience Object API"
-version = "0.6.5"
+version = "0.6.6"
 requires-python = ">=3.10"
 license-files = ["LICENSE.md"]
 dynamic = ["readme"]
@@ -10,7 +10,7 @@ authors = [
 ]
 
 dependencies = [
-    "evo-sdk-common[jmespath]>=0.5.28",
+    "evo-sdk-common[jmespath]>=0.5.31",
     "pydantic>=2,<3",
 ]
 

{evo_objects-0.6.5 → evo_objects-0.6.6}/src/evo/objects/exceptions.py

@@ -11,7 +11,7 @@
 
 from uuid import UUID
 
-from evo.common.exceptions import CustomTypedError, EvoClientException
+from evo.common.exceptions import BadRequestException, CustomTypedError, EvoClientException
 
 
 class SchemaIDFormatError(EvoClientException):
@@ -41,6 +41,30 @@ class SchemaValidationError(EvoClientException):
     """Failed to validate data against a geoscience object schema"""
 
 
+class InvalidGeoscienceObjectError(CustomTypedError, BadRequestException):
+    """The service rejected an object that does not match its geoscience object schema."""
+
+    TYPE_ID = "/geoscienceobject/schemas/invalid-object"
+
+    def __str__(self) -> str:
+        error_message = super().__str__()
+        detail = self.detail
+        if detail:
+            error_message = error_message.removesuffix(f"\nDetail: {detail}")
+        if json_path := self.content.get("json_path"):
+            error_message += f"\nInvalid value at: {json_path}"
+        if schema_path := self.content.get("schema_path"):
+            error_message += f"\nFailed schema rule: {schema_path}"
+        if detail:
+            if len(detail) > 500:
+                detail = (
+                    f"{detail[:250]} ... [omitted] ... {detail[-250:]}\n"
+                    "(For the full detail, catch this exception as exc and run print(exc.detail).)"
+                )
+            error_message += f"\nDetail: {detail}"
+        return error_message
+
+
 class ObjectAlreadyExistsError(CustomTypedError):
     TYPE_ID = "/geoscienceobject/objects/already-exists"
 

{evo_objects-0.6.5 → evo_objects-0.6.6}/src/evo/objects/typed/base.py

@@ -19,8 +19,9 @@ from dataclasses import dataclass
 from typing import Annotated, Any, ClassVar
 from uuid import UUID
 
-from evo import jmespath
+from evo import jmespath, logging
 from evo.common import IContext, IFeedback, StaticContext
+from evo.common.exceptions import error_context
 from evo.common.utils import NoFeedback
 from evo.objects import DownloadedObject, ObjectMetadata, ObjectReference, ObjectSchema, SchemaVersion
 
@@ -36,6 +37,8 @@ if sys.version_info >= (3, 11):
 else:
     from typing_extensions import Self
 
+logger = logging.getLogger("object")
+
 __all__ = [
     "BaseObject",
     "BaseObjectData",
@@ -254,9 +257,15 @@ class _BaseObject(SchemaModel):
 
         # Take a copy to avoid the context changes affecting the object
         context = StaticContext.create_copy(context)
-        object_dict = await cls._data_to_schema(data, context)
+        description = f"{cls.__name__} '{data.name}'"
+        with error_context(f"While preparing data for {description}", logger=logger):
+            object_dict = await cls._data_to_schema(data, context)
         object_dict["uuid"] = None  # New UUID is generated by the service
-        obj = await create_geoscience_object(context, object_dict, parent, path)
+        target = f"path '{path}'" if path is not None else f"parent path '{parent or ''}'"
+        with error_context(
+            f"While creating {description} at {target} (schema: {object_dict['schema']})", logger=logger
+        ):
+            obj = await create_geoscience_object(context, object_dict, parent, path)
         return cls(obj)
 
     @classmethod
@@ -285,10 +294,15 @@ class _BaseObject(SchemaModel):
             workspace_id=reference.workspace_id,
         )
 
-        object_dict = await cls._data_to_schema(data, reference_context)
-        obj = await replace_geoscience_object(
-            reference_context, reference, object_dict, create_if_missing=create_if_missing
-        )
+        description = f"{cls.__name__} '{data.name}'"
+        with error_context(f"While preparing replacement data for {description}", logger=logger):
+            object_dict = await cls._data_to_schema(data, reference_context)
+        with error_context(
+            f"While replacing {description} at '{reference}' (schema: {object_dict['schema']})", logger=logger
+        ):
+            obj = await replace_geoscience_object(
+                reference_context, reference, object_dict, create_if_missing=create_if_missing
+            )
         return cls(obj)
 
     @classmethod

{evo_objects-0.6.5 → evo_objects-0.6.6}/src/evo/objects/utils/data.py

@@ -19,7 +19,7 @@ import numpy as np
 
 from evo import logging
 from evo.common import APIConnector, Environment, ICache, IFeedback, StaticContext
-from evo.common.exceptions import StorageFileNotFoundError
+from evo.common.exceptions import StorageFileNotFoundError, error_context
 from evo.common.io.exceptions import DataExistsError
 from evo.common.utils import NoFeedback, PartialFeedback, split_feedback
 
@@ -143,22 +143,24 @@ class ObjectDataClient:
         n_names = len(names)
         logger.debug(f"Found {n_names} data reference{'' if n_names == 1 else 's'}")
         n_uploaded = 0
-        async for ctx in ObjectDataUpload._create_multiple(
-            connector=self._connector,
-            environment=self._environment,
-            names=names,
-        ):
-            if fb is not NoFeedback:
-                fb_part = PartialFeedback(parent=fb, start=n_uploaded / n_names, end=(n_uploaded + 1) / n_names)
-            else:
-                fb_part = NoFeedback
-
-            data_file = self.cache_location / ctx.name
-            logger.debug(f"Uploading data: {ctx.name}")
-            if not data_file.exists():
-                raise StorageFileNotFoundError(f"Object data file not found in cache: {data_file}")
-            await ctx.upload_from_path(filename=data_file, transport=self._connector.transport, fb=fb_part)
-            n_uploaded += 1
+        with error_context("While uploading referenced data", logger=logger):
+            async for ctx in ObjectDataUpload._create_multiple(
+                connector=self._connector,
+                environment=self._environment,
+                names=names,
+            ):
+                if fb is not NoFeedback:
+                    fb_part = PartialFeedback(parent=fb, start=n_uploaded / n_names, end=(n_uploaded + 1) / n_names)
+                else:
+                    fb_part = NoFeedback
+
+                with error_context(f"While uploading referenced data '{ctx.name}'", logger=logger):
+                    data_file = self.cache_location / ctx.name
+                    logger.debug(f"Uploading data: {ctx.name}")
+                    if not data_file.exists():
+                        raise StorageFileNotFoundError(f"Object data file not found in cache: {data_file}")
+                    await ctx.upload_from_path(filename=data_file, transport=self._connector.transport, fb=fb_part)
+                n_uploaded += 1
 
         logger.debug(
             f"Uploaded {n_uploaded} data reference{'' if n_uploaded == 1 else 's'}, skipped {n_names - n_uploaded}"
@@ -183,9 +185,10 @@ class ObjectDataClient:
         """
         from .table_formats import get_known_format
 
-        if not isinstance(table_format, KnownTableFormat):
-            table_format = get_known_format(table, table_formats=table_format)
-        table_info = table_format.save_table(table=table, destination=self.cache_location)
+        with error_context("While preparing an Arrow table for Evo Parquet storage", logger=logger):
+            if not isinstance(table_format, KnownTableFormat):
+                table_format = get_known_format(table, table_formats=table_format)
+            table_info = table_format.save_table(table=table, destination=self.cache_location)
         return table_info
 
     async def upload_table(
@@ -210,11 +213,12 @@ class ObjectDataClient:
         """
         table_info = self.save_table(table, table_format)
         upload = ObjectDataUpload(connector=self._connector, environment=self._environment, name=table_info["data"])
-        try:
-            await upload.upload_from_cache(cache=self._cache, transport=self._connector.transport, fb=fb)
-        except DataExistsError:
-            logger.debug(f"Data not uploaded because data already exists (label: {table_info['data']})")
-            fb.progress(1)
+        with error_context(f"While uploading table data '{table_info['data']}'", logger=logger):
+            try:
+                await upload.upload_from_cache(cache=self._cache, transport=self._connector.transport, fb=fb)
+            except DataExistsError:
+                logger.debug(f"Data not uploaded because data already exists (label: {table_info['data']})")
+                fb.progress(1)
         return table_info
 
     async def upload_category_table(self, table: pa.Table, fb: IFeedback = NoFeedback) -> CategoryInfo: