Merge pull request #120 from ArcanaFramework/subtypevar-convertible-from

handle subtypevars in convertible_from

Author: tclose

extras/fileformats/extras/testing/__init__.py

@@ -16,21 +16,21 @@ def ConvertibleToConverter(in_file: AbstractFile) -> ConvertibleToFile:
 
 @converter  # pyright: ignore[reportArgumentType]
 @python.define(outputs=["out_file"])  # type: ignore[misc]
-def EncodedFromTextConverter(in_file: TextFile) -> EncodedText:
+def EncodedFromTextConverter(in_file: TextFile, shift: int = 1) -> EncodedText:
     contents = in_file.read_text()
     # Encode by shifting ASCII codes forward by 1
-    encoded_contents = "".join(chr(ord(c) + 1) for c in contents)
+    encoded_contents = "".join(chr(ord(c) + shift) for c in contents)
     out_file = EncodedText.sample()
     out_file.write_text(encoded_contents)
     return out_file
 
 
 @converter  # pyright: ignore[reportArgumentType]
 @python.define(outputs=["out_file"])  # type: ignore[misc]
-def EncodedToTextConverter(in_file: EncodedText) -> TextFile:
+def EncodedToTextConverter(in_file: EncodedText, shift: int = 1) -> TextFile:
     contents = in_file.read_text()
     # Decode by shifting ASCII codes back by 1
-    decoded_contents = "".join(chr(ord(c) - 1) for c in contents)
+    decoded_contents = "".join(chr(ord(c) - shift) for c in contents)
     out_file = TextFile.sample()
     out_file.write_text(decoded_contents)
     return out_file

fileformats/core/fileset.py

@@ -24,6 +24,7 @@
     from typing_extensions import TypeAlias
 
 from fileformats.core.typing import Self
+from fileformats.core.converter_helpers import SubtypeVar
 from fileformats.core.utils import _excluded_subpackages
 
 from .classifier import Classifier
@@ -670,8 +671,6 @@ def convertible_from(
 
         Parameters
         ----------
-        include_generic: bool
-            If True, only consider parent classes in the same namespace for conversion.
         union_sort_key : callable[[DataType], Any], optional
             A function used to sort the union of types. Defaults to sorting by the type name.
 
@@ -683,9 +682,13 @@ def convertible_from(
 
         datatypes: ty.List[ty.Type[DataType]] = [cls]
         cls._import_extras_module()
-        exclude_subpackages = copy(_excluded_subpackages)
-        exclude_subpackages.discard(cls.namespace)
-        for subcls in FileSet.subclasses(exclude=exclude_subpackages):
+        if cls.namespace == "generic":
+            subclasses = [cls]
+        else:
+            exclude_subpackages = copy(_excluded_subpackages)
+            exclude_subpackages.discard(cls.namespace)
+            subclasses = list(FileSet.subclasses(exclude=exclude_subpackages))
+        for subcls in subclasses:
             if issubclass(subcls, cls):
                 subcls._import_extras_module()
                 datatypes.extend(subcls.get_converters_dict().keys())
@@ -698,6 +701,8 @@ def add_concrete(datatype: ty.Type[DataType]) -> None:
             if inspect.isabstract(datatype):
                 for subclass in datatype.subclasses():
                     add_concrete(subclass)
+            elif issubclass(datatype, SubtypeVar):
+                concrete_datatypes.add(datatype.bound)
             else:
                 concrete_datatypes.add(datatype)