datashare-python 0.11.0__tar.gz → 0.11.2__tar.gz

{datashare_python-0.11.0 → datashare_python-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: datashare-python
-Version: 0.11.0
+Version: 0.11.2
 Summary: Manage Python tasks and local resources in Datashare
 Project-URL: Homepage, https://icij.github.io/datashare-python/
 Project-URL: Documentation, https://icij.github.io/datashare-python/

{datashare_python-0.11.0 → datashare_python-0.11.2}/datashare_python/objects.py

@@ -304,11 +304,16 @@ class Document(DatashareModel):
             )
         resource_name = self.metadata.get(TIKA_METADATA_RESOURCENAME)
         if resource_name is None:
-            msg = (
-                f"doc {self} can't turn ES document into a {ProcessedFile.__name__} "
-                f"without tika metadata resources name in metadata: {self.metadata}"
-            )
-            raise ValueError(msg)
+            # Backward compat for project before resourcename was mandatory
+            if self.is_root_document:
+                resource_name = self.path.name
+            else:
+                msg = (
+                    f"doc {self} can't turn ES document into a"
+                    f" {ProcessedFile.__name__} without tika metadata resources name"
+                    f" in metadata: {self.metadata}"
+                )
+                raise ValueError(msg)
         resource_name = cast(str, resource_name)
         if self.is_root_document:
             path = self.path
@@ -361,7 +366,17 @@ class ManifestEntryStatus(StrEnum):
     PARTIAL = "partial"
 
 
+class User(DatashareModel):
+    id: str
+    name: str | None = None
+    email: str | None = None
+    provider: str | None = None
+    details: dict[str, Any] = Field(default_factory=dict)
+
+
 class TaskArgs(DatashareModel, ABC):
+    user: User | None = None
+
     def as_manifest_task_input(self) -> dict[str, Any]:
         # This is a base implementation, if the input is too large to be dumped,
         # override this and pop large keys

{datashare_python-0.11.0 → datashare_python-0.11.2}/datashare_python/utils.py

@@ -512,13 +512,21 @@ def _write_artifact_bytes(path: Path, artifact: bytes | BytesIO | Path) -> None:
             with path.open("wb") as f:
                 f.write(artifact.read())
         case Path():
-            path.unlink(missing_ok=True)
+            _remove_previous_artifacts(path)
             shutil.move(artifact, path)
         case _:
             msg = f"unsupported artifact type: {artifact.__class__.__name__}"
             raise ValueError(msg)
 
 
+def _remove_previous_artifacts(path: Path) -> None:
+    if isinstance(path, Path) and path.exists():
+        with contextlib.suppress(FileNotFoundError):
+            path.rmdir()
+    else:
+        path.unlink(missing_ok=True)
+
+
 def debuggable_name(
     path: str, component_size_limit: int = 10, *, deterministic: bool = False
 ) -> str:

{datashare_python-0.11.0 → datashare_python-0.11.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datashare-python"
-version = "0.11.0"
+version = "0.11.2"
 description = "Manage Python tasks and local resources in Datashare"
 authors = [
   { name = "Clément Doumouro", email = "cdoumouro@icij.org" },