API PES

Initial bayer app

Show Pack Classification

Adjusted docker compose to bayer specifics

Adjusted Dockerfile for Bayer

Adding secret flags to group, add secret pools to packages

Adjusted View for Package creation

Prep configs, added Package Create Modal

wip

More on PES

wip

wip

.gitea/workflows/build-image.yaml

@@ -1,62 +0,0 @@
-name: Build Docker Image
-
-# Trigger when a PR to main/develop is completed.
-on:
-  pull_request:
-    branches:
-      - main
-      - develop
-    types:
-      - closed
-
-jobs:
-  build-and-push:
-    if: ${{ github.event.pull_request.merged == true }}
-    runs-on: ubuntu-latest
-    steps:
-      # Fetch the repository content for the Docker build context.
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # Enable Buildx for BuildKit features (incl. SSH mount support).
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Authenticate against the container registry before pushing images.
-      - name: Log in to container registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.envipath.com
-          username: ${{ secrets.CI_REGISTRY_USER }}
-          password: ${{ secrets.CI_REGISTRY_PASSWORD }}
-
-      # Generate image tags/labels:
-      # - PRs targeting main get "latest" and "main-sha"
-      # - PRs targeting develop get "dev" and "dev-sha"
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: git.envipath.com/envipath/envipy
-          tags: |
-            type=raw,value=latest,enable=${{ github.event.pull_request.base.ref == 'main' }}
-            type=sha,prefix=main-,enable=${{ github.event.pull_request.base.ref == 'main' }}
-            type=raw,value=dev,enable=${{ github.event.pull_request.base.ref == 'develop' }}
-            type=sha,prefix=dev-,enable=${{ github.event.pull_request.base.ref == 'develop' }}
-
-      # Load SSH key so Docker can pull private git+ssh dependencies during build.
-      - name: Setup SSH for private git dependencies
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.ENVIPY_CI_PRIVATE_KEY }}
-
-      # Build and push the production image; forward SSH agent without registry cache reuse.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: Dockerfile
-          push: true
-          ssh: default
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.pre-commit-config.yaml

@@ -7,10 +7,10 @@ repos:
       - id: trailing-whitespace
         exclude: epiuclid/schemas/
       - id: end-of-file-fixer
-        exclude: ^epiuclid/schemas/|^static/js/ketcher3/
+        exclude: epiuclid/schemas/
       - id: check-yaml
       - id: check-added-large-files
-        exclude: ^static/images/|^epiuclid/schemas/|^fixtures/|^static/js/ketcher3/
+        exclude: ^static/images/|^epiuclid/schemas/|^fixtures/
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.13.3

Dockerfile

@@ -6,23 +6,18 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 
 WORKDIR /app
 
-
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     libpq-dev \
     curl \
     openssh-client \
     git \
-    ca-certificates \
+    nodejs \
+    npm \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Node 22 + pnpm
-RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends nodejs \
-    && corepack enable \
-    && corepack prepare pnpm@latest --activate \
-    && rm -rf /var/lib/apt/lists/*
+# Install pnpm
+RUN npm install -g pnpm
 
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh
 ENV PATH="/root/.local/bin:${PATH}"
@@ -60,10 +55,6 @@ COPY tests tests
 COPY utilities utilities
 COPY manage.py .
 
-# Used to run migrations etc
-COPY entrypoint.sh entrypoint.sh
-RUN chmod +x entrypoint.sh
-
 # Install frontend deps
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 
@@ -85,7 +76,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libxext6 \
     libfontconfig1 \
     nano \
-    openjdk-21-jre-headless \
     && rm -rf /var/lib/apt/lists/*
 
 RUN useradd -ms /bin/bash django
@@ -107,5 +97,4 @@ USER django
 
 EXPOSE 8000
 
-ENTRYPOINT ["/app/entrypoint.sh"]
-CMD ["gunicorn", "envipath.wsgi:application", "--bind", "0.0.0.0:8000", "--workers", "8"]
+CMD ["gunicorn", "envipath.wsgi:application", "--bind", "0.0.0.0:8000", "--workers", "3"]

bayer/additional_information/__init__.py

@@ -1,178 +0,0 @@
-import enum
-from typing import Optional
-
-from envipy_additional_information import GroupEnum as G
-from envipy_additional_information import SubcategoryEnum as S
-from envipy_additional_information import (
-    register,
-    register_parser_command,
-    EnviPyModel,
-    # EnviPyModelParser,
-    Interval,
-    UIConfig,
-    IntervalConfig,
-    WidgetType,
-    registry,
-)
-
-
-@register(keyname="compoundlabel", groups=[S.MISC, G.SLUDGE, G.SEDIMENT, G.SOIL])
-class CompoundLabel(EnviPyModel):
-    label: str
-
-    class UI:
-        title = "Compound Label"
-        label = UIConfig(widget=WidgetType.TEXT, label="Label", order=1)
-
-
-# TODO Expose EnviPyModelParser in lib and subclass
-@register_parser_command("compoundlabel")
-class CompoundLabelParser:
-    @staticmethod
-    def from_string(data: str) -> CompoundLabel:
-        return CompoundLabel(label=data)
-
-
-@register(keyname="studywaterstoragecapacity", groups=[S.MISC, G.SLUDGE, G.SEDIMENT, G.SOIL])
-class StudyWaterStorageCapacity(EnviPyModel):
-    capacity: str
-
-    class UI:
-        title = "Study Water Storage Capacity"
-        capacity = UIConfig(widget=WidgetType.TEXT, label="Study Water Storage Capacity", order=1)
-
-
-# TODO Expose EnviPyModelParser in lib and subclass
-@register_parser_command("studywst")
-class StudyWaterStorageCapacityParser:
-    @staticmethod
-    def from_string(data: str) -> StudyWaterStorageCapacity:
-        return StudyWaterStorageCapacity(capacity=data)
-
-
-class ObservationType(enum.Enum):
-    OBSERVED = "observed"
-    APPLIED = "applied"
-    NA = 'NA'
-
-
-@register(keyname="observation", groups=[S.MISC, G.SLUDGE, G.SEDIMENT, G.SOIL])
-class Observation(EnviPyModel):
-    type: ObservationType
-    min_value: Optional[float] = None
-    max_value: Optional[float] = None
-
-    class UI:
-        title = "Observation"
-        type = UIConfig(widget=WidgetType.SELECT, label="Observed or Applied", order=1)
-        min_value = UIConfig(widget=WidgetType.NUMBER, label="Min Value", order=2)
-        max_value = UIConfig(widget=WidgetType.NUMBER, label="Max Value", order=3)
-
-
-# TODO Expose EnviPyModelParser in lib and subclass
-@register_parser_command("observation")
-class ObservationParser:
-    @staticmethod
-    def from_string(data: str) -> Observation:
-        parts = data.split(";")
-
-        observation_type = ObservationType(parts[0])
-        min_value = None
-        if parts[1]:
-            try:
-                min_value = float(parts[1])
-            except ValueError:
-                pass
-
-        max_value = None
-        if parts[2]:
-            try:
-                max_value = float(parts[2])
-            except ValueError:
-                pass
-
-        return Observation(type=observation_type, min_value=min_value, max_value=max_value)
-
-
-@register(keyname="kinetics", groups=[S.MISC, G.SLUDGE, G.SEDIMENT, G.SOIL])
-class Kinetics(EnviPyModel):
-    dt50: Interval[float]
-    normalized_dt50: bool
-    chi2err: Optional[float] = None
-    t_test: Optional[float] = None
-    swarc: Optional[float] = None
-    visual_fit: Optional[int] = None
-    comment: str
-    source: str
-    kinetic_model: str
-    k1: Optional[float] = None
-    k2: Optional[float] = None
-    g: Optional[float] = None
-    tb: Optional[float] = None
-    alpha: Optional[float] = None
-    beta: Optional[float] = None
-
-    class UI:
-        title = "Kinetics"
-
-        # Field config
-        dt50 = IntervalConfig(label="DT50 Range", order=1, unit="d")
-        normalized_dt50 = UIConfig(widget=WidgetType.CHECKBOX, label="Normalized DT50", order=2)
-        chi2err = UIConfig(widget=WidgetType.NUMBER, label="Chi2err", order=3)
-        t_test = UIConfig(widget=WidgetType.NUMBER, label="T-Test", order=4)
-        swarc = UIConfig(widget=WidgetType.NUMBER, label="SWARC", order=5)
-        visual_fit = UIConfig(widget=WidgetType.NUMBER, label="Visual Fit", order=6)
-        comment = UIConfig(widget=WidgetType.TEXTAREA, label="Comments", order=7)
-        source = UIConfig(widget=WidgetType.TEXT, label="Source", order=8)
-        kinetic_model = UIConfig(widget=WidgetType.SELECT, label="Kinetic Model", order=9)
-        k1 = UIConfig(widget=WidgetType.NUMBER, label="K1", order=10)
-        k2 = UIConfig(widget=WidgetType.NUMBER, label="K2", order=11)
-        g = UIConfig(widget=WidgetType.NUMBER, label="G", order=12)
-        tb = UIConfig(widget=WidgetType.NUMBER, label="TB", order=13)
-        alpha = UIConfig(widget=WidgetType.NUMBER, label="Alpha", order=14)
-        beta = UIConfig(widget=WidgetType.NUMBER, label="Beta", order=15)
-
-
-# TODO Expose EnviPyModelParser in lib and subclass
-@register_parser_command("kineticevaluation")
-class KinecticsParser:
-    @staticmethod
-    def from_string(data: str) -> Kinetics:
-        parts = data.split(";")
-        dt50 = registry.get_parser("interval").from_string(parts[0])
-        normalized_dt50 = parts[1] == "true"
-        chi2err = float(parts[2]) if parts[2] else None
-        t_test = float(parts[3]) if parts[3] else None
-        swarc = float(parts[4]) if parts[4] else None
-        visual_fit = int(parts[5]) if parts[5] else None
-        comment = parts[6]
-        source = parts[7]
-        kinetic_model = parts[8]
-        k1 = float(parts[9]) if parts[9] else None
-        k2 = float(parts[10]) if parts[10] else None
-        g = float(parts[11]) if parts[11] else None
-        tb = float(parts[12]) if parts[12] else None
-        alpha = float(parts[13]) if parts[13] else None
-        beta = float(parts[14]) if parts[14] else None
-
-        return Kinetics(
-            dt50=dt50,
-            normalized_dt50=normalized_dt50,
-            chi2err=chi2err,
-            t_test=t_test,
-            swarc=swarc,
-            visual_fit=visual_fit,
-            comment=comment,
-            source=source,
-            kinetic_model=kinetic_model,
-            k1=k1,
-            k2=k2,
-            g=g,
-            tb=tb,
-            alpha=alpha,
-            beta=beta,
-        )
-
-
-if __name__ == '__main__':
-    print(KinecticsParser.from_string("187.0 - 187.0;false;;;;;;;AFO;;;;;;"))

bayer/epdb_hooks.py

@@ -1,6 +1,5 @@
 import logging
 
-from bayer import additional_information  # noqa: F401
 from epdb.template_registry import register_template
 
 logger = logging.getLogger(__name__)
@@ -37,4 +36,4 @@ register_template(
 register_template(
     "epdb.objects.node.viz",
     "objects/node_viz.html",
-)
+)

bayer/models.py

@@ -185,7 +185,7 @@ class PESStructure(CompoundStructure):
     def create(
             compound: Compound,
             pes_link: str,
-            molfile: str,
+            mol_file: str,
             smiles: str,
             name: str = None,
             description: str = None,
@@ -204,7 +204,7 @@ class PESStructure(CompoundStructure):
             cs.description = nh3.clean(description, tags=s.ALLOWED_HTML_TAGS).strip()
 
         cs.smiles = smiles
-        cs.molfile = molfile
+        cs.mol_file = mol_file
         cs.pes_link = pes_link
         cs.compound = compound
 
@@ -232,6 +232,5 @@ class PESStructure(CompoundStructure):
             "is_pes": True,
             "pes_link": self.pes_link,
             # Will overwrite image from Node
-            "image": f"{reverse('depict_pes')}?pesLink={urllib.parse.quote(self.pes_link)}",
-            "image_type": "png",
+            "image": f"{reverse("depict_pes")}?pesLink={urllib.parse.quote(self.pes_link)}"
         }

bayer/templates/modals/collections/new_package_modal.html

@@ -5,11 +5,11 @@
   class="modal"
   x-data="{
     isSubmitting: false,
-    packageClassification: '',
+    packageClassification: null,
 
     reset() {
       this.isSubmitting = false;
-      this.packageClassification = '';
+      this.packageClassification = null;
     },
 
     setFormData(data) {
@@ -114,7 +114,7 @@
             x-model="packageClassification"
             required
           >
-            <option value="" disabled>Select Classification</option>
+            <option value="null" disabled selected>Select Classification</option>
             <option value="0">Internal</option>
             <option value="10">Restricted</option>
             <option value="20">Secret</option>
@@ -131,9 +131,8 @@
             id="package-data-pool"
             name="package-data-pool"
             class="select select-bordered w-full"
-            :required="isSecret"
           >
-            <option value="" disabled>Select Data Pool</option>
+            <option value="" disabled selected>Select Data Pool</option>
               {% for obj in meta.secret_groups %}
                 <option value="{{ obj.url }}">{{ obj.name|safe }}</option>
               {% endfor %}

bayer/templates/objects/compound_structure_viz.html

@@ -3,11 +3,7 @@
   <div class="collapse-arrow bg-base-200 collapse">
     <input type="checkbox" checked />
     <div class="collapse-title text-xl font-medium">Link to PES</div>
-    <div class="collapse-content">
-      <p>
-        <a href="{{ compound_structure.pes_link }}" class="hover:bg-base-200">{{ compound_structure.pes_link }}</a>
-      </p>
-    </div>
+    <div class="collapse-content">{{ compound_structure.pes_link }}</div>
   </div>
 
   <!-- Image Representation -->

bayer/templates/objects/compound_viz.html

@@ -3,11 +3,7 @@
   <div class="collapse-arrow bg-base-200 collapse">
     <input type="checkbox" checked />
     <div class="collapse-title text-xl font-medium">Link to PES</div>
-    <div class="collapse-content">
-      <p>
-        <a href="{{ compound.default_structure.pes_link }}" class="hover:bg-base-200">{{ compound.default_structure.pes_link }}</a>
-      </p>
-    </div>
+    <div class="collapse-content">{{ compound.default_structure.pes_link }}</div>
   </div>
 
   <!-- Image Representation -->

bayer/templates/objects/node_viz.html

@@ -3,11 +3,7 @@
   <div class="collapse-arrow bg-base-200 collapse">
     <input type="checkbox" checked />
     <div class="collapse-title text-xl font-medium">Link to PES</div>
-    <div class="collapse-content">
-      <p>
-        <a href="{{ node.default_node_label.pes_link }}" class="hover:bg-base-200">{{ node.default_node_label.pes_link }}</a>
-      </p>
-    </div>
+    <div class="collapse-content">{{ node.default_node_label.pes_link }}</div>
   </div>
 
   <!-- Image Representation -->

bayer/templates/objects/package.html

@@ -4,7 +4,6 @@
 
   {% block action_modals %}
     {% include "modals/objects/edit_package_modal.html" %}
-    {% include "modals/objects/view_package_permissions_modal.html" %}
     {% include "modals/objects/edit_package_permissions_modal.html" %}
     {% include "modals/objects/publish_package_modal.html" %}
     {% include "modals/objects/set_license_modal.html" %}

bayer/views.py

@@ -1,40 +1,20 @@
 import base64
-import logging
 
 import requests
 from django.conf import settings as s
-from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed
+from django.core.exceptions import BadRequest
+from django.http import HttpResponse
 from django.shortcuts import redirect
 
 from bayer.models import PESCompound
 from epdb.logic import PackageManager
-from epdb.models import Pathway, Node, Group
-from epdb.views import _anonymous_or_real, error
+from epdb.models import Pathway, Node
+from epdb.views import _anonymous_or_real
 from utilities.decorators import package_permission_required
 
 Package = s.GET_PACKAGE_MODEL()
 
 
-logger = logging.getLogger(__name__)
-
-
-def has_secret_group(user):
-    """
-    Determines if the specified user belongs to any secret group.
-
-    This function checks whether the given user is a member of any group
-    that is marked as secret.
-
-    Args:
-        user: The user for whom the check is performed.
-
-    Returns:
-        bool: True if the user belongs to at least one secret group,
-        False otherwise.
-    """
-    return Group.objects.filter(secret=True, user_member=user).exists()
-
-
 @package_permission_required()
 def create_pes(request, package_uuid):
     current_user = _anonymous_or_real(request)
@@ -43,11 +23,7 @@ def create_pes(request, package_uuid):
     if request.method == "POST":
 
         if current_package.classification_level == Package.Classification.INTERNAL:
-            return error(
-                request,
-                f'Creation of PESs for package {current_package.name} failed!',
-                "Creating PESs for internal packages is not allowed.",
-            )
+            raise BadRequest("Cannot create PESs for internal packages.")
 
         compound_name = request.POST.get('compound-name')
         compound_description = request.POST.get('compound-description')
@@ -55,43 +31,25 @@ def create_pes(request, package_uuid):
 
         if pes_link:
             try:
-                pes_data = fetch_pes(request, pes_link, current_user)
+                pes_data = fetch_pes(request, pes_link)
             except ValueError as e:
-                return error(
-                    request,
-                    "Could not fetch PES",
-                    f"Could not fetch PES data for {pes_link}"
-                )
+                return BadRequest(f"Could not fetch PES data for {pes_link}")
 
             classification = pes_data.get("classificationLevel", "")
             if "secret" == classification.lower():
-
-                if current_package.classification_level != Package.Classification.SECRET:
-                    return error(
-                        request,
-                        "Classification Mismatch!",
-                        "Cannot create secret PESs in non-secret packages."
-                    )
-
-                if not current_package.data_pool or not current_package.data_pool.secret:
-                    logger.info(f"The current package does not have a secret data pool.")
-                    return error(
-                        request,
-                        "The current package does not have a secret data pool.",
-                        "Cannot create secret PESs in package without a secret data pool."
-                    )
+                data_pools = pes_data.get("dataPools")
+                if data_pools:
+                    if s.DATA_POOL_MAPPING[current_package.data_pool.name] not in data_pools:
+                        return BadRequest(
+                            f"PES data pool {s.DATA_POOL_MAPPING[current_package.data_pool.name]} not found in PES data")
 
             pes = PESCompound.create(current_package, pes_data, compound_name, compound_description)
 
             return redirect(pes.url)
         else:
-            return error(
-                request,
-                "No PES link received",
-                "Please provide a PES link."
-            )
+            return BadRequest("Please provide a PES link.")
     else:
-        return HttpResponseNotAllowed(["POST"])
+        pass
 
 
 @package_permission_required()
@@ -103,11 +61,7 @@ def create_pes_node(request, package_uuid, pathway_uuid):
     if request.method == "POST":
 
         if current_package.classification_level == Package.Classification.INTERNAL:
-            return error(
-                request,
-                f'Creation of PESs for package {current_package.name} failed!',
-                "Creating PESs for internal packages is not allowed.",
-            )
+            raise BadRequest("Cannot create PESs for internal packages.")
 
         compound_name = request.POST.get('compound-name')
         compound_description = request.POST.get('compound-description')
@@ -115,42 +69,20 @@ def create_pes_node(request, package_uuid, pathway_uuid):
 
         if pes_link:
             try:
-                pes_data = fetch_pes(request, pes_link, current_user)
+                pes_data = fetch_pes(request, pes_link)
             except ValueError as e:
-                return error(
-                    request,
-                    "Could not fetch PES",
-                    f"Could not fetch PES data for {pes_link}"
-                )
+                return BadRequest(f"Could not fetch PES data for {pes_link}")
 
             classification = pes_data.get("classificationLevel", "")
             if "secret" == classification.lower():
-
-                if current_package.classification_level != Package.Classification.SECRET:
-                    return error(
-                        request,
-                        "Classification Mismatch!",
-                        "Cannot create secret PESs in non-secret packages."
-                    )
-
-                if not current_package.data_pool or not current_package.data_pool.secret:
-                    logger.info(f"The current package does not have a secret data pool.")
-                    return error(
-                        request,
-                        "The current package does not have a secret data pool.",
-                        "Cannot create secret PESs in package without a secret data pool."
-                    )
+                data_pools = pes_data.get("dataPools")
+                if data_pools:
+                    if s.DATA_POOL_MAPPING[current_package.data_pool.name] not in data_pools:
+                        return BadRequest(
+                            f"PES data pool {s.DATA_POOL_MAPPING[current_package.data_pool.name]} not found in PES data")
 
             pes = PESCompound.create(current_package, pes_data, compound_name, compound_description)
 
-            node_qs = Node.objects.filter(
-                pathway=current_pathway,
-                default_node_label=pes.default_structure
-            )
-
-            if node_qs.exists():
-                return redirect(current_pathway.url)
-
             n = Node()
             n.stereo_removed = False
             n.pathway = current_pathway
@@ -165,91 +97,55 @@ def create_pes_node(request, package_uuid, pathway_uuid):
             return redirect(current_pathway.url)
 
         else:
-            return error(
-                request,
-                "No PES link received",
-                "Please provide a PES link."
-            )
+            return BadRequest("Please provide a PES link.")
     else:
-        return HttpResponseNotAllowed(["POST"])
+        pass
 
 
-def get_application_token(prod: bool) -> str:
-    scope = f"{s.PROD_PES_SCOPE if prod else s.NON_PROD_PES_SCOPE}/.default"
+def fetch_pes(request, pes_url) -> dict:
+    from epauth.views import get_access_token_from_request
+    token = get_access_token_from_request(request)
 
-    url = f"https://login.microsoftonline.com/{s.MS_TENANT_ID}/oauth2/v2.0/token"
-    data = {
-        "grant_type": "client_credentials",
-        "client_id": s.MS_ENTRA_CLIENT_ID,
-        "client_secret": s.MS_ENTRA_CLIENT_SECRET,
-        "scope": scope,
-    }
+    if token:
+        for k, v in s.PES_API_MAPPING.items():
+            if pes_url.startswith(k):
+                pes_id = pes_url.split('/')[-1]
 
-    try:
-        response = requests.post(url, data=data)
-        response.raise_for_status()
-        return response.json()["access_token"]
-    except requests.exceptions.HTTPError as e:
-        logger.error(f"Could not fetch application token: {e}")
-        raise ValueError(f"Could not fetch application token!")
-
-
-def fetch_pes(request, pes_url, user) -> dict:
-
-    for k, v in s.PES_API_MAPPING.items():
-        if pes_url.startswith(k):
-
-            prod = "cropkey-np" not in pes_url
-
-            pes_id = pes_url.split('/')[-1]
-
-            if pes_id == 'dummy':
-                import json
-                res_data = json.load(open(s.BASE_DIR / "fixtures/pes.json"))
-                res_data["pes_url"] = pes_url
-                return res_data
-            else:
-                headers = {
-                    "accept": "*/*",
-                    "authorization": "Bearer " + get_application_token(prod),
-                }
-
-                # Restrict request if user is not part of any secret group
-                if not has_secret_group(user):
-                    headers["app-classification-level-restriction"] = "restrict-pes-secret-structure-access"
-
-
-                params = {"pes_reg_entity_corporate_id": pes_id}
-
-                res = requests.get(v, headers=headers, params=params, proxies=s.PROXIES or None)
-
-                try:
-                    res.raise_for_status()
-                    pes_data = res.json()
-
-                    # Handle missing response
-                    if "detail" in pes_data and "The following PES Reg Entities Corporate Ids could not be found" in pes_data["detail"]:
-                        raise ValueError(f"PES with id {pes_id} not found")
-
-                    # Ensure we have a entity
-                    if len(pes_data) == 0:
-                        raise ValueError(f"PES with id {pes_id} not found")
-
-                    res_data = pes_data[0]
+                if pes_id == 'dummy':
+                    import json
+                    res_data = json.load(open(s.BASE_DIR / "fixtures/pes.json"))
                     res_data["pes_url"] = pes_url
                     return res_data
