datamasque-python 1.1.6__py3-none-any.whl → 1.1.7__py3-none-any.whl

datamasque/client/__init__.py

@@ -119,6 +119,7 @@ from datamasque.client.models.runs import (
 from datamasque.client.models.status import (
     AsyncRulesetGenerationTaskStatus,
     MaskingRunStatus,
+    ValidationErrorDetails,
     ValidationErrorType,
     ValidationStatus,
 )
@@ -234,6 +235,7 @@ __all__ = [
     "UserId",
     "UserRole",
     "UserSelection",
+    "ValidationErrorDetails",
     "ValidationErrorType",
     "ValidationStatus",
 ]

datamasque/client/models/connection.py

@@ -166,6 +166,7 @@ class MongoConnectionConfig(ConnectionConfig):
     tls_ca_file: str = ""
     tls_allow_invalid_certificates: bool = False
     direct_connection: bool = False
+    retry_writes: bool = True
     replica_set: str = ""
     is_read_only: bool = False
 
@@ -194,6 +195,8 @@ class MongoConnectionConfig(ConnectionConfig):
                 d.pop("tls_allow_invalid_certificates", None)
         if not d.get("direct_connection"):
             d.pop("direct_connection", None)
+        if d.get("retry_writes", True):
+            d.pop("retry_writes", None)
         if not d.get("replica_set"):
             d.pop("replica_set", None)
         if not d.get("user"):

datamasque/client/models/ruleset.py

@@ -4,7 +4,7 @@ from typing import Any, NewType, Optional
 from pydantic import Field
 
 from datamasque.client.models.git import GitTrackedEntity
-from datamasque.client.models.status import ValidationErrorType, ValidationStatus
+from datamasque.client.models.status import ValidationErrorDetails, ValidationStatus
 
 RulesetId = NewType("RulesetId", str)
 
@@ -44,7 +44,5 @@ class Ruleset(GitTrackedEntity):
     # Server-populated read-only fields, excluded from request bodies.
     id: Optional[RulesetId] = Field(default=None, exclude=True)
     is_valid: Optional[ValidationStatus] = Field(default=None, exclude=True)
-    validation_error: Optional[str] = Field(default=None, exclude=True)
-    """Human-readable validation error, or `None` when valid."""
-    validation_error_type: Optional[ValidationErrorType] = Field(default=None, exclude=True)
-    """Category of the validation failure, or `None` when valid."""
+    validation_errors: list[ValidationErrorDetails] = Field(default_factory=list, exclude=True)
+    """Validation errors surfaced by the server; empty when valid."""

datamasque/client/models/ruleset_library.py

@@ -4,7 +4,7 @@ from typing import NewType, Optional
 from pydantic import Field
 
 from datamasque.client.models.git import GitTrackedEntity
-from datamasque.client.models.status import ValidationStatus
+from datamasque.client.models.status import ValidationErrorDetails, ValidationStatus
 
 RulesetLibraryId = NewType("RulesetLibraryId", str)
 
@@ -19,7 +19,7 @@ class RulesetLibrary(GitTrackedEntity):
     # Server-populated read-only fields, excluded from request bodies.
     id: Optional[RulesetLibraryId] = Field(default=None, exclude=True)
     is_valid: Optional[ValidationStatus] = Field(default=None, exclude=True)
-    validation_error: Optional[str] = Field(default=None, exclude=True)
-    """Human-readable validation error, or `None` when valid."""
+    validation_errors: list[ValidationErrorDetails] = Field(default_factory=list, exclude=True)
+    """Validation errors surfaced by the server; empty when valid."""
     created: Optional[datetime] = Field(default=None, exclude=True)
     modified: Optional[datetime] = Field(default=None, exclude=True)

datamasque/client/models/status.py

@@ -1,4 +1,7 @@
 import enum
+from typing import Optional
+
+from pydantic import BaseModel
 
 
 class ValidationStatus(enum.Enum):
@@ -11,7 +14,7 @@ class ValidationStatus(enum.Enum):
 
 
 class ValidationErrorType(enum.Enum):
-    """Categorises why a ruleset failed validation (see `Ruleset.validation_error_type`)."""
+    """Categorises why validation failed (see `ValidationErrorDetails.validation_error_type`)."""
 
     ruleset = "ruleset"
     library_missing = "library_missing"
@@ -19,6 +22,15 @@ class ValidationErrorType(enum.Enum):
     expansion = "expansion"  # The ruleset is not valid once its library references are expanded.
 
 
+class ValidationErrorDetails(BaseModel):
+    """A single validation error, with its position in the YAML when available."""
+
+    message: str
+    validation_error_type: Optional[ValidationErrorType] = None
+    line_number: Optional[int] = None
+    column_number: Optional[int] = None
+
+
 class MaskingRunStatus(enum.Enum):
     """List of valid masking run statuses."""
 

datamasque/client/ruleset_libraries.py

@@ -64,7 +64,7 @@ class RulesetLibraryClient(BaseClient):
         Creates a new ruleset library on the server.
 
         Sets the library's server-assigned fields
-        (`id`, `is_valid`, `validation_error`, `git`, `created`, `modified`) and returns the library.
+        (`id`, `is_valid`, `validation_errors`, `git`, `created`, `modified`) and returns the library.
         """
 
         data = library.model_dump(exclude_none=True, by_alias=True, mode="json")
@@ -72,7 +72,7 @@ class RulesetLibraryClient(BaseClient):
         created_library = RulesetLibrary.model_validate(response.json())
         library.id = created_library.id
         library.is_valid = created_library.is_valid
-        library.validation_error = created_library.validation_error
+        library.validation_errors = created_library.validation_errors
         library.git = created_library.git
         library.created = created_library.created
         library.modified = created_library.modified
@@ -93,7 +93,7 @@ class RulesetLibraryClient(BaseClient):
         response = self.make_request("PUT", f"/api/ruleset-libraries/{library.id}/", data=data)
         updated_library = RulesetLibrary.model_validate(response.json())
         library.is_valid = updated_library.is_valid
-        library.validation_error = updated_library.validation_error
+        library.validation_errors = updated_library.validation_errors
         library.git = updated_library.git
         library.modified = updated_library.modified
         logger.debug('Update of ruleset library "%s" successful', library.name)

datamasque/client/rulesets.py

@@ -20,7 +20,7 @@ class RulesetClient(BaseClient):
         """
         Creates or updates a ruleset.
 
-        Populates the given ruleset's `id`, `is_valid`, `validation_error`, `validation_error_type`,
+        Populates the given ruleset's `id`, `is_valid`, `validation_errors`,
         and `git` fields from the server response, and returns the same ruleset instance for convenience.
         """
 
@@ -29,8 +29,7 @@ class RulesetClient(BaseClient):
         created = Ruleset.model_validate(response.json())
         ruleset.id = created.id
         ruleset.is_valid = created.is_valid
-        ruleset.validation_error = created.validation_error
-        ruleset.validation_error_type = created.validation_error_type
+        ruleset.validation_errors = created.validation_errors
         ruleset.git = created.git
 
         if response.status_code == 201:

{datamasque_python-1.1.6.dist-info → datamasque_python-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamasque-python
-Version: 1.1.6
+Version: 1.1.7
 Summary: Official Python client for the DataMasque data-masking API.
 Project-URL: Homepage, https://datamasque.com/
 Project-URL: Documentation, https://datamasque-python.readthedocs.io/

{datamasque_python-1.1.6.dist-info → datamasque_python-1.1.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-datamasque/client/__init__.py,sha256=8GtJwv76dHgVDFGpE5YEMC0B2KIj6W8D3M3StwjvyXo,6551
+datamasque/client/__init__.py,sha256=USBXQl-WIfbtfzXubPU_WX4hVP_jrETudUSBSgJU02w,6609
 datamasque/client/base.py,sha256=cXU4dluL9e1N1F2pV48iIvebv6OHt7Kh4Ka2y9vkOPo,14296
 datamasque/client/connections.py,sha256=EFinx8fJRme0mTxuWY3d29UnmUFbsQhMaUQT0Ma2PK4,2885
 datamasque/client/discovery.py,sha256=MTDiif6YWkv64hHXZ8YJxtRhoeKIvQVfjNYvjCIZCXE,21261
@@ -10,14 +10,14 @@ datamasque/client/files.py,sha256=vc2tZgT8RdwuCObIQ7H-Qjb80H1PBFqD0nG5Y1tOA_o,35
 datamasque/client/ifm.py,sha256=uIMxpLIPvDiDO1m4bxezixNIUFIFY0MXWRMQNvTbpTA,11858
 datamasque/client/license.py,sha256=pluYaSU168OC6_laB9bM9H3Vuuxs8wa9gujCJvtoJCk,1392
 datamasque/client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datamasque/client/ruleset_libraries.py,sha256=bMUMBHdxjDyFOziw9LMRy5xChPvHvCjpjAUoVeTm1e0,7086
-datamasque/client/rulesets.py,sha256=Fsnsv-uAhF1DBnLI-pRpOrWJ7aCSZspcuU1r0RYTzUc,2655
+datamasque/client/ruleset_libraries.py,sha256=s--iZKB8EAC7bNYrU3ZI0olSWU-mXJoyUBOgJPfQ0xQ,7091
+datamasque/client/rulesets.py,sha256=gzxn9mR7PhCySRUUB1cyl4aLmEfuDKj8BvQUq8OgLH8,2563
 datamasque/client/runs.py,sha256=l_JpYgelqsDKW_O6LtsHC60IMXHG9ak_RwVnuvJKE1I,7703
 datamasque/client/settings.py,sha256=Ui8AyR2XdoW8MZ9FIrGn2jm8DLzUGWIL8i2DOTvu7hc,2898
 datamasque/client/spcs.py,sha256=geHrBQ6WLWsMGpSMV8hmK5SFAwftrOU0DXkrR2orOmo,7532
 datamasque/client/users.py,sha256=VCUo2CJyOw4-aO_3mp_w_0BcSoa6-h1HcReMcAMyumw,3701
 datamasque/client/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datamasque/client/models/connection.py,sha256=CPT2wF1dVMs-N8Jca7hUhegtRk_mxPKU8XhWV43C0xE,17419
+datamasque/client/models/connection.py,sha256=loLy4RCiIfY9kvBFspSqJSRhHqhcJxm_mQzXwMRS4VU,17529
 datamasque/client/models/data_selection.py,sha256=406yyUZ5NmLBSql2lYM1gsTWY5GWmnutmF-DjznAoLc,1904
 datamasque/client/models/discovery.py,sha256=WHSIkFebQ5m47K_BdxY1lvCeeF23q_BbZan7Ryuh5vY,13198
 datamasque/client/models/discovery_config.py,sha256=1CHMgSxMXuarPGfRcz9wX7jeZLn1SDw0UEe-L5naE54,1917
@@ -28,12 +28,12 @@ datamasque/client/models/git.py,sha256=F0KdMFe2vMyL-9tp3SGKGeOlbD1gbcjQn0jpOzNzy
 datamasque/client/models/ifm.py,sha256=j0Ef2BZYTk6MNZO6HS6mW0qWs1_wWD9PlUP_Y6WyBQI,5563
 datamasque/client/models/license.py,sha256=OqIn4Sx3ATBStgt5KNiCOBChTTFYLBsyGj7inAl8oB4,2113
 datamasque/client/models/pagination.py,sha256=egg9aO2cf6KUDwDANPu5RxpJbdRKdwUdCQAtusnuf1c,651
-datamasque/client/models/ruleset.py,sha256=ZYv6SmcrONV5rLK0tKjhlKCwZiCU1dMYtH7olxI4l5A,1678
-datamasque/client/models/ruleset_library.py,sha256=5UbL_M47mgPedo8xt4q5crUh4aeOVoEMAEKbGO8CfiY,950
+datamasque/client/models/ruleset.py,sha256=FDnvewJQvbeH73LpZiwYg3BG9Ya4yhmKKGmO1BKZQPk,1549
+datamasque/client/models/ruleset_library.py,sha256=Pw6Udr7pMgPt1AcG2ZhUXOPBS7tTvpw13UZNLILhZbQ,1003
 datamasque/client/models/runs.py,sha256=UtPMGCJFLFP1f2nyVGAbl3A5_wAONrRNJ63y43Hbpi0,6213
-datamasque/client/models/status.py,sha256=UUEDHd3CQZA1Mf-1LyhAiE4COuCWvAz5oJx5ECVIwp4,2868
+datamasque/client/models/status.py,sha256=WiSMEy_YxdcIA46ioYpAEu8OK8UNDoXpV1W7IUhhyVY,3219
 datamasque/client/models/user.py,sha256=UGAUzgJkf78m24_zFXXoA99zdut48BXkX_ivV8yq1Vc,2043
-datamasque_python-1.1.6.dist-info/METADATA,sha256=5xb8jZEaGhZfMu2NOImE3tuTI2LBlV8O6JScm_Q-pBw,4497
-datamasque_python-1.1.6.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-datamasque_python-1.1.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-datamasque_python-1.1.6.dist-info/RECORD,,
+datamasque_python-1.1.7.dist-info/METADATA,sha256=Z5CeCXlGF3L4GUl6-AITdcffk1EpDbJ1dcRqvfBbW5I,4497
+datamasque_python-1.1.7.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+datamasque_python-1.1.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+datamasque_python-1.1.7.dist-info/RECORD,,