[Feature] Changes required for non public tenants (#370)

Co-authored-by: Tim Lorsbach <tim@lorsba.ch>
Reviewed-on: enviPath/enviPy#370

epdb/legacy_api.py

@@ -1969,7 +1969,7 @@ def add_pathway_edge(request, package_uuid, pathway_uuid, e: Form[CreateEdge]):
 
         return redirect(new_e.url)
     except ValueError:
-        return 403, {"message": "Adding node failed!"}
+        return 403, {"message": "Adding Edge failed!"}
 
 
 @router.delete("/package/{uuid:package_uuid}/pathway/{uuid:pathway_uuid}/edge/{uuid:edge_uuid}")

epdb/logic.py

@@ -264,8 +264,12 @@ class GroupManager(object):
         return bool(re.findall(GroupManager.group_pattern, url))
 
     @staticmethod
-    def create_group(current_user, name, description):
+    def create_group(current_user, name, description, *args, **kwargs):
         g = Group()
+
+        if "uuid" in kwargs:
+            g.uuid = kwargs["uuid"]
+
         # Clean for potential XSS
         g.name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
         g.description = nh3.clean(description, tags=s.ALLOWED_HTML_TAGS).strip()
@@ -341,52 +345,17 @@ class PackageManager(object):
 
     @staticmethod
     def readable(user, package):
-        if (
-            UserPackagePermission.objects.filter(package=package, user=user).exists()
-            or GroupPackagePermission.objects.filter(
-                package=package, group__in=GroupManager.get_groups(user)
-            )
-            or package.reviewed is True
-            or user.is_superuser
-        ):
-            return True
-
-        return False
+        return (
+            PackageManager.has_package_permission(user, package, "read") | package.reviewed is True
+        )
 
     @staticmethod
     def writable(user, package):
-        if (
-            UserPackagePermission.objects.filter(
-                package=package, user=user, permission=Permission.WRITE[0]
-            ).exists()
-            or GroupPackagePermission.objects.filter(
-                package=package,
-                group__in=GroupManager.get_groups(user),
-                permission=Permission.WRITE[0],
-            ).exists()
-            or UserPackagePermission.objects.filter(
-                package=package, user=user, permission=Permission.ALL[0]
-            ).exists()
-            or user.is_superuser
-        ):
-            return True
-        return False
+        return PackageManager.has_package_permission(user, package, "write")
 
     @staticmethod
     def administrable(user, package):
-        if (
-            UserPackagePermission.objects.filter(
-                package=package, user=user, permission=Permission.ALL[0]
-            ).exists()
-            or GroupPackagePermission.objects.filter(
-                package=package,
-                group__in=GroupManager.get_groups(user),
-                permission=Permission.ALL[0],
-            ).exists()
-            or user.is_superuser
-        ):
-            return True
-        return False
+        return PackageManager.has_package_permission(user, package, "all")
 
     @staticmethod
     def has_package_permission(user: "User", package: Union[str, UUID, "Package"], permission: str):
@@ -470,7 +439,9 @@ class PackageManager(object):
             # remove package if user is owner and package is reviewed e.g. admin
             qs = qs.filter(reviewed=False)
 
-        return qs.distinct()
+        qs = qs.distinct()
+
+        return qs
 
     @staticmethod
     def get_all_writeable_packages(user):
@@ -514,7 +485,9 @@ class PackageManager(object):
 
         qs = qs.filter(reviewed=False)
 
-        return qs.distinct()
+        qs = qs.distinct()
+
+        return qs
 
     @staticmethod
     def get_packages():
@@ -716,6 +689,10 @@ class PackageManager(object):
                 struc.description = structure["description"]
                 struc.aliases = structure.get("aliases", [])
                 struc.smiles = structure["smiles"]
+
+                if structure.get("molfile"):
+                    struc.molfile = structure["molfile"]
+
                 struc.save()
 
                 for scen in structure["scenarios"]:

epdb/migrations/0023_alter_compoundstructure_options_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 6.0.3 on 2026-04-21 11:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("epdb", "0022_alter_classifierpluginmodel_data_packages_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="compoundstructure",
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name="epmodel",
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name="parallelrule",
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name="rule",
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name="sequentialrule",
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name="simpleambitrule",
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name="simplerdkitrule",
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name="simplerule",
+            options={},
+        ),
+        migrations.AddField(
+            model_name="compoundstructure",
+            name="molfile",
+            field=models.TextField(blank=True, null=True, verbose_name="Molfile"),
+        ),
+    ]

epdb/models.py

@@ -1112,6 +1112,7 @@ class CompoundStructure(
     canonical_smiles = models.TextField(blank=False, null=False, verbose_name="Canonical SMILES")
     inchikey = models.TextField(max_length=27, blank=False, null=False, verbose_name="InChIKey")
     normalized_structure = models.BooleanField(null=False, blank=False, default=False)
+    molfile = models.TextField(blank=True, null=True, verbose_name="Molfile")
 
     external_identifiers = GenericRelation("ExternalIdentifier")
 
@@ -1208,6 +1209,9 @@ class CompoundStructure(
 
         return dict(hls)
 
+    def d3_json(self):
+        return {}
+
 
 class EnzymeLink(EnviPathModel, KEGGIdentifierMixin):
     rule = models.ForeignKey("Rule", on_delete=models.CASCADE, db_index=True)
@@ -2214,7 +2218,11 @@ class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
             if isinstance(ai.get(), PropertyPrediction):
                 predicted_properties[ai.get().__class__.__name__].append(ai.data)
 
-        return {
+        # If we have Subclasses of a CompoundStructure we can overwrite keys (e.g. images)
+        # by overwriting keys
+        structure_data = self.default_node_label.d3_json()
+
+        res = {
             "depth": self.depth,
             "stereo_removed": self.stereo_removed,
             "url": self.url,
@@ -2223,6 +2231,7 @@ class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
             "image_svg": IndigoUtils.mol_to_svg(
                 self.default_node_label.smiles, width=40, height=40
             ),
+            "image_type": "svg",
             "name": self.get_name(),
             "smiles": self.default_node_label.smiles,
             "scenarios": [{"name": s.get_name(), "url": s.url} for s in self.scenarios.all()],
@@ -2235,8 +2244,11 @@ class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
             "predicted_properties": predicted_properties,
             "is_engineered_intermediate": self.kv.get("is_engineered_intermediate", False),
             "timeseries": self.get_timeseries_data(),
+            **structure_data,
         }
 
+        return res
+
     @staticmethod
     @transaction.atomic
     def create(