appier 1.31.5__py2.py3-none-any.whl → 1.33.0__py2.py3-none-any.whl

appier/__init__.py

@@ -268,7 +268,7 @@ from .preferences import (
 from .queuing import Queue, MemoryQueue, MultiprocessQueue, AMQPQueue
 from .redisdb import Redis
 from .request import CODE_STRINGS, Request, MockRequest
-from .scheduler import Scheduler
+from .scheduler import Scheduler, CronScheduler, SchedulerTask, SchedulerDate, Cron
 from .serialize import serialize_csv, serialize_ics, build_encoder
 from .session import (
     Session,

appier/base.py

@@ -68,6 +68,7 @@ from . import compress
 from . import settings
 from . import observer
 from . import execution
+from . import scheduler
 from . import controller
 from . import structures
 from . import exceptions
@@ -93,7 +94,7 @@ NAME = "appier"
 """ The name to be used to describe the framework while working
 on its own environment, this is just a descriptive value """
 
-VERSION = "1.31.5"
+VERSION = "1.33.0"
 """ The version of the framework that is currently installed
 this value may be used for debugging/diagnostic purposes """
 
@@ -194,17 +195,17 @@ OCTET_TYPE = "application/octet-stream"
 """ The mime/content type to be used for octet stream based message payloads
 so that the legacy byte oriented value is readable """
 
-REPLACE_REGEX = re.compile("(?<!\(\?P)\<((\w+)(\([\"'].*?[\"']\))?:)?(\w+)\>")
+REPLACE_REGEX = re.compile(r"(?<!\(\?P)\<((\w+)(\([\"'].*?[\"']\))?:)?(\w+)\>")
 """ The regular expression to be used in the replacement
 of the capture groups for the urls, this regex will capture
 any named group not changed until this stage (eg: int,
 string, regex, etc.) """
 
-INT_REGEX = re.compile("\<int:(\w+)\>")
+INT_REGEX = re.compile(r"\<int:(\w+)\>")
 """ The regular expression to be used in the replacement
 of the integer type based groups for the urls """
 
-REGEX_REGEX = re.compile("\<regex\([\"'](.*?)[\"']\):(\w+)\>")
+REGEX_REGEX = re.compile(r"\<regex\([\"'](.*?)[\"']\):(\w+)\>")
 """ Regular expression that is going to be used for the
 replacement of regular expression types with the proper
 group in the final URL based route regex """
@@ -217,7 +218,9 @@ SLUGIER_REGEX_2 = re.compile(r"[-]+", re.UNICODE)  # @UndefinedVariable
 """ The second regular expression that is going to be used
 by the slugier sub system to replace some of its values """
 
-CSS_ABS_REGEX = re.compile(b"url\((?!(http:\/\/|https:\/\/|\/\/|\/))([^\)]+)\)")
+CSS_ABS_REGEX = re.compile(
+    legacy.bytes(r"url\((?!(http:\/\/|https:\/\/|\/\/|\/))([^\)]+)\)")
+)
 """ The regular expression that is going to be used to capture
 the relative CSS URL values, so that they may be converted into
 absolute ones for proper inlining, note that the regex is defined
@@ -425,6 +428,7 @@ class App(
         self._user_routes = None
         self._core_routes = None
         self._own = self
+        self._cron = None
         self._peers = {}
         self.__routes = []
         self.load(level=level, handlers=handlers)
@@ -730,6 +734,7 @@ class App(
         self._start_controllers()
         self._start_models()
         self._start_supervisor()
+        self._start_cron()
         if refresh:
             self.refresh()
         self.status = RUNNING
@@ -741,6 +746,7 @@ class App(
         self._print_bye()
         if refresh:
             self.refresh()
+        self._stop_cron()
         self._stop_supervisor()
         self._stop_models()
         self._stop_controllers()
@@ -2321,6 +2327,30 @@ class App(
         thread.daemon = True
         thread.start()
 
+    def cron(self, job, cron):
+        """
+        Schedule the provided method for regular execution using
+        the provided Cron like string.
+
+        The method is going to be executed at the provided time
+        in a separate thread.
+
+        :type job: function
+        :param job: The function/method that is going to be executed
+        at the specified time using the cron like string.
+        :type cron: String/SchedulerDate
+        :param cron: The cron like string that is going to be used to
+        define the execution time of the provided method.
+        :rtype: SchedulerTask
+        :return: The task that has been scheduled for execution at the
+        provided time.
+        """
+
+        if self._cron == None:
+            self._cron = scheduler.CronScheduler(self)
+            self._cron.start()
+        return self._cron.schedule(job, cron)
+
     def chunks(self, data, size=32768):
         for index in range(0, len(data), size):
             yield data[index : index + size]
@@ -2332,6 +2362,9 @@ class App(
         receivers=[],
         cc=[],
         bcc=[],
+        reply_to=[],
+        return_path=None,
+        priority=None,
         subject="",
         plain_template=None,
         smtp_url=None,
@@ -2395,6 +2428,8 @@ class App(
             cc = [cc]
         if not isinstance(bcc, (list, tuple)):
             bcc = [bcc]
+        if not isinstance(reply_to, (list, tuple)):
+            reply_to = [reply_to]
 
         sender_base = util.email_base(sender)
         receivers_base = util.email_base(receivers)
@@ -2406,6 +2441,7 @@ class App(
         sender_mime = util.email_mime(sender)
         receivers_mime = util.email_mime(receivers)
         cc_mime = util.email_mime(cc)
+        reply_to_mime = util.email_mime(reply_to)
 
         parameters = dict(kwargs)
         parameters.update(
@@ -2440,6 +2476,12 @@ class App(
         )
         if cc_mime:
             mime["Cc"] = ", ".join(cc_mime)
+        if reply_to_mime:
+            mime["Reply-To"] = ", ".join(reply_to_mime)
+        if return_path:
+            mime["Return-Path"] = return_path
+        if priority:
+            mime["Priority"] = priority
 
         for key, value in headers.items():
             mime[key] = value
@@ -2606,7 +2648,7 @@ class App(
         self.template_args(kwargs)
 
         # verifies if the target locale for the template has been defined
-        # and if thtat's the case updates the keyword based arguments for
+        # and if that's the case updates the keyword based arguments for
         # the current template render to include that value
         if locale:
             kwargs["_locale"] = locale
@@ -3751,8 +3793,8 @@ class App(
                 timeout = int(max_age)
 
             # in case the type of the resource is css an extra replace operation
-            # on the urls must be performed so that the base URL is added to all
-            # the resources, this is required so that relative urls are fixed
+            # on the URLs must be performed so that the base URL is added to all
+            # the resources, this is required so that relative URLs are fixed
             if type == "css":
                 base, _name = url.rsplit("/", 1)
                 base = legacy.bytes(base)
@@ -5344,6 +5386,16 @@ class App(
     def _stop_supervisor(self):
         pass
 
+    def _start_cron(self):
+        pass
+
+    def _stop_cron(self):
+        if not self._cron:
+            return
+        self._cron.stop()
+        self._cron.join()
+        self._cron = None
+
     def _add_route(self, *args, **kwargs):
         self.__routes.append(args)
         self.clear_routes()

appier/legacy.py

@@ -30,6 +30,8 @@ __license__ = "Apache License, Version 2.0"
 
 import os
 import sys
+import calendar
+import datetime
 import inspect
 import functools
 import itertools
@@ -152,6 +154,10 @@ PYTHON_3 = sys.version_info[0] >= 3
 interpreter is at least Python 3 compliant, this is used
 to take some of the conversion decision for runtime """
 
+PYTHON_33 = sys.version_info[0] >= 3 and sys.version_info[1] >= 3
+""" Global variable that defines if the current Python
+interpreter is at least Python 3.3 compliant """
+
 PYTHON_35 = sys.version_info[0] >= 3 and sys.version_info[1] >= 5
 """ Global variable that defines if the current Python
 interpreter is at least Python 3.5 compliant """
@@ -538,6 +544,33 @@ def build_opener(*args, **kwargs):
         return urllib2.build_opener(*args, **kwargs)  # @UndefinedVariable
 
 
+def to_timestamp(date_time):
+    if PYTHON_33:
+        return date_time.replace(tzinfo=datetime.timezone.utc).timestamp()
+    else:
+        return calendar.timegm(date_time.utctimetuple())
+
+
+def to_datetime(timestamp):
+    if PYTHON_33:
+        return datetime.datetime.fromtimestamp(
+            timestamp, datetime.timezone.utc
+        ).replace(tzinfo=None)
+    else:
+        return datetime.datetime.utcfromtimestamp(timestamp)
+
+
+def utcfromtimestamp(timestamp):
+    return to_datetime(timestamp)
+
+
+def utc_now():
+    if PYTHON_33:
+        return datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
+    else:
+        return datetime.datetime.utcnow()
+
+
 def urlparse(*args, **kwargs):
     return _urlparse.urlparse(*args, **kwargs)
 

appier/model.py

@@ -56,12 +56,14 @@ RE = lambda v: [i for i in v if not i == ""]
 empty element from the provided list values """
 
 BUILDERS = {
-    legacy.UNICODE: lambda v: v.decode("utf-8")
-    if isinstance(v, legacy.BYTES)
-    else legacy.UNICODE(v),
-    list: lambda v: RE(v)
-    if isinstance(v, list)
-    else (json.loads(v) if isinstance(v, legacy.UNICODE) else RE([v])),
+    legacy.UNICODE: lambda v: (
+        v.decode("utf-8") if isinstance(v, legacy.BYTES) else legacy.UNICODE(v)
+    ),
+    list: lambda v: (
+        RE(v)
+        if isinstance(v, list)
+        else (json.loads(v) if isinstance(v, legacy.UNICODE) else RE([v]))
+    ),
     dict: lambda v: json.loads(v) if isinstance(v, legacy.UNICODE) else dict(v),
     bool: lambda v: v if isinstance(v, bool) else not v in ("", "0", "false", "False"),
 }

appier/scheduler.py

@@ -28,11 +28,16 @@ __copyright__ = "Copyright (c) 2008-2024 Hive Solutions Lda."
 __license__ = "Apache License, Version 2.0"
 """ The license for the module """
 
+import time
+import heapq
+import calendar
+import datetime
 import logging
 import threading
 import traceback
 
 from . import config
+from . import legacy
 
 LOOP_TIMEOUT = 60.0
 """ The time value to be used to sleep the main sequence
@@ -43,11 +48,14 @@ of time between external interactions """
 
 class Scheduler(threading.Thread):
     """
-    Scheduler class that handles all the async tasks
-    related with the house keeping of the appier
-    infra-structure. The architecture of the logic
-    for the class should be modular in the sense that
-    new task may be added to it through a queue system.
+    Scheduler class that handles timeout based async tasks
+    within the context of an Appier application.
+
+    The architecture of the logic for the class should be
+    modular in the sense that new task may be added to
+    it through a queue or other external system. For that
+    a proper preemption mechanism should exist allowing
+    the scheduler to be stopped and started again.
     """
 
     def __init__(self, owner, timeout=LOOP_TIMEOUT, daemon=True):
@@ -73,8 +81,10 @@ class Scheduler(threading.Thread):
             self._condition.wait(self.timeout)
             self._condition.release()
 
-    def stop(self):
+    def stop(self, awake=True):
         self.running = False
+        if awake:
+            self.awake()
 
     def tick(self):
         pass
@@ -93,3 +103,185 @@ class Scheduler(threading.Thread):
             return self.owner.logger
         else:
             return logging.getLogger()
+
+
+class CronScheduler(Scheduler):
+    """
+    Specialized version of the scheduler that runs tasks
+    based on a cron like configuration.
+
+    The tasks are defined in a cron like format and are
+    executed based on the current time.
+    """
+
+    def __init__(self, owner, timeout=LOOP_TIMEOUT, daemon=True):
+        Scheduler.__init__(self, owner, timeout=timeout, daemon=daemon)
+        self._tasks = []
+
+    def tick(self, now_ts=None):
+        current_ts = lambda: now_ts if now_ts else time.time()
+        current_dt = lambda: (
+            legacy.to_datetime(now_ts) if now_ts else legacy.utc_now()
+        )
+
+        timestamp = current_ts() + 5.0
+
+        while True:
+            if not self._tasks:
+                break
+
+            timestamp, task = self._tasks[0]
+            if timestamp > current_ts():
+                break
+
+            heapq.heappop(self._tasks)
+
+            if task.enabled:
+                task.job()
+                heapq.heappush(
+                    self._tasks, (task.next_timestamp(now=current_dt()), task)
+                )
+
+        self.timeout = max(0, timestamp - current_ts())
+
+    def schedule(self, job, cron, now=None):
+        """
+        Schedules the provided job function for execution according
+        to the provided cron string.
+
+        The optional now parameter may be used to provide the current
+        time reference for the scheduling operation, meaning that the next
+        timestamp will be calculated using this value as reference.
+
+        :type job: Function
+        :param job: The function to be executed as the job.
+        :type cron: String/SchedulerDate
+        :param cron: The cron like string defining the schedule.
+        :type now: datetime
+        :param now: Optional time reference for the job scheduling.
+        :rtype: SchedulerTask
+        :return: The task object that was created for the job.
+        """
+
+        task = SchedulerTask(job, cron)
+        heapq.heappush(self._tasks, (task.next_timestamp(now=now), task))
+        self.awake()
+        return task
+
+    def next_run(self):
+        timestamp = self.next_timestamp()
+        if not timestamp:
+            return None
+        return legacy.to_datetime(timestamp)
+
+    def next_timestamp(self):
+        if not self._tasks:
+            return None
+        return self._tasks[0][0]
+
+
+class SchedulerTask(object):
+
+    def __init__(self, job, cron):
+        self.job = job
+        self.date = SchedulerDate.from_cron(cron)
+        self._enabled = True
+
+    def enable(self):
+        self._enabled = True
+
+    def disable(self):
+        self._enabled = False
+
+    def next_run(self, now=None):
+        return self.date.next_run(now=now)
+
+    def next_timestamp(self, now=None):
+        return self.date.next_timestamp(now=now)
+
+    @property
+    def enabled(self):
+        return self._enabled
+
+
+class SchedulerDate(object):
+
+    def __init__(
+        self, minutes="*", hours="*", days_of_month="*", months="*", days_of_week="*"
+    ):
+        self.minutes = self._parse_field(minutes, 0, 59)
+        self.hours = self._parse_field(hours, 0, 23)
+        self.days_of_month = self._parse_field(days_of_month, 1, 31)
+        self.months = self._parse_field(months, 1, 12)
+        self.days_of_week = self._parse_field(days_of_week, 0, 6)
+
+    @classmethod
+    def from_cron(cls, cron):
+        if isinstance(cron, cls):
+            return cron
+        values = (value.strip().split(",") for value in cron.split(" "))
+        return cls(*values)
+
+    def next_timestamp(self, now=None):
+        date = self.next_run(now=now)
+        return legacy.to_timestamp(date)
+
+    def next_run(self, now=None):
+        """
+        Calculate the next run time starting from the current time.
+        This operation is done respecting Cron rules.
+
+        :type now: datetime
+        :param now: Optional date time to be used as the current time.
+        :rtype: datetime
+        :return: The next run time respecting Cron rules.
+        """
+
+        now = now or legacy.utc_now()
+        now_day = datetime.datetime(now.year, now.month, now.day)
+        now_hour = datetime.datetime(now.year, now.month, now.day, hour=now.hour)
+        now_minute = datetime.datetime(
+            now.year, now.month, now.day, hour=now.hour, minute=now.minute
+        )
+
+        year = now.year
+
+        while True:
+            for month in sorted(self.months):
+                if month < now.month and year < now.year:
+                    continue
+
+                for day in sorted(self.days_of_month):
+                    try:
+                        date = datetime.datetime(year, month, day)
+                    except ValueError:
+                        continue
+                    if self.days_of_week and not date.weekday() in self.days_of_week:
+                        continue
+                    if date < now_day:
+                        continue
+
+                    for hour in sorted(self.hours):
+                        if date.replace(hour=hour) < now_hour:
+                            continue
+
+                        for minute in sorted(self.minutes):
+                            _date = date.replace(
+                                hour=hour, minute=minute, second=0, microsecond=0
+                            )
+                            if _date > now_minute:
+                                return _date
+
+            year += 1
+
+    def _parse_field(self, field, min_value, max_value):
+        if field in ("*", ["*"], ("*",)):
+            return set(range(min_value, max_value + 1))
+        elif isinstance(field, (list, tuple)):
+            return set(int(v) for v in field)
+        else:
+            return set((int(field),))
+
+
+class Cron(object):
+    pass

appier/test/base.py

@@ -275,7 +275,9 @@ class BaseTest(unittest.TestCase):
         self.assertEqual(type(result), str)
         self.assertEqual(result, "%e4%bd%a0%e5%a5%bd%e4%b8%96%e7%95%8c")
 
-        result = self.app.slugify_slugier(appier.legacy.bytes("你好世界", encoding="utf-8"))
+        result = self.app.slugify_slugier(
+            appier.legacy.bytes("你好世界", encoding="utf-8")
+        )
         self.assertEqual(type(result), str)
         self.assertEqual(result, "%e4%bd%a0%e5%a5%bd%e4%b8%96%e7%95%8c")
 
@@ -385,3 +387,19 @@ class BaseTest(unittest.TestCase):
         self.assertEqual(result, appier.legacy.u("olá"))
         result = self.app.template(template, locale="en_us")
         self.assertEqual(result, appier.legacy.u("hello"))
+
+    def test_css_abs(self):
+        result = appier.base.CSS_ABS_REGEX.sub(
+            b"url(http://www.example/\\2)", b"url(image.jpg)"
+        )
+        self.assertEqual(result, b"url(http://www.example/image.jpg)")
+
+        result = appier.base.CSS_ABS_REGEX.sub(
+            b"url(https://www.example/\\2)", b"url(image.jpg)"
+        )
+        self.assertEqual(result, b"url(https://www.example/image.jpg)")
+
+        result = appier.base.CSS_ABS_REGEX.sub(
+            b"url(http://www.example/\\2)", b"url(https://example.com/image.jpg)"
+        )
+        self.assertEqual(result, b"url(https://example.com/image.jpg)")

appier/test/scheduler.py

@@ -0,0 +1,173 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Hive Appier Framework
+# Copyright (c) 2008-2024 Hive Solutions Lda.
+#
+# This file is part of Hive Appier Framework.
+#
+# Hive Appier Framework is free software: you can redistribute it and/or modify
+# it under the terms of the Apache License as published by the Apache
+# Foundation, either version 2.0 of the License, or (at your option) any
+# later version.
+#
+# Hive Appier Framework is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Apache License for more details.
+#
+# You should have received a copy of the Apache License along with
+# Hive Appier Framework. If not, see <http://www.apache.org/licenses/>.
+
+__author__ = "João Magalhães <joamag@hive.pt>"
+""" The author(s) of the module """
+
+__copyright__ = "Copyright (c) 2008-2024 Hive Solutions Lda."
+""" The copyright for the module """
+
+__license__ = "Apache License, Version 2.0"
+""" The license for the module """
+
+import calendar
+import datetime
+import unittest
+
+import appier
+
+
+class CronSchedulerTest(unittest.TestCase):
+
+    def test_basic(self):
+        state = dict(value=0)
+
+        def increment():
+            state["value"] += 1
+
+        scheduler = appier.CronScheduler(None)
+        task = scheduler.schedule(
+            lambda: increment(),
+            "11",
+            now=datetime.datetime(2013, 1, 1, hour=1, minute=1),
+        )
+        self.assertNotEqual(task, None)
+        self.assertEqual(isinstance(task, appier.SchedulerTask), True)
+        self.assertEqual(task.enabled, True)
+        self.assertEqual(
+            scheduler.next_run(), datetime.datetime(2013, 1, 1, hour=1, minute=11)
+        )
+
+        scheduler.tick(
+            now_ts=calendar.timegm(
+                datetime.datetime(2013, 1, 1, hour=1, minute=1).utctimetuple()
+            )
+        )
+        self.assertEqual(state["value"], 0)
+        self.assertEqual(scheduler.timeout, 600)
+
+        scheduler.tick(
+            now_ts=calendar.timegm(
+                datetime.datetime(2013, 1, 1, hour=1, minute=11).utctimetuple()
+            )
+        )
+        self.assertEqual(state["value"], 1)
+        self.assertEqual(scheduler.timeout, 3600)
+
+        scheduler.tick(
+            now_ts=calendar.timegm(
+                datetime.datetime(2013, 1, 1, hour=2, minute=11).utctimetuple()
+            )
+        )
+        self.assertEqual(state["value"], 2)
+        self.assertEqual(scheduler.timeout, 3600)
+
+    def test_scheduler_date(self):
+        state = dict(value=0)
+
+        def increment():
+            state["value"] += 1
+
+        scheduler = appier.CronScheduler(None)
+        task = scheduler.schedule(
+            lambda: increment(),
+            appier.SchedulerDate(minutes=11),
+            now=datetime.datetime(2013, 1, 1, hour=1, minute=1),
+        )
+        self.assertNotEqual(task, None)
+        self.assertEqual(isinstance(task, appier.SchedulerTask), True)
+        self.assertEqual(task.enabled, True)
+        self.assertEqual(
+            scheduler.next_run(), datetime.datetime(2013, 1, 1, hour=1, minute=11)
+        )
+
+        scheduler.tick(
+            now_ts=calendar.timegm(
+                datetime.datetime(2013, 1, 1, hour=1, minute=1).utctimetuple()
+            )
+        )
+        self.assertEqual(state["value"], 0)
+        self.assertEqual(scheduler.timeout, 600)
+
+        scheduler.tick(
+            now_ts=calendar.timegm(
+                datetime.datetime(2013, 1, 1, hour=1, minute=11).utctimetuple()
+            )
+        )
+        self.assertEqual(state["value"], 1)
+        self.assertEqual(scheduler.timeout, 3600)
+
+    def test_week_days(self):
+        state = dict(value=0)
+
+        def increment():
+            state["value"] += 1
+
+        scheduler = appier.CronScheduler(None)
+        task = scheduler.schedule(
+            lambda: increment(),
+            appier.SchedulerDate(minutes=11, days_of_month=10, days_of_week=2),
+            now=datetime.datetime(2013, 1, 1, hour=1, minute=1),
+        )
+        self.assertNotEqual(task, None)
+        self.assertEqual(isinstance(task, appier.SchedulerTask), True)
+        self.assertEqual(task.enabled, True)
+        self.assertEqual(
+            scheduler.next_run(), datetime.datetime(2013, 4, 10, hour=0, minute=11)
+        )
+
+
+class SchedulerDateTest(unittest.TestCase):
+
+    def test_from_cron(self):
+        date = appier.SchedulerDate.from_cron("11")
+        self.assertEqual(date.minutes, set((11,)))
+        self.assertEqual(date.hours, set(range(0, 24)))
+        self.assertEqual(date.days_of_month, set(range(1, 32)))
+        self.assertEqual(date.months, set(range(1, 13)))
+        self.assertEqual(date.days_of_week, set(range(0, 7)))
+
+    def test_next_run(self):
+        date = appier.SchedulerDate.from_cron("11")
+
+        value = date.next_run(now=datetime.datetime(2013, 1, 1, hour=1, minute=1))
+        self.assertEqual(value, datetime.datetime(2013, 1, 1, hour=1, minute=11))
+
+        value = date.next_run(now=datetime.datetime(2013, 1, 1, hour=1, minute=12))
+        self.assertEqual(value, datetime.datetime(2013, 1, 1, hour=2, minute=11))
+
+        value = date.next_run(now=datetime.datetime(2013, 12, 31, hour=23, minute=12))
+        self.assertEqual(value, datetime.datetime(2014, 1, 1, hour=0, minute=11))
+
+    def test_next_run_complex(self):
+        date = appier.SchedulerDate.from_cron("11 3 10,16,20")
+        value = date.next_run(now=datetime.datetime(2013, 1, 1, hour=1, minute=1))
+        self.assertEqual(value, datetime.datetime(2013, 1, 10, hour=3, minute=11))
+
+        value = date.next_run(now=datetime.datetime(2013, 1, 10, hour=4, minute=1))
+        self.assertEqual(value, datetime.datetime(2013, 1, 16, hour=3, minute=11))
+
+        date = appier.SchedulerDate.from_cron("* 3 10,16,20")
+        value = date.next_run(now=datetime.datetime(2013, 1, 10, hour=3, minute=1))
+        self.assertEqual(value, datetime.datetime(2013, 1, 10, hour=3, minute=2))
+
+        value = date.next_run(now=datetime.datetime(2013, 1, 10, hour=3, minute=2))
+        self.assertEqual(value, datetime.datetime(2013, 1, 10, hour=3, minute=3))

appier/test/typesf.py

@@ -219,7 +219,7 @@ class TypesfTest(unittest.TestCase):
                 elif isinstance(value, datetime.datetime):
                     self._datetime = value
                 elif isinstance(value, (int, float)):
-                    self._datetime = datetime.datetime.utcfromtimestamp(value)
+                    self._datetime = appier.legacy.utcfromtimestamp(value)
                 else:
                     raise appier.OperationalError()
 

appier/test/validation.py

@@ -0,0 +1,119 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Hive Appier Framework
+# Copyright (c) 2008-2024 Hive Solutions Lda.
+#
+# This file is part of Hive Appier Framework.
+#
+# Hive Appier Framework is free software: you can redistribute it and/or modify
+# it under the terms of the Apache License as published by the Apache
+# Foundation, either version 2.0 of the License, or (at your option) any
+# later version.
+#
+# Hive Appier Framework is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# Apache License for more details.
+#
+# You should have received a copy of the Apache License along with
+# Hive Appier Framework. If not, see <http://www.apache.org/licenses/>.
+
+__author__ = "João Magalhães <joamag@hive.pt>"
+""" The author(s) of the module """
+
+__copyright__ = "Copyright (c) 2008-2024 Hive Solutions Lda."
+""" The copyright for the module """
+
+__license__ = "Apache License, Version 2.0"
+""" The license for the module """
+
+import unittest
+
+import appier
+
+
+class ValidationTest(unittest.TestCase):
+
+    def test_is_simple(self):
+        self.assertEqual(appier.is_simple("value")(dict(value=""), None), True)
+        self.assertEqual(appier.is_simple("value")(dict(value="hello"), None), True)
+        self.assertEqual(
+            appier.is_simple("value")(dict(value="hello world"), None), True
+        )
+
+        with self.assertRaises(appier.ValidationInternalError):
+            self.assertEqual(
+                appier.is_simple("value")(dict(value="hello?world"), None), True
+            )
+        with self.assertRaises(appier.ValidationInternalError):
+            self.assertEqual(
+                appier.is_simple("value")(dict(value="hello=world"), None), True
+            )
+        with self.assertRaises(appier.ValidationInternalError):
+            self.assertEqual(
+                appier.is_simple("value")(
+                    dict(value=appier.legacy.u("你好世界")), None
+                ),
+                True,
+            )
+
+    def test_is_email(self):
+        self.assertEqual(appier.is_email("value")(dict(value=""), None), True)
+        self.assertEqual(
+            appier.is_email("value")(dict(value="user@domain.com"), None), True
+        )
+        self.assertEqual(
+            appier.is_email("value")(dict(value="first.second@domain.com"), None), True
+        )
+        self.assertEqual(
+            appier.is_email("value")(dict(value="first+second@domain.com"), None), True
+        )
+        self.assertEqual(
+            appier.is_email("value")(
+                dict(value=appier.legacy.u("你好世界@domain.com")), None
+            ),
+            True,
+        )
+
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value="user"), None)
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value="domain"), None)
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value="domain.com"), None)
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value="user@"), None)
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value=appier.legacy.u("你好世界")), None)
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value=appier.legacy.u("你好世界@")), None)
+
+    def test_is_url(self):
+        self.assertEqual(appier.is_url("value")(dict(value=""), None), True)
+        self.assertEqual(
+            appier.is_url("value")(dict(value="http://hello.com"), None), True
+        )
+        self.assertEqual(
+            appier.is_url("value")(dict(value="http://hello.world"), None), True
+        )
+        self.assertEqual(
+            appier.is_url("value")(dict(value="https://hello.world"), None), True
+        )
+        self.assertEqual(
+            appier.is_url("value")(
+                dict(value=appier.legacy.u("https://你好世界")), None
+            ),
+            True,
+        )
+        self.assertEqual(appier.is_url("value")(dict(value="http://hello"), None), True)
+        self.assertEqual(
+            appier.is_url("value")(dict(value="mailto://hello"), None), True
+        )
+
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value=appier.legacy.u("http:")), None)
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value=appier.legacy.u("http://")), None)
+        with self.assertRaises(appier.ValidationInternalError):
+            appier.is_email("value")(dict(value=appier.legacy.u("mailto://")), None)

appier/typesf.py

@@ -615,13 +615,12 @@ def image(width=None, height=None, format="png", **kwargs):
 
             # resizes the already cropped image into the target size using an
             # anti alias based algorithm (default expectations)
-            default_resample = (
-                PIL.Image.ANTIALIAS  # type: ignore
-                if hasattr(PIL.Image, "ANTIALIAS")
-                else (PIL.Image.LANCZOS if hasattr(PIL.Image, "LANCZOS") else None)  # type: ignore
-            )
             if resample == None:
-                resample = default_resample
+                resample = (
+                    PIL.Image.ANTIALIAS  # type: ignore
+                    if hasattr(PIL.Image, "ANTIALIAS")
+                    else (PIL.Image.LANCZOS if hasattr(PIL.Image, "LANCZOS") else None)  # type: ignore
+                )
             image = image.resize(size, resample)
             return image
 

appier/util.py

@@ -59,11 +59,11 @@ CREATION_COUNTER = 0
 will be used to create an order in the declaration
 of attributes for a set of classes """
 
-FIRST_CAP_REGEX = re.compile("(.)([A-Z][a-z]+)")
+FIRST_CAP_REGEX = re.compile(r"(.)([A-Z][a-z]+)")
 """ Regular expression that ensures that the first
 token of each camel string is properly capitalized """
 
-ALL_CAP_REGEX = re.compile("([a-z0-9])([A-Z])")
+ALL_CAP_REGEX = re.compile(r"([a-z0-9])([A-Z])")
 """ The generalized transition from lower case to
 upper case letter regex that will provide a way of
 putting the underscore in the middle of the transition """
@@ -1110,7 +1110,7 @@ def escape(value, char, escape="\\"):
     :param char: The character(s) that is going to be "target" of escaping
     or a list of characters for escaping.
     :type escape: String
-    :param escape: The character to be used for escaping (typically `\`).
+    :param escape: The character to be used for escaping (typically '\').
     :rtype: String
     :return: The final string with the target character properly escaped.
     """

appier/validation.py

@@ -37,31 +37,31 @@ from . import common
 from . import legacy
 from . import exceptions
 
-SIMPLE_REGEX_VALUE = "^[\:\.\s\w-]+$"
+SIMPLE_REGEX_VALUE = r"^[\:\.\s\w-]+$"
 """ The simple regex value used to validate
 if the provided value is a "simple" one meaning
 that it may be used safely for URL parts """
 
-EMAIL_REGEX_VALUE = "^[\w\d\._%+-]+@[\w\d\.\-]+$"
+EMAIL_REGEX_VALUE = r"^[\w\d\._%+-]+@[\w\d\.\-]+$"
 """ The email regex value used to validate
 if the provided value is in fact an email """
 
 URL_REGEX_VALUE = (
-    "^\w+\:\/\/([^@]+\:[^@]+@)?[^\:\/\?#]+(\:\d+)?(\/[^\?#]+)*\/?(\?[^#]*)?(#.*)?$"
+    r"^\w+\:\/\/([^@]+\:[^@]+@)?[^\:\/\?#]+(\:\d+)?(\/[^\?#]+)*\/?(\?[^#]*)?(#.*)?$"
 )
 """ The URL regex value used to validate
 if the provided value is in fact an URL/URI """
 
-SIMPLE_REGEX = re.compile(SIMPLE_REGEX_VALUE)
+SIMPLE_REGEX = re.compile(SIMPLE_REGEX_VALUE, re.ASCII if hasattr(re, "ASCII") else 0)
 """ The simple regex used to validate
 if the provided value is a "simple" one meaning
 that it may be used safely for URL parts """
 
-EMAIL_REGEX = re.compile(EMAIL_REGEX_VALUE)
+EMAIL_REGEX = re.compile(EMAIL_REGEX_VALUE, re.UNICODE)
 """ The email regex used to validate
 if the provided value is in fact an email """
 
-URL_REGEX = re.compile(URL_REGEX_VALUE)
+URL_REGEX = re.compile(URL_REGEX_VALUE, re.UNICODE)
 """ The URL regex used to validate
 if the provided value is in fact an URL/URI """
 
@@ -144,9 +144,9 @@ def validate_e(method=None, methods=[], object=None, ctx=None, build=True):
     raise exceptions.ValidationError(errors_map, object)
 
 
-def safe(comparision):
+def safe(comparison):
     try:
-        return comparision()
+        return comparison()
     except TypeError:
         return False
 

{appier-1.31.5.dist-info → appier-1.33.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appier
-Version: 1.31.5
+Version: 1.33.0
 Summary: Appier Framework
 Home-page: http://appier.hive.pt
 Author: Hive Solutions Lda.

{appier-1.31.5.dist-info → appier-1.33.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-appier/__init__.py,sha256=guj5XljPfdUVWWwLu_MUGyEWydsPqFVOcBex95oh5UM,9304
+appier/__init__.py,sha256=2UqTnGyy5JGVUsLXxRzfr7br1oKmY6wpwgf0bH89dgM,9355
 appier/amqp.py,sha256=etYxUlfaK27Og_9FJ6qCgNLSYhnz9XgVhIhSmD2ITW4,3852
 appier/api.py,sha256=s5ZJs0tgR3wktAhLZ7Vuhbd_4lWPsGJSEx0ptkqLxvM,14369
 appier/asgi.py,sha256=sKQH9K_QEDPbBSk3AWcvHo7Lfl5yawIo6NcM0z1qQCw,12100
 appier/async_neo.py,sha256=gQpyT1-nZE6Uynh5FEmFl5kfXkxChdUsgiKgwlaNw5E,5446
 appier/async_old.py,sha256=m3BFqHVPCRuIZ9L2sGYhCQPEwuCNKBO2y7SKM0dbtj8,9194
 appier/asynchronous.py,sha256=a1LQa3wbGMaXELhF7W71dRr1klPOj6x-ST9EInvPhtU,1757
-appier/base.py,sha256=QwZSi5dqt1SKBCNnA1sq7YvmluBbXerjtNBM0a7wMWo,267288
+appier/base.py,sha256=CSPjeAmoawPDoKCPWv8z5UiyCbskHa7sg7jU7FwvWHU,268944
 appier/bus.py,sha256=AMC2UXlaf6rzhzlIyTHkzbfb6tdfPBiOii4lpl9AAwg,7670
 appier/cache.py,sha256=V1nhf4aHJpUlcFtxVsd-2tGCt1BarkxvHWwVwuhc4Ao,10689
 appier/common.py,sha256=fcECBvu-KcB9DImZzkpM_FA_PUqgCx0FKP4KHuOikYc,1313
@@ -26,11 +26,11 @@ appier/geo.py,sha256=EEPh8oX7Uk7iert-XKt7HCw0swicc8lFAv7XFeQSbZ8,4877
 appier/git.py,sha256=-neM2mxqlyiCNu17CpLyiz3RN7Ti6LtAx5L1tipxAGA,9785
 appier/graph.py,sha256=jSgu-ookILujLm4ivW14SymVmuI1nbjbVZMgRS2ehOg,4054
 appier/http.py,sha256=Xk871N8yCN39OGkm5WqQ5M9lnI9teG9t9_-A5zdVwy4,38635
-appier/legacy.py,sha256=ErZDOOOdakTyKylqdfhoqKp0JOtXp5lXdOpP7HGZxZE,14974
+appier/legacy.py,sha256=2ldRfzwQg6SQXp9dC8q7pl6-aNBAQ0AdeF_2rllcYeE,15881
 appier/log.py,sha256=QJR4lLkVe6olbsY9lrVB78-1WGMxATzLA-Y9slE_XIk,12772
 appier/meta.py,sha256=rgBLOjD6QU9CGYsbCQS3Fy4iY14uk1-Kd8ljkfmxxzc,7168
 appier/mock.py,sha256=WoWa67rb8qV_ogToQJCdT0R-rCw9RUY24EkA4bYR1G4,5800
-appier/model.py,sha256=gibqIPOBAYfW-A0OQgir1OSU8OLIgS6ozhZyElGvh6s,121756
+appier/model.py,sha256=S3Qn5R36EKZFomf52A49Qmf3oEVwA0ciP_BSqSrOGSc,121790
 appier/model_a.py,sha256=c6XpG4oIelXNDK0uicsZ69-f6isUgmh5-29F61PZt9c,16176
 appier/mongo.py,sha256=t-257ReqFWnEw0bQkDvS4McsPsc6AuKoQXIFHxlrOMw,10891
 appier/observer.py,sha256=T0QpkxdkcNuEOZJdmJT5nFSJ2e-0VPbGveX5YKtt7mA,4519
@@ -39,16 +39,16 @@ appier/preferences.py,sha256=3JrH2f8Drzw0zNTDA4MtOYMzhUaBm3Rr4d6E95mL49o,8287
 appier/queuing.py,sha256=6AJlRVdd5JunzChu8Q1U-9Biq4vQUHTuJFC8qs2wzCs,8097
 appier/redisdb.py,sha256=5inJMQqHVkfsGoqoRGYzewlgooDZD2uwOtlPXHX17V0,3504
 appier/request.py,sha256=vNiRdBZXgboMx_d3xkGHlJf3f7ifejgKyhYZ4Pr9GlE,31450
-appier/scheduler.py,sha256=pKAU_Lsn5n3GCWWXwABg1wFWFA1C7LfjmeK4D0lC35k,3075
+appier/scheduler.py,sha256=5BRlH5jjs594wRqpZcwlNOFSbl9cML2YdY7OKAWCtzQ,9228
 appier/serialize.py,sha256=LiR1ZbAiC_I3lhlQToPK_u2DC2r04Gl9OEQTayW4Rlg,6669
 appier/session.py,sha256=6rcwFdsu--7gFLr6mJJh3EFSZ_A3Oe8u7olAvTw2sUk,20380
 appier/settings.py,sha256=28tTRJIZ47iwXqUs6YtUoW7ntEVsp_0-QfONVDGA1sg,1136
 appier/smtp.py,sha256=5tW0dOEm03kejLoQyhRQFjgjYRd-jhb-VlhEKDb4Zn0,3434
 appier/storage.py,sha256=Qp_CMCDg85q35n9lggNVBZRWwlGrQ-nLYNj0W7Mnbec,7470
 appier/structures.py,sha256=YSv0YwZk8tRjPn9N6YEtYoPQ72PZQkfLEtTI_H6jXV8,8076
-appier/typesf.py,sha256=nNhMblrZDnaM1A9Lk4wGYsMq0r55dJCCh96MJR_tQSI,36915
-appier/util.py,sha256=9ojlLWylDB22YfDMNmmzrykdfqR2HPpA2vGIQBzR4Wo,86774
-appier/validation.py,sha256=vipgF1oFmFhbSfZXC2lhHpox_nburIa6VIFs2Du2mhc,22322
+appier/typesf.py,sha256=iby3f-3XayIOu9FgjHS6I9L3UoaJntHtG73eKXgIgFE,36882
+appier/util.py,sha256=L9ea0WTmvcelkgKSztHXgQNRhlireKcrOlXpkgrrkRo,86776
+appier/validation.py,sha256=vxb289skd7RfGEQVmpkQxYb71JdAfLu17QaKOuAAEEQ,22388
 appier/res/static/css/base.css,sha256=J9zLozd57KoslAsrsj2a42glGTObxbkrrckR-W-_f2A,6127
 appier/res/static/images/favicon.ico,sha256=fAL8DLx_0Yl6jwpRG_K6S7g3yXxr9Hyjn3JmqyU8t7U,1150
 appier/res/static/js/base.js,sha256=8o0rvcqF3O2gfPTQgna2ni56IBbr50xCYU8Eq-LSRQI,4953
@@ -56,7 +56,7 @@ appier/res/templates/error.html.tpl,sha256=CiKD-gCC1Zed0zfPFEo6a8qqrEz8Ye9LT-L45
 appier/res/templates/holder.html.tpl,sha256=lV-z0796VhGcowE9rG9MziHbu2S4H1uxfPmqsbx3ddA,1076
 appier/res/templates/layout.html.tpl,sha256=e6CVkHTtF8zlFClKFBVWJgMZQ1paHi_240pXahH73BY,2183
 appier/test/__init__.py,sha256=zMHH-X-dnws-iNXL4JudfPNz1h5oeRSXeS5O5TjoyZk,990
-appier/test/base.py,sha256=X4PXSmZddrHP2UODIPkKSnhjwFu2jORbHgfC43Ftd0k,14190
+appier/test/base.py,sha256=dJyWcr8egJkrjw4_p9LkUTi9GsFpL82i3lu0nJGrzcc,14857
 appier/test/cache.py,sha256=WpbfgdsXfAN9Zwo0MZvATygdl-03yqsDYAWKfn4gQf0,6922
 appier/test/config.py,sha256=ured3diixEYrfGEbwNP89MkCkBbYepWEmxB4Nkuraeo,2358
 appier/test/crypt.py,sha256=wXIHJjKZJe9qhKfIeGMz5PvQWYRIQVnwbKW-dwUukAo,2457
@@ -73,14 +73,16 @@ appier/test/part.py,sha256=yHQxg2hdfojJMO2Fs0NLvYTX3uCJ6xwgsD4VaKV04ak,3352
 appier/test/preferences.py,sha256=QyqoBddOCAmhkcgUYAJ5RgypqrkGL6x6s6a0jsIwE9w,2890
 appier/test/queuing.py,sha256=Lq7gI5QkZfXPf_MUzmRd6LHHknf9EryF-MauWjDLJn0,5710
 appier/test/request.py,sha256=h3DdvhEMARpYTp7eRcJ3-qLQyG-a8PHqSnWY52BiOeU,8176
+appier/test/scheduler.py,sha256=Y2r91OQ-bt5bzkT1x5otdK2k4RO77c9oLgA5oZ-8Hbg,6360
 appier/test/serialize.py,sha256=roX01n86AQfnPxzPVdIjdIUQWC_x0C_HE3hNgF37ci8,2120
 appier/test/session.py,sha256=KdiYLLB5autIEu1sHwOuYJXVd0y6RMPgg0ITBuRTMfA,4419
 appier/test/smtp.py,sha256=XJNa0ZTmabdrX8MfVMgcqBxabvBfHgIimvozdziP4_E,1826
 appier/test/structures.py,sha256=Uylzx5vLNORXKG5wsPMdIreW1SlHWGnmSQouqQNG6E8,6745
-appier/test/typesf.py,sha256=td-e4mqTO_SYH7txzF5au_ZMNQ6kQsFymSjGCiVc1bU,9684
+appier/test/typesf.py,sha256=KHumQFzx7wPZSCb8_mpIwobhIy2Fh_0XYviwPjXMbKI,9680
 appier/test/util.py,sha256=SSHuBAZQ0TcXLDYI0xUvmwId5nndDZb88s_5Y-Hqibw,46884
-appier-1.31.5.dist-info/LICENSE,sha256=Pd-b5cKP4n2tFDpdx27qJSIq0d1ok0oEcGTlbtL6QMU,11560
-appier-1.31.5.dist-info/METADATA,sha256=Z7rcsfIDdDWY4IarL4eX653g0tsdxpvkcCROUaK4XGU,1920
-appier-1.31.5.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-appier-1.31.5.dist-info/top_level.txt,sha256=Z2e_Y1ya06a554WwQZkfNRiaaQxqsdaPtBzrck384Lo,7
-appier-1.31.5.dist-info/RECORD,,
+appier/test/validation.py,sha256=riOCsGKob1P5jnbcB5qGZ45ApimNAVS0byg9v_uUdrk,4952
+appier-1.33.0.dist-info/LICENSE,sha256=Pd-b5cKP4n2tFDpdx27qJSIq0d1ok0oEcGTlbtL6QMU,11560
+appier-1.33.0.dist-info/METADATA,sha256=15fdtmGnRjQCiRtcnImCg5krRWYsZ_2bCGr5PGxyhvI,1920
+appier-1.33.0.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
+appier-1.33.0.dist-info/top_level.txt,sha256=Z2e_Y1ya06a554WwQZkfNRiaaQxqsdaPtBzrck384Lo,7
+appier-1.33.0.dist-info/RECORD,,