elapi 1.0.7.dev2__tar.gz → 1.0.7.dev3__tar.gz

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: elapi
-Version: 1.0.7.dev2
+Version: 1.0.7.dev3
 Summary: elAPI is a powerful, extensible API client for eLabFTW.
 Home-page: https://www.urz.uni-heidelberg.de/en/service-catalogue/software-and-applications/elabftw
 License: AGPL-3.0-only
 Keywords: elabftw,api
-Author: Alexander Haller
-Author-email: alexander.haller@urz.uni-heidelberg.de
+Author: Alexander Haller, Mahadi Xion
+Author-email: elabftw@uni-heidelberg.de
 Maintainer: Mahadi Xion
 Maintainer-email: mahadi.xion@urz.uni-heidelberg.de
 Requires-Python: >=3.9.0,<4.0.0

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/pyproject.toml

@@ -1,10 +1,9 @@
 [tool.poetry]
 name = "elapi"
-version = "1.0.7-dev2"
+version = "1.0.7.dev3"
 description = "elAPI is a powerful, extensible API client for eLabFTW."
 authors = [
-    "Alexander Haller <alexander.haller@urz.uni-heidelberg.de>",
-    "Mahadi Xion <mahadi.xion@urz.uni-heidelberg.de>",
+    "Alexander Haller, Mahadi Xion <elabftw@uni-heidelberg.de>",
 ]
 maintainers = [
     "Mahadi Xion <mahadi.xion@urz.uni-heidelberg.de>",

elapi-1.0.7.dev3/src/elapi/VERSION

@@ -0,0 +1 @@
+1.0.7.dev3

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/cli/doc.py

@@ -71,6 +71,10 @@ __PARAMETERS__doc__ = {
               f"If _--format/-F_ is absent, then {APP_NAME} can use the file extension as the data format. "
               f"If _--format/-F_ is also present, then file extension is ignored, "
               f"and --format value takes precedence.\n",
+    "export_overwrite": f"If given --export/-e path is a file, but it already **exists**, "
+                        f"{APP_NAME} will not overwrite the file by default, and will instead use the "
+                        f"fallback location. _--overwrite_ needs to be passed if {APP_NAME} should overwrite "
+                        f"an existing file when exporting.",
     "data_format": f"Format style for the output. Supported values are: {supported_highlighting_formats}. "
               f"The values are case insensitive. The default format is `{DEFAULT_EXPORT_DATA_FORMAT.upper()}`. "
               "When 'txt' is used, the response will be sent in *original*, un-formatted (almost), "

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/cli/elapi.py

@@ -195,6 +195,10 @@ def get(
         ),
     ] = False,
     _export_dest: Annotated[Optional[str], typer.Argument(hidden=True)] = None,
+    export_overwrite: Annotated[
+        bool,
+        typer.Option("--overwrite", help=docs["export_overwrite"], show_default=False),
+    ] = False,
 ) -> dict:
     """
     Make `GET` requests to eLabFTW endpoints as documented in
@@ -235,7 +239,9 @@ def get(
             style="red",
         )
         raise typer.Exit(1)
-    data_format, export_dest, export_file_ext = CLIExport(data_format, _export_dest)
+    data_format, export_dest, export_file_ext = CLIExport(
+        data_format, _export_dest, export_overwrite
+    )
     if not query:
         format = CLIFormat(data_format, export_file_ext)
     else:

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/configuration/config.py

@@ -1,10 +1,12 @@
+import errno
 import os
 from pathlib import Path
 
 from dynaconf import Dynaconf
 
 from ._config_history import ConfigHistory, InspectConfigHistory
-from .log_file import LOG_FILE_PATH, XDG_DATA_HOME
+from .log_file import LOG_FILE_PATH, _XDG_DATA_HOME
+
 # noinspection PyUnresolvedReferences
 from .._names import (
     APP_NAME,
@@ -25,11 +27,13 @@ from .._names import (
 )
 from ..loggers import Logger
 from ..path import ProperPath
+from ..styles import stdin_console, NoteText
 from ..validators import (
     Validate,
     ValidationError,
     CriticalValidationError,
     PathValidator,
+    PathValidationError,
 )
 
 logger = Logger()
@@ -116,19 +120,24 @@ TOKEN_BEARER: str = "Authorization"
 # Export location
 CONFIG_EXPORT_DIR = ProperPath(
     (_CONFIG_EXPORT_DIR_ORIGINAL := settings.get(KEY_EXPORT_DIR)) or os.devnull,
+    kind=(_CONFIG_EXPORT_DIR_ORIGINAL and "dir") or "file",
     err_logger=logger,
 )  # the default "os.devnull" saves ProperPath from TypeError, ValueError
 # for when settings.get(KEY_EXPORT_DIR) is None/"".
-if _CONFIG_EXPORT_DIR_ORIGINAL and CONFIG_EXPORT_DIR.kind != "dir":
-    logger.warning(
-        f"{KEY_EXPORT_DIR}: {_CONFIG_EXPORT_DIR_ORIGINAL} is not a directory!"
-    )
-    logger.debug("If you want to export to a file use '--export <path-to-file>'.")
-    CONFIG_EXPORT_DIR = None
 try:
     EXPORT_DIR = Validate(PathValidator(CONFIG_EXPORT_DIR)).get()
-except ValidationError:
+except PathValidationError as e:
     if _CONFIG_EXPORT_DIR_ORIGINAL:
+        if e.errno == errno.EEXIST:
+            logger.warning(
+                f"{KEY_EXPORT_DIR}: {_CONFIG_EXPORT_DIR_ORIGINAL} from configuration file is not a directory!"
+            )
+            stdin_console.print(
+                NoteText(
+                    "If you want to export to a file use '--export <path-to-file>'.\n",
+                    stem="Note",
+                )
+            )
         logger.warning(
             f"{KEY_EXPORT_DIR}: {_CONFIG_EXPORT_DIR_ORIGINAL} from configuration file couldn't be validated! "
         )
@@ -149,7 +158,7 @@ except ValidationError:
         logger.critical(
             f"{APP_NAME} couldn't validate {FALLBACK_EXPORT_DIR} to store exported data. "
             f"This is a fatal error. To quickly fix this error define an export directory "
-            f"with 'export_dir' in configuration file. {APP_NAME} will not run!"
+            f"with '{KEY_EXPORT_DIR}' in configuration file. {APP_NAME} will not run!"
         )
         raise CriticalValidationError
 # Falls back to ~/Downloads if $XDG_DOWNLOAD_DIR isn't found
@@ -159,7 +168,7 @@ if LOG_FILE_PATH.parent != LOG_DIR_ROOT:
     APP_DATA_DIR = LOG_FILE_PATH.parent
 else:
     validate_app_dir = Validate(
-        PathValidator([XDG_DATA_HOME / APP_NAME, FALLBACK_DIR / APP_NAME])
+        PathValidator([_XDG_DATA_HOME / APP_NAME, FALLBACK_DIR / APP_NAME])
     )
     try:
         APP_DATA_DIR = validate_app_dir.get()

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/configuration/log_file.py

@@ -23,7 +23,7 @@ validate_path = Validate(
     PathValidator(
         [
             LOG_DIR_ROOT / LOG_FILE_NAME,
-            (XDG_DATA_HOME := ProperPath(os.getenv(ENV_XDG_DATA_HOME, os.devnull)))
+            (_XDG_DATA_HOME := ProperPath(os.getenv(ENV_XDG_DATA_HOME, os.devnull)))
             / APP_NAME
             / LOG_FILE_NAME,
             FALLBACK_DIR / LOG_FILE_NAME,

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/path.py

@@ -5,7 +5,7 @@ import re
 from contextlib import contextmanager
 from pathlib import Path
 from shutil import rmtree
-from typing import Union, TextIO, Generator
+from typing import Union, TextIO, Generator, Optional
 
 from ._exceptions import NoException
 from .loggers import SimpleLogger
@@ -16,7 +16,7 @@ class ProperPath:
         self,
         name: Union[str, Path, None, "ProperPath"],
         env_var: bool = False,
-        kind: Union[str, None] = "",
+        kind: Optional[str] = None,  # Here, None => Undefined/unknown
         err_logger: logging.Logger = SimpleLogger(),
     ):
         self.name = name
@@ -103,7 +103,7 @@ class ProperPath:
 
     @kind.setter
     def kind(self, value) -> None:
-        if not value:
+        if value is None:
             self._kind = (
                 "dir"
                 if self.expanded.is_dir()
@@ -139,20 +139,24 @@ class ProperPath:
             else f"PATH={target}"
         )
 
-    def create(self) -> Union[Path, None]:
-        if not (path := self.expanded.resolve(strict=False)).exists():
-            # except FileNotFoundError:
-            message = (
-                f"{self._error_helper_compare_path_source(self.name, path)} could not be found. "
-                f"An attempt to create PATH={path} will be made."
-            )
-            self.err_logger.warning(message)
+    def create(self, verbose: bool = True) -> Union[Path, None]:
+        path = self.expanded.resolve(strict=False)
         try:
             if self.kind == "file":
                 path_parent, path_file = path.parent, path.name
+                if not path_parent.exists() and verbose:
+                    self.err_logger.info(
+                        f"Directory {self._error_helper_compare_path_source(self.name, path_parent)} could not be "
+                        f"found. An attempt to create directory {path_parent} will be made."
+                    )
                 path_parent.mkdir(parents=True, exist_ok=True)
                 (path_parent / path_file).touch(exist_ok=True)
             elif self.kind == "dir":
+                if not path.exists() and verbose:
+                    self.err_logger.info(
+                        f"Directory {self._error_helper_compare_path_source(self.name, path)} could not be found. "
+                        f"An attempt to create directory {path} will be made."
+                    )
                 path.mkdir(parents=True, exist_ok=True)
         except (exception := PermissionError) as e:
             message = f"Permission to create {self._error_helper_compare_path_source(self.name, path)} is denied."

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/plugins/bill_teams/_doc.py

@@ -1,3 +1,4 @@
+from ... import APP_NAME
 from ...configuration import DEFAULT_EXPORT_DATA_FORMAT
 
 _UNIQUE_SUPPORTED_FORMATS = ["json", "yaml", "txt"]
@@ -27,4 +28,17 @@ __PARAMETERS__doc__ = {
                    " to some external formatting program like `less`. "
                    "If an unsupported format value is provided then the output "
                    f"format falls back to `{DEFAULT_EXPORT_DATA_FORMAT.upper()}`.",
+    "export_details": f"- If _'--export'_ is passed without any following value, then it acts as a flag, and "
+                      f"`export_dir` value from configuration file is used. "
+                      f"It should be clear that `export_dir` in a configuration file only accepts a directory path.\n"
+                      f"- If a directory path is provided as a value, "
+                      f"i.e., _'--export \<path/to/directory\>'_, then that path is used instead. "
+                      f"When the path is a directory, "
+                      f"the file name is auto-generated using the following scheme: *'DATE_HHMMSS_\<FUNCTION\>.EXT'*.\n"
+                      f"- If a file path is passed, i.e., _'--export <path/to/file.json>'_, "
+                      f"then data is simply exported to that file. This allows custom file name scheme. "
+                      f"If _--format/-F_ is absent, then {APP_NAME} can use the file extension as the data format. "
+                      f"If _--format/-F_ is also present, then file extension is ignored, "
+                      f"and --format value takes precedence.\n"
+
 }

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/plugins/bill_teams/cli.py

@@ -42,13 +42,19 @@ def get_teams(
         typer.Option(
             "--export",
             "-e",
-            help=elapi_docs["export"] + elapi_docs["export_details"],
+            help=elapi_docs["export"] + docs["export_details"],
             is_flag=True,
             is_eager=True,
             show_default=False,
         ),
     ] = False,
     _export_dest: Annotated[Optional[str], typer.Argument(hidden=True)] = None,
+    export_overwrite: Annotated[
+        bool,
+        typer.Option(
+            "--overwrite", help=elapi_docs["export_overwrite"], show_default=False
+        ),
+    ] = False,
 ) -> dict:
     """Get billable teams data."""
     from .format import remove_csv_formatter_support
@@ -72,7 +78,9 @@ def get_teams(
     if sort_json_format:
         from .format import JSONSortedFormat  # noqa: F401
 
-    data_format, export_dest, export_file_ext = CLIExport(data_format, _export_dest)
+    data_format, export_dest, export_file_ext = CLIExport(
+        data_format, _export_dest, export_overwrite
+    )
     format = CLIFormat(data_format, export_file_ext)
 
     import asyncio
@@ -128,13 +136,19 @@ def get_owners(
         typer.Option(
             "--export",
             "-e",
-            help=elapi_docs["export"] + elapi_docs["export_details"],
+            help=elapi_docs["export"] + docs["export_details"],
             is_flag=True,
             is_eager=True,
             show_default=False,
         ),
     ] = False,
     _export_dest: Annotated[Optional[str], typer.Argument(hidden=True)] = None,
+    export_overwrite: Annotated[
+        bool,
+        typer.Option(
+            "--overwrite", help=elapi_docs["export_overwrite"], show_default=False
+        ),
+    ] = False,
 ) -> dict:
     """Get billable team owners data."""
     from .format import remove_csv_formatter_support
@@ -163,7 +177,7 @@ def get_owners(
     if sort_json_format:
         from .format import JSONSortedFormat  # noqa: F401
 
-    data_format, export_dest, export_file_ext = CLIExport(data_format, _export_dest)
+    data_format, export_dest, export_file_ext = CLIExport(data_format, _export_dest, export_overwrite)
     format = CLIFormat(data_format, export_file_ext)
 
     from .bill_teams import (
@@ -214,7 +228,7 @@ def generate_invoice(
         typer.Option(
             "--export",
             "-e",
-            help=docs["invoice_export"] + elapi_docs["export_details"],
+            help=docs["invoice_export"] + docs["export_details"],
             is_flag=True,
             is_eager=True,
             show_default=False,

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/plugins/commons/__init__.py

@@ -1,3 +1,3 @@
-from .export import Export, ExportValidator  # noqa: F401
+from .export import Export, ExportPathValidator  # noqa: F401
 from .get_information import Information, RecursiveInformation  # noqa: F401
 from .get_location_from_headers import get_location_from_headers  # noqa: F401

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/plugins/commons/cli_helpers.py

@@ -7,19 +7,29 @@ from typer.core import TyperGroup
 from ...configuration import APP_NAME, DEFAULT_EXPORT_DATA_FORMAT
 from ...loggers import Logger
 from ...path import ProperPath
+from ...validators import Exit
 
 logger = Logger()
 
 
 class CLIExport:
     def __new__(
-        cls, data_format: Optional[str] = None, export_dest: Optional[str] = None
+        cls,
+        data_format: Optional[str] = None,
+        export_dest: Optional[str] = None,
+        can_overwrite: bool = False,
     ):
         from collections import namedtuple
         from ...validators import Validate
-        from .export import ExportValidator
+        from .export import ExportPathValidator
 
-        validate_export = Validate(ExportValidator(export_dest))
+        try:
+            validate_export = Validate(
+                ExportPathValidator(export_dest, can_overwrite=can_overwrite)
+            )
+        except ValueError as e:
+            logger.error(e)
+            raise Exit(1)
         export_dest: ProperPath = validate_export.get()
 
         _export_file_ext: str = (

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/plugins/commons/export.py

@@ -74,22 +74,56 @@ class Export:
             )
 
 
-class ExportValidator(PathValidator):
+class ExportPathValidator(PathValidator):
     def __init__(
-        self, /, export_path: Union[Iterable, Union[None, str, ProperPath, Path]]
+        self,
+        /,
+        export_path: Union[Iterable, Union[None, str, ProperPath, Path]],
+        can_overwrite: bool = False,
     ):
         self.export_path = export_path
+        self.can_overwrite = can_overwrite
         super().__init__(export_path)
 
+    @property
+    def can_overwrite(self) -> bool:
+        return self._can_overwrite
+
+    @can_overwrite.setter
+    def can_overwrite(self, value: bool):
+        if not isinstance(value, bool):
+            raise ValueError("can_overwrite attribute must be a boolean!")
+        self._can_overwrite = value
+
     def validate(self) -> ProperPath:
         from ...configuration import APP_NAME, EXPORT_DIR
+        from ...styles import stdin_console, NoteText
 
         if self.export_path is not None:
             try:
-                return ProperPath(super().validate(), err_logger=logger)
+                path = ProperPath(super().validate(), err_logger=logger)
             except ValidationError:
                 logger.warning(
                     f"--export path '{self.export_path}' couldn't be validated! "
                     f"{APP_NAME} will use fallback export location."
                 )
+            else:
+                if (
+                    path.kind == "file"
+                    and path.expanded.exists()
+                    and path.expanded not in super()._self_created_files
+                    and not self.can_overwrite
+                ):
+                    logger.warning(
+                        f"--export path '{self.export_path}' already exists! "
+                        f"{APP_NAME} will use fallback export location."
+                    )
+                    stdin_console.print(
+                        NoteText(
+                            "Use '--overwrite' to force '--export' to write to an existing file.\n",
+                            stem="Note",
+                        )
+                    )
+                    return ProperPath(EXPORT_DIR, err_logger=logger)
+                return path
         return ProperPath(EXPORT_DIR, err_logger=logger)

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/plugins/experiments/_doc.py

@@ -48,6 +48,18 @@ __PARAMETERS__doc__ = {
                    "to some external formatting program like `less`. "
                    "If an unsupported format value is provided then the output format "
                    f"falls back to `{DEFAULT_EXPORT_DATA_FORMAT.upper()}`.",
+    "export_details": f"- If _'--export'_ is passed without any following value, then it acts as a flag, and "
+                      f"`export_dir` value from configuration file is used. "
+                      f"It should be clear that `export_dir` in a configuration file only accepts a directory path.\n"
+                      f"- If a directory path is provided as a value, "
+                      f"i.e., _'--export \<path/to/directory\>'_, then that path is used instead. "
+                      f"When the path is a directory, "
+                      f"the file name is auto-generated using the following scheme: *'DATE_HHMMSS_\<FUNCTION\>.EXT'*.\n"
+                      f"- If a file path is passed, i.e., _'--export <path/to/file.json>'_, "
+                      f"then data is simply exported to that file. This allows custom file name scheme. "
+                      f"If _--format/-F_ is absent, then {APP_NAME} can use the file extension as the data format. "
+                      f"If _--format/-F_ is also present, then file extension is ignored, "
+                      f"and --format value takes precedence.\n",
 
 
 }

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/plugins/experiments/cli.py

@@ -42,13 +42,19 @@ def get(
         typer.Option(
             "--export",
             "-e",
-            help=elapi_docs["export"] + elapi_docs["export_details"],
+            help=elapi_docs["export"] + docs["export_details"],
             is_flag=True,
             is_eager=True,
             show_default=False,
         ),
     ] = False,
     _export_dest: Annotated[Optional[str], typer.Argument(hidden=True)] = None,
+    export_overwrite: Annotated[
+        bool,
+        typer.Option(
+            "--overwrite", help=elapi_docs["export_overwrite"], show_default=False
+        ),
+    ] = False,
 ) -> dict:
     """
     Read or download an experiment.
