appier 1.33.1__tar.gz → 1.33.3__tar.gz

{appier-1.33.1/src/appier.egg-info → appier-1.33.3}/PKG-INFO

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

{appier-1.33.1 → appier-1.33.3}/setup.py

@@ -44,7 +44,7 @@ def read_file(path):
 
 setuptools.setup(
     name="appier",
-    version="1.33.1",
+    version="1.33.3",
     author="Hive Solutions Lda.",
     author_email="development@hive.pt",
     description="Appier Framework",
@@ -57,6 +57,7 @@ setuptools.setup(
     package_dir={"": os.path.normpath("src")},
     package_data={
         "appier": [
+            "*.pyi",
             "res/static/css/*",
             "res/static/images/*",
             "res/static/js/*",

appier-1.33.3/src/appier/asynchronous.pyi

@@ -0,0 +1,3 @@
+class AsyncManager: ...
+class SimpleManager(AsyncManager): ...
+class QueueManager(AsyncManager): ...

{appier-1.33.1 → appier-1.33.3}/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.33.1"
+VERSION = "1.33.3"
 """ The version of the framework that is currently installed
 this value may be used for debugging/diagnostic purposes """
 
@@ -2378,6 +2378,8 @@ class App(
         headers={},
         attachments=[],
         renderer=None,
+        html=None,
+        plain=None,
         html_handler=None,
         plain_handler=None,
         **kwargs
@@ -2452,13 +2454,16 @@ class App(
             subject=subject,
         )
 
-        html = renderer(template, detached=True, **parameters)
-        if plain_template:
-            plain = renderer(plain_template, detached=True, **parameters)
-        elif convert:
-            plain = util.html_to_text(html)
-        else:
-            plain = legacy.UNICODE("Email rendered using HTML")
+        if html == None:
+            html = renderer(template, detached=True, **parameters)
+
+        if plain == None:
+            if plain_template:
+                plain = renderer(plain_template, detached=True, **parameters)
+            elif convert:
+                plain = util.html_to_text(html)
+            else:
+                plain = legacy.UNICODE("Email rendered using HTML")
 
         if html_handler:
             html = html_handler(html)

appier-1.33.3/src/appier/base.pyi

@@ -0,0 +1,85 @@
+from os import PathLike
+from logging import Handler
+from typing import Sequence, Type
+
+from .bus import Bus
+from .part import Part
+from .cache import Cache
+from .data import DataAdapter
+from .session import Session
+from .preferences import Preferences
+from .asynchronous import AsyncManager
+from .scheduler import SchedulerTask, JobFunction, Cron
+
+class App:
+    def __init__(
+        self,
+        name: str | None = ...,
+        locales: Sequence[str] = ...,
+        parts: Sequence[Type[Part]] = ...,
+        level: str | int | None = ...,
+        handlers: Sequence[Handler] | None = ...,
+        service: bool = ...,
+        safe: bool = ...,
+        lazy: bool = ...,
+        payload: bool = ...,
+        cache_s: int = ...,
+        cache_c: Type[Cache] = ...,
+        preferences_c: Type[Preferences] = ...,
+        bus_c: Type[Bus] = ...,
+        session_c: Type[Session] = ...,
+        adapter_c: Type[DataAdapter] = ...,
+        manager_c: Type[AsyncManager] = ...,
+    ): ...
+    def start(self, refresh: bool = ...): ...
+    def stop(self, refresh: bool = ...): ...
+    def serve(
+        self,
+        server: str = ...,
+        host: str = ...,
+        port: int = ...,
+        ipv6: bool = ...,
+        ssl: bool = ...,
+        key_file: PathLike[str] | None = ...,
+        cer_file: PathLike[str] | None = ...,
+        backlog: int = ...,
+        threaded: bool = ...,
+        conf: bool = ...,
+        **kwargs
+    ): ...
+    def template(
+        self,
+        template: Template | PathLike[str] | str,
+        content_type: str = ...,
+        templates_path: PathLike[str] | str | None = ...,
+        cache: bool = ...,
+        detached: bool = ...,
+        locale: str | None = ...,
+        asynchronous: bool = ...,
+        **kwargs
+    ) -> str: ...
+    def cron(self, job: JobFunction, cron: Cron) -> SchedulerTask: ...
+    def url_for(
+        self,
+        type: str,
+        filename: str | None = ...,
+        prefix: str | None = ...,
+        query: str | None = ...,
+        params: str | None = ...,
+        absolute: bool = ...,
+        touch: bool = ...,
+        session: bool = ...,
+        compress: str | None = ...,
+        base_url: str | None = ...,
+        *args,
+        **kwargs
+    ) -> str | None: ...
+    ...
+
+class APIApp(App): ...
+class WebApp(App): ...
+class Template: ...
+
+def get_app() -> App: ...
+def get_name() -> str | None: ...
+def get_base_path() -> PathLike[str] | None: ...

appier-1.33.3/src/appier/bus.pyi

@@ -0,0 +1,8 @@
+from threading import Thread
+
+from .component import Component
+
+class Bus(Component): ...
+class MemoryBus(Bus): ...
+class RedisBus(Bus): ...
+class RedisListener(Thread): ...

appier-1.33.3/src/appier/cache.pyi

@@ -0,0 +1,7 @@
+from .component import Component
+
+class Cache(Component): ...
+class MemoryCache(Cache): ...
+class FileCache(Cache): ...
+class RedisCache(Cache): ...
+class SerializedCache: ...

appier-1.33.3/src/appier/component.pyi

@@ -0,0 +1 @@
+class Component: ...

{appier-1.33.1 → appier-1.33.3}/src/appier/config.py

@@ -172,6 +172,7 @@ def load(names=(FILE_NAME,), path=None, encoding="utf-8", ctx=None):
     for path in paths:
         for name in names:
             load_file(name=name, path=path, encoding=encoding, ctx=ctx)
+    load_dot_env(ctx=ctx)
     load_env(ctx=ctx)
 
 
@@ -218,6 +219,54 @@ def load_file(name=FILE_NAME, path=None, encoding="utf-8", ctx=None):
         configs[key] = value
 
 
+def load_dot_env(name=".env", encoding="utf-8", ctx=None):
+    configs = ctx["configs"] if ctx else CONFIGS
+    config_f = ctx["config_f"] if ctx else CONFIG_F
+
+    file_path = os.path.abspath(name)
+    file_path = os.path.normpath(file_path)
+
+    exists = os.path.exists(file_path)
+    if not exists:
+        return
+
+    exists = file_path in config_f
+    if exists:
+        config_f.remove(file_path)
+    config_f.append(file_path)
+
+    file = open(file_path, "rb")
+    try:
+        data = file.read()
+    finally:
+        file.close()
+    if not data:
+        return
+
+    data = data.decode(encoding)
+    data = data.strip()
+    lines = data.splitlines()
+    lines = [line.strip() for line in lines]
+
+    for line in lines:
+        line = line.strip()
+        if not line:
+            continue
+        if line.startswith("#"):
+            continue
+        key, value = line.split("=", 1)
+        key = key.strip()
+        value = value.strip()
+        if (
+            value.startswith('"')
+            and value.endswith('"')
+            or value.startswith("'")
+            and value.endswith("'")
+        ):
+            value = value[1:-1].replace('\\"', '"')
+        configs[key] = value
+
+
 def load_env(ctx=None):
     configs = ctx["configs"] if ctx else CONFIGS
 

appier-1.33.3/src/appier/data.pyi

@@ -0,0 +1,6 @@
+class DataAdapter: ...
+class MongoAdapter(DataAdapter): ...
+class TinyAdapter(DataAdapter): ...
+class Collection: ...
+class MongoCollection(Collection): ...
+class TinyCollection(Collection): ...

{appier-1.33.1 → appier-1.33.3}/src/appier/legacy.py

@@ -30,9 +30,9 @@ __license__ = "Apache License, Version 2.0"
 
 import os
 import sys
+import inspect
 import calendar
 import datetime
-import inspect
 import functools
 import itertools
 import contextlib

{appier-1.33.1 → appier-1.33.3}/src/appier/log.py

@@ -241,6 +241,7 @@ class BaseFormatter(logging.Formatter):
                 thread=record.thread,
                 process=record.process,
                 logger=record.name,
+                meta=getattr(record, "meta", None),
             )
         )
         record._wrapped = True

{appier-1.33.1 → appier-1.33.3}/src/appier/model.py

@@ -464,8 +464,10 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
             if not isinstance(model, dict):
                 continue
             _model = cls(model=model, **kwargs)
-            handler and handler(_model.model)
-            build and cls.build(_model.model, map=False)
+            if handler:
+                handler(_model.model)
+            if build:
+                cls.build(_model.model, map=False)
             wrapping.append(_model)
         if is_sequence:
             return wrapping
@@ -2361,7 +2363,8 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
     def copy(self, build=False, rules=True):
         cls = self.__class__
         _copy = copy.deepcopy(self)
-        build and cls.build(_copy.model, map=False, rules=rules)
+        if build:
+            cls.build(_copy.model, map=False, rules=rules)
         return _copy
 
     def clone(self, reset=True, deep=False):
@@ -2466,9 +2469,8 @@ class Model(legacy.with_meta(meta.Ordered, observer.Observable, *EXTRA_CLS)):
         # should ensure that the model is ready to be saved in the
         # data source, without corruption of it, only run this process
         # in case the validate flag is correctly set
-        validate and self._validate(
-            pre_validate=pre_validate, post_validate=post_validate
-        )
+        if validate:
+            self._validate(pre_validate=pre_validate, post_validate=post_validate)
 
         # calls the complete set of event handlers for the current
         # save operation, this should trigger changes in the model

appier-1.33.3/src/appier/model.pyi

@@ -0,0 +1,48 @@
+from typing import Callable, Self, Sequence
+from .base import App
+
+class Model:
+    owner: App
+
+    @classmethod
+    def singleton(
+        cls,
+        model: Self | None = ...,
+        form: bool = ...,
+        safe: bool = ...,
+        build: bool = ...,
+        *args,
+        **kwargs
+    ) -> Self | None: ...
+    @classmethod
+    def get(cls, *args, **kwargs) -> Self | None: ...
+    @classmethod
+    def find(cls, *args, **kwargs) -> Sequence[Self]: ...
+    @classmethod
+    def validate(cls) -> list[Callable]: ...
+    @classmethod
+    def _name(cls) -> str: ...
+    def save(
+        self,
+        validate: bool = ...,
+        verify: bool = ...,
+        is_new: bool | None = ...,
+        increment_a: bool | None = ...,
+        immutables_a: bool | None = ...,
+        pre_validate: bool = ...,
+        pre_save: bool = ...,
+        pre_create: bool = ...,
+        pre_update: bool = ...,
+        post_validate: bool = ...,
+        post_save: bool = ...,
+        post_create: bool = ...,
+        post_update: bool = ...,
+        before_callbacks: Sequence[Callable[[Self], None]] = ...,
+        after_callbacks: Sequence[Callable[[Self], None]] = ...,
+    ) -> Self: ...
+    ...
+
+class Field:
+    def __init__(self, *args, **kwargs): ...
+
+field = Field

appier-1.33.3/src/appier/part.pyi

@@ -0,0 +1 @@
+class Part: ...

appier-1.33.3/src/appier/preferences.pyi

@@ -0,0 +1,6 @@
+from .component import Component
+
+class Preferences(Component): ...
+class MemoryPreferences(Preferences): ...
+class FilePreferences(Preferences): ...
+class RedisPreferences(Preferences): ...

appier-1.33.3/src/appier/scheduler.pyi

@@ -0,0 +1,70 @@
+from datetime import datetime
+from logging import Logger
+from threading import Thread
+from typing import Callable
+
+from .base import App
+
+LOOP_TIMEOUT: float = ...
+
+JobFunction = Callable[[], None]
+Cron = str | SchedulerDate
+CronField = str | int | list | tuple
+
+class Scheduler(Thread):
+    owner: App | None
+    timeout: float
+    daemon: bool
+
+    def __init__(self, owner: App | None, timeout: float = ..., daemon: bool = ...): ...
+    def run(self): ...
+    def stop(self): ...
+    def tick(self): ...
+    def load(self): ...
+    def awake(self): ...
+    @property
+    def logger(self) -> Logger: ...
+
+class CronScheduler(Scheduler):
+    def __init__(self, owner: App | None, timeout: float = ..., daemon: bool = ...): ...
+    def tick(self, now_ts: float | None = ...): ...
+    def schedule(
+        self, job: JobFunction, cron: Cron, now: datetime | None = ...
+    ) -> SchedulerTask: ...
+    def next_run(self) -> datetime | None: ...
+    def next_timestamp(self) -> float | None: ...
+
+class SchedulerTask(object):
+    job: JobFunction
+    date: SchedulerDate
+
+    def __init__(self, job: JobFunction, cron: Cron): ...
+    def enable(self): ...
+    def disable(self): ...
+    def next_run(self, now: datetime | None = ...) -> datetime: ...
+    def next_timestamp(self, now: datetime | None = ...) -> float: ...
+    @property
+    def enabled(self) -> bool: ...
+
+class SchedulerDate(object):
+    minutes: set[int]
+    hours: set[int]
+    days_of_month: set[int]
+    months: set[int]
+    days_of_week: set[int]
+
+    def __init__(
+        self,
+        minutes: CronField = ...,
+        hours: CronField = ...,
+        days_of_month: CronField = ...,
+        months: CronField = ...,
+        days_of_week: CronField = ...,
+    ): ...
+    @classmethod
+    def from_cron(cls, cron: Cron) -> SchedulerDate: ...
+    def next_timestamp(self, now: datetime | None = None) -> float: ...
+    def next_run(self, now: datetime | None = None) -> datetime: ...
+    def _parse_field(
+        self, field: CronField, min_value: int, max_value: int
+    ) -> set[int]: ...

appier-1.33.3/src/appier/session.pyi

@@ -0,0 +1,7 @@
+class Session: ...
+class MockSession(Session): ...
+class DataSession(Session): ...
+class MemorySession(DataSession): ...
+class FileSession(DataSession): ...
+class RedisSession(DataSession): ...
+class ClientSession(DataSession): ...

{appier-1.33.1 → appier-1.33.3}/src/appier/test/config.py

@@ -32,6 +32,11 @@ import unittest
 
 import appier
 
+try:
+    import unittest.mock as mock
+except ImportError:
+    mock = None
+
 
 class ConfigTest(unittest.TestCase):
     def test_basic(self):
@@ -79,3 +84,34 @@ class ConfigTest(unittest.TestCase):
         result = appier.conf("HEIGHT", cast=int)
 
         self.assertEqual(result, None)
+
+    def test_load_dot_env(self):
+        if mock == None:
+            self.skipTest("Skipping test: mock unavailable")
+
+        mock_data = mock.mock_open(
+            read_data=b"#This is a comment\nAGE=10\nNAME=colony\n"
+        )
+
+        with mock.patch("os.path.exists", return_value=True), mock.patch(
+            "builtins.open", mock_data, create=True
+        ) as mock_open:
+            ctx = dict(configs={}, config_f=[])
+
+            appier.config.load_dot_env(".env", "utf-8", ctx)
+
+            result = appier.conf("AGE", cast=int)
+            self.assertEqual(type(result), int)
+            self.assertEqual(result, 10)
+
+            result = appier.conf("AGE", cast=str)
+
+            self.assertEqual(result, "10")
+            self.assertEqual(type(result), str)
+
+            result = appier.conf("HEIGHT", cast=int)
+            self.assertEqual(result, None)
+
+            self.assertEqual(len(ctx["configs"]), 2)
+
+            self.assertEqual(mock_open.return_value.close.call_count, 1)

{appier-1.33.1 → appier-1.33.3/src/appier.egg-info}/PKG-INFO

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

{appier-1.33.1 → appier-1.33.3}/src/appier.egg-info/SOURCES.txt

@@ -9,16 +9,22 @@ src/appier/asgi.py
 src/appier/async_neo.py
 src/appier/async_old.py
 src/appier/asynchronous.py
+src/appier/asynchronous.pyi
 src/appier/base.py
+src/appier/base.pyi
 src/appier/bus.py
+src/appier/bus.pyi
 src/appier/cache.py
+src/appier/cache.pyi
 src/appier/common.py
 src/appier/component.py
+src/appier/component.pyi
 src/appier/compress.py
 src/appier/config.py
 src/appier/controller.py
 src/appier/crypt.py
 src/appier/data.py
+src/appier/data.pyi
 src/appier/defines.py
 src/appier/exceptions.py
 src/appier/execution.py
@@ -35,17 +41,22 @@ src/appier/log.py
 src/appier/meta.py
 src/appier/mock.py
 src/appier/model.py
+src/appier/model.pyi
 src/appier/model_a.py
 src/appier/mongo.py
 src/appier/observer.py
 src/appier/part.py
+src/appier/part.pyi
 src/appier/preferences.py
+src/appier/preferences.pyi
 src/appier/queuing.py
 src/appier/redisdb.py
 src/appier/request.py
 src/appier/scheduler.py
+src/appier/scheduler.pyi
 src/appier/serialize.py
 src/appier/session.py
+src/appier/session.pyi
 src/appier/settings.py
 src/appier/smtp.py
 src/appier/storage.py