slthcore 0.2.1__tar.gz → 0.2.2__tar.gz

{slthcore-0.2.1/slthcore.egg-info → slthcore-0.2.2}/PKG-INFO

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

{slthcore-0.2.1 → slthcore-0.2.2}/setup.py

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

{slthcore-0.2.1 → slthcore-0.2.2}/slth/endpoints.py

@@ -62,41 +62,9 @@ class EnpointMetaclass(type):
             name not in ("Endpoint", "ChildEndpoint")
             and "_ChildEndpoint" not in bases_names
         ):
-            ENDPOINTS[cls.__name__.lower()] = cls
-        if "AdminEndpoint" in bases_names[0:1]:
-            model = cls.__orig_bases__[0].__args__[0]
-            items = (
-                ("Cadastrar", AddEndpoint[model], "plus", "add"),
-                ("Editar", EditEndpoint[model], "pen", "edit"),
-                ("Visualizar", ViewEndpoint[model], "eye", "view"),
-                ("Excluir", DeleteEndpoint[model], "trash", "delete"),
-            )
-            for prefix, base, icon, action in items:
-                endpoint = types.new_class(f"{prefix}{model.__name__}", (base,), {})
-                endpoint.__admin__ = cls
-                endpoint.__action__ = action
-                endpoint.check_permission = lambda self: (
-                    getattr(self.__admin__.instantiate(self.request, self), f'check_{self.__action__}_permission')()
-                )
-                endpoint.Meta = type(
-                    "Meta",
-                    (),
-                    dict(
-                        icon=icon,
-                        modal=prefix != "Visualizar",
-                        verbose_name=f"{prefix} {model._meta.verbose_name}",
-                    ),
-                )
-            if "Meta" not in attrs:
-                cls.Meta = type(
-                    "Meta",
-                    (),
-                    dict(
-                        icon=getattr(model._meta, "icon", None),
-                        modal=False,
-                        verbose_name=f"{model._meta.verbose_name_plural}",
-                    ),
-                )
+            module = cls.__module__.split('.')[-1]
+            key = cls.__name__.lower() if module == 'endpoints' else f'{module}.{cls.__name__.lower()}'
+            ENDPOINTS[key] = cls
         return cls
 
 
@@ -230,12 +198,34 @@ class Endpoint(metaclass=EnpointMetaclass):
     @classmethod
     def get_api_name(cls):
         return cls.__name__.lower()
+    
+    @classmethod
+    def get_key_name(cls):
+        module = cls.__module__.split('.')[-1]
+        if module == 'endpoints':
+            return cls.get_api_name()
+        else:
+            return "{}.{}".format(module, cls.get_api_name())
+    
+    @classmethod
+    def get_default_actions(cls):
+        actions = ['add', 'view', 'edit', 'delete']
+        module = cls.__module__.split('.')[-1]
+        if module == 'endpoints':
+            return actions
+        else:
+            return [f'{module}.{name}' for name in actions if f'{module}.{name}' in ENDPOINTS]
 
     @classmethod
     def get_api_url(cls, arg=None):
+        module = cls.__module__.split('.')[-1]
+        if module == 'endpoints':
+            url = "/api/{}/".format(cls.get_api_name())
+        else:
+            url = "/api/{}/{}/".format(module, cls.get_api_name())
         if arg:
-            return f"/api/{cls.get_api_name()}/{arg}/"
-        return f"/api/{cls.get_api_name()}/"
+            url = f"{url}{arg}/"
+        return url
 
     @classmethod
     def get_pretty_name(cls):
@@ -246,10 +236,6 @@ class Endpoint(metaclass=EnpointMetaclass):
             name.append(c)
         return "".join(name)
 
-    @classmethod
-    def get_qualified_name(cls):
-        return "{}.{}".format(cls.__module__, cls.__name__).lower()
-
     @classmethod
     def instantiate(cls, request, source):
         args = ()
@@ -266,28 +252,31 @@ class Endpoint(metaclass=EnpointMetaclass):
     @classmethod
     def get_api_url_pattern(cls):
         args = inspect.getfullargspec(cls.__init__).args[1:]
-        pattern = "{}/".format(cls.get_api_name())
+        module = cls.__module__.split('.')[-1]
+        if module == 'endpoints':
+            pattern = "{}/".format(cls.get_api_name())
+        else:
+            pattern = "{}/{}/".format(module, cls.get_api_name())
         for arg in args:
             pattern = "{}{}/".format(pattern, "<str:{}>".format(arg))
         return pattern
 