+                else:
+                    headers = {"Authorization": f"Bearer {token['access_token']}"}
+                    params = {"pes_reg_entity_corporate_id": pes_id}
 
-                except requests.exceptions.HTTPError as e:
-                    raise ValueError(f"Error fetching PES with id {pes_id}: {e}")
+                    res = requests.get(v, headers=headers, params=params, proxies=s.PROXIES or None)
 
-    raise ValueError(f"Unknown URL {pes_url}")
+                    try:
+                        res.raise_for_status()
+                        pes_data = res.json()
+
+                        if len(pes_data) == 0:
+                            raise ValueError(f"PES with id {pes_id} not found")
+
+                        res_data = pes_data[0]
+                        res_data["pes_url"] = pes_url
+                        return res_data
+
+                    except requests.exceptions.HTTPError as e:
+                        raise ValueError(f"Error fetching PES with id {pes_id}: {e}")
+        else:
+            raise ValueError(f"Unknown URL {pes_url}")
+    else:
+        raise ValueError("Could not fetch access token from request.")
 
 
 def visualize_pes(request):
     pes_link = request.GET.get('pesLink')
 
     if pes_link:
-        pes_data = fetch_pes(request, pes_link, request.user)
+        pes_data = fetch_pes(request, pes_link)
 
         representations = pes_data.get('representations')
 

bb4g/__init__.py

@@ -1,13 +1,12 @@
-import enum
 import json
-import logging
 import math
 from datetime import datetime
 from typing import List
-
+import enum
 import requests
 from django.conf import settings as s
-from envipy_additional_information import register, EnviPyModel, UIConfig, WidgetType
+from envipy_additional_information import EnviPyModel, UIConfig, WidgetType
+from envipy_additional_information import register
 
 from bridge.contracts import Classifier  # noqa: I001
 from bridge.dto import (
@@ -18,9 +17,6 @@ from bridge.dto import (
     TransformationProductPrediction,
 )  # noqa: I001
 
-logger = logging.getLogger("epdb")
-
-
 class SamplingAlgorithm(enum.Enum):
     EXACT = "exact"
 
@@ -89,13 +85,14 @@ class BB4G(Classifier):
         }
 
         started = False
-
-        while not started:
+        retries = 0
+        while not started and retries < 5:
             res = requests.post(f"{self.url}/start", headers=header, data={}, proxies=s.PROXIES or None)
-            logger.info(f"Starting BB4G: {res.status_code}")
+
             if res.status_code == 200:
                 started = True
             elif res.status_code in [500, 502]:
+                retries += 1
                 import time
                 time.sleep(5)
             else:
@@ -169,30 +166,18 @@ class BB4G(Classifier):
                 "cutoff": self.config.cutoff,
             }
 
-            retries = 0
-            while retries < 100:
-                resp = requests.post(f"{self.url}/compute", headers=header, data=json.dumps(data),
-                                     proxies=s.PROXIES or None)
+            resp = requests.post(f"{self.url}/compute", headers=header, data=json.dumps(data), proxies=s.PROXIES or None)
 
-                if resp.status_code == 418:
-                    retries += 1
-                    logger.info(f"BB4G predict hit a 418, retrying in 60 seconds")
-                    import time
-                    time.sleep(3)
-                    continue
+            resp.raise_for_status()
 
-                resp.raise_for_status()
+            for substrate, predictions in resp.json().items():
+                preds = {}
 
-                for substrate, predictions in resp.json().items():
-                    preds = {}
+                for pred in predictions:
+                    prod = pred["prediction"]
+                    prob = math.exp(pred["log_likelihood"])
+                    preds[prod] = prob
 
-                    for pred in predictions:
-                        prod = pred["prediction"]
-                        prob = math.exp(pred["log_likelihood"])
-                        preds[prod] = prob
-
-                    result[substrate] = preds
-
-                break
+                result[substrate] = preds
 
         return result

bridge/contracts.py

@@ -1,5 +1,4 @@
 import enum
-from typing import Any, Dict
 from abc import ABC, abstractmethod
 
 from envipy_additional_information import EnviPyModel
@@ -70,12 +69,6 @@ class Plugin(ABC):
 
 
 class Property(Plugin):
-    def parameters(self) -> Dict[str, Any]:
-        """
-        Returns the parameters of the PropertyPlugin.
-        """
-        return {}
-
     @classmethod
     @abstractmethod
     def requires_rule_packages(cls) -> bool:
@@ -268,6 +261,7 @@ class Classifier(Plugin):
             for k, v in data.items():
                 if v != "":
                     cpy[k] = v
+
         return cls.Config(**cpy)
 
     @classmethod
@@ -307,12 +301,6 @@ class Classifier(Plugin):
         """
         pass
 
-    def parameters(self) -> Dict[str, Any]:
-        """
-        Returns the parameters of the ClassifierPlugin.
-        """
-        return {}
-
     @abstractmethod
     def build(self, eP: EnviPyDTO, *args, **kwargs) -> BuildResult | None:
         """

docker-compose.dev.yml

@@ -25,14 +25,25 @@ services:
       - ep_bayer_redis_data:/data
 
   biotransformer3:
-    image: git.envipath.com/envipath/biotransformer3:1.0
+    image: envipath/biotransformer3:1.0
     container_name: epbiotransformer3
 
+#  web:
+#    image: envipath/envipy-bayer:1.0
+#    container_name: epdjango
+#    ports:
+#      - "127.0.0.1:8000:8000"
+#    env_file:
+#      - .env
+#    command: gunicorn envipath.wsgi:application --bind 0.0.0.0:8000 --workers 3
+#    volumes:
+#      - ep_bayer_data:/opt/enviPy/
+
   celery_worker:
-    image: git.envipath.com/envipath/envipy-bayer:1.2
+    image: envipath/envipy-bayer:1.0
     container_name: epcelery
     env_file:
-      - .env
+      - .env.dev
     command: celery -A envipath worker --concurrency=6 -Q model,predict,background --pool threads
     volumes:
       - ep_bayer_data:/opt/enviPy/

entrypoint.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ "${SKIP_DJANGO_SETUP:-false}" != "true" ]; then
-  python manage.py migrate --no-input
-  python manage.py collectstatic --no-input
-fi
-
-exec "$@"

envipath/settings.py

@@ -275,12 +275,6 @@ LOGGING = {
             "filename": os.path.join(LOG_DIR, "debug.log"),
             "formatter": "simple",
         },
-        "auth_file": {
-            "level": "INFO",  # Or higher
-            "class": "logging.FileHandler",
-            "filename": os.path.join(LOG_DIR, "auth.log"),
-            "formatter": "simple",
-        }
     },
     "loggers": {
         # For everything under epdb/ loaded via getlogger(__name__)
@@ -301,11 +295,6 @@ LOGGING = {
             "propagate": True,
             "level": os.environ.get("LOG_LEVEL", "INFO"),
         },
-        "auth": {
-            "handlers": ["auth_file"],
-            "propagate": True,
-            "level": os.environ.get("LOG_LEVEL", "INFO"),
-        }
     },
 }
 
@@ -354,10 +343,9 @@ DEFAULT_MODEL_PARAMS = {
     "num_chains": 10,
 }
 
-DEFAULT_MAX_NUMBER_OF_NODES = 9999
+DEFAULT_MAX_NUMBER_OF_NODES = 50
 DEFAULT_MAX_DEPTH = 8
 DEFAULT_MODEL_THRESHOLD = 0.25
-BATCH_PREDICT_MAX_COMPOUNDS = 150
 
 # Loading Plugins
 PLUGINS_ENABLED = os.environ.get("PLUGINS_ENABLED", "False") == "True"
@@ -503,5 +491,3 @@ BB4G_TENANT_ID = os.environ.get("BB4G_TENANT_ID")
 BB4G_CLIENT_ID = os.environ.get("BB4G_CLIENT_ID")
 BB4G_CLIENT_SECRET = os.environ.get("BB4G_CLIENT_SECRET")
 BB4G_SCOPE = os.environ.get("BB4G_SCOPE")
-
-os.environ["NO_PROXY"] = "localhost,127.0.0.1,epbiotransformer3"

epapi/tests/v1/test_api_permissions.py

@@ -117,28 +117,25 @@ class APIPermissionTestBase(TestCase):
 
         # Create test compounds in each package
         cls.reviewed_compound = Compound.create(
-            cls.reviewed_package, "C", name="Reviewed Compound", description="Test compound"
+            cls.reviewed_package, "C", "Reviewed Compound", "Test compound"
         )
         cls.owned_compound = Compound.create(
-            cls.unreviewed_package_owned, "CC", name="Owned Compound", description="Test compound"
+            cls.unreviewed_package_owned, "CC", "Owned Compound", "Test compound"
         )
         cls.read_compound = Compound.create(
-            cls.unreviewed_package_read, "CCC", name="Read Compound", description="Test compound"
+            cls.unreviewed_package_read, "CCC", "Read Compound", "Test compound"
         )
         cls.write_compound = Compound.create(
-            cls.unreviewed_package_write, "CCCC", name="Write Compound", description="Test compound"
+            cls.unreviewed_package_write, "CCCC", "Write Compound", "Test compound"
         )
         cls.all_compound = Compound.create(
-            cls.unreviewed_package_all, "CCCCC", name="All Compound", description="Test compound"
+            cls.unreviewed_package_all, "CCCCC", "All Compound", "Test compound"
         )
         cls.no_access_compound = Compound.create(
-            cls.unreviewed_package_no_access,
-            "CCCCCC",
-            name="No Access Compound",
-            description="Test compound",
+            cls.unreviewed_package_no_access, "CCCCCC", "No Access Compound", "Test compound"
         )
         cls.group_compound = Compound.create(
-            cls.group_package, "CCCCCCC", name="Group Compound", description="Test compound"
+            cls.group_package, "CCCCCCC", "Group Compound", "Test compound"
         )
 
 

epapi/tests/v1/test_contract_get_entities.py

@@ -294,8 +294,8 @@ class CompoundPaginationAPITest(BaseTestAPIGetPaginated, TestCase):
         return Compound.create(
             package,
             smiles,
-            name=f"Reviewed Compound {idx:03d}",
-            description="Compound for pagination tests",
+            f"Reviewed Compound {idx:03d}",
+            "Compound for pagination tests",
         )
 
     @classmethod
@@ -305,8 +305,8 @@ class CompoundPaginationAPITest(BaseTestAPIGetPaginated, TestCase):
         return Compound.create(
             package,
             smiles,
-            name=f"Draft Compound {idx:03d}",
-            description="Compound for pagination tests",
+            f"Draft Compound {idx:03d}",
+            "Compound for pagination tests",
         )
 
 

epapi/v1/endpoints/additional_information.py

@@ -9,8 +9,8 @@ from envipy_additional_information import registry
 from envipy_additional_information.groups import GroupEnum
 from epapi.utils.schema_transformers import build_rjsf_output
 from epapi.utils.validation_errors import handle_validation_error
-from epdb.models import AdditionalInformation, Scenario, Node
-from ..dal import get_scenario_for_read, get_scenario_for_write, get_package_for_write
+from epdb.models import AdditionalInformation
+from ..dal import get_scenario_for_read, get_scenario_for_write
 
 logger = logging.getLogger(__name__)
 
@@ -58,61 +58,6 @@ def list_scenario_info(request, scenario_uuid: UUID):
     return result
 
 
