Fix bug in dependenciy loading

Author: rhohndorf

fourofour_3d_gen/dependencies.py

@@ -9,6 +9,10 @@ def installed() -> bool:
         import numpy
         import pydantic
         import mixpanel
+        from .spz_updater import SPZUpdater
+
+        if SPZUpdater.need_update():
+            return False
 
         return True
     except:
@@ -42,6 +46,26 @@ def install_dependencies_from_requirements():
         check=True,
         env=env_var,
     )
+    from .spz_updater import SPZUpdater
+    SPZUpdater.update()
+
+def uninstall_dependencies():
+    env_var = dict(os.environ)
+    # ensures pip installs dependencies on blender's python lib folder
+    env_var["PYTHONNOUSERSITE"] = "1"
+
+    requirements_path = Path(__file__).resolve().parent / "requirements.txt"
+
+    if not requirements_path.exists():
+        raise FileNotFoundError(
+            f"requirements.txt not found in {requirements_path.as_posix()}"
+        )
+
+    subprocess.run(
+        [sys.executable, "-m", "pip", "uninstall", "-r", requirements_path.as_posix(), "-y"],
+        check=True,
+        env=env_var,
+    )    
 
 def update_spz():
     from .spz_updater import SPZUpdater
@@ -54,6 +78,10 @@ def install() -> None:
     install_pip()
     install_dependencies_from_requirements()
 
+def uninstall() -> None:
+    install_pip()
+    uninstall_dependencies()
+
 if __name__ == "__main__":
     if installed():
         print("dependencies installed")

fourofour_3d_gen/ops.py

@@ -141,12 +141,5 @@ def execute(self, context):
     MeshConversionOperator,
 )
 
+register, unregister = bpy.utils.register_classes_factory(classes)
 
-def register():
-    for cls in classes:
-        bpy.utils.register_class(cls)
-
-
-def unregister():
-    for cls in reversed(classes):
-        bpy.utils.unregister_class(cls)

fourofour_3d_gen/preferences.py

@@ -15,6 +15,14 @@ class DependencyInstallationOperator(bpy.types.Operator):
     def execute(self, context: Context):
         dependencies.install()
         return {"FINISHED"}
+    
+class DependencyUninstallationOperator(bpy.types.Operator):
+    bl_idname = "threegen.uninstalldeps"
+    bl_label = "Uninstall Dependencies"
+
+    def execute(self, context: Context):
+        dependencies.uninstall()
+        return {"FINISHED"}
 
 
 class ConsentOperator(bpy.types.Operator):
@@ -40,6 +48,13 @@ class ThreegenPreferences(AddonPreferences):
     data_collection: BoolProperty(default=True)
     data_collection_notice: BoolProperty(default=False)
 
+    @classmethod
+    def poll(cls, context):
+        prefs = context.preferences.addons.get(__package__)
+        if not prefs:
+            return False
+        return prefs.preferences.data_collection_notice
+
     def draw(self, context: Context):
         layout: UILayout = self.layout
         col = layout.column()
@@ -54,23 +69,18 @@ def draw(self, context: Context):
                 col.prop(self, "url", text="URL")
                 col.prop(self, "token", text="API Key")
                 col.prop(self, "data_collection", text="Allow collection of anonymous usage data")
+                col.operator(DependencyUninstallationOperator.bl_idname)
 
         else:
             col.operator(DependencyInstallationOperator.bl_idname)
 
 
 classes = (
     DependencyInstallationOperator,
+    DependencyUninstallationOperator,
     ConsentOperator,
     ThreegenPreferences,
 )
 
+register, unregister = bpy.utils.register_classes_factory(classes)
 
-def register():
-    for cls in classes:
-        bpy.utils.register_class(cls)
-
-
-def unregister():
-    for cls in reversed(classes):
-        bpy.utils.unregister_class(cls)

fourofour_3d_gen/ui.py

@@ -158,12 +158,5 @@ def draw(self, context: Context):
     SocialPanel,
 )
 
+register, unregister = bpy.utils.register_classes_factory(classes)
 
-def register():
-    for cls in classes:
-        bpy.utils.register_class(cls)
-
-
-def unregister():
-    for cls in reversed(classes):
-        bpy.utils.unregister_class(cls)