-    @classmethod
-    def get_api_metadata(cls, request, base_url, pk=None):
-        action_name = cls.get_metadata("verbose_name")
-        icon = cls.get_metadata("icon")
-        modal = cls.get_metadata("modal")
-        if cls.is_child():
-            url = append_url(base_url, f"action={cls.get_api_name()}")
+    def get_api_metadata(self, request, base_url, pk=None):
+        action_name = self.get_verbose_name()
+        icon = self.get_metadata("icon")
+        modal = self.get_metadata("modal")
+        if self.is_child():
+            url = append_url(base_url, f"action={self.get_key_name()}")
             url = f"{url}&id={pk}" if pk else url
         else:
-            url = build_url(request, f"/api/{cls.get_api_name()}/")
+            url = build_url(request, self.get_api_url())
             url = f"{url}{pk}/" if pk else url
         return dict(
             type="action",
             title=action_name,
             name=action_name,
             url=url,
-            key=cls.get_api_name(),
+            key=self.get_api_name(),
             icon=icon,
             modal=modal,
         )
@@ -299,8 +288,6 @@ class Endpoint(metaclass=EnpointMetaclass):
         if metaclass:
             value = getattr(metaclass, key, None)
         if value is None:
-            if key == "verbose_name":
-                value = cls.get_pretty_name()
             if key == "modal":
                 value = (
                     issubclass(cls, EditEndpoint)
@@ -313,6 +300,9 @@ class Endpoint(metaclass=EnpointMetaclass):
     def get_verbose_name(self):
         return self.get_metadata("verbose_name")
     
+    def get_icon(self):
+        return self.get_metadata("icon")
+    
     def get_instance(self):
         return None
     
@@ -362,6 +352,9 @@ class ModelEndpoint(Endpoint):
             self.model = self.objects(self.model).get(pk=self.pk)
         super().__init__()
 
+    def get_icon(self):
+        return self.model._meta.icon or super().get_icon()
+
 
 class AdminEndpoint(Generic[T], ModelEndpoint):
 
@@ -385,12 +378,33 @@ class AdminEndpoint(Generic[T], ModelEndpoint):
         return self.check_permission()
 
 
-class ListEndpoint(Generic[T], ModelEndpoint):
+class QuerySetEndpoint(Generic[T], ModelEndpoint):
+    class Meta:
+        modal = False
+
     def get(self) -> QuerySet:
         return self.model.objects.contextualize(self.request)
+    
+    def get_verbose_name(self):
+        return self.get_metadata('verbose_name', self.model._meta.verbose_name_plural)
+
+
+class ListEndpoint(Generic[T], ModelEndpoint):
+    class Meta:
+        modal = False
+
+    def get(self) -> QuerySet:
+        return self.model.objects.all().contextualize(self.request).actions(*self.get_default_actions())
+    
+    def get_verbose_name(self):
+        return self.get_metadata('verbose_name', self.model._meta.verbose_name_plural)
 
 
 class AddEndpoint(Generic[T], ModelEndpoint):
+    class Meta:
+        icon = 'plus'
+        modal = True
+
     def __init__(self):
         super().__init__()
         self.instance = self.model()
@@ -403,6 +417,9 @@ class AddEndpoint(Generic[T], ModelEndpoint):
     
     def formfactory(self):
         return self.instance.formfactory()
+    
+    def get_verbose_name(self):
+        return f'Cadastrar {self.model._meta.verbose_name}'
 
 
 class ModelInstanceEndpoint(ModelEndpoint):
@@ -428,21 +445,28 @@ class ViewEndpoint(Generic[T], ModelInstanceEndpoint):
     class Meta:
         icon = "eye"
         modal = False
-        verbose_name = "Visualizar"
+        verbose_name = 'Visualizar'
 
     def get(self) -> Serializer:
         return self.get_instance().serializer().contextualize(self.request)
 
-    def get_verbose_name(self):
-        return str(self.get_instance())
-
 
 class EditEndpoint(Generic[T], ModelInstanceEndpoint):
+    class Meta:
+        modal = True
+        icon = 'pen'
+        verbose_name = 'Editar'
+        
     def get(self) -> FormFactory:
         return self.get_instance().formfactory()
 
 
 class DeleteEndpoint(Generic[T], ModelInstanceEndpoint):
+    class Meta:
+        modal = True
+        icon = 'trash'
+        verbose_name = 'Excluir'
+
     def get(self) -> FormFactory:
         return self.formfactory(self.get_instance()).fields()
 
@@ -741,28 +765,28 @@ class Dashboard(Endpoint):
         serializer = Serializer(request=self.request)
         if APPLICATON["dashboard"]["boxes"]:
             boxes = Boxes("Acesso Rápido")
-            for endpoint in APPLICATON["dashboard"]["boxes"]:
-                cls = ENDPOINTS[endpoint]
-                if cls().contextualize(self.request).check_permission():
-                    icon = cls.get_metadata("icon", "check")
-                    label = cls.get_metadata("verbose_name")
+            for name in APPLICATON["dashboard"]["boxes"]:
+                cls = ENDPOINTS[name]
+                endpoint = cls().contextualize(self.request)
+                if endpoint.check_permission():
+                    icon = endpoint.get_icon() or "check"
+                    label = endpoint.get_verbose_name()
                     url = build_url(self.request, cls.get_api_url())
                     boxes.append(icon, label, url)
             serializer.append("Acesso Rápido", boxes)
         if APPLICATON["dashboard"]["top"]:
             group = serializer.group("Top")
-            for endpoint in APPLICATON["dashboard"]["top"]:
-                cls = ENDPOINTS[endpoint]
-                if cls.instantiate(
-                    self.request, self.request.user
-                ).check_permission():
+            for name in APPLICATON["dashboard"]["top"]:
+                cls = ENDPOINTS[name]
+                endpoint = cls.instantiate(self.request, self.request.user)
+                if endpoint.check_permission():
                     group.endpoint(
                         cls.get_metadata("verbose_name"), cls, wrap=False
                     )
             group.parent()
         if APPLICATON["dashboard"]["center"]:
-            for endpoint in APPLICATON["dashboard"]["center"]:
-                cls = ENDPOINTS[endpoint]
+            for name in APPLICATON["dashboard"]["center"]:
+                cls = ENDPOINTS[name]
                 serializer.endpoint(
                     cls.get_metadata("verbose_name"), cls, wrap=False
                 )

{slthcore-0.2.1 → slthcore-0.2.2}/slth/forms.py

@@ -386,9 +386,10 @@ class FormMixin:
             data["onchange"] = absolute_url(self.request, f"on_change={name}")
         if name in self._actions:
             cls = ENDPOINTS[self._actions[name]]
-            if cls.instantiate(self.request, self).check_permission():
+            endpoint = cls.instantiate(self.request, self)
+            if endpoint.check_permission():
                 data.update(
-                    action=cls.get_api_metadata(
+                    action=endpoint.get_api_metadata(
                         self.request, absolute_url(self.request)
                     )
                 )

{slthcore-0.2.1 → slthcore-0.2.2}/slth/pdf/__init__.py

@@ -28,6 +28,9 @@ class PdfWriter:
     def render(self, template_name, context):
         context.update(base_url=settings.SITE_URL)
         html = render_to_string(template_name, context)
+        self.write(html)
+
+    def write(self, html):
         self.pdf.write_html(html, tag_styles=STYLE, font_family="Courier")
 
     def save(self, path):

{slthcore-0.2.1 → slthcore-0.2.2}/slth/queryset.py

@@ -261,9 +261,10 @@ class QuerySet(models.QuerySet):
                 queryset_actions.append(cls)
 
         for cls in queryset_actions:
-            if cls.instantiate(self.request, self).check_permission():
-                action = cls.get_api_metadata(self.request, base_url)
-                action['name'] = action['name'].replace(" {}".format(self.model._meta.verbose_name.title()), "")
+            endpoint = cls.instantiate(self.request, self)
+            if endpoint.check_permission():
+                action = endpoint.get_api_metadata(self.request, base_url)
+                #action['name'] = action['name'].replace(" {}".format(self.model._meta.verbose_name.title()), "")
                 if relations and cls.get_metadata('modal'):
                         params = '&'.join(f'{k}={v}' for k, v in relations.items())
                         action['url'] = append_url(action['url'], params)
@@ -357,8 +358,9 @@ class QuerySet(models.QuerySet):
                 serializer.obj = obj
                 serialized = serializer.serialize(forward_exception=True)
                 for cls in instance_actions:
-                    if cls.instantiate(self.request, obj).check_permission():
-                        action = cls.get_api_metadata(self.request, base_url, obj.pk)
+                    endpoint = cls.instantiate(self.request, obj)
+                    if endpoint.check_permission():
+                        action = endpoint.get_api_metadata(self.request, base_url, obj.pk)
                         action['name'] = action['name'].replace(" {}".format(self.model._meta.verbose_name), "")
                         if relations and cls.get_metadata('modal'):
                             params = '&'.join(f'{k}={v}' for k, v in relations.items())

{slthcore-0.2.1 → slthcore-0.2.2}/slth/serializer.py

@@ -170,7 +170,8 @@ class Serializer:
         return self
     
     def settitle(self, title) -> 'Serializer':
-        self.title = title
+        if title != 'Visualizar':
+            self.title = title
         return self
     
     def serialize(self, debug=False, forward_exception=False):
@@ -214,7 +215,7 @@ class Serializer:
 
         if self.request and 'action' in self.request.GET:
             cls = slth.ENDPOINTS[self.request.GET.get('action')]
-            if cls and cls.get_api_name() in self.metadata['allow']:
+            if cls:### and cls.get_key_name() in self.metadata['allow']:
                 endpoint = cls.instantiate(self.request, self.obj)
                 if endpoint.check_permission():
                     raise JsonResponseException(endpoint.serialize())
@@ -224,8 +225,9 @@ class Serializer:
             leaf = only and only[-1] == 'actions'
             for qualified_name in self.metadata['actions']:
                 cls = slth.ENDPOINTS[qualified_name]
-                if cls.instantiate(self.request, self.obj).check_permission():
-                    action = cls.get_api_metadata(self.request, base_url, self.obj.pk)
+                endpoint = cls.instantiate(self.request, self.obj)
+                if endpoint.check_permission():
+                    action = endpoint.get_api_metadata(self.request, base_url, self.obj.pk)
                     action['name'] = action['name'].replace(' {}'.format(self.obj._meta.verbose_name), '')
                     actions.append(action)
             if leaf:
@@ -278,8 +280,9 @@ class Serializer:
                                     fieldset_fields.append(getfield(obj, name, self.request))
                             for qualified_name in item['actions']:
                                 cls = slth.ENDPOINTS[qualified_name]
-                                if obj and cls.instantiate(self.request, obj).check_permission():
-                                    fieldset_actions.append(cls.get_api_metadata(self.request, base_url, obj.pk))
+                                endpoint = cls.instantiate(self.request, obj)
+                                if obj and endpoint.check_permission():
+                                    fieldset_actions.append(endpoint.get_api_metadata(self.request, base_url, obj.pk))
                             data = dict(type='fieldset', title=title, key=key, url=url if reload else None, actions=fieldset_actions, data=fieldset_fields)
                         if leaf: raise JsonResponseException(data)
                 elif datatype == 'queryset':

{slthcore-0.2.1 → slthcore-0.2.2}/slth/urls.py

@@ -1,3 +1,4 @@
+import os
 import slth
 from django.apps import apps
 from django.conf import settings
@@ -13,8 +14,11 @@ for app_label in settings.INSTALLED_APPS:
         app = apps.get_app_config(app_label.split('.')[-1])
         fromlist = app.module.__package__.split('.')
         if app_label != 'slth':
-            __import__('{}.{}'.format(app_label, 'endpoints'), fromlist=fromlist)
-    except ImportError as e:
+            module = __import__('{}.{}'.format(app_label, 'endpoints'), fromlist=fromlist)
+            if os.path.dirname(module.__file__).endswith('endpoints'):
+                for name in [name for name in os.listdir(os.path.dirname(module.__file__)) if name.endswith('.py') and not name.startswith('__init__')]:
+                    __import__('{}.{}.{}'.format(app_label, 'endpoints', name[0:-3]), fromlist=fromlist)
+    except ModuleNotFoundError as e:
         if not e.name.endswith('endpoints'):
             raise e
     except BaseException as e:

{slthcore-0.2.1 → slthcore-0.2.2}/slth/views.py

@@ -39,7 +39,8 @@ def dispatcher(request, **kwargs):
             url = build_url(request, cls.get_api_url())
             return ApiResponse(dict(type='redirect', url=url))
         else:
-            cls = slth.ENDPOINTS.get(request.path.split('/')[2])
+            tokens = [token for token in request.path.split('/')[2:] if token and not token.isdigit()]
+            cls = slth.ENDPOINTS.get('.'.join(tokens))
             if cls:
                 endpoint = None
                 try:

{slthcore-0.2.1 → slthcore-0.2.2/slthcore.egg-info}/PKG-INFO

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