processlib 0.9.0__tar.gz → 0.10.0__tar.gz

{processlib-0.9.0/processlib.egg-info → processlib-0.10.0}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: processlib
-Version: 0.9.0
+Version: 0.10.0
 Summary: A workflow library for python
 Home-page: https://github.com/RaphaelKimmig/processlib
-Download-URL: https://github.com/RaphaelKimmig/processlib/archive/0.9.0.tar.gz
+Download-URL: https://github.com/RaphaelKimmig/processlib/archive/0.10.0.tar.gz
 Author: Raphael Kimmig
 Author-email: raphael@ampad.de
 License-File: LICENSE
+Requires-Dist: django>=3.2

{processlib-0.9.0 → processlib-0.10.0}/processlib/__init__.py

@@ -5,7 +5,4 @@ def autodiscover_flows():
     autodiscover_modules("flows")
 
 
-default_app_config = "processlib.apps.ProcesslibAppConfig"
-
-
-__all__ = ["autodiscover_flows", "default_app_config"]
+__all__ = ["autodiscover_flows"]

{processlib-0.9.0 → processlib-0.10.0}/processlib/activity.py

@@ -1,16 +1,10 @@
-import django
-import six
-from django.http import HttpResponseRedirect
-
-if django.VERSION[0] < 2:
-    from django.core.urlresolvers import reverse
-else:
-    from django.urls import reverse
+import logging
 
 from django.db import transaction
+from django.http import HttpResponseRedirect
+from django.urls import reverse
 from django.utils import timezone
 
-import logging
 from processlib.assignment import inherit
 from processlib.tasks import run_async_activity
 
@@ -18,7 +12,6 @@ from processlib.tasks import run_async_activity
 logger = logging.getLogger(__name__)
 
 
-@six.python_2_unicode_compatible
 class Activity(object):
     def __init__(
         self,
@@ -61,7 +54,7 @@ class Activity(object):
         return False
 
     def __str__(self):
-        return six.text_type(self.verbose_name or self.name)
+        return str(self.verbose_name or self.name)
 
     def __repr__(self):
         return '{}(name="{}")'.format(self.__class__.__name__, self.name)
@@ -346,40 +339,6 @@ class EndActivity(Activity):
         self.process.save(update_fields=update_fields)
 
 
-class EndRedirectActivity(EndActivity):
-    def __init__(self, redirect_url_callback=None, **kwargs):
-        self.redirect_url_callback = redirect_url_callback
-        super(EndActivity, self).__init__(**kwargs)
-
-    def instantiate(self, **kwargs):
-        # HACK: we skip the EndActivity implementation
-        # because it would finish the activity right away
-        super(EndActivity, self).instantiate(**kwargs)
-
-    def has_view(self):
-        return True
-
-    def get_absolute_url(self):
-        return reverse(
-            "processlib:process-activity",
-            kwargs={"flow_label": self.flow.label, "activity_id": self.instance.pk},
-        )
-
-    def dispatch(self, request, *args, **kwargs):
-        self.start()
-        url = reverse(
-            "processlib:process-detail", kwargs={"pk": self.instance.process.pk}
-        )
-        try:
-            if self.redirect_url_callback:
-                url = self.redirect_url_callback(self)
-            self.finish()
-        except Exception as e:
-            logger.exception(e)
-            self.error(exception=e)
-        return HttpResponseRedirect(url)
-
-
 class FormActivity(Activity):
     def __init__(self, form_class=None, **kwargs):
         self.form_class = form_class

{processlib-0.9.0 → processlib-0.10.0}/processlib/flow.py

@@ -3,9 +3,7 @@ from __future__ import unicode_literals
 from collections import OrderedDict, defaultdict
 
 import logging
-import six
 from django.utils import timezone
-from six import python_2_unicode_compatible
 
 from .models import Process, ActivityInstance
 
@@ -34,7 +32,6 @@ def register_flow(flow):
     _FLOWS[flow.label] = flow
 
 
-@python_2_unicode_compatible
 class Flow(object):
     def __init__(
         self,
@@ -68,7 +65,7 @@ class Flow(object):
         )
 
     def __str__(self):
-        return six.text_type(self.verbose_name or self.name)
+        return str(self.verbose_name or self.name)
 
     def start_with(self, activity_name, activity, **activity_kwargs):
         if self._activities:
@@ -98,7 +95,7 @@ class Flow(object):
         predecessors = [after] if after else []
 
         if wait_for:
-            if isinstance(wait_for, six.string_types):
+            if isinstance(wait_for, str):
                 raise TypeError("wait_for should be a list or tuple")
 
             activity_kwargs["wait_for"] = wait_for
@@ -125,7 +122,7 @@ class Flow(object):
             process=process,
             instance=None,
             name=activity_name,
-            **self._activity_kwargs[activity_name]
+            **self._activity_kwargs[activity_name],
         )
 
     def get_activity_by_instance(self, instance):
