rdmo 2.1.2__tar.gz → 2.2.0__tar.gz

{rdmo-2.1.2 → rdmo-2.2.0}/AUTHORS

@@ -6,6 +6,7 @@ The core developers are:
     Olaf Michaelis
     David Wallace
     Max Schröder
+    Claudia Malzer
 
 We appreciate contributions from:
 
@@ -40,6 +41,7 @@ The development of RDMO was supported by the following institutions:
     Istituto Nazionale di Ricerca Metrologica (https://www.inrim.eu)
     Universität Rostock (https://www.uni-rostock.de)
     Freie Universität Berlin (https://www.fu-berlin.de)
+    Julius Kühn-Institut – Bundesforschungsinstitut für Kulturpflanzen (JKI) (https://www.julius-kuehn.de/)
 
 Funding for RDMO was received from:
 

{rdmo-2.1.2 → rdmo-2.2.0}/NOTICE

@@ -4,7 +4,7 @@ THIS NOTICE APPLIES TO ALL FILES CONTAINED IN THIS AND UNDERLYING FOLDERS
 
 RDMO - Research Data Management Organiser
 
-Copyright (c) 2015-2023  RDMO Arbeitsgemeinschaft <rdmorganiser.github.io>
+Copyright (c) 2015-2024  RDMO Arbeitsgemeinschaft <rdmorganiser.github.io>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

{rdmo-2.1.2/rdmo.egg-info → rdmo-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rdmo
-Version: 2.1.2
+Version: 2.2.0
 Summary: RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project.
 Author-email: RDMO Arbeitsgemeinschaft <rdmo-team@listserv.dfn.de>
 License: Apache-2.0
@@ -29,58 +29,58 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
 License-File: AUTHORS
-Requires-Dist: defusedcsv~=2.0
-Requires-Dist: defusedxml~=0.7.1
-Requires-Dist: django~=4.2
-Requires-Dist: django-cleanup~=8.0
-Requires-Dist: django-compressor~=4.4
-Requires-Dist: django-extensions~=3.2
-Requires-Dist: django-filter~=23.2
-Requires-Dist: django-libsass~=0.9
-Requires-Dist: django-mathfilters~=1.0
+Requires-Dist: defusedcsv<3.0,>=2.0
+Requires-Dist: defusedxml<1.0,>=0.7.1
+Requires-Dist: django<5.0,>=4.2
+Requires-Dist: django-cleanup<9.0,>=8.0
+Requires-Dist: django-compressor<5.0,>=4.4
+Requires-Dist: django-extensions<4.0,>=3.2
+Requires-Dist: django-filter<25.0,>=23.2
+Requires-Dist: django-libsass<1.0,>=0.9
+Requires-Dist: django-mathfilters<2.0,>=1.0
 Requires-Dist: django-mptt==0.14.0
-Requires-Dist: django-rest-swagger~=2.2
-Requires-Dist: django-settings-export~=1.2
-Requires-Dist: django-split-settings~=1.2
-Requires-Dist: django-widget-tweaks~=1.5
-Requires-Dist: djangorestframework~=3.14
-Requires-Dist: drf-extensions~=0.7.1
-Requires-Dist: iso8601~=2.0
-Requires-Dist: markdown~=3.4
-Requires-Dist: packaging~=23.2
-Requires-Dist: pypandoc~=1.11
-Requires-Dist: requests-toolbelt~=1.0
-Requires-Dist: rules~=3.3
+Requires-Dist: django-rest-swagger<3.0,>=2.2
+Requires-Dist: django-settings-export<2.0,>=1.2
+Requires-Dist: django-split-settings<2.0,>=1.2
+Requires-Dist: django-widget-tweaks<2.0,>=1.5
+Requires-Dist: djangorestframework<4.0,>=3.15
+Requires-Dist: drf-extensions<1.0,>=0.7.1
+Requires-Dist: iso8601<3.0,>=2.0
+Requires-Dist: markdown<4.0,>=3.4
+Requires-Dist: packaging<25.0,>=23.2
+Requires-Dist: pypandoc<2.0,>=1.11
+Requires-Dist: requests-toolbelt<2.0,>=1.0
+Requires-Dist: rules<4.0,>=3.4
 Provides-Extra: allauth
-Requires-Dist: django-allauth~=0.57.0; extra == "allauth"
+Requires-Dist: django-allauth[openid,socialaccount]<64.2.0,>=64.1.0; extra == "allauth"
 Provides-Extra: ci
-Requires-Dist: coveralls~=3.3; extra == "ci"
 Requires-Dist: rdmo[dev]; extra == "ci"
+Requires-Dist: pytest-github-actions-annotate-failures<0.3.0,>=0.2.0; extra == "ci"
 Provides-Extra: dev
-Requires-Dist: build~=1.0; extra == "dev"
-Requires-Dist: pipdeptree~=2.13; extra == "dev"
-Requires-Dist: pre-commit~=3.4; extra == "dev"
-Requires-Dist: setuptools~=69.0; extra == "dev"
-Requires-Dist: twine~=4.0; extra == "dev"
-Requires-Dist: wheel~=0.42.0; extra == "dev"
+Requires-Dist: build<2.0,>=1.0; extra == "dev"
+Requires-Dist: pipdeptree<3.0,>=2.13; extra == "dev"
+Requires-Dist: pre-commit<4.0,>=3.4; extra == "dev"
+Requires-Dist: setuptools<74,>=73; extra == "dev"
+Requires-Dist: twine<6.0,>=5.1.1; extra == "dev"
+Requires-Dist: wheel<0.45,>=0.42; extra == "dev"
 Requires-Dist: rdmo[allauth]; extra == "dev"
 Requires-Dist: rdmo[pytest]; extra == "dev"
 Provides-Extra: gunicorn
-Requires-Dist: gunicorn~=21.2; extra == "gunicorn"
+Requires-Dist: gunicorn<24.0,>=23.0; extra == "gunicorn"
 Provides-Extra: ldap
-Requires-Dist: django-auth-ldap~=4.5; extra == "ldap"
+Requires-Dist: django-auth-ldap<5.0,>=4.5; extra == "ldap"
 Provides-Extra: mysql
-Requires-Dist: mysqlclient~=2.2; extra == "mysql"
+Requires-Dist: mysqlclient<3.0,>=2.2; extra == "mysql"
 Provides-Extra: postgres
-Requires-Dist: psycopg[binary]~=3.1; extra == "postgres"
+Requires-Dist: psycopg[binary]<4.0,>=3.1; extra == "postgres"
 Provides-Extra: pytest
-Requires-Dist: pytest~=7.4; extra == "pytest"
-Requires-Dist: pytest-cov~=4.1; extra == "pytest"
-Requires-Dist: pytest-django~=4.5; extra == "pytest"
-Requires-Dist: pytest-mock~=3.11; extra == "pytest"
-Requires-Dist: pytest-playwright~=0.4.3; extra == "pytest"
-Requires-Dist: pytest-randomly~=3.15; extra == "pytest"
-Requires-Dist: pytest-xdist~=3.3; extra == "pytest"
+Requires-Dist: pytest<9.0,>=8.0; extra == "pytest"
+Requires-Dist: pytest-cov<6.0,>=4.1; extra == "pytest"
+Requires-Dist: pytest-django<5.0,>=4.5; extra == "pytest"
+Requires-Dist: pytest-mock<4.0,>=3.11; extra == "pytest"
+Requires-Dist: pytest-playwright<0.6.0,>=0.4.3; extra == "pytest"
+Requires-Dist: pytest-randomly<4.0,>=3.15; extra == "pytest"
+Requires-Dist: pytest-xdist<4.0,>=3.3; extra == "pytest"
 
 RDMO - Research Data Management Organiser
 =========================================
@@ -112,4 +112,4 @@ RDMO is a tool to support the systematic planning, organisation and implementati
   <dd>https://rdmo.aip.de</dd>
 </dl>
 
-If you encounter any problems or bugs with the RDMO Software, or if you want to request a feature, please file an issue here: <https://github.com/rdmorganiser/rdmo/issues>. For problems or suggestions with questionaires, the RDMO domain model or other content, please use the issues in the [rdmo-catalog](https://github.com/rdmorganiser/rdmo-catalog) repository: <https://github.com/rdmorganiser/rdmo-catalog/issues>. In order to file issues, you will need a GitHub account.
+If you encounter any problems or bugs with the RDMO Software, or if you want to request a feature, please file an issue here: <https://github.com/rdmorganiser/rdmo/issues>. For problems or suggestions with questionnaires, the RDMO domain model or other content, please use the issues in the [rdmo-catalog](https://github.com/rdmorganiser/rdmo-catalog) repository: <https://github.com/rdmorganiser/rdmo-catalog/issues>. In order to file issues, you will need a GitHub account.

{rdmo-2.1.2 → rdmo-2.2.0}/README.md

@@ -28,4 +28,4 @@ RDMO is a tool to support the systematic planning, organisation and implementati
   <dd>https://rdmo.aip.de</dd>
 </dl>
 
-If you encounter any problems or bugs with the RDMO Software, or if you want to request a feature, please file an issue here: <https://github.com/rdmorganiser/rdmo/issues>. For problems or suggestions with questionaires, the RDMO domain model or other content, please use the issues in the [rdmo-catalog](https://github.com/rdmorganiser/rdmo-catalog) repository: <https://github.com/rdmorganiser/rdmo-catalog/issues>. In order to file issues, you will need a GitHub account.
+If you encounter any problems or bugs with the RDMO Software, or if you want to request a feature, please file an issue here: <https://github.com/rdmorganiser/rdmo/issues>. For problems or suggestions with questionnaires, the RDMO domain model or other content, please use the issues in the [rdmo-catalog](https://github.com/rdmorganiser/rdmo-catalog) repository: <https://github.com/rdmorganiser/rdmo-catalog/issues>. In order to file issues, you will need a GitHub account.

{rdmo-2.1.2 → rdmo-2.2.0}/pyproject.toml

@@ -40,68 +40,68 @@ dependencies = [
   # dependencies with major version on zero are declared with
   # major.minor.patch, because they can potentially introduce breaking changes
   # in minor version updates anytime
-  "defusedcsv~=2.0",
-  "defusedxml~=0.7.1",
-  "django~=4.2",
-  "django-cleanup~=8.0",
-  "django-compressor~=4.4",
-  "django-extensions~=3.2",
-  "django-filter~=23.2",
-  "django-libsass~=0.9",
-  "django-mathfilters~=1.0",
-  "django-mptt==0.14.0", # pinned, 0.15 requires Python >= 3.9
-  "django-rest-swagger~=2.2",
-  "django-settings-export~=1.2",
-  "django-split-settings~=1.2",
-  "django-widget-tweaks~=1.5",
-  "djangorestframework~=3.14",
-  "drf-extensions~=0.7.1",
-  "iso8601~=2.0",
-  "markdown~=3.4",
-  "packaging~=23.2",
-  "pypandoc~=1.11",
-  "requests-toolbelt~=1.0",
-  "rules~=3.3",
+  "defusedcsv>=2.0,<3.0",
+  "defusedxml>=0.7.1,<1.0",
+  "django>=4.2,<5.0",
+  "django-cleanup>=8.0,<9.0",
+  "django-compressor>=4.4,<5.0",
+  "django-extensions>=3.2,<4.0",
+  "django-filter>=23.2,<25.0",
+  "django-libsass>=0.9,<1.0",
+  "django-mathfilters>=1.0,<2.0",
+  "django-mptt==0.14.0",  # pinned, 0.15 requires Python >= 3.9
+  "django-rest-swagger>=2.2,<3.0",
+  "django-settings-export>=1.2,<2.0",
+  "django-split-settings>=1.2,<2.0",
+  "django-widget-tweaks>=1.5,<2.0",
+  "djangorestframework>=3.15,<4.0",
+  "drf-extensions>=0.7.1,<1.0",
+  "iso8601>=2.0,<3.0",
+  "markdown>=3.4,<4.0",
+  "packaging>=23.2,<25.0",
+  "pypandoc>=1.11,<2.0",
+  "requests-toolbelt>=1.0,<2.0",
+  "rules>=3.4,<4.0",
 ]
 
 [project.optional-dependencies]
 allauth = [
-  "django-allauth~=0.57.0",
+  "django-allauth[socialaccount,openid]>=64.1.0,<64.2.0",
 ]
 ci = [
-  "coveralls~=3.3",
   "rdmo[dev]",
+  "pytest-github-actions-annotate-failures>=0.2.0,<0.3.0",
 ]
 dev = [
-  "build~=1.0",
-  "pipdeptree~=2.13",
-  "pre-commit~=3.4",
-  "setuptools~=69.0",
-  "twine~=4.0",
-  "wheel~=0.42.0",
+  "build>=1.0,<2.0",
+  "pipdeptree>=2.13,<3.0",
+  "pre-commit>=3.4,<4.0",
+  "setuptools>=73,<74",
+  "twine>=5.1.1,<6.0",
+  "wheel>=0.42,<0.45",
   "rdmo[allauth]",
   "rdmo[pytest]",
 ]
 gunicorn = [
-  "gunicorn~=21.2",
+  "gunicorn>=23.0,<24.0",
 ]
 ldap = [
-  "django-auth-ldap~=4.5",
+  "django-auth-ldap>=4.5,<5.0",
 ]
 mysql = [
-  "mysqlclient~=2.2",
+  "mysqlclient>=2.2,<3.0",
 ]
 postgres = [
-  "psycopg[binary]~=3.1",
+  "psycopg[binary]>=3.1,<4.0",
 ]
 pytest = [
-  "pytest~=7.4",
-  "pytest-cov~=4.1",
-  "pytest-django~=4.5",
-  "pytest-mock~=3.11",
-  "pytest-playwright~=0.4.3",
-  "pytest-randomly~=3.15",
-  "pytest-xdist~=3.3",
+  "pytest>=8.0,<9.0",
+  "pytest-cov>=4.1,<6.0",
+  "pytest-django>=4.5,<5.0",
+  "pytest-mock>=3.11,<4.0",
+  "pytest-playwright>=0.4.3,<0.6.0",
+  "pytest-randomly>=3.15,<4.0",
+  "pytest-xdist>=3.3,<4.0",
 ]
 
 [project.urls]
@@ -123,8 +123,9 @@ exclude = ["*assets*", "*tests*"]
 version = {attr = "rdmo.__version__"}
 
 [tool.ruff]
-target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "B",    # flake8-bugbear
   "C4",   # flake8-comprehensions
@@ -133,10 +134,13 @@ select = [
   "F",    # pyflakes
   "I",    # isort
   "PGH",  # pygrep-hooks
+  "PT",   # flake8-pytest-style
   "RUF",  # ruff
   "UP",   # pyupgrade
   "W",    # pycodestyle
   "YTT",  # flake8-2020
+  "G",    # flake8-logging-format
+  "INT"   # flake8-gettext
 ]
 ignore = [
   "B006",   # mutable-argument-default
@@ -145,7 +149,7 @@ ignore = [
   "RUF012", # mutable-class-default
 ]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["rdmo"]
 section-order = [
   "future",
@@ -158,12 +162,12 @@ section-order = [
   "local-folder"
 ]
 
-[tool.ruff.isort.sections]
+[tool.ruff.lint.isort.sections]
 pytest = ["pytest"]
 django = ["django"]
 rest_framework = ["rest_framework"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "rdmo/**/models/__init__.py" = [
   "F401", # unused-import
 ]
@@ -184,10 +188,13 @@ rest_framework = ["rest_framework"]
   "F821", # undefined-names
 ]
 
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+parametrize-names-type = "csv"
+
 [tool.pytest.ini_options]
 DJANGO_SETTINGS_MODULE = "config.settings"
-testpaths = ["rdmo"]
-python_files = "test_*.py"
+testpaths = ["rdmo/*/tests"]
 pythonpath = [".", "testing"]
 addopts = '-p no:randomly -m "not e2e"'
 markers = [
@@ -201,6 +208,12 @@ filterwarnings = [
   "ignore:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning",
   "ignore:pkg_resources is deprecated as an API:DeprecationWarning",
 
+  # ignore warning from rest_framework about coreapi
+  "ignore:CoreAPI compatibility is deprecated and will be removed in DRF 3.17:rest_framework.RemovedInDRF317Warning",
+
+  # ignore warning from django_filters
+  "ignore:Built-in schema generation is deprecated. Use drf-spectacular.:django_filters.RemovedInDjangoFilter25Warning",
+
   # ignore warnings raised from within django itself
   # django/core/files/storage/__init__.py
   "ignore:django.core.files.storage.get_storage_class is deprecated:django.utils.deprecation.RemovedInDjango51Warning",
@@ -221,3 +234,10 @@ exclude_lines = [
     "raise Exception",
     "except ImportError:"
 ]
+
+[tool.typos] # Ref: https://github.com/crate-ci/typos/blob/master/docs/reference.md
+# add "spellchecker:disable-line" to ignore specific lines
+default.extend-ignore-re = [
+  "(?Rm)^.*(#|//)\\s*spellchecker:disable-line$", # for .py files
+  "(?Rm)^.*<!-- spellchecker:disable-line -->$", # for .html files
+]

rdmo-2.2.0/rdmo/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.2.0"

{rdmo-2.1.2 → rdmo-2.2.0}/rdmo/accounts/admin.py

@@ -30,15 +30,29 @@ class RoleAdmin(admin.ModelAdmin):
 
     list_display = ('user', 'email', 'members', 'managers', 'editors', 'reviewers')
 
+    readonly_fields = ('user', )
+
     def get_queryset(self, request):
         return Role.objects.prefetch_related(
                 'member', 'manager', 'editor', 'reviewer').annotate(
-                    Count('member'), Count('manager'), Count('editor'), Count('reviewer'),
+                    Count('member', distinct=True),
+                    Count('manager', distinct=True),
+                    Count('editor', distinct=True),
+                    Count('reviewer', distinct=True),
                     sites_count=Value(Site.objects.count())
                 )
 
+    def get_form(self, request, obj=None, **kwargs):
+        form = super().get_form(request, obj, **kwargs)
+        form.base_fields['member'].widget.can_add_related = False
+        form.base_fields['manager'].widget.can_add_related = False
+        form.base_fields['editor'].widget.can_add_related = False
+        form.base_fields['reviewer'].widget.can_add_related = False
+
+        return form
+
     @staticmethod
-    def render_all_sites_or_join(obj, field_name: str) -> str:
+    def get_sites_for_role(obj, field_name: str) -> str:
         if getattr(obj, f'{field_name}__count', 0) == obj.sites_count:
             return 'all Sites'
         return ', '.join([site.domain for site in getattr(obj, field_name).all()])
@@ -47,13 +61,13 @@ class RoleAdmin(admin.ModelAdmin):
         return obj.user.email
 
     def members(self, obj):
-        return self.render_all_sites_or_join(obj, 'member')
+        return self.get_sites_for_role(obj, 'member')
 
     def managers(self, obj):
-        return self.render_all_sites_or_join(obj, 'manager')
+        return self.get_sites_for_role(obj, 'manager')
 
     def editors(self, obj):
-        return self.render_all_sites_or_join(obj, 'editor')
+        return self.get_sites_for_role(obj, 'editor')
 
     def reviewers(self, obj):
-        return self.render_all_sites_or_join(obj, 'reviewer')
+        return self.get_sites_for_role(obj, 'reviewer')

{rdmo-2.1.2 → rdmo-2.2.0}/rdmo/accounts/forms.py

@@ -5,6 +5,9 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _
 
+from allauth.account.forms import LoginForm as AllauthLoginForm
+from allauth.account.forms import SignupForm as AllauthSignupForm
+
 from .models import AdditionalField, AdditionalFieldValue, ConsentFieldValue
 
 log = logging.getLogger(__name__)
@@ -48,7 +51,7 @@ class ProfileForm(forms.ModelForm):
         # existing user is going to be updated
         if self.instance.pk is not None:
             for additional_field_value in AdditionalFieldValue.objects.filter(user=self.instance):
-                self.fields[additional_field.key].initial = additional_field_value.value
+                self.fields[additional_field_value.field.key].initial = additional_field_value.value
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
@@ -68,7 +71,18 @@ class ProfileForm(forms.ModelForm):
             additional_value.save()
 
 
-class SignupForm(ProfileForm):
+class LoginForm(AllauthLoginForm):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # remove forget password link introduced with allauth 0.57.0
+        password_field = self.fields.get('password')
+        if password_field:
+            password_field.help_text = None
+
+
+class SignupForm(AllauthSignupForm, ProfileForm):
 
     use_required_attribute = False
 

{rdmo-2.1.2 → rdmo-2.2.0}/rdmo/accounts/serializers/v1.py

@@ -72,7 +72,9 @@ class UserSerializer(serializers.ModelSerializer):
             'id',
             'groups',
             'role',
-            'memberships'
+            'memberships',
+            'is_superuser',
+            'is_staff'
         ]
         if settings.USER_API:
             fields += [

{rdmo-2.1.2 → rdmo-2.2.0}/rdmo/accounts/utils.py

@@ -69,7 +69,7 @@ def delete_user(user=None, email=None, password=None):
             log.info('Deletion of user with usable password "%s" succeeded.', username)
             return True
         except Exception as e:
-            log.error('Deletion of user with usable password "%s" failed, an exception (%s) occured',
+            log.error('Deletion of user with usable password "%s" failed, an exception (%s) occurred',
                       str(e), username)
             return False
     elif not user.has_usable_password() and password is None:
@@ -78,7 +78,7 @@ def delete_user(user=None, email=None, password=None):
             log.info('Deletion of user without usable password "%s" succeeded.', username)
             return True
         except Exception as e:
-            log.error('Deletion of user without usable password "%s" failed, an exception (%s) occured',
+            log.error('Deletion of user without usable password "%s" failed, an exception (%s) occurred',
                       str(e), username)
             return False
     else:

{rdmo-2.1.2 → rdmo-2.2.0}/rdmo/accounts/views.py

@@ -48,7 +48,7 @@ def remove_user(request):
         log.info('Remove user form is disabled in settings PROFILE_DELETE')
         return render(request, 'profile/profile_remove_closed.html')
     form = RemoveForm(request.POST or None, request=request)
-    log.debug('Remove user form initialized for "%s"' % request.user.username)
+    log.debug('Remove user form initialized for "%s"', request.user.username)
 
     if request.method == 'POST':
         if 'cancel' in request.POST:

{rdmo-2.1.2 → rdmo-2.2.0}/rdmo/accounts/viewsets.py

@@ -1,5 +1,8 @@
 from django.contrib.auth import get_user_model
 
+from rest_framework.decorators import action
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
 from django_filters.rest_framework import DjangoFilterBackend
@@ -40,3 +43,8 @@ class UserViewSet(UserViewSetMixin, ReadOnlyModelViewSet):
                                      'role__member', 'role__manager',
                                      'role__editor', 'role__reviewer',
                                      'memberships')
+
+    @action(detail=False, permission_classes=(IsAuthenticated, ))
+    def current(self, request):
+        serializer = UserSerializer(request.user)
+        return Response(serializer.data)

rdmo-2.2.0/rdmo/conditions/imports.py

@@ -0,0 +1,14 @@
+from rdmo.core.import_helpers import ElementImportHelper, ExtraFieldHelper
+
+from .models import Condition
+from .validators import ConditionLockedValidator, ConditionUniqueURIValidator
+
+import_helper_condition = ElementImportHelper(
+    model=Condition,
+    validators=(ConditionLockedValidator, ConditionUniqueURIValidator),
+    foreign_fields=('source', 'target_option'),
+    extra_fields=(
+        ExtraFieldHelper(field_name='relation', value=''),
+        ExtraFieldHelper(field_name='target_text', value=''),
+    ),
+)

{rdmo-2.1.2 → rdmo-2.2.0}/rdmo/conditions/migrations/0013_meta.py

@@ -41,6 +41,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='condition',
             name='target_text',
-            field=models.CharField(blank=True, help_text='If using a regular attibute, the text value this condition is checking against.', max_length=256, null=True, verbose_name='Target (Text)'),
+            field=models.CharField(blank=True, help_text='If using a regular attribute, the text value this condition is checking against.', max_length=256, null=True, verbose_name='Target (Text)'),
         ),
     ]

{rdmo-2.1.2 → rdmo-2.2.0}/rdmo/core/constants.py

@@ -5,6 +5,7 @@ VALUE_TYPE_URL = 'url'
 VALUE_TYPE_INTEGER = 'integer'
 VALUE_TYPE_FLOAT = 'float'
 VALUE_TYPE_BOOLEAN = 'boolean'
+VALUE_TYPE_DATE = 'date'
 VALUE_TYPE_DATETIME = 'datetime'
 VALUE_TYPE_OPTIONS = 'option'
 VALUE_TYPE_EMAIL = 'email'
@@ -16,6 +17,7 @@ VALUE_TYPE_CHOICES = (
     (VALUE_TYPE_INTEGER, _('Integer')),
     (VALUE_TYPE_FLOAT, _('Float')),
     (VALUE_TYPE_BOOLEAN, _('Boolean')),
+    (VALUE_TYPE_DATE, _('Date')),
     (VALUE_TYPE_DATETIME, _('Datetime')),
     (VALUE_TYPE_EMAIL, _('E-mail')),
     (VALUE_TYPE_PHONE, _('Phone')),
@@ -77,3 +79,17 @@ HUMAN2BYTES_MAPPER = {
     "tib": {"base": 1024, "power": 4},
     "pib": {"base": 1024, "power": 5},
 }
+
+RDMO_MODELS = {
+  'attribute': 'domain.attribute',
+  'condition': 'conditions.condition',
+  'option': 'options.option',
+  'optionset': 'options.optionset',
+  'question': 'questions.question',
+  'questionset': 'questions.questionset',
+  'page': 'questions.page',
+  'section': 'questions.section',
+  'catalog': 'questions.catalog',
+  'task': 'tasks.task',
+  'view': 'views.view'
+}

rdmo-2.2.0/rdmo/core/import_helpers.py

@@ -0,0 +1,57 @@
+from dataclasses import dataclass, field
+from inspect import signature
+from typing import Callable, Iterable, Optional, Sequence, Union
+
+from django.db import models
+
+ELEMENT_COMMON_FIELDS = (
+    'uri_prefix',
+    'uri_path',
+    'comment',
+)
+
+@dataclass(frozen=True)
+class ThroughInstanceMapper:
+    field_name: str
+    source_name: str
+    target_name: str
+    through_name: str
+
+
+@dataclass(frozen=True)
+class ExtraFieldHelper:
+    field_name: str
+    value: Union[str, bool, int, None] = None
+    callback: Optional[Callable] = None
+    overwrite_in_element: bool = False
+
+    def get_value(self, **kwargs):
+        if self.value is not None:
+            return self.value
+        elif self.callback is not None:
+            return self.get_value_from_callback(self.callback, kwargs)
+
+    @staticmethod
+    def get_value_from_callback(callback, kwargs):
+        if not callable(callback):
+            raise TypeError('callback must be callable')
+        sig = signature(callback)
+        kwargs = {k: val for k, val in kwargs.items() if k in sig.parameters}
+        value = callback(**kwargs)
+        return value
+
+
+@dataclass(frozen=True)
+class ElementImportHelper:
+    model: Optional[models.Model] = field(default=None)
+    model_path: Optional[str] = field(default=None)
+    validators: Iterable[Callable] = field(default_factory=list)
+    common_fields: Sequence[str] = field(default=ELEMENT_COMMON_FIELDS)
+    lang_fields: Sequence[str] = field(default_factory=list)
+    foreign_fields: Sequence[str] = field(default_factory=list)
+    extra_fields: Sequence[ExtraFieldHelper] = field(default_factory=list)
+    m2m_instance_fields: Sequence[str] = field(default_factory=list)
+    m2m_through_instance_fields: Sequence[ThroughInstanceMapper] = field(default_factory=list)
+    reverse_m2m_through_instance_fields: Sequence[ThroughInstanceMapper] = field(default_factory=list)
+    add_current_site_editors: bool = field(default=True)
+    add_current_site_sites: bool = field(default=False)