Merge pull request #164 from Algebraic-UG/prep_for_5.1

Prep for 5.1

Author: Vollkornaffe

.github/workflows/test.yml

@@ -6,11 +6,6 @@ on:
     pull_request:
       branches: ["*"]
     workflow_dispatch:
-      inputs:
-        bpy_spec:
-          description: 'Override bpy requirement (e.g. "bpy==5.1.0" or "bpy>=5.0,<5.2")'
-          required: false
-          default: ""
 
 # Cancel in-progress runs when a new workflow with the same group is triggered
 concurrency:
@@ -49,10 +44,6 @@ jobs:
           - name: Install uv
             uses: astral-sh/setup-uv@v5
 
-          - name: Lock with bpy override
-            if: ${{ github.event.inputs.bpy_spec != '' }}
-            run: uv lock --upgrade-package "${{ github.event.inputs.bpy_spec }}"
-
           - name: Install tree_clipper
             run: uv sync --all-extras
 

.gitignore

@@ -85,7 +85,7 @@ ipython_config.py
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
-# .python-version
+.python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.

.python-version

@@ -7,6 +7,7 @@
             "command": "uv",
             "args": [
                 "run",
+                "--prerelease=allow",
                 "python-vendorize",
             ],
             "options": {

.vscode/tasks.json

@@ -1,7 +1,6 @@
 [project]
 name = "tree-clipper"
 version = "0.1.5"
-requires-python = ">=3.11"
 dependencies = []
 maintainers = [
     { name="Algebraic", email="tree.clipper@algebraic.games" },
@@ -26,7 +25,7 @@ Homepage = "https://github.com/Algebraic-UG/tree_clipper"
 Issues = "https://github.com/Algebraic-UG/tree_clipper/issues"
 
 [project.optional-dependencies]
-bpy = [ "bpy >= 5.0.0, < 5.1" ]
+bpy = [ "bpy >= 5" ]
 
 [build-system]
 requires = ["uv_build >= 0.9.18, < 0.10.0"]

packages/tree_clipper/pyproject.toml

@@ -148,3 +148,4 @@ def most_specific_type_handled(
 EXTERNAL_SERIALIZATION = dict[str, int | str | None]
 
 DEFAULT_FILE = str(Path(tempfile.gettempdir()) / "default.json")
+DEFAULT_HINT = "Hint for Import"

packages/tree_clipper/src/tree_clipper/common.py

@@ -223,6 +223,9 @@ def _export_property_simple(
 
             # https://github.com/Algebraic-UG/tree_clipper/issues/96
             def clamp_and_report(value: int | float) -> int | float:
+                # https://github.com/Algebraic-UG/tree_clipper/issues/162
+                if isinstance(obj, bpy.types.NodeTreeInterfaceSocket):
+                    return value
                 # https://github.com/Algebraic-UG/tree_clipper/issues/132
                 if (
                     isinstance(obj, bpy.types.NodeSocket)

packages/tree_clipper/src/tree_clipper/export_nodes.py

@@ -67,10 +67,14 @@ def __init__(
 class Importer:
     def __init__(
         self,
+        *,
+        blender_version: list[int],
         specific_handlers: dict[type, DESERIALIZER],
         getters: dict[int, GETTER],
         debug_prints: bool,
     ) -> None:
+        self.blender_version = blender_version
+
         self.specific_handlers = specific_handlers
         self.getters = getters
         self.debug_prints = debug_prints
@@ -498,10 +502,15 @@ def getter() -> bpy.types.ShaderNodeTree:
 
 
 def _check_version(data: dict) -> None:
-    exporter_blender_version = data[BLENDER_VERSION]
-    importer_blender_version = bpy.app.version_string
-
-    if exporter_blender_version != importer_blender_version:
+    exporter_blender_version = [
+        int(v) for v in data[BLENDER_VERSION].split(" ")[0].split(".")
+    ]
+    importer_blender_version = bpy.app.version
+
+    if (
+        exporter_blender_version[0] != importer_blender_version[0]
+        or exporter_blender_version[1] > importer_blender_version[1]
+    ):
         raise RuntimeError(
             f"Blender version mismatch. File version: {exporter_blender_version}, but running {importer_blender_version}"
         )
@@ -586,7 +595,7 @@ def get_external(self) -> dict[str, EXTERNAL_SERIALIZATION]:
 
     def set_external(
         self,
-        ids_and_references: Iterator[Tuple[int, bpy.types.ID]],
+        ids_and_references: Iterator[Tuple[int, bpy.types.ID | None]],
     ) -> None:
         for external_id, external_item in ids_and_references:
             scene_id = self.get_external()[str(external_id)][EXTERNAL_SCENE_ID]
@@ -620,11 +629,18 @@ def set_external(
                 assert int(external_id) in self.getters
 
     def start_import(self, parameters: ImportParameters) -> None:
+        version_cycle = self.data[BLENDER_VERSION].split(" ")
+        blender_version = [int(v) for v in version_cycle[0].split(".")]
         self.importer = Importer(
+            blender_version=blender_version,
             specific_handlers=parameters.specific_handlers,
             getters=self.getters,
             debug_prints=parameters.debug_prints,
         )
+        if len(version_cycle) > 1:
+            self.importer.report.warnings.append(
+                f"This was exported from a Blender {version_cycle[1]} version."
+            )
 
     def step(self) -> bool:
         assert isinstance(self.importer, Importer)

packages/tree_clipper/src/tree_clipper/import_nodes.py

@@ -275,6 +275,30 @@ def import_all_simple_writable_properties_and_list(self, id_list: list[str]):
         self.import_all_simple_writable_properties()
         self.import_properties_from_id_list(id_list)
 
+    def only_create_getters(self, id_list: list[str]):
+        for identifier in id_list:
+            self.register_getter(
+                getter=lambda: getattr(self.getter(), identifier),
+                serialization=self.serialization[identifier],
+                from_root=self.from_root.add_prop(
+                    self.getter().bl_rna.properties[identifier]
+                ),
+            )
+
+    def register_getter(
+        self,
+        *,
+        getter: GETTER,
+        serialization: dict[str, Any],
+        from_root,
+    ):
+        self.importer._import_obj_with_deserializer(
+            getter=getter,
+            serialization=serialization,
+            deserializer=default_deserializer,
+            from_root=from_root,
+        )
+
     @abstractmethod
     def deserialize(self) -> None:
         """Do the actual importing here"""