-@router.post("/information/{model_name}/")
-def add_object_info(request, model_name: str, payload: Dict[str, Any] = Body(...)):
-    from epdb.views import EPDBURLParser
-
-    cls = registry.get_model(model_name.lower())
-    if not cls:
-        raise HttpError(404, f"Unknown model: {model_name}")
-
-    try:
-        instance = cls(**payload)  # Pydantic validates
-    except ValidationError as e:
-        handle_validation_error(e)
-
-    if "attach_obj_url" in payload:
-        url_parser = EPDBURLParser(payload["attach_obj_url"])
-
-        if url_parser.contains_package_url():
-            package = get_package_for_write(request.user, url_parser.get_objects()[0].uuid)
-            attach_obj = url_parser.get_object()
-
-            if "scenario_uuid" in payload:
-                scenario = get_scenario_for_read(request.user, payload["scenario_uuid"])
-            else:
-                scenario = Scenario.create(
-                    package,
-                    name=f"Scenario {Scenario.objects.filter(package=package).count() + 1}",
-                    description="no description",
-                    scenario_date=None,
-                    scenario_type=None,
-                    additional_information=[],
-                )
-
-            if isinstance(attach_obj, Node):
-                ai = add_info_to_node(package, instance, scenario, attach_obj)
-            else:
-                raise HttpError(404, f"Bad request - Not implemented for {type(attach_obj)}!")
-
-            return {"status": "created", "uuid": ai.uuid}
-
-    raise HttpError(404, "Bad request!")
-
-
-def add_info_to_node(package, add_inf, scenario, node):
-    ai = AdditionalInformation.create(
-        package,
-        add_inf,
-        scenario=scenario,
-        content_object=node,
-    )
-
-    node.pathway.scenarios.add(scenario)
-
-    return ai
-
-
 @router.post("/scenario/{uuid:scenario_uuid}/information/{model_name}/")
 def add_scenario_info(
     request, scenario_uuid: UUID, model_name: str, payload: Dict[str, Any] = Body(...)

epapi/v1/endpoints/joblogs.py

@@ -1,26 +0,0 @@
-from django.conf import settings as s
-from ninja import Router
-from ninja_extra.pagination import paginate
-
-from epdb.models import JobLog
-from ..pagination import EnhancedPageNumberPagination
-from ..schemas import JobLogOutSchema
-
-router = Router()
-
-
-@router.get("/joblog/", response=EnhancedPageNumberPagination.Output[JobLogOutSchema])
-@paginate(
-    EnhancedPageNumberPagination,
-    page_size=s.API_PAGINATION_DEFAULT_PAGE_SIZE,
-)
-def list_all_joblogs(request):
-    """
-    List all JobLogs from reviewed packages.
-    """
-    current_user = request.user
-
-    if current_user.is_superuser:
-        return JobLog.objects.all().order_by("-created")
-    else:
-        return JobLog.objects.filter(user=current_user).order_by("-created")

epapi/v1/interfaces/iuclid/projections.py

@@ -56,7 +56,7 @@ def get_pathway_for_iuclid_export(user, pathway_uuid: UUID) -> PathwayExportDTO:
 
         ai_for_node = []
         scenario_entries: list[PathwayScenarioDTO] = []
-        for scenario in sorted(node.get_scenarios(), key=lambda item: item.pk):
+        for scenario in sorted(node.scenarios.all(), key=lambda item: item.pk):
             ai_for_scenario = list(scenario.get_additional_information(direct_only=True))
             ai_for_node.extend(ai_for_scenario)
             scenario_entries.append(

epapi/v1/router.py

@@ -15,7 +15,6 @@ from .endpoints import (
     additional_information,
     settings,
     groups,
-    joblogs,
 )
 
 # Main router with authentication
@@ -38,7 +37,6 @@ router.add_router("", structure.router)
 router.add_router("", additional_information.router)
 router.add_router("", settings.router)
 router.add_router("", groups.router)
-router.add_router("", joblogs.router)
 
 if s.IUCLID_EXPORT_ENABLED:
     from epiuclid.api import router as iuclid_router

epapi/v1/schemas.py

@@ -1,10 +1,7 @@
-from datetime import datetime
+from ninja import FilterSchema, FilterLookup, Schema
 from typing import Annotated, Optional, List, Dict, Any
 from uuid import UUID
 
-from django.urls import reverse
-from ninja import Field, FilterSchema, FilterLookup, Schema
-
 
 # Filter schema for query parameters
 class ReviewStatusFilter(FilterSchema):
@@ -136,23 +133,3 @@ class GroupOutSchema(Schema):
     url: str = ""
     name: str
     description: str
-
-
-class SimpleUserOutSchema(Schema):
-    uuid: UUID
-    url: str
-    name: str = Field(alias="username")
-
-
-class JobLogOutSchema(Schema):
-    user: SimpleUserOutSchema
-    id: UUID = Field(alias="task_id")
-    url: str
-    name: str = Field(alias="job_name")
-    created: datetime = Field(alias="created")
-    status: str = Field(alias="status")
-    done: Optional[datetime] = Field(None, alias="done_at")
-
-    @staticmethod
-    def resolve_url(obj):
-        return reverse("job detail", kwargs={"job_uuid": obj.task_id})

epauth/views.py

@@ -1,5 +1,3 @@
-import logging
-
 import msal
 from django.conf import settings as s
 from django.contrib.auth import get_user_model
@@ -9,9 +7,6 @@ from django.shortcuts import redirect
 
 from epdb.logic import UserManager, GroupManager
 from epdb.models import Group
-from epdb.views import get_remote_address, error
-
-auth_log = logging.getLogger("auth")
 
 
 def get_msal_app_with_cache(request):
@@ -35,9 +30,6 @@ def get_msal_app_with_cache(request):
 
 
 def entra_login(request):
-
-    auth_log.info(f"Login request from {get_remote_address(request)}")
-
     msal_app = msal.ConfidentialClientApplication(
         client_id=s.MS_ENTRA_CLIENT_ID,
         client_credential=s.MS_ENTRA_CLIENT_SECRET,
@@ -62,28 +54,14 @@ def entra_callback(request):
     # Acquire token using the flow and callback request
     result = msal_app.acquire_token_by_auth_code_flow(flow, request.GET)
 
-    if "error" in result:
-        auth_log.error(f"Login attempt by {get_remote_address(request)} failed due to {result['error']}")
-        return redirect("/")
-
     # Save the token cache to session
     if cache.has_state_changed:
         request.session["msal_token_cache"] = cache.serialize()
 
     claims = result["id_token_claims"]
 
-    if claims.get("roles") is None or claims.get("roles") == [] or "envipath_registered_user" not in claims.get("roles"):
-        auth_log.error(f"Login attempt by {get_remote_address(request)} failed due to missing role")
-        return error(
-            request,
-            "Login Failed",
-            "The user is not authenticated. A reason for this might be a missing assignment to the respective enviPath group.",
-            403,
-        )
-
     user_name = claims.get("name")
-    # preferred_username is a fallback for 2nd CWID
-    user_email = claims.get("emailaddress", claims.get("email", claims.get("preferred_username")))
+    user_email = claims.get("emailaddress", claims.get("email"))
     user_oid = claims.get("oid")
 
     if not all([user_name, user_email, user_oid]):
@@ -92,7 +70,6 @@ def entra_callback(request):
     # Get implementing class
     User = get_user_model()
 
-    registered = False
     if User.objects.filter(uuid=user_oid).exists():
         u = User.objects.get(uuid=user_oid)
 
@@ -101,11 +78,8 @@ def entra_callback(request):
             u.save()
 
     else:
-        auth_log.info(f"Registering {user_name} with OID {user_oid}")
         u = UserManager.create_user(user_name, user_email, None, uuid=user_oid, is_active=True)
-        registered = True
 
-    auth_log.info(f"User {user_name} {'(admin) ' if u.is_superuser else ''}with OID {user_oid} successfully logged in as {u.username} from {get_remote_address(request)}")
     login(request, u)
 
     # EDIT START
@@ -128,31 +102,10 @@ def entra_callback(request):
         else:
             g = Group.objects.get(uuid=id)
 
-    sync_groups = list(s.ENTRA_GROUPS.keys()) + list(s.ENTRA_SECRET_GROUPS.keys())
-    user_groups = claims.get("groups", [])
-
-    for uuid in sync_groups:
-        if uuid in user_groups:
-            g = Group.objects.get(uuid=uuid)
-            if not g.user_member.contains(u):
-                g.user_member.add(u)
-                auth_log.info(f"Login Group Sync: Adding {u.username} to Group {g.name} ({ uuid })")
-        else:
-            g = Group.objects.get(uuid=uuid)
-            if g.user_member.contains(u):
-                g.user_member.remove(u)
-                auth_log.info(f"Login Group Sync: Removing {u.username} from Group {g.name} ({ uuid })")
-
-    if registered:
-        # #72 make package secret if user is part of a secret group
-        for id, name in s.ENTRA_SECRET_GROUPS.items():
-            group = Group.objects.get(uuid=id)
-            if group.user_member.contains(u):
-                # User is eligible for secrete
-                pack = u.default_package
-                pack.data_pool = group
-                pack.classification_level = pack.Classification.SECRET
-                pack.save()
+    for group_uuid in claims.get("groups", []):
+        if Group.objects.filter(uuid=group_uuid).exists():
+            g = Group.objects.get(uuid=group_uuid)
+            g.user_member.add(u)
 
     # EDIT END
 

epdb/exceptions.py

@@ -1,10 +0,0 @@
-class InvalidSMILESException(Exception):
-    pass
-
-
-class InvalidMolfileException(Exception):
-    pass
-
-
-class PackageImportException(Exception):
-    pass

epdb/legacy_api.py

@@ -1,4 +1,3 @@
-import logging
 from collections import defaultdict
 from typing import Any, Dict, List, Optional
 
@@ -10,6 +9,7 @@ from django.contrib.auth import get_user_model
 from django.core.cache import cache
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import redirect
+from jwt import InvalidIssuerError
 from ninja import Field, Form, Query, Router, Schema
 from ninja.security import HttpBearer
 
@@ -45,12 +45,9 @@ from .models import (
     User,
     UserPackagePermission,
 )
-from .views import delete_with_log, get_remote_address
 
 Package = s.GET_PACKAGE_MODEL()
 
-auth_log = logging.getLogger("auth")
-
 
 def get_cached_jwks(tenant_id: str, force=False) -> Dict:
     """Get JWKS using Django cache"""
@@ -72,10 +69,6 @@ def get_cached_jwks(tenant_id: str, force=False) -> Dict:
     return jwks
 
 
-def get_package_for_read(user, package_uuid):
-    return PackageManager.get_package_by_id(user, package_uuid)
-
-
 def get_package_for_write(user, package_uuid):
     p = PackageManager.get_package_by_id(user, package_uuid)
     if not PackageManager.writable(user, p):
@@ -122,22 +115,15 @@ def validate_token(token: str) -> dict:
 class MSBearerTokenAuth(HttpBearer):
 
     def authenticate(self, request, token):
-
-        auth_log.info(f"Authentication request by {get_remote_address(request)}")
-
         if token is None:
             return None
 
         claims = validate_token(token)
 
         if not User.objects.filter(uuid=claims['oid']).exists():
-            auth_log.info(f"Authentication request by {get_remote_address(request)} failed!")
             return None
 
-        user = User.objects.get(uuid=claims['oid'])
-        request.user = user
-        auth_log.info(
-            f"User {user.username} {'(admin) ' if user.is_superuser else ''}with OID {user.uuid} successfully logged in as {user.username} from {get_remote_address(request)}")
+        request.user = User.objects.get(uuid=claims['oid'])
         return request.user
 
 
@@ -453,50 +439,23 @@ class PackageSchema(Schema):
 
     @staticmethod
     def resolve_readers(obj: Package):
-        readers = []
+        users = User.objects.filter(
+            id__in=UserPackagePermission.objects.filter(
+                package=obj, permission=UserPackagePermission.READ[0]
+            ).values_list("user", flat=True)
+        ).distinct()
 
-        user_ids = UserPackagePermission.objects.filter(package=obj).values_list("user", flat=True)
-
-        users = User.objects.filter(id__in=user_ids).distinct()
-
-        for u in users:
-            readers.append({"id": str(u.url), "identifier": "user", "name": u.get_name()})
-
-        group_ids = GroupPackagePermission.objects.filter(package=obj).values_list(
-            "group", flat=True
-        )
-
-        groups = Group.objects.filter(id__in=group_ids).distinct()
-
-        for g in groups:
-            readers.append({"id": str(g.url), "identifier": "group", "name": g.get_name()})
-
-        return readers
+        return [{u.id: u.get_name()} for u in users]
 
     @staticmethod
     def resolve_writers(obj: Package):
-        writers = []
+        users = User.objects.filter(
+            id__in=UserPackagePermission.objects.filter(
+                package=obj, permission=UserPackagePermission.WRITE[0]
+            ).values_list("user", flat=True)
+        ).distinct()
 
-        user_ids = UserPackagePermission.objects.filter(
-            package=obj,
-            permission__in=[UserPackagePermission.WRITE[0], UserPackagePermission.ALL[0]],
-        ).values_list("user", flat=True)
-
-        users = User.objects.filter(id__in=user_ids).distinct()
-
-        for u in users:
-            writers.append({"id": str(u.url), "identifier": "user", "name": u.get_name()})
-
-        group_ids = GroupPackagePermission.objects.filter(
-            package=obj, permission=[UserPackagePermission.WRITE[0], UserPackagePermission.ALL[0]]
-        ).values_list("group", flat=True)
-
-        groups = Group.objects.filter(id__in=group_ids).distinct()
-
-        for g in groups:
-            writers.append({"id": str(g.url), "identifier": "group", "name": g.get_name()})
-
-        return writers
+        return [{u.id: u.get_name()} for u in users]
 
     @staticmethod
     def resolve_review_comment(obj):
@@ -571,10 +530,7 @@ def update_package(request, package_uuid, pack: Form[UpdatePackage]):
 
         if pack.hiddenMethod:
             if pack.hiddenMethod == "DELETE":
-                if PackageManager.administrable(request.user, p):
-                    delete_with_log(request, p)
-                else:
-                    raise ValueError("You do not have the rights to delete this Package!")
+                p.delete()
 
         elif pack.packageDescription is not None:
             description = nh3.clean(pack.packageDescription, tags=s.ALLOWED_HTML_TAGS).strip()
@@ -611,7 +567,7 @@ def delete_package(request, package_uuid):
         p = PackageManager.get_package_by_id(request.user, package_uuid)
 
         if PackageManager.administrable(request.user, p):
-            delete_with_log(request, p)
+            p.delete()
             return redirect(f"{s.SERVER_URL}/package")
         else:
             raise ValueError("You do not have the rights to delete this Package!")
@@ -650,14 +606,9 @@ class CompoundSchema(Schema):
     reviewStatus: str = Field(False, alias="review_status")
     scenarios: List["SimpleScenario"] = Field([], alias="scenarios")
     structures: List["CompoundStructureSchema"] = []
-    pesLink: str | None = Field(None, alias="pes_link")
 
     @staticmethod
-    def resolve_pes_link(obj: Compound):
-        return getattr(obj.default_structure, "pes_link", None)
-
-    @staticmethod
-    def resolve_review_status(obj: Compound):
+    def resolve_review_status(obj: CompoundStructure):
         return "reviewed" if obj.package.reviewed else "unreviewed"
 
     @staticmethod
@@ -731,7 +682,6 @@ class CompoundStructureSchema(Schema):
     reviewStatus: str = Field(None, alias="review_status")
     scenarios: List["SimpleScenario"] = Field([], alias="scenarios")
     smiles: str = Field(None, alias="smiles")
-    pesLink: str | None = Field(None, alias="pes_link")
 
     @staticmethod
     def resolve_review_status(obj: CompoundStructure):
@@ -867,7 +817,6 @@ def get_package_compound_structure(request, package_uuid, compound_uuid, structu
 
 class CreateCompound(Schema):
     compoundSmiles: str
-    compoundMolFile: str | None = None
     compoundName: str | None = None
     compoundDescription: str | None = None
     inchi: str | None = None
@@ -889,29 +838,21 @@ def create_package_compound(
             from bayer.models import PESCompound
 
             try:
-                pes_data = fetch_pes(request, c.pesLink, request.user)
+                pes_data = fetch_pes(request, c.pesLink)
             except ValueError as e:
                 return 400, {"message": f"Could not fetch PES data for {c.pesLink}"}
 
             classification = pes_data.get("classificationLevel", "")
             if "secret" == classification.lower():
-
-                if p.classification_level != Package.Classification.SECRET:
-                    return 400, {"message": "Cannot create secret PESs in non-secret packages."}
-
-                if not p.data_pool or not p.data_pool.secret:
-                    return 400, {"message": "Cannot create secret PESs in package without a secret data pool."}
-
+                data_pools = pes_data.get("dataPools")
+                if data_pools:
+                    if s.DATA_POOL_MAPPING[p.data_pool.name] not in data_pools:
+                        return 400, { "messsage": f"PES data pool {s.DATA_POOL_MAPPING[p.data_pool.name]} not found in PES data"}
 
             c = PESCompound.create(p, pes_data, c.compoundName, c.compoundDescription)
         else:
             c = Compound.create(
-                p,
-                c.compoundSmiles,
-                molfile=c.compoundMolFile,
-                name=c.compoundName,
-                description=c.compoundDescription,
-                inchi=c.inchi
+                p, c.compoundSmiles, c.compoundName, c.compoundDescription, inchi=c.inchi
             )
         return redirect(c.url)
     except ValueError as e:
@@ -931,27 +872,6 @@ def delete_compound(request, package_uuid, compound_uuid):
         }
 
 
-class CreateCompoundStructure(Schema):
-    smiles: str
-    name: str | None = None
-    description: str | None = None
-    inchi: str | None = None
-    molfile: str | None = None
-
-
-@router.post("/package/{uuid:package_uuid}/compound/{uuid:compound_uuid}/structure")
-def create_package_compound_structure(
-    request, package_uuid, compound_uuid, structure: Form[CreateCompoundStructure]
-):
-    try:
-        p = get_package_for_write(request.user, package_uuid)
-        c = Compound.objects.get(package=p, uuid=compound_uuid)
-        cs = CompoundStructure.create(c, structure.smiles, structure.name, structure.description)
-        return redirect(cs.url)
-    except ValueError as e:
-        return 400, {"message": str(e)}
-
-
 @router.delete(
     "/package/{uuid:package_uuid}/compound/{uuid:compound_uuid}/structure/{uuid:structure_uuid}"
 )
@@ -1478,7 +1398,6 @@ class ScenarioSchema(Schema):
     aliases: List[str] = Field([], alias="aliases")
     collection: Dict["str", List[Dict[str, Any]]] = Field([], alias="collection")
     collectionID: Optional[str] = None
-    date: str = Field(None, alias="scenario_date")
     description: str = Field(None, alias="description")
     id: str = Field(None, alias="url")
     identifier: str = "scenario"
@@ -1622,56 +1541,28 @@ def create_package_additional_information(request, package_uuid):
         scen = request.POST.get("scenario")
         scenario = Scenario.objects.get(package=p, url=scen)
 
-        if request.POST.get("adInfoTypes[]"):
-            url_parser = EPDBURLParser(request.POST.get("attach_obj"))
-            attach_obj = url_parser.get_object()
+        url_parser = EPDBURLParser(request.POST.get("attach_obj"))
+        attach_obj = url_parser.get_object()
 
-            if not hasattr(attach_obj, "additional_information"):
-                raise ValueError("Can't attach additional information to this object!")
+        if not hasattr(attach_obj, "additional_information"):
+            raise ValueError("Can't attach additional information to this object!")
 
-            if not attach_obj.url.startswith(p.url):
-                raise ValueError(
-                    "Additional Information can only be set to objects stored in the same package!"
-                )
+        if not attach_obj.url.startswith(p.url):
+            raise ValueError(
+                "Additional Information can only be set to objects stored in the same package!"
+            )
 
-            types = request.POST.get("adInfoTypes[]", "").split(",")
+        types = request.POST.get("adInfoTypes[]", "").split(",")
 
-            for t in types:
-                ai = build_additional_information_from_request(request, t)
+        for t in types:
+            ai = build_additional_information_from_request(request, t)
 
-                AdditionalInformation.create(
-                    p,
-                    ai,
-                    scenario=scenario,
-                    content_object=attach_obj,
-                )
-
-        elif request.POST.get("ais"):
-            import json
-
-            parsed_ais = json.loads(request.POST.get("ais"))
-
-            for ai_type, ais in parsed_ais.items():
-                for ai in ais:
-                    attach_obj = None
-                    if ai.get("related"):
-                        url_parser = EPDBURLParser(ai.get("related").get("url"))
-                        attach_obj = url_parser.get_object()
-
-                        if not hasattr(attach_obj, "additional_information"):
-                            raise ValueError("Can't attach additional information to this object!")
-
-                        if not attach_obj.url.startswith(p.url):
-                            raise ValueError(
-                                "Additional Information can only be set to objects stored in the same package!"
-                            )
-
-                    AdditionalInformation.create(
-                        p,
-                        AdditionalInformation.from_dict(ai_type, ai),
-                        scenario=scenario,
-                        content_object=attach_obj,
-                    )
+            AdditionalInformation.create(
+                p,
+                ai,
+                scenario=scenario,
+                content_object=attach_obj,
+            )
 
         # TODO implement additional information endpoint ?
         return redirect(f"{scenario.url}")
@@ -1715,15 +1606,13 @@ class PathwayNode(Schema):
     dt50s: List[Dict[str, str]] = Field([], alias="dt50s")
     engineeredIntermediate: bool = Field(None, alias="engineered_intermediate")
     id: str = Field(None, alias="url")
-    idcomp: str = Field(None, alias="node_label_id")
-    idreact: str = Field(None, alias="node_label_id")
+    idcomp: str = Field(None, alias="default_node_label.url")
+    idreact: str = Field(None, alias="default_node_label.url")
     image: str = Field(None, alias="image")
     imageSize: int = Field(None, alias="image_size")
     name: str = Field(None, alias="name")
-    proposed: List[Dict[str, Any]] = []
-    smiles: str = Field(None, alias="smiles")
-    pseudo: bool = Field(False, alias="pseudo")
-    pesLink: str | None = Field(None, alias="pes_link")
+    proposed: List[Dict[str, str]] = Field([], alias="proposed_intermediate")
+    smiles: str = Field(None, alias="default_node_label.smiles")
 
     @staticmethod
     def resolve_atom_count(obj: Node):
@@ -1736,10 +1625,24 @@ class PathwayNode(Schema):
         # TODO
         return []
 
+    @staticmethod
+    def resolve_engineered_intermediate(obj: Node):
+        # TODO
+        return False
+
+    @staticmethod
+    def resolve_image(obj: Node):
+        return f"{obj.default_node_label.url}?image=svg"
+
     @staticmethod
     def resolve_image_size(obj: Node):
         return 400
 
+    @staticmethod
+    def resolve_proposed_intermediate(obj: Node):
+        # TODO
+        return []
+
 
 class PathwaySchema(Schema):
     aliases: List[str] = Field([], alias="aliases")
@@ -1863,36 +1766,13 @@ def create_package_pathway(
         return 403, {"message": str(e)}
 
 
-@router.post("/package/{uuid:package_uuid}/pathway/{uuid:pathway_uuid}")
-def update_pathway(request, package_uuid, pathway_uuid):
-    try:
-        p = get_package_for_write(request.user, package_uuid)
-
-        if request.POST.get("scenario"):
-            pw = Pathway.objects.get(package=p, uuid=pathway_uuid)
-            scen = Scenario.objects.get(package=p, url=request.POST.get("scenario"))
-
-            pw.scenarios.add(scen)
-            pw.save()
-
-            return redirect(f"{pw.url}")
-
-        else:
-            return 400, {"message": "No scenario specified!"}
-
-    except ValueError:
-        return 403, {
-            "message": f"Deleting Pathway with id {pathway_uuid} failed due to insufficient rights!"
-        }
-
-
 @router.delete("/package/{uuid:package_uuid}/pathway/{uuid:pathway_uuid}")
 def delete_pathway(request, package_uuid, pathway_uuid):
     try:
         p = get_package_for_write(request.user, package_uuid)
 
         pw = Pathway.objects.get(package=p, uuid=pathway_uuid)
-        delete_with_log(request, pw)
+        pw.delete()
         return redirect(f"{p.url}/pathway")
 
     except ValueError:
@@ -1990,8 +1870,7 @@ def get_package_pathway_node(request, package_uuid, pathway_uuid, node_uuid):
 
 
 class CreateNode(Schema):
-    nodeAsSmiles: str | None = None
-    nodeAsMolFile: str | None = None
+    nodeAsSmiles: str
     nodeName: str | None = None
     nodeReason: str | None = None
     nodeDepth: str | None = None
@@ -2000,38 +1879,30 @@ class CreateNode(Schema):
 
 @router.post(
     "/package/{uuid:package_uuid}/pathway/{uuid:pathway_uuid}/node",
-    response={200: str | Any, 400: Error, 403: Error},
+    response={200: str | Any, 403: Error},
 )
 def add_pathway_node(request, package_uuid, pathway_uuid, n: Form[CreateNode]):
     try:
         p = get_package_for_write(request.user, package_uuid)
         pw = Pathway.objects.get(package=p, uuid=pathway_uuid)
 
-        # TODO Code Dup from bayer.views
-
         if n.pesLink:
             from bayer.views import fetch_pes
             from bayer.models import PESCompound
 
             try:
-                pes_data = fetch_pes(request, n.pesLink, request.user)
+                pes_data = fetch_pes(request, c.pesLink)
             except ValueError as e:
-                return 400, {"message": f"Could not fetch PES data for {n.pesLink}"}
+                return 400, {"message": f"Could not fetch PES data for {c.pesLink}"}
 
             classification = pes_data.get("classificationLevel", "")
             if "secret" == classification.lower():
+                data_pools = pes_data.get("dataPools")
+                if data_pools:
+                    if s.DATA_POOL_MAPPING[p.data_pool.name] not in data_pools:
+                        return 400, { "messsage": f"PES data pool {s.DATA_POOL_MAPPING[p.data_pool.name]} not found in PES data"}
 
-                if p.classification_level != Package.Classification.SECRET:
-                    return 400, {"message": "Cannot create secret PESs in non-secret packages."}
-
-                if not p.data_pool or not p.data_pool.secret:
-                    return 400, {"message": "Cannot create secret PESs in package without a secret data pool."}
-
-            c = PESCompound.create(p, pes_data, n.nodeName, n.nodeReason)
-
-            node_qs = Node.objects.filter(pathway=pw, default_node_label=c.default_structure)
-            if node_qs.exists():
-                return redirect(pw.url)
+            c = PESCompound.create(p, pes_data, c.compoundName, c.compoundDescription)
 
             node = Node()
             node.stereo_removed = False
@@ -2049,14 +1920,7 @@ def add_pathway_node(request, package_uuid, pathway_uuid, n: Form[CreateNode]):
             else:
                 node_depth = -1
 
-            node = Node.create(
-                pw,
-                n.nodeAsSmiles,
-                node_depth,
-                molfile=n.nodeAsMolFile,
-                name=n.nodeName,
-                description=n.nodeReason,
-            )
+            node = Node.create(pw, n.nodeAsSmiles, node_depth, n.nodeName, n.nodeReason)
 
         return redirect(node.url)
     except ValueError:
@@ -2070,7 +1934,7 @@ def delete_node(request, package_uuid, pathway_uuid, node_uuid):
 
         pw = Pathway.objects.get(package=p, uuid=pathway_uuid)
         n = Node.objects.get(pathway=pw, uuid=node_uuid)
-        delete_with_log(request, n)
+        n.delete()
         return redirect(f"{pw.url}/node")
 
     except ValueError:
@@ -2201,10 +2065,6 @@ def add_pathway_edge(request, package_uuid, pathway_uuid, e: Form[CreateEdge]):
             for pr in e.products.split(","):
                 products.append(Node.objects.get(pathway=pw, url=pr.strip()))
 
-        multi_step = False
-        if e.multistep and e.multistep.strip() == "true":
-            multi_step = True
-
         new_e = Edge.create(
             pathway=pw,
             start_nodes=educts,
@@ -2212,12 +2072,8 @@ def add_pathway_edge(request, package_uuid, pathway_uuid, e: Form[CreateEdge]):
             rule=None,
             name=None,
             description=e.edgeReason,
-            multi_step=multi_step,
         )
 
-        # Update depths as sideeffect of above operation
-        pw.update_depths()
-
         return redirect(new_e.url)
     except ValueError:
         return 403, {"message": "Adding Edge failed!"}
@@ -2230,7 +2086,7 @@ def delete_edge(request, package_uuid, pathway_uuid, edge_uuid):
 
         pw = Pathway.objects.get(package=p, uuid=pathway_uuid)
         e = Edge.objects.get(pathway=pw, uuid=edge_uuid)
-        delete_with_log(request, e)
+        e.delete()
         return redirect(f"{pw.url}/edge")
 
     except ValueError:
@@ -2411,65 +2267,3 @@ def get_setting(request, setting_uuid):
         return 403, {
             "message": f"Getting Setting with id {setting_uuid} failed due to insufficient rights!"
         }
-
-
-########
-# Util #
-########
-class NonPersistent(Schema):
-    smiles: str
-    setting_url: str = Field(..., alias="settingUri")
-
-
-@router.post("/util", response={200: Any, 403: Error})
-def predict(request, np: Form[NonPersistent]):
-    try:
-        from epdb.logic import SPathway
-
-        setting = SettingManager.get_setting_by_url(request.user, np.setting_url)
-        spw = SPathway(prediction_setting=setting, root_nodes=[np.smiles])
-        spw.predict()
-        return spw.to_json()
-    except ValueError:
-        return 403, {
-            "message": f"Getting Setting with id {np.setting_url} failed due to insufficient rights!"
-        }
-
-
-##########
-# Export #
-##########
-class PackageExportInSchema(Schema):
-    package_uuid: str
-    additional_information_types: List[str] | None = None
-
-
-@router.get("/export", response={200: Any, 403: Error})
-def export(request, q: Query[PackageExportInSchema]):
-    try:
-        p = get_package_for_read(request.user, q.package_uuid)
-
-        from envipy_additional_information import registry
-        from utilities.misc import PathwayExporter
-
-        ai_types = []
-        if q.additional_information_types is not None:
-            for ai_type in q.additional_information_types:
-                if registry.get_model(ai_type) is None:
-                    return 400, {
-                        "message": f"Exporting Package with id {q.package_uuid} failed as {ai_type} is not a valid additional information type!"
-                    }
-                ai_types.append(ai_type)
-
-        exporter = PathwayExporter(p, add_infs_to_export=ai_types)
-        res = exporter.do_export()
-
-        filename = f"{p.get_name().replace(' ', '_')}_{p.uuid}.tsv"
-        response = HttpResponse(res, content_type="text/csv")
-        response["Content-Disposition"] = f'attachment; filename="{filename}"'
-
-        return response
-    except ValueError:
-        return 403, {
-            "message": f"Exporting Package with id {q.package_uuid} failed due to insufficient rights!"
-        }

epdb/logic.py

@@ -35,7 +35,6 @@ from utilities.chem import FormatConverter
 from utilities.misc import PackageExporter, PackageImporter
 
 logger = logging.getLogger(__name__)
-auth_log = logging.getLogger("auth")
 
 Package = s.GET_PACKAGE_MODEL()
 
@@ -46,7 +45,7 @@ class EPDBURLParser:
     MODEL_PATTERNS = {
         "epdb.User": re.compile(rf"^.*/user/{UUID_PATTERN}"),
         "epdb.Group": re.compile(rf"^.*/group/{UUID_PATTERN}"),
-        s.EPDB_PACKAGE_MODEL: re.compile(rf"^.*/package/{UUID_PATTERN}"),
+        "epdb.Package": re.compile(rf"^.*/package/{UUID_PATTERN}"),
         "epdb.Compound": re.compile(rf"^.*/package/{UUID_PATTERN}/compound/{UUID_PATTERN}"),
         "epdb.CompoundStructure": re.compile(
             rf"^.*/package/{UUID_PATTERN}/compound/{UUID_PATTERN}/structure/{UUID_PATTERN}"
@@ -96,7 +95,7 @@ class EPDBURLParser:
 
     def contains_package_url(self):
         return (
-            bool(self.MODEL_PATTERNS[s.EPDB_PACKAGE_MODEL].findall(self.url))
+            bool(self.MODEL_PATTERNS["epdb.Package"].findall(self.url))
             and not self.is_package_url()
         )
 
@@ -124,7 +123,7 @@ class EPDBURLParser:
             "epdb.EPModel",
             "epdb.Pathway",
             # 1st level
-            s.EPDB_PACKAGE_MODEL,
+            "epdb.Package",
             "epdb.Setting",
             "epdb.Group",
             "epdb.User",
@@ -146,7 +145,7 @@ class EPDBURLParser:
 
         hierarchy_order = [
             # 1st level
-            s.EPDB_PACKAGE_MODEL,
+            "epdb.Package",
             "epdb.Setting",
             "epdb.Group",
             "epdb.User",
@@ -317,19 +316,13 @@ class GroupManager(object):
         if isinstance(member, Group):
             if add_or_remove == "add":
                 group.group_member.add(member)
-                auth_log.info(f"{caller.username} ({caller.url}) adds {member.name} ({member.url}) to {group.name} ({group.url})")
             else:
                 group.group_member.remove(member)
-                auth_log.info(
-                    f"{caller.username} ({caller.url}) removes {member.name} ({member.url}) from {group.name} ({group.url})")
         else:
             if add_or_remove == "add":
                 group.user_member.add(member)
-                auth_log.info(f"{caller.username} ({caller.url}) adds {member.username} ({member.url}) to {group.name} ({group.url})")
             else:
                 group.user_member.remove(member)
-                auth_log.info(
-                    f"{caller.username} ({caller.url}) removes {member.username} ({member.url}) from {group.name} ({group.url})")
 
         group.save()
 
@@ -585,11 +578,9 @@ class PackageManager(object):
         if isinstance(grantee, User):
             perm_cls = UserPackagePermission
             data["user"] = grantee
-            grantee_name = grantee.username
         else:
             perm_cls = GroupPackagePermission
             data["group"] = grantee
-            grantee_name = grantee.name
 
         if new_perm is None:
             qs = perm_cls.objects.filter(**data)
@@ -598,23 +589,11 @@ class PackageManager(object):
             if qs.count() != 0:
                 logger.info(f"Deleting Perm {qs.first()}")
                 qs.delete()
-                auth_log.info(f"{caller.username} ({caller.url}) revokes {grantee_name} ({grantee.url}) all Permissions on {package.name} ({package.url})")
             else:
                 logger.debug(f"No Permission object for {perm_cls} with filter {data} found!")
         else:
-            old_perm = None
-            old_perms_qs = perm_cls.objects.filter(**data)
-
-            if old_perms_qs.exists():
-                old_perm = old_perms_qs.first().permission
-
             _ = perm_cls.objects.update_or_create(defaults={"permission": new_perm}, **data)
 
-            if old_perm is None:
-                auth_log.info(f"{caller.username} ({caller.url}) grants {grantee_name} ({grantee.url}) '{new_perm}' Permissions on {package.name} ({package.url})")
-            else:
-                auth_log.info(f"{caller.username} ({caller.url}) set {grantee_name} ({grantee.url}) Permissions from '{old_perm}' to '{new_perm}' on {package.name} ({package.url})")
-
     @staticmethod
     def grant_read(caller: User, package: Package, grantee: Union[User, Group]):
         PackageManager.update_permissions(caller, package, grantee, Permission.READ[0])
@@ -1086,9 +1065,52 @@ class PackageManager(object):
 
         print("Fixing Node depths...")
         total_pws = Pathway.objects.filter(package=pack).count()
-
         for p, pw in enumerate(Pathway.objects.filter(package=pack)):
-            pw.update_depths()
+            in_count = defaultdict(lambda: 0)
+            out_count = defaultdict(lambda: 0)
+
+            for e in pw.edges:
+                # TODO check if this will remain
+                for react in e.start_nodes.all():
+                    out_count[str(react.uuid)] += 1
+
+                for prod in e.end_nodes.all():
+                    in_count[str(prod.uuid)] += 1
+
+            root_nodes = []
+            for n in pw.nodes:
+                num_parents = in_count[str(n.uuid)]
+                if num_parents == 0:
+                    # must be a root node or unconnected node
+                    if n.depth != 0:
+                        n.depth = 0
+                        n.save()
+
+                    # Only root node may have children
+                    if out_count[str(n.uuid)] > 0:
+                        root_nodes.append(n)
+
+            levels = [root_nodes]
+            seen = set()
+            # Do a bfs to determine depths starting with level 0 a.k.a. root nodes
+            for i, level_nodes in enumerate(levels):
+                new_level = []
+                for n in level_nodes:
+                    for e in n.out_edges.all():
+                        for prod in e.end_nodes.all():
+                            if str(prod.uuid) not in seen:
+                                old_depth = prod.depth
+                                if old_depth != i + 1:
+                                    prod.depth = i + 1
+                                    prod.save()
+
+                                new_level.append(prod)
+
+                    seen.add(str(n.uuid))
+
+                if new_level:
+                    levels.append(new_level)
+
             print(f"{p + 1}/{total_pws} fixed.", end="\r")
 
         return pack
@@ -1099,8 +1121,10 @@ class PackageManager(object):
         data: Dict[str, Any],
         owner: User,
         preserve_uuids=False,
+        add_import_timestamp=True,
+        trust_reviewed=False,
     ) -> Package:
-        importer = PackageImporter(data, preserve_uuids)
+        importer = PackageImporter(data, preserve_uuids, add_import_timestamp, trust_reviewed)
         imported_package = importer.do_import()
 
         up = UserPackagePermission()
@@ -1896,51 +1920,12 @@ class SPathway(object):
 
         logger.info("Update done!")
 
-    def compute_bayes_probabilities(self) -> Dict[SEdge, float]:
-        """
-        Computes Bayes-adjusted probabilities for all edges in the pathway
-        by iterating level by level from depth 0 upwards, keyed on educt depth.
-
-        Returns:
-            A dict mapping each SEdge to its Bayes-adjusted probability.
-        """
-        bayes_probs: Dict[SEdge, float] = {}
-
-        # Group edges by their educt depth
-        edges_by_depth: Dict[int, List[SEdge]] = {}
-        for edge in self.edges:
-            d = edge.educts[0].depth
-            edges_by_depth.setdefault(d, []).append(edge)
-
-        for depth in sorted(edges_by_depth.keys()):
-            for edge in edges_by_depth[depth]:
-                if depth == 0:
-                    bayes_probs[edge] = edge.probability
-                else:
-                    predecessor_edges = [e for e in self.edges if edge.educts[0] in e.products]
-
-                    if not predecessor_edges or not all(
-                        e in bayes_probs for e in predecessor_edges
-                    ):
-                        # Predecessor not computed yet (e.g. same-depth product),
-                        # fall back to raw probability
-                        bayes_probs[edge] = edge.probability
-                    else:
-                        predecessor_avg = sum(bayes_probs[e] for e in predecessor_edges) / len(
-                            predecessor_edges
-                        )
-                        bayes_probs[edge] = predecessor_avg * edge.probability
-
-        return bayes_probs
-
     def to_json(self):
         nodes = []
         edges = []
 
         idx_lookup = {}
 
-        bayes_probs = self.compute_bayes_probabilities()
-
         for i, smiles in enumerate(self.smiles_to_node):
             n = self.smiles_to_node[smiles]
             idx_lookup[smiles] = i
@@ -1956,13 +1941,6 @@ class SPathway(object):
                 "to": to_indices,
             }
 
-            if edge.rule:
-                e["rule"] = edge.rule.simple_json()
-
-            if edge.probability:
-                e["probability"] = edge.probability
-                e["multiGenProbability"] = bayes_probs[edge]
-
             edges.append(e)
 
         return {

epdb/management/commands/bootstrap.py

@@ -99,15 +99,11 @@ class Command(BaseCommand):
                 new_license.image_link = f"https://licensebuttons.net/l/{cc_string}/4.0/88x31.png"
                 new_license.save()
 
-    def import_package(self, data, owner, all_envipath_user_group):
-        p = PackageManager.import_legacy_package(
+    def import_package(self, data, owner):
+        return PackageManager.import_legacy_package(
             data, owner, keep_ids=True, add_import_timestamp=False, trust_reviewed=True
         )
 
-        PackageManager.grant_read(owner, p, all_envipath_user_group)
-
-        return p
-
     def create_default_setting(self, owner, packages):
         s = SettingManager.create_setting(
             owner,
@@ -202,7 +198,7 @@ class Command(BaseCommand):
                     s.BASE_DIR / "fixtures" / "packages" / "2025-07-18" / p, encoding="utf-8"
                 ).read()
             )
-            imported_package = self.import_package(package_data, admin, g)
+            imported_package = self.import_package(package_data, admin)
             mapping[p.replace(".json", "")] = imported_package
 
         setting = self.create_default_setting(admin, [mapping["EAWAG-BBD"]])

epdb/management/commands/localize_urls.py

@@ -44,25 +44,20 @@ class Command(BaseCommand):
             "EPModel",
             "ApplicabilityDomain",
             "EnzymeLink",
-            "AdditionalInformation",
         ]
         for model in MODELS:
             obj_cls = apps.get_model("epdb", model)
-
-            update_fields = {"url": Replace(F("url"), Value(options["old"]), Value(options["new"]))}
-            if hasattr(obj_cls, "description"):
-                update_fields["description"] = Replace(
-                    F("description"), Value(options["old"]), Value(options["new"])
-                )
-
+            obj_cls.objects.update(
+                url=Replace(F("url"), Value(options["old"]), Value(options["new"]))
+            )
             if issubclass(obj_cls, EnviPathModel):
-                update_fields["kv"] = Cast(
-                    Replace(
-                        Cast(F("kv"), output_field=TextField()),
-                        Value(options["old"]),
-                        Value(options["new"]),
-                    ),
-                    output_field=JSONField(),
+                obj_cls.objects.update(
+                    kv=Cast(
+                        Replace(
+                            Cast(F("kv"), output_field=TextField()),
+                            Value(options["old"]),
+                            Value(options["new"]),
+                        ),
+                        output_field=JSONField(),
+                    )
                 )
-
-            obj_cls.objects.update(**update_fields)

epdb/management/commands/reaction_rule_mapping.py

@@ -1,97 +0,0 @@
-import logging
-
-from django.core.management.base import BaseCommand
-from django.db import transaction
-from uuid import uuid4
-from epdb.models import Package, ReactionExplanation
-from utilities.chem import FormatConverter
-from django.utils import timezone
-
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    def add_arguments(self, parser):
-        parser.add_argument(
-            "--rule-package",
-            action="append",
-            default=["32de3cf4-e3e6-4168-956e-32fa5ddb0ce1"],
-            type=str,
-            help="UUID to process. Can be specified multiple times.",
-        )
-
-        parser.add_argument(
-            "--reaction-package",
-            action="append",
-            default=[
-                "32de3cf4-e3e6-4168-956e-32fa5ddb0ce1",  # BBD
-                "f05e38d8-e9b4-4c3e-b0d8-9ab29966eccf",  # Sediment
-                "521c547a-fd2a-491c-ad5b-7eaa1577fb65",  # Sludge
-                "5882df9c-dae1-4d80-a40e-db4724271456",  # Soil
-                "87a49584-d937-482c-9c33-25928dcb02a8",  # PFAS
-            ],
-            type=str,
-            help="UUID to process. Can be specified multiple times.",
-        )
-
-        parser.add_argument(
-            "--dry-run",
-            default=False,
-            action="store_true",
-            help="Perform dry run",
-        )
-
-    @transaction.atomic
-    def handle(self, *args, **options):
-        RUN_UUID = uuid4()
-        RUN_START = timezone.now()
-
-        rule_packages = Package.objects.filter(uuid__in=options["rule_package"])
-        reaction_packages = Package.objects.filter(uuid__in=options["reaction_package"])
-
-        rules = []
-        for rule_package in rule_packages:
-            rules.extend(rule_package.get_applicable_rules())
-
-        reactions = []
-        for reaction_package in reaction_packages:
-            reactions.extend(reaction_package.reactions)
-
-        logger.debug(f"Collected {len(rules)} rules and {len(reactions)} reactions.")
-
-        for i, reaction in enumerate(reactions):
-            logger.debug(f"Reaction {i} / {len(reactions)}")
-            for j, rule in enumerate(rules):
-                reactants, products = reaction.smirks().split(">>")
-
-                if len(reactants.split(".")) > 1:
-                    logger.debug(f"Skipping reaction {reaction.uuid} as it has multiple reactants.")
-                    break
-
-                products = products.split(".")
-
-                # Run reaction with rule
-                rule_products = rule.apply(reactants)
-
-                # Check if products match (in both directions if extras are not allowed)
-                for product_set in rule_products:
-                    covered, exact = FormatConverter.smiles_covered_by(
-                        products,
-                        product_set.product_set,
-                        standardize=True,
-                        canonicalize_tautomers=True,
-                        return_exact_match=True,
-                    )
-
-                    if covered and not options["dry-run"]:
-                        logger.debug(f"Reaction {reaction.uuid} explained by rule {rule.uuid}")
-                        re = ReactionExplanation()
-                        re.run_uuid = RUN_UUID
-                        re.run_start = RUN_START
-                        re.reaction = reaction
-                        re.rule = rule
-                        re.exact = exact
-                        re.save()
-                        # Its explained, if there are more sets skip them
-                        break

epdb/migrations/0025_auto_20260511_2025.py

@@ -1,57 +0,0 @@
-# Generated by Django 6.0.3 on 2026-05-11 20:25
-
-from django.db import migrations
-from envipy_additional_information import HalfLife, HalfLifeModel, HalfLifeWS
-
-MAPPING = {
-    "": HalfLifeModel.OTHER,
-    "HS-SFO": HalfLifeModel.HS_SFO,
-    "FOMC": HalfLifeModel.FOMC,
-    "FOTC": HalfLifeModel.DFOP,
-    "FMOC": HalfLifeModel.FOMC,
-    "DFOP": HalfLifeModel.DFOP,
-    "SFO + SFO": HalfLifeModel.SFO_SFO,
-    "FOMC-SFO": HalfLifeModel.FOMC_SFO,
-    "first order kinetics": HalfLifeModel.SFO,
-    "SFO²": HalfLifeModel.SFO,
-    "HS": HalfLifeModel.HS,
-    "top down": HalfLifeModel.OTHER,
-    "SFO": HalfLifeModel.SFO,
-    "First Order": HalfLifeModel.SFO,
-    "SFO/SFO": HalfLifeModel.SFO_SFO,
-    "FOMC + SFO": HalfLifeModel.FOMC_SFO,
-    "true": HalfLifeModel.SFO,
-    "SFO-SFO": HalfLifeModel.SFO_SFO,
-    "DFOP-SFO": HalfLifeModel.DFOP_SFO,
-    "other": HalfLifeModel.OTHER,
-}
-
-
-def forward_func(apps, schema_editor):
-    AdditionalInformation = apps.get_model("epdb", "AdditionalInformation")
-
-    hls = AdditionalInformation.objects.filter(type="HalfLife")
-
-    for hl in hls:
-        data = hl.data
-        data["model"] = MAPPING[data["model"]].value
-        hl.data = HalfLife(**data).model_dump(mode="json")
-        hl.save()
-
-    hlws = AdditionalInformation.objects.filter(type="HalfLifeWS")
-
-    for hl in hlws:
-        data = hl.data
-        data["model"] = MAPPING[data["model"]].value
-        hl.data = HalfLifeWS(**data).model_dump(mode="json")
-        hl.save()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("epdb", "0024_user_contacted"),
-    ]
-
-    operations = [
-        migrations.RunPython(forward_func, reverse_code=migrations.RunPython.noop),
-    ]

epdb/migrations/0026_auto_20260602_1718.py

@@ -1,48 +0,0 @@
-# Generated by Django 6.0.3 on 2026-06-02 17:18
-
-from django.db import migrations
-from envipy_additional_information import DOI
-
-
-def forward_func(apps, schema_editor):
-    AdditionalInformation = apps.get_model("epdb", "AdditionalInformation")
-
-    refs = AdditionalInformation.objects.filter(type="Reference")
-
-    remaining = []
-
-    for ref in refs:
-        r = ref.data["reference"]
-        try:
-            # PubMed IDs are plain ints, try parsing
-            _ = int(r)
-            # Nothing to do
-        except ValueError:
-            DOMAINS = [
-                "http://dx.doi.org/",
-                "https://dx.doi.org/",
-                "http://doi.org/",
-                "https://doi.org/",
-            ]
-            for d in DOMAINS:
-                r = r.replace(d, "")
-
-            if r.startswith("10."):
-                ref.type = DOI.__name__
-                ref.data = {"doi": r}
-                ref.save()
-            else:
-                remaining.append(ref)
-
-    if len(remaining) > 0:
-        raise ValueError(f"Could not parse {len(remaining)} references")
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("epdb", "0025_auto_20260511_2025"),
-    ]
-
-    operations = [
-        migrations.RunPython(forward_func, reverse_code=migrations.RunPython.noop),
-    ]

epdb/migrations/0027_alter_compound_aliases_and_more.py

@@ -1,150 +0,0 @@
-# Generated by Django 6.0.3 on 2026-07-01 20:59
-
-import django.contrib.postgres.fields
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("epdb", "0026_auto_20260602_1718"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="compound",
-            name="aliases",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.TextField(), blank=True, default=list, verbose_name="Aliases"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="compound",
-            name="default_structure",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="compound_default_structure",
-                to="epdb.compoundstructure",
-                verbose_name="Default Structure",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="compound",
-            name="scenarios",
-            field=models.ManyToManyField(
-                blank=True, to="epdb.scenario", verbose_name="Attached Scenarios"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="compoundstructure",
-            name="aliases",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.TextField(), blank=True, default=list, verbose_name="Aliases"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="compoundstructure",
-            name="scenarios",
-            field=models.ManyToManyField(
-                blank=True, to="epdb.scenario", verbose_name="Attached Scenarios"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="edge",
-            name="aliases",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.TextField(), blank=True, default=list, verbose_name="Aliases"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="edge",
-            name="edge_label",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                to="epdb.reaction",
-                verbose_name="Edge label",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="edge",
-            name="scenarios",
-            field=models.ManyToManyField(
-                blank=True, to="epdb.scenario", verbose_name="Attached Scenarios"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="node",
-            name="aliases",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.TextField(), blank=True, default=list, verbose_name="Aliases"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="node",
-            name="scenarios",
-            field=models.ManyToManyField(
-                blank=True, to="epdb.scenario", verbose_name="Attached Scenarios"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="pathway",
-            name="aliases",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.TextField(), blank=True, default=list, verbose_name="Aliases"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="pathway",
-            name="scenarios",
-            field=models.ManyToManyField(
-                blank=True, to="epdb.scenario", verbose_name="Attached Scenarios"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="reaction",
-            name="aliases",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.TextField(), blank=True, default=list, verbose_name="Aliases"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="reaction",
-            name="medline_references",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.TextField(),
-                blank=True,
-                null=True,
-                verbose_name="Medline References",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="reaction",
-            name="rules",
-            field=models.ManyToManyField(
-                blank=True, related_name="reaction_rule", to="epdb.rule", verbose_name="Rule"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="reaction",
-            name="scenarios",
-            field=models.ManyToManyField(
-                blank=True, to="epdb.scenario", verbose_name="Attached Scenarios"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="rule",
-            name="aliases",
-            field=django.contrib.postgres.fields.ArrayField(
-                base_field=models.TextField(), blank=True, default=list, verbose_name="Aliases"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="rule",
-            name="scenarios",
-            field=models.ManyToManyField(
-                blank=True, to="epdb.scenario", verbose_name="Attached Scenarios"
-            ),
-        ),
-    ]

epdb/migrations/0028_auto_20260812_0902.py

@@ -1,113 +0,0 @@
-# Generated by Django 6.0.3 on 2026-08-12 09:02
-
-from django.conf import settings as s
-from django.db import migrations
-from envipy_additional_information import Likelihood, RuleLikelihood
-
-NEW_RULE = {
-    "parent": "bt0005",
-    "name": "bt0005-3667",
-    "description": "vic-unsubstituted Aromatic > vic-Dihydroxyaromatic",
-    "smirks": "[#8:7]([H])-[#6:1]([H])-1-[#6:2]=[#6:3]-[#6:4]=[#6:5]-[#6:6]([H])-1-[#8:8]([H])>>[#8:7]([H])-[#6:1]=1-[#6:2]=[#6:3]-[#6:4]=[#6:5]-[#6:6]=1-[#8:8]([H])",
-    "scenario_name": "bt0005-3667 aerobic likelihood",
-    "scenario_aerobic_likelihood": RuleLikelihood(likelihood=Likelihood.LIKELY),
-}
-
-RULE_FIXES = {
-    "bt0005-4282": "[c:1]([H])1:[c:2]([H]):[#6,#7;a:3]:[c:4]:[c:5]:[c:6]1>>[c:1]([#8])1:[c:2]([#8]):[#6,#7;a:3]:[c:4]:[c:5]:[c:6]1",
-    "bt0014-4215": "[c:1]([H])1[c:8][#6,#7;a:7][c:6][c:5][c:4]1[#8;!$([OH]c:[#6,#7;a:7]([OH])):9]([H])>>[#8:9]([H])[c:4]1:[c:5]:[c:6]:[#6,#7;a:7]:[c:8]:[c:1]1[#8]([H])",
-    # "bt0063-3938": "[#1,#6:6][#7;X3;!$(NC1CC1)!$([N][C]=O)!$([!#8]CNC=O):1]([#1,#6:7])[#6;A;X4:2][H:3]>>[#1,#6:6][#7;X3:1]([H:3])(=[#1,#6:7]).[#6;A:2]=O",
-    # CN1C=NC2=C1C(=O)N(C)C(=O)N2 not working anymore with bt0063-3938 if change above is applied
-    "bt0063-3938": "[#1,#6:6][#7;X3;!$(NC1CC1)!$([N][C]=O)!$([!#8]CNC=O):1]([#1,#6:7])[#6;A;X4:2][H:3]>>[#1,#6:6][#7;X3:1]([#1,#6:7])[H:3].[#6;A:2]=O",
-    "bt0068-3564": "[#7:4]!@-[#6:2](!@-[#7:1])=[O:5]>>[#7:4]-[#6:2](-[O+0H1])=[O:5].[#7H1:1]",
-    "bt0180-2844": "[H][C:2]([#6:5]([H])([H])([H]))([#1,#6:4])!@-[#6:1]([H])([H])-[#6:3](-[#8-:8])=[O:6]>>[#6:5]([H])([H])([H])\\[#6:2](-[#1,#6:4])=[#6H:1]\\[#6:3](-[#8-:8])=[O:6]",
-    "bt0181-1278": "[#8-:1]-[#6:2](=[O:11])-[#6:7]=[#6:8]-[#6:3](-[H])=[#6:5](-Cl)-[#6:6](-[#8-:10])=[O:9]>>[O+0H1:10]-[#6:6](=[O:9])-[#6:5]=[#6:3]-1-[O+0:1]-[#6:2](=[O:11])-[#6:7]=[#6:8]-1",
-    "bt0298-3335": "[#6:1][N+:2]#[C:3]>>[#6:1]-[#7H2:2]-[#6:3]=O",
-    "bt0322-3393": "[H:10]\\[#6:6](=[#6:9](/[#6:1]([H])([H])([H]))-[#6:11]-[#6:12]-[#6:13]=[#6:14])-[#6:5](-[#16:7])=[O:8]>>[H:10]\\[#6:6](-[#6:5](-[#16:7])=[O:8])=[#6:9](\\[#6:11]-[#6:12]-[#6:13]=[#6:14])-[#6:1]-[#6](-[#8-])=O",
-    "bt0343-2675": "[#8-]-[#6](=O)-[c:1]1[c:6][cH:7][c:8](-[#7H2,#8H1:9])[cH:10][c:11]1>>[#8H][c:1]1[c:6][c:7][c:8]([*:9])[c:10][c:11]1",
-    "bt0350-3319": "[#6:6][#7:3][#6;!R:2]=[#7;!R:1][#6:5]>>[#6:5][#7:1][#6:2]=O.[#6:6][#7:3]",  # Trig before 5 -> all of them shouldn't
-    "bt0374-4081": "[cH:4]1[c:16][c:15][c:14][c:13][c:3]1[#7,#8:2][c:1]1[c:8][c:9][c:10][c:11][c:12]1>>[#7,#8:2]-[c:1]1[c:12][c:11][c:10][c:9][c:8]1[c:13]1[c:14][c:15][c:16][c:4](-[#8])[c:3]1-[#8]",
-    "bt0378-3188": "[#8-:7][c:1]1[c:6]([#7+]([#8-])=O)[c:5][c:4]([#7+:9]([#8-])=O)[c:3][c:2]1([#7+:8]([#8-])=O)>>[#8+0:7]=[#6:1]1-[#6:6]-[#6:5]-[#6:4]([#7+:9]([#8-])=O)-[#6:3]-[#6:2]1([#7+:8]([#8-])=O)",
-    "bt0379-3190": "[#9,#17,#35,#53]-[#6:1](-[H])-1-[#6:5]-,=[#6:6]-[#6:7]-,=[#6:8]-[#6:2](-[H])-1-[#9,#17,#35,#53]>>[#6:6]~1-[#6:7]~[#6:8]-[#6:2]=[#6:1]-[#6:5]~1",
-    "bt0393-3367": "[#6:5]-[#6:1](-[#7:2](-[H])(-[H]))=[S+:3]-[#8-:6]>>[#6:5]-[#6:1](=[#7H1:2])-[S+0:3](=[O])-[#8+0H1:6]",
-}
-
-
-def forward_func(apps, schema_editor):
-    ContentType = apps.get_model("contenttypes", "ContentType")
-
-    pkg_class = s.EPDB_PACKAGE_MODEL
-
-    if len(pkg_class.split(".")) != 2:
-        raise ValueError(
-            f"EPDB_PACKAGE_MODEL must be of the form 'app_label.model_name', got {pkg_class}"
-        )
-
-    app_label, model_name = pkg_class.split(".")
-    Package = apps.get_model(app_label, model_name)
-    SimpleAmbitRule = apps.get_model("epdb", "SimpleAmbitRule")
-    ParallelRule = apps.get_model("epdb", "ParallelRule")
-    Scenario = apps.get_model("epdb", "Scenario")
-    AdditionalInformation = apps.get_model("epdb", "AdditionalInformation")
-    simple_ambit_rule_ct = ContentType.objects.get_for_model(SimpleAmbitRule)
-
-    if Package.objects.filter(name="EAWAG-BBD").exists():
-        p = Package.objects.get(name="EAWAG-BBD")
-
-        if not SimpleAmbitRule.objects.filter(package=p, name=NEW_RULE["name"]).exists():
-            # Create Missing Rule
-            new_sr = SimpleAmbitRule()
-            new_sr.polymorphic_ctype = simple_ambit_rule_ct
-            new_sr.package = p
-            new_sr.name = NEW_RULE["name"]
-            new_sr.description = NEW_RULE["description"]
-            new_sr.smirks = NEW_RULE["smirks"]
-            new_sr.save()
-
-            new_sr.url = "{}/simple-ambit-rule/{}".format(new_sr.package.url, new_sr.uuid)
-            new_sr.save()
-
-            # Add likelihood
-            new_scen = Scenario()
-            new_scen.package = p
-            new_scen.name = NEW_RULE["scenario_name"]
-            new_scen.save()
-
-            new_scen.url = "{}/scenario/{}".format(new_scen.package.url, new_scen.uuid)
-            new_scen.save()
-
-            ai = NEW_RULE["scenario_aerobic_likelihood"]
-            new_add_inf = AdditionalInformation()
-            new_add_inf.package = p
-            new_add_inf.type = ai.__class__.__name__
-            new_add_inf.data = ai.model_dump(mode="json")
-            new_add_inf.scenario = new_scen
-            new_add_inf.save()
-
-            new_add_inf.url = "{}/additional-information/{}".format(
-                new_add_inf.scenario.url, new_add_inf.uuid
-            )
-            new_add_inf.save()
-
-            # Link Scenario
-            new_sr.scenarios.add(new_scen)
-
-            # Link to bt0005
-            pr = ParallelRule.objects.get(package=p, name="bt0005")
-            pr.simple_rules.add(new_sr)
-
-        # Update others
-        for rule_name, smirks in RULE_FIXES.items():
-            sr = SimpleAmbitRule.objects.get(package=p, name=rule_name)
-            sr.smirks = smirks
-            sr.save()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("epdb", "0027_alter_compound_aliases_and_more"),
-    ]
-
-    operations = [
-        migrations.RunPython(forward_func, reverse_code=migrations.RunPython.noop),
-    ]

epdb/migrations/0029_reactionexplanation_reaction_explained_by.py

@@ -1,63 +0,0 @@
-# Generated by Django 6.0.3 on 2026-08-13 09:58
-
-import django.db.models.deletion
-import django.utils.timezone
-import model_utils.fields
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("epdb", "0028_auto_20260812_0902"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="ReactionExplanation",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-                    ),
-                ),
-                (
-                    "created",
-                    model_utils.fields.AutoCreatedField(
-                        default=django.utils.timezone.now, editable=False, verbose_name="created"
-                    ),
-                ),
-                (
-                    "modified",
-                    model_utils.fields.AutoLastModifiedField(
-                        default=django.utils.timezone.now, editable=False, verbose_name="modified"
-                    ),
-                ),
-                ("run_uuid", models.UUIDField()),
-                ("run_start", models.DateTimeField()),
-                ("exact", models.BooleanField(default=False)),
-                (
-                    "reaction",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="epdb.reaction"
-                    ),
-                ),
-                (
-                    "rule",
-                    models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="epdb.rule"),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
-        migrations.AddField(
-            model_name="reaction",
-            name="explained_by",
-            field=models.ManyToManyField(
-                related_name="explained_reactions",
-                through="epdb.ReactionExplanation",
-                to="epdb.rule",
-            ),
-        ),
-    ]

epdb/migrations/0030_auto_20260814_0741.py

@@ -1,37 +0,0 @@
-# Generated by Django 6.0.3 on 2026-08-14 07:41
-
-from django.db import migrations
-
-
-def forward_func(apps, schema_editor):
-    ContentType = apps.get_model("contenttypes", "ContentType")
-    AdditionalInformation = apps.get_model("epdb", "AdditionalInformation")
-
-    models = {}
-
-    for c in ContentType.objects.all():
-        try:
-            models[(c.app_label, c.model)] = apps.get_model(c.app_label, c.model)
-        except Exception:
-            pass
-
-    for ai in AdditionalInformation.objects.all():
-        if ai.url is None:
-            if ai.content_type is None:
-                ai.url = "{}/additional-information/{}".format(ai.scenario.url, ai.uuid)
-            else:
-                model = models[(ai.content_type.app_label, ai.content_type.model)]
-                obj = model.objects.get(pk=ai.object_id)
-                ai.url = "{}/additional-information/{}".format(obj.url, ai.uuid)
-
-            ai.save()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("epdb", "0029_reactionexplanation_reaction_explained_by"),
-    ]
-
-    operations = [
-        migrations.RunPython(forward_func, reverse_code=migrations.RunPython.noop),
-    ]

epdb/models.py

@@ -31,10 +31,6 @@ from sklearn.model_selection import ShuffleSplit
 
 from bridge.contracts import Property
 from bridge.dto import RunResult, PropertyPrediction
-from epdb.exceptions import (
-    InvalidMolfileException,
-    InvalidSMILESException,
-)
 from utilities.chem import FormatConverter, IndigoUtils, PredictionResult, ProductSet
 from utilities.ml import (
     ApplicabilityDomainPCA,
@@ -580,10 +576,6 @@ class ReactionIdentifierMixin(ExternalIdentifierMixin):
     def get_uniprot_identifiers(self):
         return self.get_external_identifier("UniProt")
 
-    def contains_pes(self):
-        from bayer.models import PESStructure
-        return any([isinstance(o, PESStructure) for o in self.educts.all()]) or any(
-            [isinstance(o, PESStructure) for o in self.products.all()])
 
 ##############
 # EP Objects #
@@ -640,7 +632,7 @@ class EnviPathModel(TimeStampedModel):
 
 class AliasMixin(models.Model):
     aliases = ArrayField(
-        models.TextField(blank=False, null=False), verbose_name="Aliases", default=list, blank=True
+        models.TextField(blank=False, null=False), verbose_name="Aliases", default=list
     )
 
     @transaction.atomic
@@ -663,9 +655,7 @@ class AliasMixin(models.Model):
 
 
 class ScenarioMixin(models.Model):
-    scenarios = models.ManyToManyField(
-        "epdb.Scenario", verbose_name="Attached Scenarios", blank=True
-    )
+    scenarios = models.ManyToManyField("epdb.Scenario", verbose_name="Attached Scenarios")
 
     @transaction.atomic
     def set_scenarios(self, scenarios: List["Scenario"]):
@@ -791,19 +781,12 @@ class Compound(
         "CompoundStructure",
         verbose_name="Default Structure",
         related_name="compound_default_structure",
-        on_delete=models.SET_NULL,
+        on_delete=models.CASCADE,
         null=True,
     )
 
     external_identifiers = GenericRelation("ExternalIdentifier")
 
-    def get_structure_by_smiles(self, smiles: str) -> "CompoundStructure":
-        for struct in self.structures.all():
-            if struct.smiles == smiles:
-                return struct
-
-        raise ValueError(f"No structure with SMILES {smiles} found for {self.get_name()}")
-
     @property
     def structures(self) -> QuerySet:
         return CompoundStructure.objects.filter(compound=self)
@@ -859,15 +842,9 @@ class Compound(
     @property
     def related_reactions(self):
         return (
-            (
-                Reaction.objects.filter(package=self.package, educts__in=[self.default_structure])
-                | Reaction.objects.filter(
-                    package=self.package, products__in=[self.default_structure]
-                )
-            )
-            .distinct()
-            .order_by("name")
-        )
+            Reaction.objects.filter(package=self.package, educts__in=[self.default_structure])
+            | Reaction.objects.filter(package=self.package, products__in=[self.default_structure])
+        ).order_by("name")
 
     @property
     def related_nodes(self):
@@ -878,36 +855,16 @@ class Compound(
     @staticmethod
     @transaction.atomic
     def create(
-        package: "Package",
-        smiles: str,
-        molfile: str | None = None,
-        name: str | None = None,
-        description: str | None = None,
-        *args,
-        **kwargs,
+        package: "Package", smiles: str, name: str = None, description: str = None, *args, **kwargs
     ) -> "Compound":
-        # Molfile has precendence over SMILES
-        if molfile is not None and molfile.strip() != "":
-            mol = FormatConverter.from_molfile(molfile)
-
-            if mol is None:
-                raise InvalidMolfileException("Given molfile is invalid")
-            else:
-                # Overwrite SMILES from molfile
-                smiles = FormatConverter.to_smiles(mol)
-
         if smiles is None or smiles.strip() == "":
-            raise InvalidSMILESException("SMILES is required")
+            raise ValueError("SMILES is required")
 
         smiles = smiles.strip()
 
         parsed = FormatConverter.from_smiles(smiles)
         if parsed is None:
-            raise InvalidSMILESException("Given SMILES is invalid")
-
-        if name is not None:
-            # Clean for potential XSS
-            name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
+            raise ValueError("Given SMILES is invalid")
 
         standardized_smiles = FormatConverter.standardize(smiles, remove_stereo=True)
 
@@ -919,14 +876,8 @@ class Compound(
 
         # Check if we find a direct match for a given SMILES
         if qs.exists():
-            found_structure = qs.first()
-            found_compound = found_structure.compound
+            return qs.first().compound
 
-            if name:
-                found_structure.add_alias(name)
-                found_compound.add_alias(name)
-
-            return found_compound
 
         qs = CompoundStructure.objects.filter(smiles=standardized_smiles, compound__package=package)
         if subclasses:
@@ -934,23 +885,17 @@ class Compound(
 
         # Check if we can find the standardized one
         if qs.exists():
-            found_structure = qs.first()
-            found_compound = found_structure.compound
-
-            # We've only found the standardized one, create the very structure
-            _ = found_compound.add_structure(
-                smiles, molfile=molfile, name=name, description=description
-            )
-
-            if name:
-                found_compound.add_alias(name)
-
-            return found_compound
+            # TODO should we add a structure?
+            return qs.first().compound
 
         # Generate Compound
         c = Compound()
         c.package = package
 
+        if name is not None:
+            # Clean for potential XSS
+            name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
+
         if name is None or name == "":
             name = f"Compound {Compound.objects.filter(package=package).count() + 1}"
 
@@ -974,12 +919,7 @@ class Compound(
             )
 
         cs = CompoundStructure.create(
-            c,
-            smiles,
-            molfile=molfile,
-            name=name,
-            description=description,
-            normalized_structure=is_standardized,
+            c, smiles, name=name, description=description, normalized_structure=is_standardized
         )
 
         c.default_structure = cs
@@ -992,22 +932,11 @@ class Compound(
         self,
         smiles: str,
         name: str = None,
-        molfile: str = None,
         description: str = None,
         default_structure: bool = False,
         *args,
         **kwargs,
     ) -> "CompoundStructure":
-        # Molfile has precendence over SMILES
-        if molfile is not None and molfile.strip() != "":
-            mol = FormatConverter.from_molfile(molfile)
-
-            if mol is None:
-                raise InvalidMolfileException("Given molfile is invalid")
-            else:
-                # Overwrite SMILES from molfile
-                smiles = FormatConverter.to_smiles(mol)
-
         if smiles is None or smiles == "":
             raise ValueError("SMILES is required")
 
@@ -1027,28 +956,16 @@ class Compound(
             )
 
         if is_standardized:
-            CompoundStructure.objects.get(smiles=smiles, compound__package=self.package)
+            CompoundStructure.objects.get(smiles__in=smiles, compound__package=self.package)
 
         # Check if we find a direct match for a given SMILES and/or its standardized SMILES
-        if CompoundStructure.objects.filter(smiles=smiles, compound__package=self.package).exists():
-            found_cs = CompoundStructure.objects.get(smiles=smiles, compound__package=self.package)
-
-            if found_cs.molfile is None and (molfile is not None and molfile.strip() != ""):
-                logger.info(
-                    f"Setting molfile for found CompoundStructure(uuid={found_cs.uuid}) as it was empty"
-                )
-                found_cs.molfile = molfile
-                found_cs.save()
-
-            return found_cs
+        if CompoundStructure.objects.filter(
+            smiles__in=smiles, compound__package=self.package
+        ).exists():
+            return CompoundStructure.objects.get(smiles__in=smiles, compound__package=self.package)
 
         cs = CompoundStructure.create(
-            self,
-            smiles,
-            name=name,
-            molfile=molfile,
-            description=description,
-            normalized_structure=is_standardized,
+            self, smiles, name=name, description=description, normalized_structure=is_standardized
         )
 
         if default_structure:
@@ -1229,61 +1146,24 @@ class CompoundStructure(
     @staticmethod
     @transaction.atomic
     def create(
-        compound: Compound,
-        smiles: str,
-        molfile: str = None,
-        name: str = None,
-        description: str = None,
-        *args,
-        **kwargs,
+        compound: Compound, smiles: str, name: str = None, description: str = None, *args, **kwargs
     ):
-        # Molfile has precendence over SMILES
-        if molfile is not None and molfile.strip() != "":
-            mol = FormatConverter.from_molfile(molfile)
-
-            if mol is None:
-                raise InvalidMolfileException("Given molfile is invalid")
-            else:
-                # Overwrite SMILES from molfile
-                smiles = FormatConverter.to_smiles(mol)
-
-        # Clean for potential XSS
-        if name is not None:
-            name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
-
         if CompoundStructure.objects.filter(compound=compound, smiles=smiles).exists():
-            found_cs = CompoundStructure.objects.get(compound=compound, smiles=smiles)
-
-            if name:
-                found_cs.add_alias(name)
-
-            if found_cs.molfile is None and (molfile is not None and molfile.strip() != ""):
-                logger.info(
-                    f"Setting molfile for found CompoundStructure(uuid={found_cs.uuid}) as it was empty"
-                )
-                found_cs.molfile = molfile
-                found_cs.save()
-
-            return found_cs
+            return CompoundStructure.objects.get(compound=compound, smiles=smiles)
 
         if compound.pk is None:
             raise ValueError("Unpersisted Compound! Persist compound first!")
 
         cs = CompoundStructure()
-
+        # Clean for potential XSS
         if name is not None:
-            cs.name = name
+            cs.name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
 
-        # We have a default here only set the value if it carries some payload
-        if description is not None and description.strip() != "":
+        if description is not None:
             cs.description = nh3.clean(description, tags=s.ALLOWED_HTML_TAGS).strip()
 
-        cs.compound = compound
         cs.smiles = smiles
-
-        # If molfile is not None, it hase to be a valid Molfile as we've survived the parsing check
-        if molfile is not None:
-            cs.molfile = molfile
+        cs.compound = compound
 
         if "normalized_structure" in kwargs:
             cs.normalized_structure = kwargs["normalized_structure"]
@@ -1302,8 +1182,6 @@ class CompoundStructure(
 
     @property
     def as_svg(self, width: int = 800, height: int = 400):
-        if self.molfile is not None and self.molfile.strip() != "":
-            return IndigoUtils.mol_to_svg(self.molfile, width=width, height=height)
         return IndigoUtils.mol_to_svg(self.smiles, width=width, height=height)
 
     @property
@@ -1501,9 +1379,6 @@ class SimpleAmbitRule(SimpleRule):
         if not FormatConverter.is_valid_smirks(smirks):
             raise ValueError(f'SMIRKS "{smirks}" is invalid!')
 
-        if name is not None:
-            name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
-
         query = SimpleAmbitRule.objects.filter(package=package, smirks=smirks)
 
         if reactant_filter_smarts is not None and reactant_filter_smarts.strip() != "":
@@ -1515,17 +1390,14 @@ class SimpleAmbitRule(SimpleRule):
         if query.exists():
             if query.count() > 1:
                 logger.error(f"More than one rule matched this one! {query}")
-
-            found_rule = query.first()
-
-            if name:
-                found_rule.add_alias(name)
-
-            return found_rule
+            return query.first()
 
         r = SimpleAmbitRule()
         r.package = package
 
+        if name is not None:
+            name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
+
         if name is None or name == "":
             name = f"Rule {Rule.objects.filter(package=package).count() + 1}"
 
@@ -1658,9 +1530,6 @@ class ParallelRule(Rule):
                     f"Simple rule {sr.uuid} does not belong to package {package.uuid}!"
                 )
 
-        if name is not None:
-            name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
-
         # Deduplication check
         query = ParallelRule.objects.annotate(
             srs_count=Count("simple_rules", filter=Q(simple_rules__in=simple_rules), distinct=True)
@@ -1672,19 +1541,15 @@ class ParallelRule(Rule):
 
         if existing_rule_qs.exists():
             if existing_rule_qs.count() > 1:
-                logger.error(
-                    f"Found more than one ParallelRule for given input! {existing_rule_qs}"
-                )
-
-            found_rule = existing_rule_qs.first()
-            if name:
-                found_rule.add_alias(name)
-
-            return found_rule
+                logger.error(f"Found more than one reaction for given input! {existing_rule_qs}")
+            return existing_rule_qs.first()
 
         r = ParallelRule()
         r.package = package
 
+        if name is not None:
+            name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
+
         if name is None or name == "":
             name = f"Rule {Rule.objects.filter(package=package).count() + 1}"
 
@@ -1741,14 +1606,6 @@ class SequentialRuleOrdering(models.Model):
     order_index = models.IntegerField(null=False, blank=False)
 
 
-class ReactionExplanation(TimeStampedModel):
-    run_uuid = models.UUIDField(null=False, blank=False)
-    run_start = models.DateTimeField(null=False, blank=False)
-    reaction = models.ForeignKey("epdb.Reaction", on_delete=models.CASCADE)
-    rule = models.ForeignKey("epdb.Rule", on_delete=models.CASCADE)
-    exact = models.BooleanField(default=False)
-
-
 class Reaction(
     EnviPathModel, AliasMixin, ScenarioMixin, ReactionIdentifierMixin, AdditionalInformationMixin
 ):
@@ -1761,25 +1618,14 @@ class Reaction(
     products = models.ManyToManyField(
         "epdb.CompoundStructure", verbose_name="Products", related_name="reaction_products"
     )
-    rules = models.ManyToManyField(
-        "epdb.Rule", verbose_name="Rule", related_name="reaction_rule", blank=True
-    )
+    rules = models.ManyToManyField("epdb.Rule", verbose_name="Rule", related_name="reaction_rule")
     multi_step = models.BooleanField(verbose_name="Multistep Reaction")
     medline_references = ArrayField(
-        models.TextField(blank=False, null=False),
-        null=True,
-        verbose_name="Medline References",
-        blank=True,
+        models.TextField(blank=False, null=False), null=True, verbose_name="Medline References"
     )
 
     external_identifiers = GenericRelation("ExternalIdentifier")
 
-    explained_by = models.ManyToManyField(
-        "epdb.Rule",
-        through="ReactionExplanation",
-        related_name="explained_reactions",
-    )
-
     def _url(self):
         return "{}/reaction/{}".format(self.package.url, self.uuid)
 
@@ -1792,12 +1638,8 @@ class Reaction(
         educts: Union[List[str], List[CompoundStructure]] = None,
         products: Union[List[str], List[CompoundStructure]] = None,
         rules: Union[Rule | List[Rule]] = None,
-        multi_step: bool = False,
+        multi_step: bool = True,
     ):
-        # Clean for potential XSS
-        if name is not None and name.strip() != "":
-            name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
-
         _educts = []
         _products = []
 
@@ -1852,23 +1694,16 @@ class Reaction(
                 logger.error(
                     f"Found more than one reaction for given input! {existing_reaction_qs}"
                 )
-
-            found_reaction = existing_reaction_qs.first()
-
-            if name:
-                found_reaction.add_alias(name)
-
-            return found_reaction
+            return existing_reaction_qs.first()
 
         r = Reaction()
         r.package = package
 
-        if name is None or name == "":
-            name = f"Reaction {Reaction.objects.filter(package=package).count() + 1}"
+        # Clean for potential XSS
+        if name is not None and name.strip() != "":
+            r.name = nh3.clean(name, tags=s.ALLOWED_HTML_TAGS).strip()
 
-        r.name = name
-
-        if description is not None and description.strip() != "":
+        if description is not None and name.strip() != "":
             r.description = nh3.clean(description, tags=s.ALLOWED_HTML_TAGS).strip()
 
         r.multi_step = multi_step
@@ -1946,7 +1781,7 @@ class Reaction(
         return new_reaction
 
     def smirks(self):
-        return f"{'.'.join([cs.smiles for cs in self.educts.all().order_by('-pk')])}>>{'.'.join([cs.smiles for cs in self.products.all().order_by('-pk')])}"
+        return f"{'.'.join([cs.smiles for cs in self.educts.all()])}>>{'.'.join([cs.smiles for cs in self.products.all()])}"
 
     @property
     def as_svg(self):
@@ -2059,9 +1894,6 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMix
                 if n not in queue:
                     queue.append(n)
 
-        for i in queue:
-            processed.add(i)
-
         while len(queue):
             current = queue.pop()
             processed.add(current)
@@ -2102,7 +1934,6 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMix
                 # add links start -> pseudo
                 new_link = {
                     "name": link["name"],
-                    "plain_name": link["plain_name"],
                     "id": link["id"],
                     "url": link["url"],
                     "image": link["image"],
@@ -2112,7 +1943,6 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMix
                     "source": node_url_to_idx[link["start_node_urls"][0]],
                     "target": pseudo_idx,
                     "app_domain": link.get("app_domain", None),
-                    "to_pseudo": True,
                 }
                 adjusted_links.append(new_link)
 
@@ -2120,7 +1950,6 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMix
                 for target in link["end_node_urls"]:
                     new_link = {
                         "name": link["name"],
-                        "plain_name": link["plain_name"],
                         "id": link["id"],
                         "url": link["url"],
                         "image": link["image"],
@@ -2131,7 +1960,6 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMix
                         "target": node_url_to_idx[target],
                         "app_domain": link.get("app_domain", None),
                         "multi_step": link["multi_step"],
-                        "from_pseudo": True,
                     }
                     adjusted_links.append(new_link)
 
@@ -2193,7 +2021,7 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMix
 
             row += [cs.smiles, cs.get_name(), n.depth]
 
-            edges = self.edges.filter(end_nodes=n)
+            edges = self.edges.filter(end_nodes__in=[n])
             if len(edges):
                 for e in edges:
                     _row = row.copy()
@@ -2341,12 +2169,11 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMix
     def add_node(
         self,
         smiles: str,
-        molfile: str | None = None,
-        name: str | None = None,
-        description: str | None = None,
-        depth: int = -1,
+        name: Optional[str] = None,
+        description: Optional[str] = None,
+        depth: Optional[int] = 0,
     ):
-        return Node.create(self, smiles, depth, molfile=molfile, name=name, description=description)
+        return Node.create(self, smiles, depth, name=name, description=description)
 
     @transaction.atomic
     def add_edge(
@@ -2359,68 +2186,6 @@ class Pathway(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMix
     ):
         return Edge.create(self, start_nodes, end_nodes, rule, name=name, description=description)
 
-    def update_depths(self):
-        # Collect number of in and out links per node
-        in_count = defaultdict(lambda: 0)
-        out_count = defaultdict(lambda: 0)
-
-        for e in self.edges:
-            for react in e.start_nodes.all():
-                out_count[str(react.uuid)] += 1
-
-            for prod in e.end_nodes.all():
-                in_count[str(prod.uuid)] += 1
-
-        depth_map = {}
-        depth_map[0] = list()
-        processed = set()
-
-        data_driven_root_nodes = (
-            self.node_set.all()
-            .annotate(prod_cnt=Count("edge_products"), educt_cnt=Count("edge_educts"))
-            .filter(prod_cnt=0, educt_cnt__gt=0)
-            .distinct()
-        )
-
-        # Eval QuerySet
-        root_nodes_by_depth = list(self.root_nodes)
-
-        data_driven_root_nodes.update(depth=0)
-        root_nodes = [n for n in data_driven_root_nodes]
-
-        for n in root_nodes_by_depth:
-            if n not in root_nodes:
-                if len(n.edge_products.all()) == 0:
-                    root_nodes.append(n)
-
-        for n in root_nodes:
-            depth_map[0].append(n)
-
-        # At most depth len(nodes) is possible
-        for i in range(self.nodes.count()):
-            level_nodes = depth_map.get(i, [])
-
-            if len(level_nodes) == 0:
-                break
-
-            unique_next_level = set()
-            for n in level_nodes:
-                processed.add(n)
-                for e in self.edges:
-                    if n in e.start_nodes.all():
-                        for p in e.end_nodes.all():
-                            if p not in processed:
-                                unique_next_level.add(p)
-
-            if len(unique_next_level) > 0:
-                depth_map[i + 1] = list(unique_next_level)
-
-        for depth, nodes in depth_map.items():
-            for n in nodes:
-                if n.depth != depth and depth != 0:
-                    n.depth = depth
-                    n.save()
-
 
 class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin):
     pathway = models.ForeignKey(
@@ -2442,19 +2207,17 @@ class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
     def _url(self):
         return "{}/node/{}".format(self.pathway.url, self.uuid)
 
-    def get_name(self, include_suffix=True):
+    def get_name(self):
         non_generic_name = True
 
-        if self.name is None or self.name == "no name":
+        if self.name == "no name":
             non_generic_name = False
 
-        if non_generic_name:
-            return self.name
-        else:
-            if include_suffix:
-                return f"{self.default_node_label.name} (taken from underlying structure)"
-            else:
-                return self.default_node_label.name
+        return (
+            self.name
+            if non_generic_name
+            else f"{self.default_node_label.name} (taken from underlying structure)"
+        )
 
     def d3_json(self):
         app_domain_data = self.get_app_domain_assessment_data()
@@ -2475,18 +2238,12 @@ class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
             "node_label_id": self.default_node_label.url,
             "image": f"{self.url}?image=svg",
             "image_svg": IndigoUtils.mol_to_svg(
-                self.default_node_label.molfile
-                if self.default_node_label.molfile is not None
-                and self.default_node_label.molfile.strip()
-                else self.default_node_label.smiles,
-                width=40,
-                height=40,
+                self.default_node_label.smiles, width=40, height=40
             ),
             "image_type": "svg",
             "name": self.get_name(),
-            "plain_name": self.get_name(include_suffix=False),
             "smiles": self.default_node_label.smiles,
-            "scenarios": [{"name": s.get_name(), "url": s.url} for s in self.get_scenarios()],
+            "scenarios": [{"name": s.get_name(), "url": s.url} for s in self.scenarios.all()],
             "app_domain": {
                 "inside_app_domain": app_domain_data["assessment"]["inside_app_domain"]
                 if app_domain_data
@@ -2495,7 +2252,6 @@ class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
             },
             "predicted_properties": predicted_properties,
             "is_engineered_intermediate": self.kv.get("is_engineered_intermediate", False),
-            "proposed": self.get_proposed_info(),
             "timeseries": self.get_timeseries_data(),
             **structure_data,
         }
@@ -2508,60 +2264,40 @@ class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
         pathway: "Pathway",
         smiles: str,
         depth: int,
-        molfile: str | None = None,
-        name: str | None = None,
-        description: str | None = None,
+        name: Optional[str] = None,
+        description: Optional[str] = None,
     ):
-        # Molfile has precendence over SMILES
-        if molfile is not None and molfile.strip() != "":
-            mol = FormatConverter.from_molfile(molfile)
-
-            if mol is None:
-                raise InvalidMolfileException("Given molfile is invalid")
-            else:
-                # Overwrite SMILES from molfile
-                smiles = FormatConverter.to_smiles(mol)
-
         stereo_removed = False
         if pathway.predicted and FormatConverter.has_stereo(smiles):
             smiles = FormatConverter.standardize(smiles, remove_stereo=True)
             stereo_removed = True
 
-        c = Compound.create(
-            pathway.package, smiles, molfile=molfile, name=name, description=description
-        )
+        c = Compound.create(pathway.package, smiles, name=name, description=description)
 
-        structure = c.get_structure_by_smiles(smiles)
-
-        if Node.objects.filter(pathway=pathway, default_node_label=structure).exists():
-            return Node.objects.get(pathway=pathway, default_node_label=structure)
+        if Node.objects.filter(pathway=pathway, default_node_label=c.default_structure).exists():
+            return Node.objects.get(pathway=pathway, default_node_label=c.default_structure)
 
         n = Node()
         n.stereo_removed = stereo_removed
         n.pathway = pathway
         n.depth = depth
 
-        n.default_node_label = structure
+        n.default_node_label = c.default_structure
         n.save()
 
-        n.node_labels.add(structure)
+        n.node_labels.add(c.default_structure)
         n.save()
 
         return n
 
     @property
     def as_svg(self):
-        if (
-            self.default_node_label.molfile is not None
-            and self.default_node_label.molfile.strip() != ""
-        ):
-            return IndigoUtils.mol_to_svg(self.default_node_label.molfile)
         return IndigoUtils.mol_to_svg(self.default_node_label.smiles)
 
     def get_timeseries_data(self):
         for ai in self.additional_information.all():
-            if ai.type == "OECD301FTimeSeries":
-                return ai.get().model_dump(mode="json")
+            if ai.__class__.__name__ == "OECD301FTimeSeries":
+                return ai.model_dump(mode="json")
 
         return None
 
@@ -2592,44 +2328,13 @@ class Node(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
 
         return res
 
-    def get_proposed_info(self):
-        collected = defaultdict(dict)
-        for ai in self.additional_information.filter(
-            type__in=["ProposedIntermediate", "TransformationProductImportance", "Confidence"],
-            scenario__isnull=False,
-        ):
-            collected[str(ai.scenario.uuid)]["scenarioId"] = ai.scenario.url
-            collected[str(ai.scenario.uuid)]["scenarioName"] = ai.scenario.name
-
-            if ai.type == "ProposedIntermediate":
-                collected[str(ai.scenario.uuid)]["proposed"] = True
-
-            if ai.type == "Confidence":
-                collected[str(ai.scenario.uuid)]["Confidence"] = ai.get().level.value
-
-            if ai.type == "TransformationProductImportance":
-                collected[str(ai.scenario.uuid)]["Transformation product importance"] = (
-                    ai.get().importance.value
-                )
-
-        return list(collected.values())
-
-    def get_scenarios(self):
-        qs = self.scenarios.all()
-        qs |= Scenario.objects.filter(
-            id__in=self.additional_information.filter(scenario__isnull=False)
-            .values_list("scenario", flat=True)
-            .distinct()
-        )
-        return qs.distinct()
-
 
 class Edge(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin):
     pathway = models.ForeignKey(
         "epdb.Pathway", verbose_name="belongs to", on_delete=models.CASCADE, db_index=True
     )
     edge_label = models.ForeignKey(
-        "epdb.Reaction", verbose_name="Edge label", null=True, on_delete=models.CASCADE
+        "epdb.Reaction", verbose_name="Edge label", null=True, on_delete=models.SET_NULL
     )
     start_nodes = models.ManyToManyField(
         "epdb.Node", verbose_name="Start Nodes", related_name="edge_educts"
@@ -2644,7 +2349,6 @@ class Edge(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
     def d3_json(self):
         edge_json = {
             "name": self.get_name(),
-            "plain_name": self.get_name(include_suffix=False),
             "id": self.url,
             "url": self.url,
             "image": self.url + "?image=svg",
@@ -2709,8 +2413,6 @@ class Edge(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
         rule: Optional[Rule] = None,
         name: Optional[str] = None,
         description: Optional[str] = None,
-        *args,
-        **kwargs,
     ):
         e = Edge()
         e.pathway = pathway
@@ -2740,7 +2442,7 @@ class Edge(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
             educts=[n.default_node_label for n in e.start_nodes.all()],
             products=[n.default_node_label for n in e.end_nodes.all()],
             rules=rule,
-            multi_step=kwargs.get("multi_step", False),
+            multi_step=False,
         )
 
         e.edge_label = r
@@ -2759,19 +2461,17 @@ class Edge(EnviPathModel, AliasMixin, ScenarioMixin, AdditionalInformationMixin)
 
         return res
 
-    def get_name(self, include_suffix=True):
+    def get_name(self):
         non_generic_name = True
 
         if self.name == "no name":
             non_generic_name = False
 
-        if non_generic_name:
-            return self.name
-        else:
-            if include_suffix:
-                return f"{self.edge_label.name} (taken from underlying reaction)"
-            else:
-                return self.edge_label.name
+        return (
+            self.name
+            if non_generic_name
+            else f"{self.edge_label.name} (taken from underlying reaction)"
+        )
 
 
 class EPModel(PolymorphicModel, EnviPathModel, AdditionalInformationMixin):
@@ -2878,58 +2578,6 @@ class PackageBasedModel(EPModel):
 
         return res
 
-    def parameters(self):
-        params = {
-            "Model Evaluation Threshold": f"{self.threshold:.2f}",
-            "Multi Gen Evaluation": "Yes" if self.multigen_eval else "No",
-        }
-
-        if self.app_domain:
-            params["Applicability Domain Num Neighbors"] = f"{self.app_domain.num_neighbours:.2f}"
-            params["Applicability Domain Reliability Threshold"] = (
-                f"{self.app_domain.reliability_threshold:.2f}"
-            )
-            params["Applicability Domain Local Compatibility Threshold"] = (
-                f"{self.app_domain.local_compatibilty_threshold:.2f}"
-            )
-
-        return params
-
-    def statistics(self):
-        from sklearn.metrics import auc
-
-        recall = list(self.eval_results["average_recall_per_threshold"].values())
-        precision = list(self.eval_results["average_precision_per_threshold"].values())
-        mg_recall = list(
-            self.eval_results.get("multigen_average_recall_per_threshold", {}).values()
-        )
-        mg_precision = list(
-            self.eval_results.get("multigen_average_precision_per_threshold", {}).values()
-        )
-
-        return {
-            "accuracy": [
-                self.eval_results["average_accuracy"],
-                self.eval_results.get("multigen_average_accuracy"),
-            ],
-            "precision": [
-                self.eval_results["average_precision_per_threshold"][f"{self.threshold:.2f}"],
-                self.eval_results.get("multigen_average_precision_per_threshold", {}).get(
-                    f"{self.threshold:.2f}"
-                ),
-            ],
-            "recall": [
-                self.eval_results["average_recall_per_threshold"][f"{self.threshold:.2f}"],
-                self.eval_results.get("multigen_average_recall_per_threshold", {}).get(
-                    f"{self.threshold:.2f}"
-                ),
-            ],
-            "Area under PR Curve": [
-                auc(recall, precision),
-                auc(mg_recall, mg_precision) if self.multigen_eval else None,
-            ],
-        }
-
     @cached_property
     def applicable_rules(self) -> List["Rule"]:
         """
@@ -3086,14 +2734,7 @@ class PackageBasedModel(EPModel):
 
             prec, rec = dict(), dict()
 
-            thresholds = list(np.arange(0, 1.05, 0.05))
-
-            # Add specific threshold set during object creation if not already present
-            if np.float64(threshold) not in thresholds:
-                thresholds.append(np.float64(threshold))
-                thresholds.sort()
-
-            for t in thresholds:
+            for t in np.arange(0, 1.05, 0.05):
                 temp_thresholded = (y_pred_filtered >= t).astype(int)
                 prec[f"{t:.2f}"] = precision_score(
                     y_test_filtered, temp_thresholded, zero_division=0
@@ -3103,12 +2744,7 @@ class PackageBasedModel(EPModel):
             return acc, prec, rec
 
         def evaluate_mg(model, pathways: Union[QuerySet["Pathway"] | List["Pathway"]], threshold):
-            thresholds = list(np.arange(0, 1.05, 0.05))
-
-            # Add specific threshold set during object creation if not already present
-            if np.float64(threshold) not in thresholds:
-                thresholds.append(np.float64(threshold))
-                thresholds.sort()
+            thresholds = np.arange(0.1, 1.1, 0.1)
 
             precision = {f"{t:.2f}": [] for t in thresholds}
             recall = {f"{t:.2f}": [] for t in thresholds}
@@ -3134,7 +2770,7 @@ class PackageBasedModel(EPModel):
 
             s = Setting()
             s.model = mod
-            s.model_threshold = 0.0
+            s.model_threshold = thresholds.min()
             s.max_depth = 10
             s.max_nodes = 50
 
@@ -3158,17 +2794,14 @@ class PackageBasedModel(EPModel):
             for t in thresholds:
                 for true, pred in zip(pathways, pred_pathways):
                     acc, pre, rec = multigen_eval(true, pred, t)
-
-                    if f"{t:.2f}" == f"{threshold:.2f}":
-                        mg_acc += acc
-
+                    if abs(t - threshold) < 0.01:
+                        mg_acc = acc
                     precision[f"{t:.2f}"].append(pre)
                     recall[f"{t:.2f}"].append(rec)
 
-            avg_mg_acc = mg_acc / len(root_compounds)
             precision = {k: sum(v) / len(v) if len(v) > 0 else 0 for k, v in precision.items()}
             recall = {k: sum(v) / len(v) if len(v) > 0 else 0 for k, v in recall.items()}
-            return avg_mg_acc, precision, recall
+            return mg_acc, precision, recall
 
         # If there are eval packages perform single generation evaluation on them instead of random splits
         if self.eval_packages.count() > 0:
@@ -4300,9 +3933,6 @@ class ClassifierPluginModel(PackageBasedModel):
         instance = impl(conf)
         return instance
 
-    def parameters(self):
-        return self.instance().parameters()
-
     def build_dataset(self):
         """
         Required by general model contract but actual implementation resides in plugin.
@@ -4523,9 +4153,6 @@ class PropertyPluginModel(PackageBasedModel):
         instance = impl()
         return instance
 
-    def parameters(self):
-        return self.instance().parameters()
-
     def build_dataset(self):
         """
         Required by general model contract but actual implementation resides in plugin.
@@ -4823,22 +4450,18 @@ class AdditionalInformation(models.Model):
 
         return f"{self.scenario.url}/additional-information/{self.uuid}"
 
-    @staticmethod
-    def from_dict(ai_type: str, ai_data: Dict[str, Any]):
+    def get(self) -> "EnviPyModel":
         from envipy_additional_information import registry
 
         MAPPING = {c.__name__: c for c in registry.list_models().values()}
         try:
-            inst = MAPPING[ai_type](**ai_data)
+            inst = MAPPING[self.type](**self.data)
         except Exception as e:
-            print(f"Error loading {ai_type}: {e}")
+            print(f"Error loading {self.type}: {e}")
             raise e
 
-        return inst
-
-    def get(self) -> "EnviPyModel":
-        inst = AdditionalInformation.from_dict(self.type, self.data)
         inst.__dict__["uuid"] = str(self.uuid)
+
         return inst
 
     def __str__(self) -> str:

epdb/tasks.py

@@ -477,7 +477,8 @@ def batch_predict(
             limit=None,
             setting_overrides={
                 "max_nodes": num_tps,
-                "model_threshold": 0.0,
+                "max_depth": num_tps,
+                "model_threshold": 0.001,
             },
         )
 

epdb/views.py

@@ -19,7 +19,6 @@ from sentry_sdk import capture_exception
 
 from utilities.chem import FormatConverter, IndigoUtils
 from utilities.decorators import package_permission_required
-from .exceptions import InvalidMolfileException, InvalidSMILESException
 
 from .logic import (
     EPDBURLParser,
@@ -61,7 +60,6 @@ from .models import (
 )
 
 logger = logging.getLogger(__name__)
-auth_log = logging.getLogger("auth")
 
 Package = s.GET_PACKAGE_MODEL()
 
@@ -72,18 +70,6 @@ def log_post_params(request):
             logger.debug(f"{k}\t{v}")
 
 
-def get_remote_address(request):
-    remote_address = ""
-
-    if request is not None:
-        remote_address = request.META.get("HTTP_X_FORWARDED_FOR")
-
-        if not remote_address:
-            remote_address = request.META.get("REMOTE_ADDR", "")
-
-    return remote_address
-
-
 def get_error_handler_context(request, for_user=None) -> Dict[str, Any]:
     current_user = _anonymous_or_real(request)
 
@@ -160,20 +146,6 @@ def handler500(request):
     return render(request, "errors/error.html", context, status=500)
 
 
-def delete_with_log(request, obj):
-    caller = request.user
-    obj_type = obj.__class__.__name__
-
-    try:
-        obj.delete()
-        auth_log.info(f"{caller.username} ({caller.url}) deleted {obj_type}: {obj.name} ({obj.url})")
-    except Exception as e:
-        logger.info(f"Tried to delete {obj_type}: {obj.name} ({obj.url}) but deletion failed! Exception {e}")
-        auth_log.info(
-            f"{caller.username} ({caller.url}) tried to delete {obj_type}: {obj.name} ({obj.url}) but deletion failed!")
-        raise e
-
-
 def login(request):
     context = get_base_context(request)
 
@@ -232,18 +204,11 @@ def login(request):
         if user is not None:
             login(request, user)
 
-            if user.is_superuser:
-                auth_log.error(f"admin ({user.username}) login attempt by {get_remote_address(request)} successful")
-
             if next := request.POST.get("next"):
                 return redirect(next)
 
             return redirect(reverse("index"))
         else:
-            if _user := User.objects.get(email=email):
-                if _user.is_superuser:
-                    auth_log.error(f"admin ({_user.username}) login attempt by {get_remote_address(request)} failed")
-
             context["message"] = "Login failed!"
             return render(request, "static/login.html", context)
     else:
@@ -424,7 +389,7 @@ def get_base_context(request, for_user=None) -> Dict[str, Any]:
             "external_databases": ExternalDatabase.get_databases(),
             "site_id": s.MATOMO_SITE_ID,
             # EDIT START
-            "secret_groups": Group.objects.filter(secret=True, user_member=current_user),
+            "secret_groups": Group.objects.filter(secret=True),
             # EDIT END
         },
     }
@@ -560,7 +525,6 @@ def batch_predict_pathway(request):
     context = get_base_context(request)
     context["title"] = "enviPath - Batch Predict Pathway"
     context["meta"]["current_package"] = context["meta"]["user"].default_package
-    context["batch_predict_max_compounds"] = s.BATCH_PREDICT_MAX_COMPOUNDS
 
     return render(request, "batch_predict_pathway.html", context)
 
@@ -821,11 +785,6 @@ def models(request):
             {"Model": s.SERVER_URL + "/model"},
         ]
 
-        context["entity_type"] = "model"
-        context["api_endpoint"] = f"{s.SERVER_PATH}/api/v1/models/"
-        context["per_page"] = s.API_PAGINATION_DEFAULT_PAGE_SIZE
-        context["list_title"] = "models"
-
         # Keep model_types for potential modal/action use
         context["model_types"] = {
             "ML Relative Reasoning": {
@@ -838,14 +797,12 @@ def models(request):
                 "requires_rule_packages": True,
                 "requires_data_packages": True,
             },
-        }
-
-        if s.ENVIFORMER_PRESENT:
-            context["model_types"]["EnviFormer"] = {
+            "EnviFormer": {
                 "type": "enviformer",
                 "requires_rule_packages": False,
                 "requires_data_packages": True,
-            }
+            },
+        }
 
         if s.FLAGS.get("PLUGINS", False):
             for k, v in s.CLASSIFIER_PLUGINS.items():
@@ -853,9 +810,6 @@ def models(request):
                     "type": k,
                     "requires_rule_packages": v.requires_rule_packages(),
                     "requires_data_packages": v.requires_data_packages(),
-                    "additional_parameters": v.Config.__name__.lower()
-                    if v.Config.__name__ != ""
-                    else None,
                 }
             for k, v in s.PROPERTY_PLUGINS.items():
                 context["model_types"][v.display()] = {
@@ -864,6 +818,12 @@ def models(request):
                     "requires_data_packages": v.requires_data_packages(),
                 }
 
+        # Context for paginated template
+        context["entity_type"] = "model"
+        context["api_endpoint"] = f"{s.SERVER_PATH}/api/v1/models/"
+        context["per_page"] = s.API_PAGINATION_DEFAULT_PAGE_SIZE
+        context["list_title"] = "models"
+
         return render(request, "collections/models_paginated.html", context)
 
     elif request.method == "POST":
@@ -978,12 +938,13 @@ def package_models(request, package_uuid):
                 "requires_data_packages": True,
             },
         }
+
         if s.ENVIFORMER_PRESENT:
             context["model_types"]["EnviFormer"] = {
                 "type": "enviformer",
                 "requires_rule_packages": False,
                 "requires_data_packages": True,
-            }
+            },
 
         if s.FLAGS.get("PLUGINS", False):
             for k, v in s.CLASSIFIER_PLUGINS.items():
@@ -1145,27 +1106,18 @@ def package_model(request, package_uuid, model_uuid):
                 for pr in pred_res:
                     if len(pr) > 0:
                         products = []
-
                         for prod_set in pr.product_sets:
                             logger.debug(f"Checking {prod_set}")
                             products.append(tuple([x for x in prod_set]))
 
-                        products = list(set(products))
-
-                        for prod in products:
-                            res["pred"].append(
-                                {
-                                    "products": list(prod),
-                                    "probability": pr.probability,
-                                    "btrule": {k: getattr(pr.rule, k) for k in ["url", "name"]}
-                                    if pr.rule is not None
-                                    else None,
-                                }
-                            )
-
-                        # Sort data by prob desc
-                        res["pred"] = sorted(
-                            res["pred"], key=lambda x: x["probability"], reverse=True
+                        res["pred"].append(
+                            {
+                                "products": list(set(products)),
+                                "probability": pr.probability,
+                                "btrule": {k: getattr(pr.rule, k) for k in ["url", "name"]}
+                                if pr.rule is not None
+                                else None,
+                            }
                         )
 
                 return JsonResponse(res, safe=False)
@@ -1271,7 +1223,9 @@ def package(request, package_uuid):
     if request.method == "GET":
         if request.GET.get("export", False) == "true":
             filename = f"{current_package.get_name().replace(' ', '_')}_{current_package.uuid}.json"
-            pack_json = PackageManager.export_package(current_package)
+            pack_json = PackageManager.export_package(
+                current_package, include_models=False, include_external_identifiers=False
+            )
             response = JsonResponse(pack_json, content_type="application/json")
             response["Content-Disposition"] = f'attachment; filename="{filename}"'
 
@@ -1320,8 +1274,7 @@ def package(request, package_uuid):
                         "You cannot delete the default package. If you want to delete this package you have to set another default package first.",
                     )
 
-                delete_with_log(request, current_package)
-
+                logger.debug(current_package.delete())
                 return redirect(s.SERVER_URL + "/package")
             elif hidden == "publish-package":
                 for g in Group.objects.filter(public=True):
@@ -1455,18 +1408,12 @@ def package_compounds(request, package_uuid):
     elif request.method == "POST":
         compound_name = request.POST.get("compound-name")
         compound_smiles = request.POST.get("compound-smiles")
-        compound_molfile = request.POST.get("compound-molfile")
         compound_description = request.POST.get("compound-description")
-
         try:
             c = Compound.create(
-                current_package,
-                compound_smiles,
-                molfile=compound_molfile,
-                name=compound_name,
-                description=compound_description,
+                current_package, compound_smiles, compound_name, compound_description
             )
-        except (InvalidSMILESException, InvalidMolfileException) as e:
+        except ValueError as e:
             raise BadRequest(str(e))
 
         return redirect(c.url)
@@ -1592,15 +1539,11 @@ def package_compound_structures(request, package_uuid, compound_uuid):
     elif request.method == "POST":
         structure_name = request.POST.get("structure-name")
         structure_smiles = request.POST.get("structure-smiles")
-        structure_molfile = request.POST.get("structure-molfile")
         structure_description = request.POST.get("structure-description")
 
         try:
             cs = current_compound.add_structure(
-                structure_smiles,
-                molfile=structure_molfile,
-                name=structure_name,
-                description=structure_description,
+                structure_smiles, structure_name, structure_description
             )
         except ValueError:
             return error(
@@ -1988,24 +1931,9 @@ def package_reactions(request, package_uuid):
     elif request.method == "POST":
         reaction_name = request.POST.get("reaction-name")
         reaction_description = request.POST.get("reaction-description")
-        reaction_smiles = request.POST.get("reaction-smiles")
-
-        if reaction_smiles is None or reaction_smiles.strip() == "":
-            return error(
-                request,
-                "Reaction SMILES is empty / missing",
-                "No reaction SMILES provided. Please provide a SMILES for the reaction.",
-            )
-
-        if not FormatConverter.is_valid_smirks(reaction_smiles):
-            return error(
-                request,
-                "Reaction SMILES is invalid",
-                f"The provided reactions SMILES {reaction_smiles} is invalid",
-            )
-
-        educts = reaction_smiles.split(">>")[0].split(".")
-        products = reaction_smiles.split(">>")[1].split(".")
+        reactions_smirks = request.POST.get("reaction-smirks")
+        educts = reactions_smirks.split(">>")[0].split(".")
+        products = reactions_smirks.split(">>")[1].split(".")
 
         r = Reaction.create(
             current_package,
@@ -2186,14 +2114,12 @@ def package_pathways(request, package_uuid):
         else:
             prediction_setting = current_user.prediction_settings()
 
-        is_predict_mode = pw_mode in {"predict", "incremental"}
-
         pw = Pathway.create(
             current_package,
-            stand_smiles if is_predict_mode else smiles,
+            stand_smiles,
             name=name,
             description=description,
-            predicted=is_predict_mode,
+            predicted=pw_mode in {"predict", "incremental"},
         )
 
         # set mode
@@ -2312,7 +2238,7 @@ def package_pathway(request, package_uuid, pathway_uuid):
     elif request.method == "POST":
         if hidden := request.POST.get("hidden", None):
             if hidden == "delete":
-                delete_with_log(request, current_pathway)
+                current_pathway.delete()
                 return redirect(current_package.url + "/pathway")
             else:
                 return HttpResponseBadRequest()
@@ -2434,17 +2360,8 @@ def package_pathway_nodes(request, package_uuid, pathway_uuid):
         node_name = request.POST.get("node-name")
         node_description = request.POST.get("node-description")
 
-        node_smiles = request.POST.get("node-smiles")
-        node_molfile = request.POST.get("node-molfile")
-
-        try:
-            current_pathway.add_node(
-                node_smiles, molfile=node_molfile, name=node_name, description=node_description
-            )
-        except InvalidSMILESException:
-            return error(
-                request, "Node creation failed!", f"Given SMILES ({node_smiles}) is invalid"
-            )
+        node_smiles = request.POST.get("node-smiles").strip()
+        current_pathway.add_node(node_smiles, name=node_name, description=node_description)
 
         return redirect(current_pathway.url)
 
@@ -2530,7 +2447,7 @@ def package_pathway_node(request, package_uuid, pathway_uuid, node_uuid):
         if hidden := request.POST.get("hidden", None):
             if hidden == "delete":
                 # pre_delete signal will take care of edge deletion
-                delete_with_log(request, current_node)
+                current_node.delete()
 
                 return redirect(current_pathway.url)
             else:
@@ -2552,26 +2469,7 @@ def package_pathway_node(request, package_uuid, pathway_uuid, node_uuid):
 
             return JsonResponse({"success": current_node.url})
 
-        new_node_name = request.POST.get("node-name")
-        new_node_description = request.POST.get("node-description")
-
-        if any([new_node_name, new_node_description]):
-            if new_node_name is not None and new_node_name.strip() != "":
-                new_node_name = nh3.clean(new_node_name.strip(), tags=s.ALLOWED_HTML_TAGS).strip()
-                current_node.name = new_node_name
-
-            if new_node_description is not None and new_node_description.strip() != "":
-                new_node_description = nh3.clean(
-                    new_node_description.strip(), tags=s.ALLOWED_HTML_TAGS
-                ).strip()
-                current_node.description = new_node_description
-
-            current_node.save()
-
-            return redirect(current_node.url)
-
-        return error(request, "Node update failed!", "No changes were made to the node")
-
+        return HttpResponseBadRequest()
     else:
         return HttpResponseNotAllowed(["GET", "POST"])
 
@@ -2641,9 +2539,6 @@ def package_pathway_edges(request, package_uuid, pathway_uuid):
             substrate_nodes, product_nodes, name=edge_name, description=edge_description
         )
 
-        # Update depths as sideeffect of above operation
-        current_pathway.update_depths()
-
         return redirect(current_pathway.url)
 
     else:
@@ -2684,7 +2579,7 @@ def package_pathway_edge(request, package_uuid, pathway_uuid, edge_uuid):
 
         if hidden := request.POST.get("hidden", None):
             if hidden == "delete":
-                delete_with_log(request, current_edge)
+                current_edge.delete()
                 return redirect(current_pathway.url)
 
         if "selected-scenarios" in request.POST:
@@ -3046,7 +2941,7 @@ def group(request, group_uuid):
 
         if hidden := request.POST.get("hidden", None):
             if hidden == "delete":
-                delete_with_log(request, current_group)
+                current_group.delete()
                 return redirect(s.SERVER_URL + "/group")
             else:
                 return HttpResponseBadRequest()
@@ -3103,15 +2998,9 @@ def settings(request):
         new_default = request.POST.get("prediction-setting-new-default", "off") == "on"
 
         # min 2, max s.DEFAULT_MAX_NUMBER_OF_NODES
-        temp_max_nodes = request.POST.get("prediction-setting-max-nodes")
-        if temp_max_nodes is None or temp_max_nodes == "" or int(temp_max_nodes) == -1:
-            temp_max_nodes = s.DEFAULT_MAX_NUMBER_OF_NODES
-        else:
-            temp_max_nodes = int(request.POST.get("prediction-setting-max-nodes", 1))
-
         max_nodes = min(
             max(
-                temp_max_nodes,
+                int(request.POST.get("prediction-setting-max-nodes", 1)),
                 2,
             ),
             s.DEFAULT_MAX_NUMBER_OF_NODES,
@@ -3132,7 +3021,6 @@ def settings(request):
 
             model_uuid = model_url.split("/")[-1]
             params["model"] = EPModel.objects.get(uuid=model_uuid)
-            # TODO Check if removed if request contains "" or not at all
             params["model_threshold"] = request.POST.get(
                 "model-based-prediction-setting-threshold", s.DEFAULT_MODEL_THRESHOLD
             )
@@ -3222,21 +3110,12 @@ def jobs(request):
             {"Home": s.SERVER_URL},
             {"Jobs": s.SERVER_URL + "/jobs"},
         ]
-        # if current_user.is_superuser:
-        #     context["jobs"] = JobLog.objects.all().order_by("-created")
-        # else:
-        #     context["jobs"] = JobLog.objects.filter(user=current_user).order_by("-created")
+        if current_user.is_superuser:
+            context["jobs"] = JobLog.objects.all().order_by("-created")
+        else:
+            context["jobs"] = JobLog.objects.filter(user=current_user).order_by("-created")
 
-        # Context for paginated template
-        context["entity_type"] = "joblog"
-        context["api_endpoint"] = f"{s.SERVER_PATH}/api/v1/joblog/"
-        context["per_page"] = s.API_PAGINATION_DEFAULT_PAGE_SIZE
-        context["list_title"] = "joblog"
-        context["list_mode"] = "combined"
-
-        return render(request, "collections/joblog_paginated.html", context)
-
-        # return render(request, "collections/joblog.html", context)
+        return render(request, "collections/joblog.html", context)
 
     elif request.method == "POST":
         job_name = request.POST.get("job-name")

epiuclid/serializers/pathway_mapper.py

@@ -120,6 +120,13 @@ class PathwayMapper:
             )
             bundle.reference_substances.append(ref_sub)
 
+            sub = IUCLIDSubstanceData(
+                uuid=sub_uuid,
+                name=compound.name,
+                reference_substance_uuid=ref_sub_uuid,
+            )
+            bundle.substances.append(sub)
+
         if not export.compounds:
             return bundle
 
@@ -138,16 +145,6 @@ class PathwayMapper:
         if not root_compound_pks:
             return bundle
 
-        for root_pk in root_compound_pks:
-            root_sub_uuid, root_ref_uuid = seen_compounds[root_pk]
-            bundle.substances.append(
-                IUCLIDSubstanceData(
-                    uuid=root_sub_uuid,
-                    name=compound_names[root_pk],
-                    reference_substance_uuid=root_ref_uuid,
-                )
-            )
-
         edge_templates: list[tuple[UUID, frozenset[int], tuple[int, ...], tuple[UUID, ...]]] = []
         for edge in sorted(export.edges, key=lambda item: str(item.edge_uuid)):
             parent_compound_pks = sorted(
@@ -351,8 +348,7 @@ class PathwayMapper:
 
         props = SoilPropertiesData()
 
-        for ai_obj in ai_list:
-            ai = ai_obj.get()
+        for ai in ai_list:
             if isinstance(ai, SoilTexture1) and props.soil_type is None:
                 props.soil_type = ai.type.value
             elif isinstance(ai, SoilTexture2):

epiuclid/tests/test_api.py

@@ -70,7 +70,8 @@ class IUCLIDExportAPITest(TestCase):
             names = zf.namelist()
             self.assertIn("manifest.xml", names)
             i6d_files = [n for n in names if n.endswith(".i6d")]
-            self.assertEqual(len(i6d_files), 4)
+            # 2 substances + 2 ref substances + 1 ESR = 5 i6d files
+            self.assertEqual(len(i6d_files), 5)
 
     def test_anonymous_returns_401(self):
         self.client.logout()

epiuclid/tests/test_i6z.py

@@ -7,11 +7,6 @@ from uuid import uuid4
 
 from django.test import SimpleTestCase, tag
 
-from epapi.v1.interfaces.iuclid.dto import (
-    PathwayCompoundDTO,
-    PathwayEdgeDTO,
-    PathwayExportDTO,
-)
 from epiuclid.serializers.i6z import I6ZSerializer
 from epiuclid.serializers.pathway_mapper import (
     IUCLIDDocumentBundle,
@@ -19,24 +14,9 @@ from epiuclid.serializers.pathway_mapper import (
     IUCLIDReferenceSubstanceData,
     IUCLIDSubstanceData,
     IUCLIDTransformationProductEntry,
-    PathwayMapper,
 )
 
 
-def _unlinked_documents(manifest_xml: str) -> list[tuple[str | None, str]]:
-    ns = "http://iuclid6.echa.europa.eu/namespaces/manifest/v1"
-    root = ET.fromstring(manifest_xml)
-    base = root.findtext(f"{{{ns}}}base-document-uuid")
-    linked_targets: set[str | None] = {base}
-    docs: dict[str, str | None] = {}
-    for doc in root.findall(f".//{{{ns}}}document"):
-        uuid = doc.findtext(f"{{{ns}}}uuid")
-        docs[uuid] = doc.findtext(f"{{{ns}}}type")
-        for link in doc.findall(f"{{{ns}}}links/{{{ns}}}link"):
-            linked_targets.add(link.findtext(f"{{{ns}}}ref-uuid"))
-    return [(doc_type, uuid) for uuid, doc_type in docs.items() if uuid not in linked_targets]
-
-
 def _make_bundle() -> IUCLIDDocumentBundle:
     ref_uuid = uuid4()
     sub_uuid = uuid4()
@@ -217,29 +197,3 @@ class I6ZSerializerTest(SimpleTestCase):
             }
             self.assertIn(parent_ref_key, reference_links)
             self.assertIn(product_ref_key, reference_links)
-
-    def test_multi_compound_pathway_has_no_unlinked_documents(self):
-        compounds = [
-            PathwayCompoundDTO(pk=1, name="Root", smiles="c1ccccc1"),
-            PathwayCompoundDTO(pk=2, name="P1", smiles="CCO"),
-            PathwayCompoundDTO(pk=3, name="P2", smiles="CCN"),
-            PathwayCompoundDTO(pk=4, name="P3", smiles="CCC"),
-        ]
-        export = PathwayExportDTO(
-            pathway_uuid=uuid4(),
-            pathway_name="Regression Pathway",
-            compounds=compounds,
-            edges=[
-                PathwayEdgeDTO(edge_uuid=uuid4(), start_compound_pks=[1], end_compound_pks=[2]),
-                PathwayEdgeDTO(edge_uuid=uuid4(), start_compound_pks=[1], end_compound_pks=[3]),
-                PathwayEdgeDTO(edge_uuid=uuid4(), start_compound_pks=[2], end_compound_pks=[4]),
-            ],
-            root_compound_pks=[1],
-        )
-        bundle = PathwayMapper().map(export)
-        data = I6ZSerializer().serialize(bundle)
-
-        with zipfile.ZipFile(io.BytesIO(data)) as zf:
-            manifest_xml = zf.read("manifest.xml").decode("utf-8")
-
-        self.assertEqual(_unlinked_documents(manifest_xml), [])

epiuclid/tests/test_pathway_mapper.py

@@ -31,7 +31,7 @@ class PathwayMapperTest(SimpleTestCase):
         )
         bundle = PathwayMapper().map(export)
 
-        self.assertEqual(len(bundle.substances), 1)
+        self.assertEqual(len(bundle.substances), 2)
         self.assertEqual(len(bundle.reference_substances), 2)
         self.assertEqual(len(bundle.endpoint_study_records), 1)
 
@@ -49,7 +49,8 @@ class PathwayMapperTest(SimpleTestCase):
         )
         bundle = PathwayMapper().map(export)
 
-        self.assertEqual(len(bundle.substances), 1)
+        # 2 unique compounds -> 2 substances, 2 ref substances
+        self.assertEqual(len(bundle.substances), 2)
         self.assertEqual(len(bundle.reference_substances), 2)
         # One endpoint study record per pathway
         self.assertEqual(len(bundle.endpoint_study_records), 1)

migration/views.py

@@ -65,25 +65,6 @@ def run_both_engines(SMILES, SMIRKS):
 
 
 def migration(request):
-    accepted_diffs = [
-        "bt0055-3469.1",
-        "bt0056-2685",
-        "bt0193-4263",
-        "bt0231-1871.1",
-        "bt0242-3803",
-        "bt0254-4224.1",
-        "bt0254-4224.2",
-        "bt0291-1129",
-        "bt0337-3543",
-        "bt0391-4285",
-        "bt0402-3576",
-        "bt0404-3928",
-        "bt0416-4269",
-        "bt0432-4254",
-        "bt0337-4117",
-        "bt0322-3393",
-    ]
-
     if request.method == "GET":
         context = get_base_context(request)
 
@@ -128,11 +109,11 @@ def migration(request):
                         ),
                         "id": str(r.uuid),
                         "url": r.url,
-                        "status": res or r.name in accepted_diffs,
+                        "status": res,
                     }
                 )
 
-                if res or r.name in accepted_diffs:
+                if res:
                     success += 1
                 else:
                     error += 1
@@ -154,16 +135,7 @@ def migration(request):
 
         for r in migration_status["results"]:
             r["detail_url"] = r["detail_url"].replace("http://localhost:8000", s.SERVER_URL)
-            if r["name"] in accepted_diffs:
-                r["status"] = True
 
-        migration_status["results"] = sorted(
-            migration_status["results"], key=lambda x: (x["status"], x["name"])
-        )
-
-        num_success = sum([int(x["status"]) for x in migration_status["results"]])
-        migration_status["success"] = num_success
-        migration_status["error"] = migration_status["total"] - num_success
         context.update(**migration_status)
 
         return render(request, "migration.html", context)

package.json

@@ -21,11 +21,5 @@
     "django",
     "tailwindcss",
     "daisyui"
-  ],
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "@parcel/watcher",
-      "@tailwindcss/oxide"
-    ]
-  }
+  ]
 }

pepper/__init__.py

@@ -46,7 +46,7 @@ class PepperPrediction(PropertyPrediction):
 
         import matplotlib.patches as mpatches
         import numpy as np
-        from matplotlib.figure import Figure
+        from matplotlib import pyplot as plt
         from scipy import stats
 
         """
@@ -101,8 +101,7 @@ class PepperPrediction(PropertyPrediction):
         mask_red = x > vp
 
         # Plot
-        fig = Figure(figsize=(9, 5.5))
-        ax = fig.subplots()
+        fig, ax = plt.subplots(figsize=(9, 5.5))
         ax.plot(x, y, color="#1f4e79", lw=2, label="Lognormal PDF")
 
         if np.any(mask_green):
@@ -147,12 +146,13 @@ class PepperPrediction(PropertyPrediction):
         ]
         ax.legend(handles=patches, frameon=True)
 
-        fig.tight_layout()
+        plt.tight_layout()
 
         # --- Export to SVG string ---
         buf = io.StringIO()
         fig.savefig(buf, format="svg", bbox_inches="tight")
         svg = buf.getvalue()
+        plt.close(fig)
         buf.close()
 
         return svg

pepper/impl/pepper.py

@@ -187,9 +187,8 @@ class Pepper:
         groups = [group for group in dataset.group_by("structure_id")]
 
         # Unless explicitly set compute everything serial
-        n_threads = int(os.environ.get("N_PEPPER_THREADS", 1))
-        if n_threads > 1:
-            results = Parallel(n_jobs=n_threads)(
+        if os.environ.get("N_PEPPER_THREADS", 1) > 1:
+            results = Parallel(n_jobs=os.environ["N_PEPPER_THREADS"])(
                 delayed(compute_bayes_per_group)(group[1])
                 for group in dataset.group_by("structure_id")
             )

pnpm-workspace.yaml

@@ -1,5 +1,3 @@
-allowBuilds:
-  '@parcel/watcher': true
 onlyBuiltDependencies:
   - '@parcel/watcher'
-  - '@tailwindcss/oxide'
+  - '@tailwindcss/oxide'

static/css/input.css

@@ -34,12 +34,3 @@
 }
 
 @import "./daisyui-theme.css";
-
-select.select[multiple] {
-  display: block;
-  white-space: normal;
-}
-
-p a {
-  @apply underline;
-}

static/js/alpine/components/widgets.js

@@ -59,9 +59,6 @@ document.addEventListener("alpine:init", () => {
     get isEditMode() {
       return this.mode === "edit";
     },
-    get isRequired() {
-      return (this.schema.required || []).indexOf(this.fieldName) > -1
-    }
   });
 
   // Text widget
@@ -296,34 +293,6 @@ document.addEventListener("alpine:init", () => {
     }),
   );
 
-    // PubMed link widget
-  Alpine.data(
-    "doiWidget",
-    (fieldName, data, schema, uiSchema, mode, debugErrors, context = null) => ({
-      ...baseWidget(
-        fieldName,
-        data,
-        schema,
-        uiSchema,
-        mode,
-        debugErrors,
-        context,
-      ),
-
-      get value() {
-        return this.data[this.fieldName] || "";
-      },
-      set value(v) {
-        this.data[this.fieldName] = v;
-      },
-      get doiUrl() {
-        return this.value
-          ? `https://dx.doi.org/${this.value}`
-          : null;
-      },
-    }),
-  );
-
   // Compound link widget
   Alpine.data(
     "compoundWidget",

static/js/alpine/pagination.js

@@ -5,126 +5,6 @@
  */
 
 document.addEventListener('alpine:init', () => {
-
-  const basePagination = (
-    items,
-    currentPage,
-    totalPages,
-    totalItems,
-    perPage,
-    isReviewed,
-    instanceId
-  ) => ({
-    items,
-    currentPage,
-    totalPages,
-    totalItems,
-    perPage,
-    isReviewed,
-    instanceId,
-
-    get paginatedItems() {
-      return this.items;
-    },
-
-    get showingStart() {
-      if (this.totalItems === 0) return 0;
-      return (this.currentPage - 1) * this.perPage + 1;
-    },
-
-    get showingEnd() {
-      if (this.totalItems === 0) return 0;
-      return Math.min((this.currentPage - 1) * this.perPage + this.items.length, this.totalItems);
-    },
-
-    nextPage() {
-      if (this.currentPage < this.totalPages) {
-        this.fetchPage(this.currentPage + 1);
-      }
-    },
-
-    prevPage() {
-      if (this.currentPage > 1) {
-        this.fetchPage(this.currentPage - 1);
-      }
-    },
-
-    goToPage(page) {
-      if (page >= 1 && page <= this.totalPages) {
-        this.fetchPage(page);
-      }
-    },
-
-    get pageNumbers() {
-      const pages = [];
-      const total = this.totalPages;
-      const current = this.currentPage;
-
-      if (total === 0) {
-        return pages;
-      }
-
-      if (total <= 7) {
-        for (let i = 1; i <= total; i++) {
-          pages.push({ page: i, isEllipsis: false, key: `${this.instanceId}-page-${i}` });
-        }
-      } else {
-        pages.push({ page: 1, isEllipsis: false, key: `${this.instanceId}-page-1` });
-
-        let rangeStart;
-        let rangeEnd;
-
-        if (current <= 4) {
-          rangeStart = 2;
-          rangeEnd = 5;
-        } else if (current >= total - 3) {
-          rangeStart = total - 4;
-          rangeEnd = total - 1;
-        } else {
-          rangeStart = current - 1;
-          rangeEnd = current + 1;
-        }
-
-        if (rangeStart > 2) {
-          pages.push({ page: '...', isEllipsis: true, key: `${this.instanceId}-ellipsis-start` });
-        }
-
-        for (let i = rangeStart; i <= rangeEnd; i++) {
-          pages.push({ page: i, isEllipsis: false, key: `${this.instanceId}-page-${i}` });
-        }
-
-        if (rangeEnd < total - 1) {
-          pages.push({ page: '...', isEllipsis: true, key: `${this.instanceId}-ellipsis-end` });
-        }
-
-        pages.push({ page: total, isEllipsis: false, key: `${this.instanceId}-page-${total}` });
-      }
-
-      return pages;
-    }
-  });
-
-  Alpine.data('paginatedList',
-    (items, options = {}) => ({
-      ...basePagination(items,1, 0, 0, options.perPage || 50, options.isReviewed || false, options.instanceId || Math.random().toString(36).substring(2, 9),),
-
-      init() {
-        this.fetchPage(1);
-      },
-
-      async fetchPage(page) {
-        this.totalItems = this.items.length;
-        this.totalPages = Math.ceil(this.items.length / this.perPage);
-        this.currentPage = page
-
-        const start = page * this.perPage - this.perPage;
-        const end = page * this.perPage;
-        return this.items.slice(start, end);
-      }
-
-    })
-  );
-
   Alpine.data('remotePaginatedList', (options = {}) => ({
     items: [],
     currentPage: 1,

static/js/api/additional-information.js

@@ -186,40 +186,6 @@ window.AdditionalInformationApi = {
     return this._handleResponse(response, "createItem");
   },
 
-    /**
-   * Create new additional information and attach it to an object.
-
-   * @param {string} modelName - Name/type of the additional information model
-   * @param {Object} data - Data for the new item
-   * @param {string} attachObjectUrl - UUID of the object this data should be attached to
-   * @param {string} scenarioUuid - UUID of the scenario
-   * @returns {Promise<{status: string, uuid: string}>}
-   */
-  async createItemOnNonScenarioObject(modelName, data, attachObjectUrl, scenarioUuid) {
-    const sanitizedData = this.sanitizePayload(data);
-    this._log("createItemOnNonScenarioObject", { modelName, data: sanitizedData, attachObjectUrl, scenarioUuid });
-
-    sanitizedData.attach_obj_url = attachObjectUrl;
-    if (scenarioUuid) {
-      sanitizedData.scenario_uuid = scenarioUuid;
-    }
-
-
-    // Normalize model name to lowercase
-    const normalizedName = modelName.toLowerCase();
-
-    const response = await fetch(
-      `/api/v1/information/${normalizedName}/`,
-      {
-        method: "POST",
-        headers: this._buildHeaders(),
-        body: JSON.stringify(sanitizedData),
-      },
-    );
-
-    return this._handleResponse(response, "createItemOnNonScenarioObject");
-  },
-
   /**
    * Delete additional information from a scenario
    * @param {string} scenarioUuid - UUID of the scenario

static/js/ketcher2/DEVNOTES.md

@@ -0,0 +1,57 @@
+## Prerequisites
+
+   Stable [Node.js](https://nodejs.org) version
+
+## Build instructions
+
+    npm install
+    npm start
+
+For production build:
+
+    npm run build
+   
+You could also build only the style with command
+
+    npm run style
+
+## Indigo Service
+
+Ketcher uses Indigo Service for server operations.
+You can use `--api-path` parameter to start with it:
+
+    npm start -- --api-path=<server-url>
+For production build:
+
+    npm run build -- --api-path=<server-url>
+
+You can find the instruction for service installation
+[here](http://lifescience.opensource.epam.com/indigo/service/index.html).
+
+## Tests instructions
+
+You can start tests for input/output `.mol`-files and render.
+
+    npm test
+
+Tests are started for all structures in `test/fixtures` directory.
+
+To start the tests separately:
+
+    npm run test-io
+    npm run test-render
+
+#### Parameters
+
+You can use following parameters to start the tests:
+ - `--fixtures` - for the choice of a specific directory with molecules
+ - `--headless` - for start of the browser in headless mode
+
+```
+npm run test-render -- --fixtures=fixtures/super --headless
+```
+
+If you have added new structures for testing to the `test/fixtures` directory 
+you have to generate `svg` from them for correct render-test with:
+
+    npm run generate-svg    

static/js/ketcher2/LICENSE

@@ -0,0 +1,184 @@
+                               Apache License
+                         Version 2.0, January 2004
+                      http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+    "License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.
+    "Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.
+    "Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+    "You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.
+    "Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.
+    "Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).
+    "Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.
+    "Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."
+    "Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+    Work or Derivative Works thereof in any medium, with or without
+    modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+    (a) You must give any other recipients of the Work or
+        Derivative Works a copy of this License; and
+    (b) You must cause any modified files to carry prominent notices
+        stating that You changed the files; and
+    (c) You must retain, in the Source form of any Derivative Works
+        that You distribute, all copyright, patent, trademark, and
+        attribution notices from the Source form of the Work,
+        excluding those notices that do not pertain to any part of
+        the Derivative Works; and
+    (d) If the Work includes a "NOTICE" text file as part of its
+        distribution, then any Derivative Works that You distribute must
+        include a readable copy of the attribution notices contained
+        within such NOTICE file, excluding those notices that do not
+        pertain to any part of the Derivative Works, in at least one
+        of the following places: within a NOTICE text file distributed
+        as part of the Derivative Works; within the Source form or
+        documentation, if provided along with the Derivative Works; or,
+        within a display generated by the Derivative Works, if and
+        wherever such third-party notices normally appear. The contents
+        of the NOTICE file are for informational purposes only and
+        do not modify the License. You may add Your own attribution
+        notices within Derivative Works that You distribute, alongside
+        or as an addendum to the NOTICE text from the Work, provided
+        that such additional attribution notices cannot be construed
+        as modifying the License.
+    You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+    any Contribution intentionally submitted for inclusion in the Work
+    by You to the Licensor shall be under the terms and conditions of
+    this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+    names, trademarks, service marks, or product names of the Licensor,
+    except as required for reasonable and customary use in describing the
+    origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+    agreed to in writing, Licensor provides the Work (and each
+    Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+    whether in tort (including negligence), contract, or otherwise,
+    unless required by applicable law (such as deliberate and grossly
+    negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+    the Work or Derivative Works thereof, You may choose to offer,
+    and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+    To apply the Apache License to your work, attach the following
+    boilerplate notice, with the fields enclosed by brackets "[]"
+    replaced with your own identifying information. (Don't include
+    the brackets!)  The text should be enclosed in the appropriate
+    comment syntax for the file format. We also recommend that a
+    file or class name and description of purpose be included on the
+    same "printed page" as the copyright notice for easier
+    identification within third-party archives.
+
+ Copyright 2017 EPAM Systems
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.

static/js/ketcher2/LICENSE-history

@@ -0,0 +1,5 @@
+ Ketcher version 1 was released under GNU Affero General Public License v3.0
+ Ketcher version 2 was re-licensed under Apache License, Version 2.
+
+ Current version is distributed by the terms of the Apache License, Version 2.
+ which is included in the file LICENSE, found at the root of the Ketcher source tree.

static/js/ketcher2/NOTICE

@@ -0,0 +1,19 @@
+ Ketcher
+ Copyright (C) 2017 EPAM Systems
+ This product includes software developed at EPAM Systems, Inc.
+
+ In addition, this product contains dependencies on files licensed under:
+
+ The FreeBSD Documentation License https://www.freebsd.org/copyright/freebsd-doc-license.html
+ The MIT License https://opensource.org/licenses/MIT
+ X11 License http://www.xfree86.org/3.3.6/COPYRIGHT2.html
+ Academic Free License https://opensource.org/licenses/AFL-3.0
+ Apache License, Version 1.0 http://www.apache.org/licenses/LICENSE-1.0
+ Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0
+ The 2-Clause BSD License https://opensource.org/licenses/BSD-2-Clause
+ The 3-Clause BSD License https://opensource.org/licenses/BSD-3-Clause
+ ISC License (ISC) https://opensource.org/licenses/ISC
+ GNU Lesser General Public License version 2.1 https://opensource.org/licenses/LGPL-2.1
+ The Mozilla Public License https://opensource.org/licenses/MPL-1.0
+ Public Domain https://wiki.creativecommons.org/wiki/Public_domain
+ Unlicense http://unlicense.org/

static/js/ketcher2/README.md

@@ -0,0 +1,35 @@
+# EPAM Ketcher projects
+Copyright (c) 2017 EPAM Systems, Inc
+
+Ketcher is an open-source web-based chemical structure editor incorporating high performance, good portability, light weight, and ability to easily integrate into a custom web-application. Ketcher is designed for chemists, laboratory scientists and technicians who draw structures and reactions.
+
+## KEY FEATURES
+* Fast 2D structure representation that satisfies common chemical drawing standards
+* 3D structure visualization
+* Draw and edit structures using major tools: Atom Tool, Bond Tool, and Template Tool
+* Template library (including custom and user's templates)
+* Add atom and bond basic properties and query features, add aliases and Generic groups
+* Select, modify, and erase connected and unconnected atoms and bonds using Selection Tool, or using Shift key
+* Simple Structure Clean up Tool (checks bonds length, angles and spatial arrangement of atoms) and Advanced Structure Clean up Tool (+ stereochemistry checking and structure layout) 
+* Aromatize/De-aromatize Tool
+* Calculate CIP Descriptors Tool
+* Structure Check Tool
+* MW and Structure Parameters Calculate Tool 
+* Stereochemistry support during editing, loading, and saving chemical structures
+* Storing history of actions, with the ability to rollback to previous state
+* Ability to load and save structures and reactions in MDL Molfile or RXN file format, InChI String, ChemAxon Extended SMILES, ChemAxon Extended CML file formats
+* Easy to use R-Group and S-Group tools (Generic, Multiple group, SRU polymer, peratom, Data S-Group) 
+* Reaction Tool (reaction generating, manual and automatic atom-to-atom mapping) 
+* Flip/Rotate Tool
+* Zoom in/out, hotkeys, cut/copy/paste
+* OCR - ability to recognize structures at pictures (image files) and reproduce them
+* Copy and paste between different chemical editors
+* Settings support (Rendering, Displaying, Debugging)
+* Use of SVG to achieve best quality in-browser chemical structure rendering
+* Languages: JavaScript with third-party libraries
+
+## Build instructions
+Please read [DEVNOTES.md](DEVNOTES.md) for details.
+
+## License
+Please read [LICENSE](LICENSE) and [NOTICE](NOTICE) for details.

static/js/ketcher2/doc/help.md

@@ -0,0 +1,570 @@
+**Ketcher** is a tool to draw molecular structures and chemical
+reactions.
+
+# Ketcher Overview
+
+**Ketcher** is a tool to draw molecular structures and chemical
+reactions. Ketcher operates in two modes, the Server mode with most
+functions available and the client mode with limited functions
+available.
+
+**Ketcher** consists of the following elements:
+
+ ![](main.png "Main window")
+
+**Note** : Depending on the screen size, some tools on the _Tool
+palette_ can be displayed in expanded or collapsed forms.
+
+Using the _Tool palette_, you can
+
+  * draw and edit a molecule or reaction by clicking on and dragging
+  atoms, bonds, and other elements provided with the buttons on the
+  _Atoms_ toolbar and _Tool palette_;
+
+  * delete any element of the drawing (atom or bond) by clicking on it
+  with the Erase tool;
+
+  * delete the entire molecule or its fragment by a lasso,
+  rectangular, or fragment selection with the Erase tool;
+
+  * draw special structures (see the following sections);
+
+  * select the entire molecule or its fragment in one of the following
+  ways (click on the button to see the list of available options):
+
+    * in the expanded form
+
+      ![](expanded.png "Expanded tool")
+
+    * in the collapsed form
+
+      ![](collapsed.png "Collapsed tool")
+
+To select one atom or bond, click Lasso or Rectangle Selection tool,
+and then click the atom or bond.
+
+To select the entire structure:
+
+  * Select the Fragment Selection tool and then click the object.
+
+  * Select the Lasso or Rectangle Selection tool, and then drag the
+  mouse to select the object.
+
+  * `Ctrl-click` with the Lasso or Rectangle Selection tool.
+
+To select multiple atoms, bonds, structures, or other objects, do one
+of the following:
+
+  * `Shift-click` with the Lasso or Rectangle Selection tool selects
+  some (connected or not) atoms/bonds.
+
+  * With the Lasso or Rectangle Selection tool click and drag the
+  mouse around the atoms, bonds, or structures that you want to
+  select.
+
+**Note** : `Ctrl+Shift-click` with the Lasso or Rectangle Selection tool
+selects several structures.
+
+You can use the buttons of the _Main_ toolbar:
+
+
+ ![](toolbar.png "Tolbar")
+
+  * **Clear Canvas** (1) button to start drawing a new molecule; this
+  command clears the drawing area;
+
+  * **Open…** (2) and **Save As…** (3) buttons to import a molecule
+  from a molecular file or save it to a supported molecular file
+  format;
+
+  * **Undo** / **Redo** (4), **Cut** (5), **Copy** (6), **Paste** (7),
+  **Zoom In** / **Out** (8), and **Scaling** (9) buttons to perform
+  the corresponding actions;
+
+  * **Layout** button (10) to change the position of the structure to
+  work with it with the most convenience;
+
+  * **Clean Up** button (11) to improve the appearance of the
+  structure by assigning them uniform bond lengths and angles.
+
+  * **Aromatize** / **Dearomatize** buttons (12) to mark aromatic
+  structures (to convert a structure to the Aromatic or Kekule
+  presentation);
+
+  * **Calculate CIP** button (13) to determine R/S and E/Z
+  configurations;
+
+  * **Check Structure** button (14) to check the following properties
+  of the structure:
+
+    ![](check.png "Structure Ckeck")
+
+  * **Calculated Values** button (15) to display some properties of
+  the structure:
+
+    ![](analyse.png "Calculated Values")
+
+  * **Recognize Molecule** button (16) to recognize a structure in the
+  image file and load it to the canvas;
+
+  * **3D Viewer** button (17) to open the structure in the
+  three-dimensional Viewer;
+
+  * **Settings** button (18) to make some settings for molecular
+    files:
+    
+    ![](settings.png "Settings")
+
+  * **Help** button (19) to view Help;
+    
+  * **About** button (20) to display version and copyright information
+  of the program.
+
+**Note** : **Layout,** **Clean Up,** **Aromatize** / **Dearomatize,**
+**Calculate CIP,** **Check Structure,** **Calculated Values,**
+**Recognize Molecule** and **3D View** buttons are active only in the
+Server mode.
+
+# 3D Viewer
+
+The structure appears in a modal window after clicking on the **3D
+Viewer** button:
+
+ ![](miew.png "3D Viewer")
+
+You can perform the following actions:
+
+  * Rotate the structure holding the left mouse button;
+
+  * Zoom In/Out the structure;
+
+Ketcher Settings allow to change the appearance of the structure and background coloring.
+
+"Lines" drawing method, "Bright" atom name coloring
+method and "Light" background coloring are default.
+
+# Drawing Atoms
+
+To draw/edit atoms you can:
+
+  * select an atom in the Atoms toolbar and click inside the drawing
+  area;
+
+  * if the desired atom is absent in the toolbar, click on
+  the ![](periodic-table.png) button to invoke the Periodic Table and
+  click on the desired atom (available options: _Single_ – selection
+  of a single atom, _List_ – choose an atom from the list of selected
+  options (To allow one atom from a list of atoms of your choice at
+  that position), _Not List_ - exclude any atom on your list at that
+  position).
+
+    ![](periodic-dialog.png "Periodic Table")
+
+  * add an atom to the existing molecule by selecting an atom in the
+  _Atoms_ toolbar, clicking on an atom in the molecule, and dragging
+  the cursor; the atom will be added with a single bond; vacant
+  valences will be filled with the corresponding number of hydrogen
+  atoms;
+
+  * change an atom by selecting an atom in the _Atoms_ toolbar and
+  clicking on the atom to be changed; in the case a wrong valence thus
+  appears the atom will be underlined in red;
+
+  * change an atom by clicking on an existing atom with the
+  _Selection_ tool and waiting for a couple of seconds for the text
+  box to appear; type another atom symbol in the text box:
+
+    ![](inline-edit.png "Change Atom")
+
+  * change the charge of an atom by selecting the Charge Plus or
+  Charge Minus tool and clicking consecutively on an atom to
+  increase/decrease its charge
+
+    ![](charge.png "Ions")
+
+  * change an atom or its properties by double-clicking on the atom to
+  invoke the Atom Properties dialog (the dialog also provides atom
+  query features):
+
+    ![](atom-dialog.png "Atom Properties")
+
+  * click on the Periodic Table button, open the Extended table and
+  select a corresponding Generic group or Special Node:
+
+    ![](periodic-dialog-ext.png "Generic Groups")
+
+# Drawing Bonds
+
+To draw/edit bonds you can:
+
+  * Click an arrow on the Bond tool ![](bond.png) in the Tools palette
+  to open the drop-down list with the following bond types:
+
+    ![](bonds.png)
+
+    For the full screen format, the Bond tool from the Tools palette
+    splits into three: _Single Bond,__Single Up Bond,_ and _Any
+    Bond_,which include the corresponding bond types:
+
+    ![](bond-types.png)
+
+  * select a bond type from the drop down list and click inside the
+  drawing area; a bond of the selected type will be drawn;
+
+  * click on an atom in the molecule; a bond of the selected type will
+  be added to the atom at the angle of 120 degrees;
+
+  * add a bond to the existing molecule by clicking on an atom in the
+  molecule and dragging the cursor; in this case you can set the angle
+  manually;
+
+  * change the bond type by clicking on it;
+
+  * use the Chain Tool ![](chain.png) to draw consecutive single
+  bonds;
+
+  * change a bond or its properties by double-clicking on the bond to
+  invoke the Bond Properties dialog:
+
+    ![](bond-dialog.png "Bond Properties")
+
+  * clicking on a drawn stereo bond changes its direction.
+
+  * clicking with the Single Bond tool or Chain tool switches the bond type
+  cyclically: Single-Double-Triple-Single.
+
+# Drawing R-Groups
+
+Use the _R-Group_ toolbox ![](rgroup.png) to draw R-groups in Markush
+structures:
+
+ ![](rgroup-types.png)
+
+Selecting the _R-Group_ _Label_ Tool and clicking on an atom in the
+structure invokes the dialog to select the R-Group label for a current
+atom position in the structure:
+
+ ![](rgroup-dialog.png)
+
+Selecting the R-Group label and clicking **OK** converts the structure
+into a Markush structure with the selected R-Group label:
+
+ ![](rgroup-example1.png)
+
+**Note** : You can choose several R-Group labels simultaneously:
+
+ ![](rgroup-example2.png)
+
+Particular chemical fragments that may be substituted for a given
+R-Group form a set of R-Group members. R-Group members can be any
+structural fragment, including functional groups and single atoms or
+atom lists.
+
+To create a set of R-Group members:
+
+  1. Draw a structure to become an R-Group member.
+
+  2. Select the structure using the _R-Group Fragment Tool_ to invoke
+     the R-Group dialog; in this dialog select the label of the
+     R-Group to assign the fragment to.
+
+  3. Click on **OK** to convert the structure into an R-Group member.
+
+An R-Group attachment point is the atom in an R-Group member fragment
+that attaches the fragment to the initial Markush structure.
+
+Selecting the _Attachment Point Tool_ and clicking on an atom in the
+R-Group fragment converts this atom into an attachment point. If the
+R-Group contains more than one attachment point, you can specify one
+of them as primary and the other as secondary. You can select between
+either the primary or secondary attachment point using the dialog that
+appears after clicking on the atom:
+
+ ![](attpoints-dialog.png)
+
+If there are two attachment points on an R-Group member, there must be
+two corresponding attachments (bonds) to the R-Group atom that has the
+same R-Group label. Clicking on **OK** in the above dialog creates the
+attachment point.
+
+Schematically, the entire process of the R-Group member creation can
+be presented as:
+
+ ![](rgroup-example3.png)
+
+ ![](rgroup-example4.png)
+
+# R-Group Logic
+
+**Ketcher** enables one to add logic when using R-Groups. To access
+the R-Group logic:
+
+  1. Create an R-Group member fragment as described above.
+
+  2. Move the cursor over the entire fragment for the green frame to
+     appear, then click inside the fragment. The following dialog
+     appears:
+
+     ![](rlogic-dialog.png)
+
+  3. Specify **Occurrence** to define how many of an R-Group
+     occurs. If an R-Group atom appears several times in the initial
+     structure, you will specify **Occurrence**">n", n
+     being the number of occurrences; if it appears once, you see
+     "R1 > 0".
+
+  4. Specify H at **unoccupied** R-Group sites ( **RestH** ): check or
+     clear the checkbox.
+
+  5. Specify the logical **Condition**. Use the R-Group condition **If
+     R(i) Then** to specify whether the presence of an R-Group is
+     dependent on the presence of another R-Group.
+
+
+# Marking S-Groups
+
+To mark S-Groups, use the _S-Group tool_ ![](sgroup.png) and the
+following dialog that appears after selecting a fragment with this
+tool:
+
+ ![](sgroup-dialog.png "S-Group Dialog")
+
+Available S-Group types:
+
+_Generic_
+
+Generic is a pair of brackets without any labels.
+
+_Multiple group_
+
+A Multiple group indicates a number of replications of a fragment or a part of a
+structure in contracted form.
+
+_SRU Polymer_
+
+The Structural Repeating Unit (SRU) brackets enclose the structural
+repeating of a polymer. You have three available patterns:
+head-to-tail (the default), head-to-head, and either/unknown.
+
+_Superatom_
+
+An abbreviated structure (abbreviation) is all or part of a structure
+(molecule or reaction component) that has been abbreviated to a text
+label. Structures that you abbreviate keep their chemical
+significance, but their underlying structure is hidden. The current
+version can't display contracted structures but correctly
+saves/reads them into/from files.
+
+# Data S-Groups
+
+The _Data S-Groups Tool_ ![](sdata.png) is a separate tool for
+comfortable use with the accustomed set of descriptors (like Attached
+Data in **Marvin** Editor).
+
+You can attach data to an atom, a fragment, a single bond, or a
+group. The defined set of _Names_ and _Values_ is introduced for each
+type of selected elements:
+
+ ![](sdata-dialog.png)
+
+  * Select the appropriate S-Group Field Name.
+
+  * Select or type the appropriate Field Value.
+
+  * Labels can be specified as Absolute, Relative or Attached.
+
+# Changing Structure Display
+
+Use the _Flip/Rotate_ tool ![](transform.png) to change the structure
+display:
+
+ ![](transform-types.png)
+
+For the full screen format, the _Flip/Rotate_ tool is split into
+separate buttons:
+
+ ![](rotate.png)
+
+_Rotate Tool_
+
+This tool allows rotating objects.
+  * If some objects are selected, the tool rotates the selected objects.
+  * If no objects are selected, or all objects are selected, the tool rotates the whole canvas
+  * The default rotation step is 15 degrees. 
+  * Press and hold the Ctrl key for more gradual continuous rotation with 1 degree rotation step
+
+Select any bond on the structure and click Alt+H to rotate the structure so that the selected bond is placed horizontally.
+Select any bond on the structure and click Alt+V to rotate the structure so that the selected bond is placed vertically.
+
+_Flip Tool_
+
+This tool flips the objects horizontally or vertically.
+  * If some objects are selected, the Horizontal Flip tool (or Alt+H) flips the selected objects horizontally
+  * If no objects are selected, or all objects are selected, the Horizontal Flip tool (or Alt+H) flips each structure horizontally
+  * If some objects are selected, the Vertical Flip tool (or Alt+V) flips the selected objects vertically
+  * If no objects are selected, or all objects are selected, the Vertical Flip tool (or Alt+V) flips each structure vertically
+
+# Drawing Reactions
+
+To draw/edit reactions you can
+
+  * draw reagents and products as described above;
+  * use options of the _Reaction Arrow Tool_ ![](reaction.png) to draw an
+  arrow and pluses in the reaction equation and map same atoms in
+  reagents and products.
+
+    ![](reaction-types.png)
+
+**Note** : Reaction Auto-Mapping Tool is available only in the Server
+mode.
+
+# Templates toolbar
+
+You can add templates (rings or other predefined structures) to the
+structure using the _Templates_ toolbar together with the _Custom
+Templates_ button located at the bottom:
+
+ ![](template.png)
+
+To add a ring to the molecule, select a ring from the toolbar and
+click inside the drawing area, or click on an atom or a bond in the
+molecule.
+
+Rules of using templates:
+
+  * Selecting a template and clicking on an atom in the existing
+  structure adds the template to the structure connected with a single
+  bond:
+
+    ![](template-example1.png)
+
+  * Selecting a template and dragging the cursor from an atom in the
+  existing structure adds the template directly to this atom resulting
+  in the fused structure:
+
+    ![](template-example2.png)
+
+  * Dragging the cursor from an atom in the existing structure results
+  in the single bond attachment if the cursor is dragged to more than
+  the bond length; otherwise the fused structure is drawn.
+  * Selecting a template and clicking on a bond in the existing
+  structure created a bond-to-bond fused structure:
+
+    ![](template-example3.png)
+
+  * The bond in the initial structure is replaced with the bond in the
+  template.
+
+  * This procedure doesn't change the length of the bond in the
+  initial structure.
+
+  * Dragging the cursor relative to the initial bond applies the
+  template at the corresponding side of the bond.
+
+**Note** : The added template will be fused by the default attachment
+atom or bond preset in the program.
+
+**Note** : User is able to define the attachment atom and bond by clicking
+the Edit button for template structure.
+
+
+The _Custom Templates_ button ![](template-lib.png)invokes the scrolling
+list of templates available in the program; both built-in and created
+by user:
+
+ ![](template-dialog.png)
+
+
+To create a user template:
+* draw a structure.
+* click the Save as button.
+* click the Save to Templates button.
+* enter a name and define the attachment atom and bond.
+
+# Working with Files
+
+Ketcher supports the following molecular formats that can be entered
+either manually or from files:
+
+  * MDL Molfile or RXN file;
+
+  * Daylight SMILES (Server mode only);
+
+  * Daylight SMARTS (Server mode only);
+
+  * InChi string (Server mode only);
+
+  * CML file (Server mode only).
+
+You can use the **Open…** and **Save As…** buttons of the _Main_
+toolbar to import a molecule from a molecular file or save it to a
+supported molecular file format. The _Open Structure_ dialog enables
+one to either browse for a file (Server mode) or manually input, e.g.,
+the Molfile ctable for the molecule to be imported:
+
+ ![](open.png)
+
+The _Save Structure_ dialog enables one to save the molecular file:
+
+ ![](save.png)
+
+**Note** : In the standalone version only mol/rxn are supported for
+Open and mol/rxn/SMILES for Save.
+
+
+# Hotkeys
+
+You can use keyboard hotkeys (including Numeric keypad) for some
+features/commands of the Editor. To display the hotkeys just place the
+cursor over a toolbar button. If a hotkey is available for the button,
+it will appear in brackets after the description of the button.
+
+| Key | Action |
+| --- | --- |
+| `Esc` | Switching between the Lasso/Rectangle/Fragment Selection tools |
+| `Del` | Delete the selected objects |
+| `0` | Draw Any bond. |
+| `1` | Single / Single Up / Single Down / Single Up/Down bond. Consecutive pressing switches between these types. |
+| `2` | Double / Double Cis/Trans bond |
+| `3` | Draw a triple bond. |
+| `4` | Draw an aromatic bond. |
+| `5` | Charge Plus/Charge Minus |
+| `A` | Draw any atom |
+| `H` | Draw a hydrogen |
+| `C` | Draw a carbon |
+| `N` | Draw a nitrogen |
+| `O` | Draw an oxygen |
+| `S` | Draw a sulfur |
+| `F` | Draw a fluorine |
+| `P` | Draw a phosphorus |
+| `I` | Draw an iodine |
+| `T` | Basic templates. Consecutive pressing switches between different templates |
+| `Shift+t` | Open template library |
+| `Alt+r` | Rotate tool |
+| `Alt+v` | Flip vertically |
+| `Alt+h` | Flip horizontally |
+| `Ctrl+g` | S-Group tool / Data S-Group tool |
+| `Ctrl+d` | Align and select all S-Group data
+| `Ctrl+r` | Switching between the R-Group Label Tool/R-Group Fragment Tool/Attachment Point Tool |
+| `Ctrl+Shift+r`  | R-Group Fragment Tool |
+| `Ctrl+Del` | Clear canvas |
+| `Ctrl+o` | Open |
+| `Ctrl+s` | Save As |
+| `Ctrl+z` | Undo |
+| `Ctrl+Shift+z` | Redo |
+| `Ctrl+x` | Cut selected objects |
+| `Ctrl+c` | Copy selected objects |
+| `Ctrl+v` | Paste selected objects |
+| `+` | Zoom In |
+| `-` | Zoom Out |
+| `Ctrl+l` | Layout |
+| `Ctrl+Shift+l` | Clean Up |
+| `Ctrl+p` | Calculate CIP |
+| `?` | Help |
+
+**Note** : Please, use `Ctrl+V` to paste the selected object in
+Google Chrome and Mozilla Firefox browsers.
+
+**Note 2** : Probably, you have forbidden access to the local storage.
+If you are using IE10 or IE11 and didn't forbid access to local storage 
+intentionally, you can pay attention here: https://stackoverflow.com/a/20848924