slthcore 0.4.4__tar.gz → 0.4.6__tar.gz

{slthcore-0.4.4/slthcore.egg-info → slthcore-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slthcore
-Version: 0.4.4
+Version: 0.4.6
 Summary: API generator based on yml file
 Home-page: https://github.com/brenokcc
 Author: Breno Silva

{slthcore-0.4.4 → slthcore-0.4.6}/setup.py

@@ -5,7 +5,7 @@ install_requires = []
 
 setup(
     name='slthcore',
-    version='0.4.4',
+    version='0.4.6',
     packages=find_packages(),
     install_requires=install_requires,
     include_package_data=True,

{slthcore-0.4.4 → slthcore-0.4.6}/slth/endpoints/__init__.py

@@ -1,4 +1,5 @@
 import io
+import json
 import inspect
 from ..models import Log
 from django.apps import apps
@@ -11,6 +12,7 @@ from django.http import JsonResponse, HttpResponse
 from ..factory import FormFactory
 from django.core.exceptions import ValidationError
 from slth import forms
+from slth.models import Role
 from django.db.models import Model
 from datetime import datetime
 from django.template.loader import render_to_string
@@ -45,6 +47,7 @@ class ApiResponse(JsonResponse):
         self["Access-Control-Allow-Headers"] = "*"
         self["Access-Control-Allow-Methods"] = "GET, POST, OPTIONS, PUT, DELETE, PATCH"
         self["Access-Control-Max-Age"] = "600"
+        # print(json.dumps(args[0], indent=1, ensure_ascii=False))
 
 
 class EnpointMetaclass(type):
@@ -82,7 +85,7 @@ class Endpoint(metaclass=EnpointMetaclass):
         return self
 
     def objects(self, model):
-        return apps.get_model(model).objects
+        return apps.get_model(model).objects.contextualize(self.request)
 
     def get(self):
         fields = []
@@ -105,7 +108,7 @@ class Endpoint(metaclass=EnpointMetaclass):
             return True
         for name in names:
             if (
-                self.objects("slth.role")
+                Role.objects
                 .filter(username=self.request.user.username, name=name)
                 .exists()
             ):
@@ -151,7 +154,7 @@ class Endpoint(metaclass=EnpointMetaclass):
             data = data.contextualize(self.request).settitle(title)
         elif isinstance(data, FormFactory):
             form = self.getform(data.settitle(title).form(self))
-            if self.request.method == "POST" or (title and self.request.GET.get("form") == title):
+            if self.request.method == "POST" or (title and self.request.GET.get("form") == form._key):
                 try:
                     if isinstance(self, DeleteEndpoint):
                         return self.post()
@@ -177,6 +180,7 @@ class Endpoint(metaclass=EnpointMetaclass):
         output = self.process()
         if isinstance(output, QuerySet) or isinstance(output, Serializer):
             output.base_url = self.base_url
+            output = output.contextualize(self.request)
         if isinstance(output, Task):
             job = Job.objects.create(task=output)
             output = Response(f'Tarefa {job.id} iniciada.', task=job.id)
@@ -291,7 +295,16 @@ class Endpoint(metaclass=EnpointMetaclass):
         return default if value is None else value
 
     def get_verbose_name(self):
-        return self.get_metadata("verbose_name")
+        return self.get_metadata("verbose_name", self.get_default_verbose_name())
+    
+    def get_submit_label(self):
+        return self.get_metadata("submit_label", "Enviar")
+    
+    def get_submit_icon(self):
+        return self.get_metadata("submit_icon", "chevron-right")
+    
+    def get_default_verbose_name(self):
+        return type(self).__name__
     
     def get_icon(self):
         return self.get_metadata("icon")
@@ -337,6 +350,9 @@ class ModelEndpoint(Endpoint):
 
     def get_icon(self):
         return super().get_icon() or getattr(self.model._meta, 'icon', None)
+    
+    def get_default_verbose_name(self):
+        return type(self).__name__.replace(self.model.__name__, f' {self.model._meta.verbose_name}')
 
 
 class QuerySetEndpoint(Generic[T], ModelEndpoint):

slthcore-0.4.6/slth/endpoints/whatsappnotification.py

@@ -0,0 +1,52 @@
+from slth import endpoints
+from ..models import WhatsappNotification
+
+
+class WhatsappNotifications(endpoints.ListEndpoint[WhatsappNotification]):
+    def get(self):
+        return super().get().actions('whatsappnotification.send')
+    def check_permission(self):
+        return self.check_role()
+
+
+class Add(endpoints.AddEndpoint[WhatsappNotification]):
+    class Meta:
+        modal = True
+        icon = 'message'
+    
+    def check_permission(self):
+        return self.check_role()
+    
+    def get_verbose_name(self):
+        return 'Enviar Whatsapp'
+
+
+class Edit(endpoints.EditEndpoint[WhatsappNotification]):
+    def check_permission(self):
+        return self.check_role()
+
+
+class Delete(endpoints.DeleteEndpoint[WhatsappNotification]):
+    def check_permission(self):
+        return self.check_role()
+
+
+class View(endpoints.ViewEndpoint[WhatsappNotification]):
+    def check_permission(self):
+        return self.check_role()
+
+
+class Send(endpoints.InstanceEndpoint[WhatsappNotification]):
+    class Meta:
+        icon = "chevron-right"
+        verbose_name = "Send"
+
+    def check_permission(self):
+        return self.check_role()
+    
+    def get(self):
+        return self.formfactory().fields()
+    
+    def post(self):
+        self.instance.send()
+        return super().post()

{slthcore-0.4.4 → slthcore-0.4.6}/slth/factory.py

@@ -39,6 +39,7 @@ class FormFactory:
         return self
 
     def fields(self, *names, **values) -> 'FormFactory':
+        names = names + tuple(values.keys())
         not_str = {name for name in names if not isinstance(name, str)}
         if not_str:
             self.fieldset('Dados Gerais', names)
@@ -126,6 +127,8 @@ class FormFactory:
         form._dispose = self._dispose
         form._image = self._image
         form._autosubmit = self._autosubmit
+        form._submit_label = endpoint.get_submit_label()
+        form._submit_icon = endpoint.get_submit_icon()
         for name in self._fieldlist:
             if name not in form.fields:
                 form.fields[name] = getattr(endpoint, name)

{slthcore-0.4.4 → slthcore-0.4.6}/slth/forms.py

@@ -4,6 +4,7 @@ import datetime
 from django.forms import *
 from django.utils.translation import gettext_lazy as _
 from django.forms.models import ModelChoiceIterator, ModelMultipleChoiceField
+from django.forms import fields
 from django.db.models import Model, QuerySet, Manager
 from .models import Token, Profile
 from django.db import transaction
@@ -156,7 +157,6 @@ class FormMixin:
         field_name = self.request.GET.get("on_change")
         if field_name:
             raise JsonResponseException(self.controller.on_change(field_name))
-
         data = dict(
             type="form",
             key=self._key,
@@ -168,6 +168,8 @@ class FormMixin:
             info=self._info,
             image=self._image,
             autosubmit=self._autosubmit,
+            submit_label=self._submit_label,
+            submit_icon=self._submit_icon,
         )
         data.update(
             controls=self.controller.controls, width=self.get_metadata("width", "100%")
@@ -340,7 +342,7 @@ class FormMixin:
                 if word in name:
                     data.update(type="password")
             pick = getattr(field, "pick", False)
-            if isinstance(field, CharField) or isinstance(field, IntegerField):
+            if isinstance(field, fields.CharField) or isinstance(field, fields.IntegerField):
                 mask = getattr(field, "mask", None)
                 if mask:
                     data.update(mask=mask)
@@ -528,6 +530,8 @@ class Form(DjangoForm, FormMixin):
         self._method = "POST"
         self._key = self._title.lower()
         self._autosubmit = None
+        self._submit_label = "Enviar"
+        self._submit_icon = "chevron-right"
 
         self.fieldsets = {}
         self.fields = {}

slthcore-0.4.6/slth/management/commands/worker.py

@@ -0,0 +1,28 @@
+import time
+from django.apps import apps
+from django.conf import settings
+from django.core.management.commands.test import Command
+
+
+class Command(Command):
+    def add_arguments(self, parser):
+        super().add_arguments(parser)
+        parser.add_argument("--preview", action="store_true", help="Preview")
+    
+    def handle(self, *args, **options):
+        seconds = 10 if settings.DEBUG else 60
+        preview = options.get("preview")
+        try:
+            while True:
+                print('Checking whatsapp notifications...')
+                apps.get_model("slth", "whatsappnotification").objects.send(preview)
+                print('Checking email notifications...')
+                apps.get_model("slth", "email").objects.send(preview)
+                print('Checking push notifications...')
+                apps.get_model("slth", "pushnotification").objects.send(preview)
+                print('Checking jobs...')
+                apps.get_model("slth", "job").objects.execute(preview)
+                print(f'Sleeping for {seconds} seconds...')
+                time.sleep(seconds)
+        except KeyboardInterrupt:
+            pass

slthcore-0.4.6/slth/migrations/0013_whatsappnotification.py

@@ -0,0 +1,35 @@
+# Generated by Django 5.1.3 on 2025-01-23 14:16
+
+import slth
+import slth.db.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('slth', '0012_timezone_remove_usertimezone_key_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='WhatsappNotification',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('to', slth.db.models.CharField(max_length=255, verbose_name='To')),
+                ('title', slth.db.models.CharField(max_length=255, verbose_name='Subject')),
+                ('message', slth.db.models.TextField(verbose_name='Content')),
+                ('url', slth.db.models.CharField(blank=True, max_length=255, null=True, verbose_name='URL')),
+                ('send_at', slth.db.models.DateTimeField(blank=True, null=True, verbose_name='Send at')),
+                ('sent_at', slth.db.models.DateTimeField(blank=True, null=True, verbose_name='Sent at')),
+                ('attempt', slth.db.models.IntegerField(blank=True, default=0, verbose_name='Attempt')),
+                ('error', slth.db.models.TextField(blank=True, null=True, verbose_name='Error')),
+                ('key', slth.db.models.CharField(blank=True, db_index=True, max_length=255, null=True)),
+            ],
+            options={
+                'verbose_name': 'Whatsapp Notification',
+                'verbose_name_plural': 'Whatsapp Notifications',
+            },
+            bases=(models.Model, slth.ModelMixin),
+        ),
+    ]

{slthcore-0.4.4 → slthcore-0.4.6}/slth/models.py

@@ -16,7 +16,7 @@ from django.utils.html import strip_tags
 from django.core import serializers
 from django.template.loader import render_to_string
 from django.core.mail import EmailMultiAlternatives
-from .notifications import send_push_web_notification
+from .notifications import send_push_web_notification, send_whatsapp_notification
 from .components import HtmlContent
 from slth import APPLICATON
 from django.utils import timezone
@@ -222,18 +222,19 @@ class JobManager(models.Manager):
         task_runner = super().create(name=name or uuid1().hex, task=task, start=start)
         return task_runner
     
-    def execute(self):
+    def execute(self, preview=False):
         qs = self.filter(finish__isnull=True, attempt__lte=3, canceled=False)
         qs = qs.filter(start__isnull=True) | qs.filter(start__lt=datetime.now())
         for obj in qs:
             try:
                 obj.task.job = obj
                 print(f'Executing job {obj.id}...')
-                obj.start = datetime.now()
-                obj.attempt += 1
-                obj.task.run()
-                obj.finish = datetime.now()
-                print(f'Job {obj.id} completed with success.')
+                if not preview:
+                    obj.start = datetime.now()
+                    obj.attempt += 1
+                    obj.task.run()
+                    obj.finish = datetime.now()
+                    print(f'Job {obj.id} completed with success.')
             except Exception as e:
                 traceback.print_exc()
                 obj.error = str(e)
@@ -243,7 +244,8 @@ class JobManager(models.Manager):
                     obj.finish = datetime.now()
                     print(f'Job {obj.id} completed with error ({obj.error}).')
             finally:
-                obj.save()
+                if not preview:
+                    obj.save()
 
 
 class Job(models.Model):
@@ -280,18 +282,23 @@ class Job(models.Model):
 
 class PushNotificationQuerySet(models.QuerySet):
     def all(self):
-        return self
+        return self.fields('title', 'to', 'message', 'send_at', 'sent_at').search('title', 'message', 'to').filters('send_at__gte', 'send_at__lte', 'sent_at__gte', 'sent_at__lte').rows().order_by('-id')
 
     def create(self, to, title, message, send_at=None, action=None, url=None, key=None):
-        return super().create(
+        if key:
+            self.filter(key=key, sent_at__isnull=False).delete()
+        notification = super().create(
             to=to, title=title, message=message, send_at=send_at, url=url, key=key
         )
+        if send_at and send_at <= datetime.now():
+            notification.send()
+        return notification
     
-    def send(self):
+    def send(self, preview=False):
         qs = self.filter(attempt__lte=3, sent_at__isnull=True)
         qs = qs.filter(send_at__isnull=True) | qs.filter(send_at__lte=datetime.now())
         for obj in qs:
-            obj.send()
+            obj.send(preview=preview)
 
 
 class PushNotification(models.Model):
@@ -316,19 +323,92 @@ class PushNotification(models.Model):
     def __str__(self):
         return f'Push Notification {self.title} to {self.to}'
 
-    def send(self):
+    def send(self, preview=False):
         self.attempt = self.attempt + 1
         try:
             print(f'Sending notification "{self.title}" to "{self.to}"...')
-            send_push_web_notification(self.to, self.title, self.message, url=self.url)
-            self.sent_at = datetime.now()
-            print(f'Notification "{self.title}" to "{self.to}" sent with success.')
+            if not preview:
+                send_push_web_notification(self.to, self.title, self.message, url=self.url)
+                self.sent_at = datetime.now()
+                print(f'Notification "{self.title}" to "{self.to}" sent with success.')
         except Exception as e:
             self.error = str(e)
             print(f'Notification "{self.title}" to "{self.to}" failed during attempt {self.attempt}.')
             traceback.print_exc()
         finally:
-            super().save()
+            if not preview:
+                super().save()
+
+
+class WhatsappNotificationQuerySet(models.QuerySet):
+    def all(self):
+        return self.fields('title', 'to', 'message', 'send_at', 'sent_at').search('title', 'message', 'to').filters('send_at__gte', 'send_at__lte', 'sent_at__gte', 'sent_at__lte').rows().order_by('-id')
+
+    @meta('Enviadas')
+    def sent(self):
+        return self.filter(send_at__isnull=False)
+    
+    @meta('Não-Enviadas')
+    def unsent(self):
+        return self.filter(send_at__isnull=True)
+
+    def create(self, to, title, message, send_at=None, url=None, key=None):
+        if key:
+            self.filter(key=key, sent_at__isnull=False).delete()
+        notification = super().create(
+            to=to, title=title, message=message, send_at=send_at, url=url, key=key
+        )
+        if send_at and send_at <= datetime.now():
+            notification.send()
+        return notification
+    
+    def send(self, preview=False):
+        qs = self.filter(attempt__lte=3, sent_at__isnull=True)
+        qs = qs.filter(send_at__isnull=True) | qs.filter(send_at__lte=datetime.now())
+        for obj in qs:
+            obj.send(preview=preview)
+
+
+class WhatsappNotification(models.Model):
+    to = models.CharField(verbose_name='To')
+    title = models.CharField("Subject")
+    message = models.TextField("Content")
+    url = models.CharField("URL", null=True, blank=True)
+    
+    send_at = models.DateTimeField("Send at", null=True, blank=True)
+    sent_at = models.DateTimeField("Sent at", null=True, blank=True)
+    attempt = models.IntegerField("Attempt", default=0, blank=True)
+
+    error = models.TextField("Error", null=True, blank=True)
+    key = models.CharField(max_length=255, null=True, blank=True, db_index=True)
+
+    class Meta:
+        verbose_name = 'Whatsapp Notification'
+        verbose_name_plural = 'Whatsapp Notifications'
+
+    objects = PushNotificationQuerySet()
+
+    def __str__(self):
+        return f'Push Notification {self.title} to {self.to}'
+
+    def send(self, preview=False):
+        self.attempt = self.attempt + 1
+        try:
+            print(f'Sending notification "{self.title}" to "{self.to}"...')
+            if not preview:
+                send_whatsapp_notification(self.to, self.title, self.message, url=self.url)
+                self.sent_at = datetime.now()
+                print(f'Notification "{self.title}" to "{self.to}" sent with success.')
+        except Exception as e:
+            self.error = str(e)
+            print(f'Notification "{self.title}" to "{self.to}" failed during attempt {self.attempt}.')
+            traceback.print_exc()
+        finally:
+            if not preview:
+                super().save()
+
+    def serializer(self):
+        return super().serializer().fieldset("Dados Gerais", ('subject', 'to', 'content', 'url', 'send_at'))
 
 
 class EmailManager(models.Manager):
@@ -339,15 +419,18 @@ class EmailManager(models.Manager):
         to = [to] if isinstance(to, str) else list(to)
         if key:
             self.filter(key=key, sent_at__isnull=False).delete()
-        return super().create(
+        email = super().create(
             to=" ".join(to), subject=subject, content=content, send_at=send_at, action=action, url=url, key=key
         )
+        if send_at and send_at <= datetime.now():
+            email.send()
+        return email
     
-    def send(self):
+    def send(self, preview=False):
         qs = self.filter(attempt__lte=3, sent_at__isnull=True)
         qs = qs.filter(send_at__isnull=True) | qs.filter(send_at__lte=datetime.now())
         for obj in qs:
-            obj.send()
+            obj.send(preview=preview)
 
 
 class Email(models.Model):
@@ -373,7 +456,7 @@ class Email(models.Model):
     def __str__(self):
         return self.subject
 
-    def send(self):
+    def send(self, preview=False):
         to = [email.strip() for email in self.to.split()]
         msg = EmailMultiAlternatives(self.subject, strip_tags(self.content), settings.DEFAULT_FROM_EMAIL, to)
         html = render_to_string('email.html', dict(email=self, title=APPLICATON['title']))
@@ -381,15 +464,17 @@ class Email(models.Model):
         self.attempt = self.attempt + 1
         try:
             print(f'Sending e-mail "{self.subject}" to "{self.to}"...')
-            msg.send(fail_silently=False)
-            self.sent_at = datetime.now()
-            print(f'E-mail "{self.subject}" to "{self.to}" sent with success.')
+            if not preview:
+                msg.send(fail_silently=False)
+                self.sent_at = datetime.now()
+                print(f'E-mail "{self.subject}" to "{self.to}" sent with success.')
         except Exception as e:
             self.error = str(e)
             print(f'Email "{self.subject}" to "{self.to}" failed during attempt {self.attempt}.')
             traceback.print_exc()
         finally:
-            super().save()
+            if not preview:
+                super().save()
 
     def formfactory(self):
         return super().formfactory().fieldset(

{slthcore-0.4.4 → slthcore-0.4.6}/slth/notifications.py

@@ -1,8 +1,10 @@
 import json
 import os
+import requests
 from pywebpush import webpush
 from slth import APPLICATON
 
+
 def send_push_web_notification(user, title, message, url=None, icon=None):
     icon = icon or APPLICATON['icon']
     for subscription in user.pushsubscription_set.all():
@@ -14,3 +16,13 @@ def send_push_web_notification(user, title, message, url=None, icon=None):
             vapid_claims={"sub": "mailto:admin@admin.com"}
         )
         print(data)
+
+
+def send_whatsapp_notification(to, title, messsage, url=None):
+    api_url = 'https://whatsapp.aplicativo.click/send'
+    headers={"Content-Type": "application/json", "Authorization": "Token undefined"}
+    to = to.replace('(', '').replace(')', '').replace('-', '').replace(' ', '')
+    to = '55{}{}@c.us'.format(to[0:2], to[3:])
+    data = {"to": to, "message": "*{}*\n{}\n{}".format(title, messsage, url or "")}
+    response = requests.post(api_url, headers=headers, json=data)
+    response.status_code == 200

{slthcore-0.4.4 → slthcore-0.4.6}/slth/queryset.py

@@ -168,7 +168,6 @@ class QuerySet(models.QuerySet):
                     raise JsonResponseException(endpoint.serialize())
                 raise Exception()
 
-        
         filters = qs.metadata.get('filters', ())
         for lookup in filters:
             if request and lookup in request.GET and lookup != choices_field_name:

{slthcore-0.4.4 → slthcore-0.4.6}/slth/serializer.py

@@ -9,7 +9,7 @@ from django.db.models import Model, QuerySet, Manager
 from django.utils.text import slugify
 from .exceptions import JsonResponseException
 from .utils import absolute_url, build_url
-from .components import Image, FileLink, FileViewer
+from .components import Image, FileLink, FileViewer, Banner
 from django.db.models.fields.files import ImageFieldFile, FieldFile
 
 
@@ -36,7 +36,7 @@ def serialize(obj, primitive=False, request=None, logging=False):
         return None
     elif isinstance(obj, dict):
         if request:
-            if isinstance(obj, Image):
+            if isinstance(obj, Image) or isinstance(obj, Banner):
                 if isinstance(obj['src'], ImageFieldFile):
                     obj['src'] = build_url(request, obj['src'].url) if obj['src'] else None
             elif isinstance(obj, FileLink) or isinstance(obj, FileViewer):
@@ -316,12 +316,15 @@ class Serializer:
                                 returned = endpoint.process()
                                 if isinstance(returned, QuerySet) or isinstance(returned, Serializer):
                                     returned.base_url = endpoint.base_url
+                                    returned = returned.contextualize(self.request)
                             path = self.path + [key]
                             if wrap:
                                 data = dict(type='fieldset', key=key, title=title, url=None, data=serialize(returned))
                             else:
                                 data = serialize(returned)
-                                data['title'] = title
+                                #if 'title' in data and data['title'] is None:
+                                if lazy:
+                                    data['title'] = title
                             if isinstance(data, dict):
                                 data['url'] = absolute_url(self.request, 'only={}'.format('__'.join(path)))
                             if leaf: raise JsonResponseException(data)

{slthcore-0.4.4 → slthcore-0.4.6}/slth/static/css/slth.css

@@ -70,6 +70,14 @@ input[type="checkbox"], input[type="radio"]{
     text-align: center;
   }
 
+  #output h1{
+    font-size: 1.5rem;
+  }
+
+  .tabContent h1{
+    display: none;
+  }
+
 
   /* .object-viewer .object-fieldset {
     border: solid 1px #2c3e50;