typex: python 3.9 support.

Author: AGrigis

README.rst

@@ -36,7 +36,7 @@ Important links
 Content
 -------
 
-TypeX supplies a simple decorator to enforce Python types on function parameters when annotations are available.
+TypEx supplies a simple decorator to enforce Python types on function parameters when annotations are available.
 
 Where to start
 --------------

typex/tests/test_typing.py

@@ -6,7 +6,7 @@
 # for details.
 ##########################################################################
 
-
+import os
 import torch
 import types
 import unittest
@@ -18,6 +18,7 @@
 from traits.api import TraitError
 from typex.decorator import typecheck
 from typex.validation import check_type
+from typex.typing_extensions import File, Directory
 
 
 class TestExperiment(unittest.TestCase):
@@ -51,12 +52,16 @@ def setUp(self):
             Union[int, float],
             Sequence[int],
             Optional[int],
+            File,
+            Directory,
         ]
         self.mvalues = [
             (3, None),
             (2.3, None),
             ([1, 2, 3], None),
             (None, 3.),
+            (__file__, None),
+            (os.path.dirname(__file__), None),
         ]
 
     def tearDown(self):

typex/traits_extension.py

@@ -6,6 +6,8 @@
 # for details.
 ##########################################################################
 
+import os
+
 import numpy as np
 import torch
 import traits.api as traits
@@ -46,6 +48,20 @@ def validate(self, objekt, name, value):
         return value
 
 
+class File(traits.TraitType):
+    def validate(self, objekt, name, value):
+        if not (isinstance(value, str) and os.path.isfile(value)):
+            self.error(objekt, name, value)
+        return value
+
+
+class Directory(traits.TraitType):
+    def validate(self, objekt, name, value):
+        if not (isinstance(value, str) and os.path.isdir(value)):
+            self.error(objekt, name, value)
+        return value
+
+
 class Sequence(traits.List):
     def validate(self, objekt, name, value):
         if not isinstance(value, (tuple, list)):
@@ -81,12 +97,15 @@ def validate(self, objekt, name, value):
     "int": "traits.Int",
     "float": "traits.Float",
     "bool": "traits.Bool",
-    "Tensor": "traits.Tensor",
+    "torch.Tensor": "traits.Tensor",
     "list": "traits.List",
     "tuple": "traits.Tuple",
-    "Sequence": "traits.Sequence",
-    "array": "traits.Array",
-    "Union": "traits.Union",
-    "Optional": "traits.Either",
+    "collections.abc.Sequence": "traits.Sequence",
+    "typing.Sequence": "traits.Sequence",
+    "numpy.array": "traits.Array",
+    "typing.Union": "traits.Union",
+    "typing.Optional": "traits.Either",
     "NoneType": "traits.Undefined",
+    "typex.typing_extensions.File": "traits.File",
+    "typex.typing_extensions.Directory": "traits.Directory"
 }

typex/typing_extensions.py

@@ -0,0 +1,17 @@
+##########################################################################
+# NSAp - Copyright (C) CEA, 2025
+# Distributed under the terms of the CeCILL-B license, as published by
+# the CEA-CNRS-INRIA. Refer to the LICENSE file or to
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# for details.
+##########################################################################
+
+import os
+
+
+class File(os.PathLike):
+    pass
+
+
+class Directory(os.PathLike):
+    pass

typex/validation.py

@@ -58,7 +58,11 @@ def check_type(
 
 
 def typing_to_traits(annot, default_value=False):
-    name = annot.__name__
+    if hasattr(annot, "__name__"):
+        name = f"{annot.__module__}.{annot.__name__}"
+        name = name.replace("builtins.", "")
+    else:
+        name = repr(annot).split("[")[0]
     if name not in TRAIT_TYPES:
         raise NotImplementedError(f"The '{name}' type is not handled yet.")
     expr = f"{TRAIT_TYPES[name]}("