@@ -143,7 +140,7 @@ class Flow(object):
             flow_label=self.label,
             started_at=timezone.now(),
             status=self.process_model.STATUS_STARTED,
-            **(process_kwargs or {})
+            **(process_kwargs or {}),
         )
         activity = self._get_activity_by_name(process, list(self._activities)[0])
         activity.instantiate(instance_kwargs=activity_instance_kwargs, request=request)

{processlib-0.9.0 → processlib-0.10.0}/processlib/models.py

@@ -1,7 +1,6 @@
 import uuid
 import string
 
-import six
 from django.conf import settings
 from django.contrib.auth.models import Group
 from django.core.exceptions import ValidationError
@@ -9,9 +8,6 @@ from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 
-from six import python_2_unicode_compatible
-
-
 def validate_flow_label(value):
     from .flow import _FLOWS
 
@@ -24,14 +20,13 @@ def validate_flow_label(value):
 
 def is_format_string(value):
     try:
-        parsed = next(string.Formatter().parse(six.text_type(value)))
+        parsed = next(string.Formatter().parse(str(value)))
     except ValueError:
         return False
 
     return parsed[1] is not None
 
 
-@python_2_unicode_compatible
 class Process(models.Model):
     STATUS_STARTED = "started"
     STATUS_CANCELED = "canceled"
@@ -61,9 +56,9 @@ class Process(models.Model):
 
     def __str__(self):
         if not self.flow:
-            return six.text_type(self.id)
+            return str(self.id)
         if self.flow.verbose_name:
-            return six.text_type(self.flow.verbose_name)
+            return str(self.flow.verbose_name)
         return self.flow.name
 
     @property