@@ -71,7 +77,9 @@ def get(
         logger.error(e)
         raise typer.Exit(1)
     else:
-        data_format, export_dest, export_file_ext = CLIExport(data_format, _export_dest)
+        data_format, export_dest, export_file_ext = CLIExport(
+            data_format, _export_dest, export_overwrite
+        )
         format = CLIFormat(data_format, export_file_ext)
 
         if isinstance(format, formats.BinaryFormat):
@@ -81,7 +89,7 @@ def get(
                 f"Data will be exported."
             )
             response = FixedExperimentEndpoint().get(
-                experiment_id, query={"format": data_format}
+                experiment_id, query={"format": data_format.lower()}
             )
             formatted_data = format(response_data := response.content)
         else:
@@ -248,13 +256,19 @@ def download_attachment(
         typer.Option(
             "--export",
             "-e",
-            help=elapi_docs["export"] + elapi_docs["export_details"],
+            help=elapi_docs["export"] + docs["export_details"],
             is_flag=True,
             is_eager=True,
             show_default=False,
         ),
     ] = False,
     _export_dest: Annotated[Optional[str], typer.Argument(hidden=True)] = None,
+    export_overwrite: Annotated[
+        bool,
+        typer.Option(
+            "--overwrite", help=elapi_docs["export_overwrite"], show_default=False
+        ),
+    ] = False,
 ) -> None:
     """
     Download an attachment from an experiment.
@@ -289,7 +303,7 @@ def download_attachment(
             raise typer.Exit(1)
         else:
             data_format, export_dest, export_file_ext = CLIExport(
-                attachment_extension, _export_dest
+                attachment_extension, _export_dest, export_overwrite
             )
             _is_real_id = attachment_id == attachment_real_id
             if export:

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/validators/__init__.py

@@ -8,5 +8,5 @@ from .base import (
     CriticalValidationError,
 )
 from .identity import HostIdentityValidator
-from .path import PathValidator
+from .path import PathValidator, PathValidationError
 from .permission import PermissionValidator, APITokenRWValidator

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/validators/base.py

@@ -2,17 +2,10 @@ import sys
 from abc import abstractmethod, ABC
 from typing import Any
 
-import typer
-
 
 class ValidationError(Exception): ...
 
 
-class RuntimeValidationError(typer.Exit):
-    def __init__(self, *args) -> None:
-        super().__init__(*args or (1,))  # default error code is always 1
-
-
 class Exit(BaseException):
     if (
         hasattr(sys, "ps1")
@@ -32,7 +25,12 @@ class Exit(BaseException):
         return super().__new__(cls, *args, **kwargs)  # cls == CriticalValidationError
 
 
-class CriticalValidationError(Exit): ...
+class RuntimeValidationError(Exit, ValidationError):
+    def __init__(self, *args) -> None:
+        super().__init__(*args or (1,))  # default error code is always 1
+
+
+class CriticalValidationError(Exit, ValidationError): ...
 
 
 class Validator(ABC):

{elapi-1.0.7.dev2 → elapi-1.0.7.dev3}/src/elapi/validators/path.py

@@ -1,16 +1,29 @@
 import string
 from pathlib import Path
 from random import choices
-from typing import Union, Iterable
+from typing import Union, Iterable, Optional
 
 from .base import Validator, ValidationError
 from ..path import ProperPath
 
 
+class PathValidationError(ValidationError):
+    def __init__(self, *args) -> None:
+        super().__init__(*args)
+        self.errno: Optional[int] = None
+        # Unlike OSError errno here is an instance attribute instead a class attribute.
+        # This ensures broad use of errno with PathValidationError in the future.
+
+    def __call__(self, *args):
+        super().__init__(*args)
+        return self
+
+
 class PathValidator(Validator):
     def __init__(
         self,
         path: Union[Iterable, Union[None, str, ProperPath, Path]],
+        retain_created_file: bool = True,
         **kwargs,
     ):
         from ..loggers import Logger
@@ -20,6 +33,8 @@ class PathValidator(Validator):
         self.TMP_FILE = (
             f".tmp_{''.join(choices(string.ascii_lowercase + string.digits, k=16))}"
         )
+        self.retain_created_file = retain_created_file
+        self.__self_created_files: list = []
 
     @property
     def path(self):
@@ -38,7 +53,13 @@ class PathValidator(Validator):
         else:
             self._path = (value,) if isinstance(value, str) else value
 
+    @property
+    def _self_created_files(self):
+        return self.__self_created_files
+
     def validate(self):
+        errno: Optional[int] = None
+        _self_created_file: bool = False
         for p in self.path:
             if not isinstance(p, ProperPath):
                 try:
@@ -51,7 +72,10 @@ class PathValidator(Validator):
                 else p
             )
             try:
-                p.create()
+                if not p.expanded.exists():
+                    p.create()
+                    self._self_created_files.append(p.expanded)
+                    _self_created_file = True
                 with p_child.open(mode="ba+") as f:
                     f.write(
                         b"\x06"
@@ -63,9 +87,25 @@ class PathValidator(Validator):
                         continue  # It'd not be possible to read from those files.
                     f.seek(f.tell() - 1)
                     f.truncate()
-            except (p.PathException, p_child.PathException, ValueError, AttributeError):
+            except (
+                p.PathException,
+                p_child.PathException,
+                ValueError,
+                AttributeError,
+            ) as e:
+                errno = getattr(e, "errno", None)
                 continue
             else:
-                p_child.remove() if p.kind == "dir" else ...
+                if p.kind == "dir":
+                    p_child.remove()
+                if (
+                    not self.retain_created_file
+                    and _self_created_file
+                    and p.kind == "file"
+                    and p.expanded.stat().st_size == 0
+                ):
+                    p.remove()
                 return p.expanded
-        raise ValidationError("Given path(s) could not be validated!")
+        validation_error = PathValidationError()
+        validation_error.errno = errno
+        raise validation_error("Given path(s) could not be validated!")

elapi-1.0.7.dev2/src/elapi/VERSION

@@ -1 +0,0 @@
-1.0.7-dev2