appier 1.34.6__tar.gz → 1.34.7__tar.gz

{appier-1.34.6/src/appier.egg-info → appier-1.34.7}/PKG-INFO

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

{appier-1.34.6 → appier-1.34.7}/setup.py

@@ -44,7 +44,7 @@ def read_file(path):
 
 setuptools.setup(
     name="appier",
-    version="1.34.6",
+    version="1.34.7",
     author="Hive Solutions Lda.",
     author_email="development@hive.pt",
     description="Appier Framework",

{appier-1.34.6 → appier-1.34.7}/src/appier/__init__.py

@@ -78,7 +78,7 @@ from .asynchronous import (
     QueueManager,
     AwaitWrapper,
     CoroutineWrapper,
-    AyncgenWrapper,
+    AsyncgenWrapper,
     await_wrap,
     await_yield,
     ensure_generator,

{appier-1.34.6 → appier-1.34.7}/src/appier/async_neo.py

@@ -92,7 +92,7 @@ class CoroutineWrapper(object):
         self._buffer.append(value)
 
 
-class AyncgenWrapper(object):
+class AsyncgenWrapper(object):
     def __init__(self, async_iter):
         self.async_iter = async_iter
         self.current = None
@@ -149,7 +149,7 @@ def ensure_generator(value):
     if hasattr(inspect, "isasyncgen") and inspect.isasyncgen(
         value
     ):  # @UndefinedVariable
-        return True, AyncgenWrapper(value)
+        return True, AsyncgenWrapper(value)
 
     return False, value
 

{appier-1.34.6 → appier-1.34.7}/src/appier/async_old.py

@@ -179,7 +179,7 @@ class CoroutineWrapper(object):
     pass
 
 
-class AyncgenWrapper(object):
+class AsyncgenWrapper(object):
     pass
 
 

{appier-1.34.6 → appier-1.34.7}/src/appier/base.py

@@ -94,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.34.6"
+VERSION = "1.34.7"
 """ The version of the framework that is currently installed
 this value may be used for debugging/diagnostic purposes """
 
@@ -6138,7 +6138,10 @@ class App(
                 continue
             if _handler[1] and not scope == _handler[1]:
                 continue
-            if not json == _handler[2]:
+            # if the handler has explicitly defined to handle JSON
+            # contexts then it should only be used if the JSON flag
+            # is also set to the same value as in the handler
+            if not _handler[2] == None and not json == _handler[2]:
                 continue
             handler = _handler
             break

{appier-1.34.6 → appier-1.34.7}/src/appier/data.py

@@ -204,6 +204,8 @@ class TinyAdapter(DataAdapter):
         return tinydb.TinyDB(storage=tinydb.storages.MemoryStorage)
 
     def _drop_db_json(self):
+        if not os.path.exists(self.file_path):
+            return
         os.remove(self.file_path)
 
     def _drop_db_memory(self):

{appier-1.34.6 → appier-1.34.7}/src/appier/model.py

@@ -354,6 +354,7 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
         safe=True,
         build=False,
         fill=True,
+        fill_safe=False,
         new=True,
         **kwargs
     ):
@@ -395,7 +396,11 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
         injected into the resulting instance.
         :type fill: bool
         :param fill: If the various attributes of the model should be "filled"
-        with default values (avoiding empty values).
+        with default values (avoiding empty values), not going to be applied to
+        safe attributes.
+        :type fill_safe: bool
+        :param fill_safe: If the safe values should also be "filled" meaning that
+        they are initialized in a forced "way".
         :type new: bool
         :param new: In case this value is valid the resulting instance is expected
         to be considered as new meaning that no identifier attributes are set.
@@ -408,7 +413,7 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
             model = util.get_object() if form else dict(kwargs)
         if fill:
             model = cls.fill(model, safe=not new)
-        instance = cls(fill=False)
+        instance = cls(fill=fill_safe)
         instance.apply(model, form=form, safe_a=safe)
         if build:
             cls.build(instance.model, map=False)

{appier-1.34.6 → appier-1.34.7}/src/appier/test/data.py

@@ -28,6 +28,8 @@ __copyright__ = "Copyright (c) 2008-2024 Hive Solutions Lda."
 __license__ = "Apache License, Version 2.0"
 """ The license for the module """
 
+import os
+import tempfile
 import unittest
 
 import appier
@@ -40,3 +42,11 @@ class DataTest(unittest.TestCase):
 
         self.assertEqual(type(identifier), str)
         self.assertEqual(len(identifier), 24)
+
+    def test_drop_db_missing(self):
+        fd, file_path = tempfile.mkstemp()
+        os.close(fd)
+        adapter = appier.TinyAdapter(file_path=file_path)
+        adapter.get_db()
+        os.remove(file_path)
+        adapter.drop_db()

appier-1.34.7/src/appier/test/error_handler.py

@@ -0,0 +1,136 @@
+#!/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 ErrorHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self._original_handlers = appier.common.base().App._ERROR_HANDLERS
+        appier.common.base().App._ERROR_HANDLERS = {}
+        self.app = appier.App()
+
+    def tearDown(self):
+        self.app.unload()
+        appier.common.base().App._ERROR_HANDLERS = self._original_handlers
+
+    def test_basic_registration_and_call(self):
+        """
+        Decorator should register the handler and it must be invoked by
+        :pyfunc:`appier.App.call_error` when an exception matching the provided
+        error code is raised.
+
+        The error handler is a JSON handler by default, to be able to properly
+        handle errors in an App.
+        """
+
+        expected_message = "resource not found"
+
+        @appier.error_handler(404, json=True)
+        def not_found(_):
+            return expected_message
+
+        exc = appier.exceptions.NotFoundError("dummy")
+        result = self.app.call_error(exc, code=exc.code, scope=None, json=True)
+
+        self.assertEqual(result, expected_message)
+
+        handlers = appier.common.base().App._ERROR_HANDLERS.get(404)
+        self.assertNotEqual(handlers, None)
+        self.assertEqual(len(handlers), 1)
+
+        method, scope, json, opts, ctx, priority = handlers[0]
+        self.assertEqual(method, not_found)
+        self.assertEqual(scope, None)
+        self.assertEqual(json, True)
+        self.assertEqual(opts, None)
+        self.assertEqual(ctx, None)
+        self.assertEqual(priority, 1)
+
+    def test_web_handler(self):
+        """
+        Test that in which the error handler is a web handler by default, to be
+        able to properly handle errors in an WebApp, because this is a App no
+        handler is called.
+        """
+
+        expected_message = "resource not found"
+
+        @appier.error_handler(404, json=False)
+        def not_found(_):
+            return expected_message
+
+        exc = appier.exceptions.NotFoundError("dummy")
+        result = self.app.call_error(exc, code=exc.code, scope=None, json=True)
+
+        self.assertEqual(result, None)
+
+        handlers = appier.common.base().App._ERROR_HANDLERS.get(404)
+        self.assertNotEqual(handlers, None)
+        self.assertEqual(len(handlers), 1)
+
+        method, scope, json, opts, ctx, priority = handlers[0]
+        self.assertEqual(method, not_found)
+        self.assertEqual(scope, None)
+        self.assertEqual(json, False)
+        self.assertEqual(opts, None)
+        self.assertEqual(ctx, None)
+        self.assertEqual(priority, 1)
+
+    def test_scope_registration(self):
+        """
+        When a *scope* argument is provided, it should be stored in the handler
+        metadata so that the framework can later match it appropriately.
+
+        The error handler is a JSON handler by default, to be able to properly
+        handle errors in an App.
+        """
+
+        class DummyScope:
+            pass
+
+        @appier.error_handler(400, scope=DummyScope, json=True)
+        def bad_request(_):
+            return "bad request"
+
+        handlers = appier.common.base().App._ERROR_HANDLERS.get(400)
+        self.assertNotEqual(handlers, None)
+        self.assertEqual(len(handlers), 1)
+
+        method, scope, json, opts, ctx, priority = handlers[0]
+
+        self.assertEqual(method, bad_request)
+        self.assertEqual(scope, DummyScope)
+        self.assertEqual(json, True)
+        self.assertEqual(opts, None)
+        self.assertEqual(ctx, None)
+        self.assertEqual(priority, 1)

appier-1.34.7/src/appier/test/exception_handler.py

@@ -0,0 +1,143 @@
+#!/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 ExceptionHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self._original_handlers = appier.common.base().App._ERROR_HANDLERS
+        appier.common.base().App._ERROR_HANDLERS = {}
+        self.app = appier.App()
+
+    def tearDown(self):
+        self.app.unload()
+        appier.common.base().App._ERROR_HANDLERS = self._original_handlers
+
+    def test_basic_registration_and_call(self):
+        """
+        Decorator should register the handler and it must be invoked by
+        :pyfunc:`appier.App.call_error` when an exception matching the provided
+        type is raised.
+
+        The exception handler is a JSON handler by default, to be able to properly
+        handle errors in an App.
+        """
+
+        expected_message = "resource not found"
+
+        @appier.exception_handler(appier.exceptions.NotFoundError, json=True)
+        def not_found(_):
+            return expected_message
+
+        exc = appier.exceptions.NotFoundError("dummy")
+        result = self.app.call_error(exc, code=exc.code, scope=None, json=True)
+
+        self.assertEqual(result, expected_message)
+
+        handlers = appier.common.base().App._ERROR_HANDLERS.get(
+            appier.exceptions.NotFoundError
+        )
+        self.assertNotEqual(handlers, None)
+        self.assertEqual(len(handlers), 1)
+
+        method, scope, json, opts, ctx, priority = handlers[0]
+        self.assertEqual(method, not_found)
+        self.assertEqual(scope, None)
+        self.assertEqual(json, True)
+        self.assertEqual(opts, None)
+        self.assertEqual(ctx, None)
+        self.assertEqual(priority, 1)
+
+    def test_scope_registration(self):
+        """
+        When a *scope* argument is provided, it should be stored in the handler
+        metadata so that the framework can later match it appropriately.
+
+        The exception handler is a JSON handler by default, to be able to properly
+        handle errors in an App.
+        """
+
+        class DummyScope:
+            pass
+
+        class DummyException(Exception):
+            code = 400
+
+        @appier.exception_handler(DummyException, scope=DummyScope, json=True)
+        def dummy_handler(_):
+            return "dummy"
+
+        handlers = appier.common.base().App._ERROR_HANDLERS.get(DummyException)
+        self.assertNotEqual(handlers, None)
+        self.assertEqual(len(handlers), 1)
+
+        method, scope, json, opts, ctx, priority = handlers[0]
+
+        self.assertEqual(method, dummy_handler)
+        self.assertEqual(scope, DummyScope)
+        self.assertEqual(json, True)
+        self.assertEqual(opts, None)
+        self.assertEqual(ctx, None)
+        self.assertEqual(priority, 1)
+
+    def test_web_handler(self):
+        """
+        Test that in which the exception handler is a web handler by default, to be
+        able to properly handle errors in an WebApp, because this is an App no
+        handler is called.
+        """
+
+        expected_message = "resource not found"
+
+        @appier.exception_handler(appier.exceptions.NotFoundError, json=False)
+        def not_found(_):
+            return expected_message
+
+        exc = appier.exceptions.NotFoundError("dummy")
+        result = self.app.call_error(exc, code=exc.code, scope=None, json=True)
+
+        self.assertEqual(result, None)
+
+        handlers = appier.common.base().App._ERROR_HANDLERS.get(
+            appier.exceptions.NotFoundError
+        )
+        self.assertNotEqual(handlers, None)
+        self.assertEqual(len(handlers), 1)
+
+        method, scope, json, opts, ctx, priority = handlers[0]
+        self.assertEqual(method, not_found)
+        self.assertEqual(scope, None)
+        self.assertEqual(json, False)
+        self.assertEqual(opts, None)
+        self.assertEqual(ctx, None)
+        self.assertEqual(priority, 1)

{appier-1.34.6 → appier-1.34.7}/src/appier/test/http.py

@@ -104,6 +104,9 @@ class HTTPTest(unittest.TestCase):
         self.assertEqual(params, dict(hello=["world"]))
 
     def test_redirect(self):
+        if appier.conf("NO_NETWORK", False, cast=bool):
+            self.skipTest("Network access is disabled")
+
         _data, response = appier.get(
             "https://%s/redirect-to" % self.httpbin,
             params=dict(url="https://%s/" % self.httpbin),
@@ -135,6 +138,9 @@ class HTTPTest(unittest.TestCase):
         self.assertEqual(code, 200)
 
     def test_timeout(self):
+        if appier.conf("NO_NETWORK", False, cast=bool):
+            self.skipTest("Network access is disabled")
+
         self.assertRaises(
             BaseException,
             lambda: appier.get(
@@ -155,6 +161,9 @@ class HTTPTest(unittest.TestCase):
         self.assertNotEqual(data, None)
 
     def test_get_f(self):
+        if appier.conf("NO_NETWORK", False, cast=bool):
+            self.skipTest("Network access is disabled")
+
         file = appier.get_f("https://%s/image/png" % self.httpbin)
 
         self.assertEqual(file.file_name, "default")
@@ -170,6 +179,9 @@ class HTTPTest(unittest.TestCase):
         self.assertEqual(len(file.data_b64) > 100, True)
 
     def test_generator(self):
+        if appier.conf("NO_NETWORK", False, cast=bool):
+            self.skipTest("Network access is disabled")
+
         def text_g(message=[b"hello", b" ", b"world"]):
             yield sum(len(value) for value in message)
             for value in message:
@@ -185,6 +197,9 @@ class HTTPTest(unittest.TestCase):
         self.assertEqual(data["data"], "hello world")
 
     def test_file(self):
+        if appier.conf("NO_NETWORK", False, cast=bool):
+            self.skipTest("Network access is disabled")
+
         data, response = appier.post(
             "https://%s/post" % self.httpbin,
             data=appier.legacy.BytesIO(b"hello world"),
@@ -198,6 +213,9 @@ class HTTPTest(unittest.TestCase):
         self.assertEqual(data["data"], "hello world")
 
     def test_multithread(self):
+        if appier.conf("NO_NETWORK", False, cast=bool):
+            self.skipTest("Network access is disabled")
+
         threads = []
         results = []
 
@@ -230,11 +248,17 @@ class HTTPTest(unittest.TestCase):
             self.assertEqual(code, 200)
 
     def test_error(self):
+        if appier.conf("NO_NETWORK", False, cast=bool):
+            self.skipTest("Network access is disabled")
+
         self.assertRaises(
             appier.HTTPError, lambda: appier.get("https://%s/status/404" % self.httpbin)
         )
 
     def test_invalid(self):
+        if appier.conf("NO_NETWORK", False, cast=bool):
+            self.skipTest("Network access is disabled")
+
         self.assertRaises(
             BaseException, lambda: appier.get("https://invalidlargedomain.org/")
         )

{appier-1.34.6 → appier-1.34.7}/src/appier/util.py

@@ -2145,13 +2145,13 @@ def route(url, method="GET", asynchronous=False, json=False, opts=None, priority
     return decorator
 
 
-def error_handler(code, scope=None, json=False, opts=None, priority=1):
+def error_handler(code, scope=None, json=None, opts=None, priority=1):
     def decorator(function, *args, **kwargs):
         if is_detached(function):
             delay(function, *args, **kwargs)
         else:
             common.base().App.add_error(
-                code, function, json=json, opts=opts, priority=priority
+                code, function, scope=scope, json=json, opts=opts, priority=priority
             )
         return function
 
@@ -2168,13 +2168,18 @@ def error_handler(code, scope=None, json=False, opts=None, priority=1):
     return decorator
 
 
-def exception_handler(exception, scope=None, json=False, opts=None, priority=1):
+def exception_handler(exception, scope=None, json=None, opts=None, priority=1):
     def decorator(function, *args, **kwargs):
         if is_detached(function):
             delay(function, *args, **kwargs)
         else:
             common.base().App.add_exception(
-                exception, function, json=json, opts=opts, priority=priority
+                exception,
+                function,
+                scope=scope,
+                json=json,
+                opts=opts,
+                priority=priority,
             )
         return function
 

{appier-1.34.6 → appier-1.34.7/src/appier.egg-info}/PKG-INFO

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

{appier-1.34.6 → appier-1.34.7}/src/appier.egg-info/SOURCES.txt

@@ -82,6 +82,8 @@ src/appier/test/cache.py
 src/appier/test/config.py
 src/appier/test/crypt.py
 src/appier/test/data.py
+src/appier/test/error_handler.py
+src/appier/test/exception_handler.py
 src/appier/test/exceptions.py
 src/appier/test/export.py
 src/appier/test/graph.py