@@ -73,16 +68,16 @@ class Process(models.Model):
     def can_cancel(self, user=None):
         return (
             self.status not in (self.STATUS_DONE, self.STATUS_CANCELED)
-            and not
+            and
             # FIXME allow cancelation of scheduled instances
-            self._activity_instances.filter(
+            not self._activity_instances.filter(
                 status=ActivityInstance.STATUS_SCHEDULED
             ).exists()
         )
 
     @property
     def description(self):
-        flow_description = six.text_type(self.flow.description or self.flow)
+        flow_description = str(self.flow.description or self.flow)
         if not is_format_string(flow_description):
             return flow_description
         try:

{processlib-0.9.0 → processlib-0.10.0}/processlib/services.py

@@ -87,6 +87,9 @@ def cancel_process(process, user):
 
 
 def get_user_processes(user, include_unassigned=True):
+    if not user.is_authenticated:
+        return Process.objects.none()
+
     q = Q(_activity_instances__assigned_group__in=user.groups.all()) & ~Q(
         _activity_instances__status=ActivityInstance.STATUS_CANCELED
     ) | Q(_activity_instances__assigned_user=user) & ~Q(
@@ -104,6 +107,9 @@ def get_user_processes(user, include_unassigned=True):
 
 
 def get_user_current_processes(user, include_unassigned=True):
+    if not user.is_authenticated:
+        return Process.objects.none()
+
     q = Q(
         _activity_instances__assigned_group__in=user.groups.all(),
         _activity_instances__status__in=(
@@ -129,17 +135,23 @@ def get_user_current_processes(user, include_unassigned=True):
         )
 
     q &= get_permission_filter(user)
-    return Process.objects.filter(
-        status=Process.STATUS_STARTED,
-    ).filter(q).distinct()
+    return (
+        Process.objects.filter(
+            status=Process.STATUS_STARTED,
+        )
+        .filter(q)
+        .distinct()
+    )
 
 
 def get_permission_filter(user):
     flows = get_flows()
-    flows_label_list = [label for (label, flow) in flows if not flow.permission or user.has_perm(flow.permission)]
-    return Q(
-        _activity_instances__process__flow_label__in=flows_label_list
-    )
+    flows_label_list = [
+        label
+        for (label, flow) in flows
+        if not flow.permission or user.has_perm(flow.permission)
+    ]
+    return Q(_activity_instances__process__flow_label__in=flows_label_list)
 
 
 def user_has_any_process_perm(user, process):
@@ -162,7 +174,9 @@ def user_has_activity_perm(user, activity):
         # if there are no required permissions we grant access
         return True
     elif activity.permission and activity.flow.permission:
-        return user.has_perm(activity.permission) and user.has_perm(activity.flow.permission)
+        return user.has_perm(activity.permission) and user.has_perm(
+            activity.flow.permission
+        )
     elif activity.permission:
         return user.has_perm(activity.permission)
     elif activity.flow.permission:

{processlib-0.9.0 → processlib-0.10.0}/processlib/signals.py

@@ -1,6 +1,5 @@
 from logging import getLogger
 
-import six
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.signals import pre_migrate
@@ -28,15 +27,21 @@ def create_flow_permissions(app_config, **kwargs):
                         flow.permission, app_label, process_content_type.app_label
                     )
                 )
-            if Permission.objects.filter(codename=codename).exclude(content_type=process_content_type).exists():
+            if (
+                Permission.objects.filter(codename=codename)
+                .exclude(content_type=process_content_type)
+                .exists()
+            ):
                 # app_label.codename should match process_content_type, otherwise that doesn't really make sense
-                raise ValueError("A permission for {}.{} with a different content type already"
-                                 " exists. Set auto_create_permission to False or remove the other"
-                                 " permission")
+                raise ValueError(
+                    "A permission for {}.{} with a different content type already"
+                    " exists. Set auto_create_permission to False or remove the other"
+                    " permission"
+                )
             Permission.objects.update_or_create(
                 content_type=process_content_type,
                 codename=codename,
-                defaults={"name": six.text_type(flow)},
+                defaults={"name": str(flow)},
             )
         activity_content_type = ContentType.objects.get_for_model(flow.process_model)
         for activity_name in flow._activities:
@@ -47,11 +52,17 @@ def create_flow_permissions(app_config, **kwargs):
             # split like django
             app_label, codename = activity.permission.split(".", 1)
 
-            if Permission.objects.filter(codename=codename).exclude(content_type=activity_content_type).exists():
+            if (
+                Permission.objects.filter(codename=codename)
+                .exclude(content_type=activity_content_type)
+                .exists()
+            ):
                 # app_label.codename should match activity_content_type, otherwise that doesn't really make sense
-                raise ValueError("A permission for {}.{} with a different content type already"
-                                 " exists. Set auto_create_permission to False or remove the other"
-                                 " permission")
+                raise ValueError(
+                    "A permission for {}.{} with a different content type already"
+                    " exists. Set auto_create_permission to False or remove the other"
+                    " permission"
+                )
 
             if app_label != activity_content_type.app_label:
                 raise ValueError(
@@ -65,9 +76,7 @@ def create_flow_permissions(app_config, **kwargs):
             Permission.objects.update_or_create(
                 content_type=activity_content_type,
                 codename=codename,
-                defaults={
-                    "name": "{} - {}".format(six.text_type(flow), six.text_type(name))
-                },
+                defaults={"name": "{} - {}".format(str(flow), str(name))},
             )
 
 

{processlib-0.9.0 → processlib-0.10.0}/processlib/tests.py

@@ -9,7 +9,13 @@ from django.urls import reverse
 
 from processlib.activity import FunctionActivity, AsyncActivity
 from processlib.forms import ProcessCancelForm
-from .activity import StartActivity, EndActivity, ViewActivity, Wait, StartViewActivity
+from .activity import (
+    StartActivity,
+    EndActivity,
+    ViewActivity,
+    Wait,
+    StartViewActivity,
+)
 from .assignment import inherit, nobody, request_user
 from .flow import Flow
 from .models import ActivityInstance
@@ -393,9 +399,7 @@ class ProcesslibViewPermissionTest(TestCase):
         self.post_with_permissions = RequestFactory().post("/")
         self.post_with_permissions.user = self.user_with_perms
 
-    def test_process_list_view_respects_flow_permission(
-        self
-    ):
+    def test_process_list_view_respects_flow_permission(self):
         no_perm_response = ProcessListView.as_view()(
             self.get_no_permissions,
         )
@@ -406,9 +410,7 @@ class ProcesslibViewPermissionTest(TestCase):
         )
         self.assertContains(perm_response, self.process.pk)
 
-    def test_user_process_list_view_respects_flow_permission(
-            self
-    ):
+    def test_user_process_list_view_respects_flow_permission(self):
         no_perm_response = UserProcessListView.as_view()(
             self.get_no_permissions,
         )
@@ -419,9 +421,7 @@ class ProcesslibViewPermissionTest(TestCase):
         )
         self.assertContains(perm_response, self.process.pk)
 
