slthcore 0.4.8__tar.gz → 0.4.9__tar.gz

{slthcore-0.4.8/slthcore.egg-info → slthcore-0.4.9}/PKG-INFO

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

{slthcore-0.4.8 → slthcore-0.4.9}/setup.py

@@ -4,7 +4,7 @@ install_requires = []
 
 setup(
     name='slthcore',
-    version='0.4.8',
+    version='0.4.9',
     packages=find_packages(),
     install_requires=install_requires,
     include_package_data=True,

{slthcore-0.4.8 → slthcore-0.4.9}/slth/endpoints/__init__.py

@@ -1,5 +1,4 @@
 import io
-import json
 import inspect
 from ..models import Log
 from django.apps import apps
@@ -26,10 +25,9 @@ from ..components import (
 from slth.application import Application as ApplicationConfig
 from ..exceptions import JsonResponseException, ReadyResponseException
 from ..utils import build_url, append_url
-from ..models import Profile, Log, Job
+from ..models import Log, Job
 from slth.queryset import QuerySet
 from slth import ENDPOINTS
-from .. import oauth
 from ..threadlocal import tl
 from ..tasks import Task
 
@@ -65,6 +63,7 @@ class Endpoint(metaclass=EnpointMetaclass):
     cache = cache
 
     def __init__(self):
+        self.form: Form | ModelForm = None
         self.base_url = None
         self.request = None
         self.source = None
@@ -150,15 +149,15 @@ class Endpoint(metaclass=EnpointMetaclass):
         elif isinstance(data, Serializer):
             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") == form._key):
+            self.form = self.getform(data.settitle(title).build(self))
+            if self.request.method == "POST" or (title and self.request.GET.get("form") == self.form._key):
                 try:
                     if isinstance(self, DeleteEndpoint):
                         return self.post()
                     else:
-                        self.cleaned_data = form.submit()
-                        if form._message or form._redirect or form._dispose:
-                            return Response(form._message, form._redirect, dispose=form._dispose)
+                        self.cleaned_data = self.form.submit()
+                        if self.form._message or self.form._redirect or self.form._dispose:
+                            return Response(self.form._message, self.form._redirect, dispose=self.form._dispose)
                         else:
                             return self.post()
                 except ValidationError as e:
@@ -166,7 +165,7 @@ class Endpoint(metaclass=EnpointMetaclass):
                         dict(type="error", text="\n".join(e.messages), errors={})
                     )
             else:
-                data = form
+                data = self.form
         elif isinstance(data, Form) or isinstance(data, ModelForm):
             data = data.settitle(title)
         elif self.request.method == "POST":# and not data:
@@ -337,7 +336,6 @@ class PublicEndpoint(Endpoint):
         return True
 
 
-
 class ModelEndpoint(Endpoint):
     def __init__(self):
         self.model = self.__orig_bases__[0].__args__[0]
@@ -503,6 +501,43 @@ class ChildInstanceEndpoint(ChildEndpoint):
         return Serializer(self.get_instance()).contextualize(self.request)
 
 
+class RelationEditEndpoint(Generic[T], ChildEndpoint):
+
+    def __init__(self, instance):
+        self.source = instance
+        
+    def get(self) -> FormFactory:
+        return self.formfactory()
+    
+    def formfactory(self) -> FormFactory:
+        return FormFactory(self.get_instance())
+
+    def get_instance(self):
+        return self.__orig_bases__[0].__args__[0].objects.get(pk=self.request.GET['id'])
+
+
+class RelationDeleteEndpoint(Generic[T], ChildEndpoint):
+
+    def __init__(self, instance):
+        self.model = self.__orig_bases__[0].__args__[0]
+        self.source = instance
+        
+    def get(self) -> FormFactory:
+        return FormFactory(self.get_instance()).fields()
+
+    def post(self):
+        self.get_instance().safe_delete(self.request.user.username)
+        return super().post()
+    
+    def formfactory(self) -> FormFactory:
+        return FormFactory(self.get_instance())
+
+    def get_instance(self):
+        return self.model.objects.get(pk=self.request.GET['id'])
+
+
+
+
 class Search(Endpoint):
     def get(self):
         key = "_options_"
@@ -529,7 +564,6 @@ class Search(Endpoint):
         return result[0:10]
 
 
-
 class Home(PublicEndpoint):
     class Meta:
         verbose_name = ""

{slthcore-0.4.8 → slthcore-0.4.9}/slth/factory.py

@@ -3,7 +3,7 @@ from .serializer import Serializer
 
 
 class FormFactory:
-    def __init__(self, instance, endpoint=None, method='POST'):
+    def __init__(self, instance, method='POST'):
         self._instance = instance
         self._fieldsets = {}
         self._values = {}
@@ -48,7 +48,7 @@ class FormFactory:
                 self._append_field(field_name)
         for k in values:
             self._append_field(k)
-            self.setvalue(**values)
+            self.values(**values)
         self._empty = not self._fieldlist
         return self
 
@@ -84,7 +84,7 @@ class FormFactory:
         self._actions.update(kwargs)
         return self
     
-    def setvalue(self, **kwargs) -> 'FormFactory':
+    def values(self, **kwargs) -> 'FormFactory':
         self._values.update(kwargs)
         return self
     
@@ -106,7 +106,7 @@ class FormFactory:
             self._redirect = '.'
         return self
 
-    def form(self, endpoint):
+    def build(self, endpoint):
         from .forms import ModelForm, Form
         
         if isinstance(self._instance, Model):
@@ -135,7 +135,7 @@ class FormFactory:
         for name, queryset in self._choices.items():
             form.fields[name].queryset = queryset
         form.fieldsets = self._fieldsets
-        form.setvalue(**self._values)
+        form.values(**self._values)
         if self._display:
             serializer = Serializer(self._instance, request=endpoint.request)
             for title, fields in self._display.items():

{slthcore-0.4.8 → slthcore-0.4.9}/slth/forms.py

@@ -6,7 +6,7 @@ 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.utils.text import slugify
 from django.db import transaction
 from django.db.models import Manager
 from .exceptions import JsonResponseException
@@ -35,7 +35,7 @@ MASKS = dict(
 
 class FormController:
 
-    def __init__(self, form):
+    def __init__(self, form: Form | ModelForm):
         super().__init__()
         self.form = form
         self.controls = dict(hide=[], show=[], reload=[], set={})
@@ -66,7 +66,10 @@ class FormController:
                 v = v.strftime("%Y-%m-%d")
             self.controls["set"][k] = v
 
-    def get(self, name, value, default=None):
+    def get(self, field_name, default=None):
+        return self.field_value(field_name, self.form.request.GET.get(field_name, default))
+
+    def field_value(self, name, value, default=None):
         if value is None:
             return default
         else:
@@ -83,28 +86,28 @@ class FormController:
         self.controls["hide"].clear()
         self.controls["set"].clear()
 
-    def on_change(self, field_name):
+    def on_field_change(self, field_name):
         self.clear()
-        getattr(self.form._endpoint, f"on_{field_name}_change")(self, self.values())
+        value = self.get(field_name)
+        getattr(self.form._endpoint, f"on_{field_name}_change")(value)
         return self.controls
 
-
-    def get_field_queryset(self, fname, qs):
+    def get_field_queryset(self, field_name, queryset):
         method_attr = None
-        method_name = f"get_{fname}_queryset"
+        method_name = f"get_{field_name}_queryset"
         if hasattr(self.form._endpoint, method_name):
             method_attr = getattr(self.form._endpoint, method_name)
         elif hasattr(self.form, "instance") and hasattr(
             self.form.instance, method_name
         ):
             method_attr = getattr(self.form.instance, method_name)
-        queryset = method_attr(qs, self.values()) if method_attr else qs
+        queryset = method_attr(queryset) if method_attr else queryset
         return queryset.apply_lookups(self.form.request.user)
 
     def values(self):
         data = dict(**self.controls["set"])
         for name in self.form.fields:
-            value = self.get(name, self.form.request.GET.get(name))
+            value = self.get(name)
             if value:
                 data[name] = value
         return data
@@ -156,7 +159,7 @@ class FormMixin:
     def to_dict(self, prefix=None):
         field_name = self.request.GET.get("on_change")
         if field_name:
-            raise JsonResponseException(self.controller.on_change(field_name))
+            raise JsonResponseException(self.controller.on_field_change(field_name))
         data = dict(
             type="form",
             key=self._key,
@@ -176,7 +179,9 @@ class FormMixin:
         )
         if self._display:
             if isinstance(self._display, Serializer):
-                # self._display.request = self.request
+                self._display.request.GET._mutable = True
+                self._display.request.GET.pop('only', None)
+                self._display.request.GET._mutable = False
                 data.update(
                     display=self._display.serialize(forward_exception=True)["data"]
                 )
@@ -220,7 +225,7 @@ class FormMixin:
                     fieldsetlist.append(fields[0][0])
                 else:
                     fieldsetlist.append(
-                        dict(type="fieldset", title=title, fields=fields)
+                        dict(type="fieldset", title=title, name=slugify(title), fields=fields)
                     )
             data.update(fieldsets=fieldsetlist)
         else:
@@ -285,7 +290,7 @@ class FormMixin:
             else:
                 value = None
                 if self.instance is None or self.instance.id is None:
-                    value = field.initial
+                    value = field.initial or self.initial.get(name)
                 else:
                     value = self.initial.get(name)
                 if callable(value):
@@ -307,7 +312,7 @@ class FormMixin:
                     isinstance(field, ModelChoiceField)
                     or isinstance(field, DjangoModelChoiceField)
                 ):
-                    obj = field.queryset.get(pk=value)
+                    obj = field.queryset.get(pk=value) if isinstance(value, int) else value
                     value = dict(id=obj.id, label=str(obj).strip())
                 elif isinstance(field, DjangoImageField):
                     value = build_url(self.request, value.url) if value else None
@@ -397,11 +402,9 @@ class FormMixin:
             cls = ENDPOINTS[self._actions[name]]
             endpoint = cls.instantiate(self.request, self)
             if endpoint.check_permission():
-                data.update(
-                    action=endpoint.get_api_metadata(
-                        self.request, absolute_url(self.request)
-                    )
-                )
+                action=endpoint.get_api_metadata(self.request, absolute_url(self.request))
+                action['name'] = action['name'].replace(field.label, "").strip()
+                data.update(action=action)
         return data
 
     def submit(self):
@@ -525,7 +528,7 @@ class FormMixin:
         self._title = title
         return self
 
-    def setvalue(self, **kwargs):
+    def values(self, **kwargs):
         self._values.update(**kwargs)
         return self
 
@@ -700,8 +703,6 @@ class CharField(CharField):
         self.mask = kwargs.pop("mask", None)
         super().__init__(*args, **kwargs)
 
-    
-
 
 class ChoiceField(ChoiceField):
 

{slthcore-0.4.8 → slthcore-0.4.9}/slth/management/commands/api.py

@@ -14,22 +14,36 @@ class {plural}(endpoints.ListEndpoint[{model}]):
     def get(self):
         return (
             super().get()
-            .actions('{lower}.cadastrar', '{lower}.editar', '{lower}.excluir')
+            .actions('{lower}.cadastrar', '{lower}.visualizar', '{lower}.editar', '{lower}.excluir')
         )
 
 
 class Cadastrar(endpoints.AddEndpoint[{model}]):
     class Meta:
+        icon = 'plus'
         verbose_name = 'Cadastrar {verbose_name}'
 
     def get(self):
         return (
             super().get()
         )
+
+        
+class Visualizar(endpoints.ViewEndpoint[{model}]):
+    class Meta:
+        modal = False
+        icon = 'eye'
+        verbose_name = 'Visualizar {verbose_name}'
+
+    def get(self):
+        return (
+            super().get()
+        )
     
 
 class Editar(endpoints.EditEndpoint[{model}]):
     class Meta:
+        icon = 'pen'
         verbose_name = 'Editar {verbose_name}'
 
     def get(self):
@@ -40,6 +54,7 @@ class Editar(endpoints.EditEndpoint[{model}]):
 
 class Excluir(endpoints.DeleteEndpoint[{model}]):
     class Meta:
+        icon = 'trash'
         verbose_name = 'Excluir {verbose_name}'
 
     def get(self):
@@ -50,10 +65,18 @@ class Excluir(endpoints.DeleteEndpoint[{model}]):
 """
 
 class Command(Command):
+
+    def add_arguments(self, parser):
+        parser.add_argument("models", nargs="*", type=str)
     
     def handle(self, *args, **options):
-        for model in apps.get_models():
-            if model._meta.app_label == "api":
+        names = options.get('models')
+        if names:
+            models = [apps.get_model(name) for name in names]
+        else:
+            models = apps.get_models()
+        for model in models:
+            if names or model._meta.app_label == "api":
                 content = TEMPLATE.format(
                     plural = slugify(model._meta.verbose_name_plural).replace('-de-', '-').replace('-', '').title(),
                     model = model.__name__,

{slthcore-0.4.8 → slthcore-0.4.9}/slth/models.py

@@ -96,7 +96,7 @@ class RoleFilter(models.Filter):
 
     def choices(self, queryset, term=None):
         application = ApplicationConfig.get_instance()
-        return [(k, v) for k, v in application.items()]
+        return [(k, v) for k, v in application.groups.items()]
      
     def filter(self, queryset, value):
         if value:

{slthcore-0.4.8 → slthcore-0.4.9}/slth/serializer.py

@@ -143,10 +143,11 @@ class Serializer:
         self.metadata['content'].append(('queryset', name, dict(title=title, condition=condition, roles=roles)))
         return self
     
-    def endpoint(self, title, cls, wrap=True, condition=None, roles=()) -> 'Serializer':
+    def endpoint(self, title, cls, wrap=False, condition=None, roles=()) -> 'Serializer':
+        key = to_snake_case(title) if title else cls.replace('.', '_')
         if isinstance(cls, str):
             cls = slth.ENDPOINTS[cls]
-        self.metadata['content'].append(('endpoint', to_snake_case(title), dict(title=title, cls=cls, wrap=wrap, condition=condition, roles=roles)))
+        self.metadata['content'].append(('endpoint', key, dict(title=title, cls=cls, wrap=wrap, condition=condition, roles=roles)))
         return self
     
     def append(self, title, component, condition=None, roles=()) -> 'Serializer':
@@ -217,6 +218,9 @@ class Serializer:
         if self.request and 'action' in self.request.GET:
             cls = slth.ENDPOINTS[self.request.GET.get('action')]
             if cls:### and cls.get_key_name() in self.metadata['allow']:
+                self.request.GET._mutable = True
+                self.request.GET.pop('action', None)
+                self.request.GET._mutable = False
                 endpoint = cls.instantiate(self.request, self.obj)
                 if endpoint.check_permission():
                     raise JsonResponseException(endpoint.serialize())
@@ -234,7 +238,7 @@ class Serializer:
             if leaf:
                 raise JsonResponseException(actions)
 
-        if not self.metadata['content'] and self.obj:
+        if not self.metadata['content'] and self.obj and isinstance(self.obj, Model):
             self.fields(*[field.name for field in type(self.obj)._meta.fields])
             for m2m in type(self.obj)._meta.many_to_many:
                 self.queryset(m2m.verbose_name, m2m.name)