-    def test_user_current_process_list_view_respects_flow_permission(
-            self
-    ):
+    def test_user_current_process_list_view_respects_flow_permission(self):
         no_perm_response = UserCurrentProcessListView.as_view()(
             self.get_no_permissions,
         )
@@ -433,7 +433,7 @@ class ProcesslibViewPermissionTest(TestCase):
         self.assertContains(perm_response, self.process.pk)
 
     def test_process_detail_view_raises_permission_denied_with_missing_permissions(
-        self
+        self,
     ):
         with self.assertRaises(PermissionDenied):
             ProcessDetailView.as_view()(self.get_no_permissions, pk=self.process.id)
@@ -443,7 +443,7 @@ class ProcesslibViewPermissionTest(TestCase):
         self.assertEqual(response.status_code, 200)
 
     def test_process_cancel_view_raises_permission_denied_with_missing_permissions(
-        self
+        self,
     ):
         with self.assertRaises(PermissionDenied):
             ProcessCancelView.as_view()(self.get_no_permissions, pk=self.process.id)
@@ -474,7 +474,7 @@ class ProcesslibViewPermissionTest(TestCase):
         self.assertEqual(response.status_code, 302)
 
     def test_process_activity_view_raises_permission_denied_with_missing_permissions(
-        self
+        self,
     ):
         next_activity = next(get_current_activities_in_process(self.process))
 
@@ -506,7 +506,7 @@ class ProcesslibViewPermissionTest(TestCase):
         self.assertEqual(response.status_code, 302)
 
     def test_retry_activity_view_raises_permission_denied_with_missing_permissions(
-        self
+        self,
     ):
         with self.assertRaises(PermissionDenied):
             ActivityRetryView.as_view()(
@@ -522,7 +522,7 @@ class ProcesslibViewPermissionTest(TestCase):
         self.assertEqual(response.status_code, 302)
 
     def test_cancel_activity_view_raises_permission_denied_with_missing_permissions(
-        self
+        self,
     ):
         next_activity = next(get_current_activities_in_process(self.process))
         with self.assertRaises(PermissionDenied):
@@ -762,6 +762,56 @@ class ProcesslibViewTest(TestCase):
         self.assertContains(response, str(self.process.pk))
 
 
+end_direct_test_flow = (
+    Flow("end_direct_test_flow")
+    .start_with("start", StartActivity)
+    .and_then(
+        "success-view",
+        ViewActivity,
+        view=ProcessUpdateView.as_view(
+            fields=[],
+            success_url=lambda a: "/custom/{}".format(a),
+        ),
+    )
+    .and_then("end", EndActivity)
+)
+
+
+class ProcesslibRedirectViewTest(TestCase):
+    def setUp(self):
+        self.user = User.objects.create(username="testuser")
+        self.user.set_password("password")
+        self.user.save()
+
+        self.start = end_direct_test_flow.get_start_activity()
+        self.start.start()
+        self.start.finish()
+        self.process = self.start.process
+        self.next_activity = next(get_current_activities_in_process(self.process))
+
+        self.get = RequestFactory().get("/")
+        self.get.user = self.user
+        self.client.login(username="testuser", password="password")
+
+    def test_end_redirect(self):
+        activity_instance = self.next_activity.instance
+        url = reverse(
+            "processlib:process-activity",
+            kwargs={
+                "flow_label": self.process.flow_label,
+                "activity_id": activity_instance.id,
+            },
+        )
+        response = self.client.post(url, {"_finish_go_to_next": True})
+
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.headers["location"], "/custom/success-view")
+
+        self.process.refresh_from_db()
+
+        self.assertIsNotNone(self.process.finished_at)
+
+
 class ActivityTest(TestCase):
     def test_function_activity_with_error_records_error(self):
         function_error_flow = (
@@ -798,9 +848,9 @@ class ActivityTest(TestCase):
             activity.instance.assigned_group = Group.objects.create(name="side-effect")
             activity.instance.save()
 
-        function_error_retry_flow._activity_kwargs["function"][
-            "callback"
-        ] = working_callback
+        function_error_retry_flow._activity_kwargs["function"]["callback"] = (
+            working_callback
+        )
 
         activity_instance.activity.retry()
         activity_instance.refresh_from_db()

{processlib-0.9.0 → processlib-0.10.0}/processlib/urls.py

@@ -13,6 +13,10 @@ from processlib.views import (
     ProcessCancelView,
 )
 
+
+app_name = "processlib"
+
+
 urlpatterns = [
     re_path(r"^process/$", ProcessListView.as_view(), name="process-list"),
     re_path(
@@ -20,7 +24,9 @@ urlpatterns = [
         UserCurrentProcessListView.as_view(),
         name="process-list-user-current",
     ),
-    re_path(r"^process/user/$", UserProcessListView.as_view(), name="process-list-user"),
+    re_path(
+        r"^process/user/$", UserProcessListView.as_view(), name="process-list-user"
+    ),
     re_path(
         r"^process/start/(?P<flow_label>.*)/$",
         ProcessStartView.as_view(),
@@ -46,7 +52,9 @@ urlpatterns = [
         ActivityRetryView.as_view(),
         name="activity-retry",
     ),
-    re_path(r"^process/(?P<pk>.*)/$", ProcessDetailView.as_view(), name="process-detail"),
+    re_path(
+        r"^process/(?P<pk>.*)/$", ProcessDetailView.as_view(), name="process-detail"
+    ),
     re_path(
         r"^process/(?P<pk>.*)/cancel$",
         ProcessCancelView.as_view(),

{processlib-0.9.0 → processlib-0.10.0}/processlib/views.py

@@ -1,4 +1,3 @@
-import six
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.db.models import Q
@@ -58,7 +57,7 @@ class ProcessListView(CurrentAppMixin, ListView):
     def get_queryset(self):
         qs = super(ProcessListView, self).get_queryset()
         qs = self.filter_queryset(qs)
-        return qs.filter(get_permission_filter(self.request.user))
+        return qs.filter(get_permission_filter(self.request.user)).distinct()
 
     def get_search_query(self):
         return self.request.GET.get("search", "").strip()
@@ -273,6 +272,7 @@ class ActivityMixin(CurrentAppMixin):
     Mixin used by view activities, e.g. those defined as an ActivityView.
     """
 
+    success_url = None
     activity = None
     _finish_go_to_next = False
 
@@ -323,9 +323,7 @@ class ActivityMixin(CurrentAppMixin):
         if self.activity.instance.status == self.activity.instance.STATUS_DONE:
             messages.info(
                 request,
-                _("The activity {} has already been done.").format(
-                    six.text_type(self.activity)
-                ),
+                _("The activity {} has already been done.").format(str(self.activity)),
             )
             return HttpResponseRedirect(
                 reverse(
@@ -356,6 +354,13 @@ class ActivityMixin(CurrentAppMixin):
                         },
                         current_app=self.get_current_app(),
                     )
+
+        if self.success_url is not None:
+            if callable(self.success_url):
+                return self.success_url(self.activity)
+            else:
+                return str(self.success_url)
+
         return reverse(
             "processlib:process-detail",
             args=(self.activity.process.id,),

{processlib-0.9.0 → processlib-0.10.0/processlib.egg-info}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: processlib
-Version: 0.9.0
+Version: 0.10.0
 Summary: A workflow library for python
 Home-page: https://github.com/RaphaelKimmig/processlib
-Download-URL: https://github.com/RaphaelKimmig/processlib/archive/0.9.0.tar.gz
+Download-URL: https://github.com/RaphaelKimmig/processlib/archive/0.10.0.tar.gz
 Author: Raphael Kimmig
 Author-email: raphael@ampad.de
 License-File: LICENSE
+Requires-Dist: django>=3.2

processlib-0.10.0/setup.py

@@ -0,0 +1,16 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="processlib",
+    version="0.10.0",
+    url="https://github.com/RaphaelKimmig/processlib",
+    download_url="https://github.com/RaphaelKimmig/processlib/archive/0.10.0.tar.gz",
+    author="Raphael Kimmig",
+    author_email="raphael@ampad.de",
+    description="A workflow library for python",
+    include_package_data=True,
+    packages=find_packages(),
+    install_requires=[
+        "django >= 3.2",
+    ],
+)

processlib-0.9.0/setup.py

@@ -1,14 +0,0 @@
-from setuptools import setup, find_packages
-
-setup(
-    name='processlib',
-    version='0.9.0',
-    url='https://github.com/RaphaelKimmig/processlib',
-    download_url='https://github.com/RaphaelKimmig/processlib/archive/0.9.0.tar.gz',
-    author='Raphael Kimmig',
-    author_email='raphael@ampad.de',
-    description='A workflow library for python',
-    include_package_data=True,
-    packages=find_packages(),
-    install_requires=['django >= 3.2', ],
-)