slthcore 0.4.2__tar.gz → 0.4.3__tar.gz

{slthcore-0.4.2/slthcore.egg-info → slthcore-0.4.3}/PKG-INFO

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

{slthcore-0.4.2 → slthcore-0.4.3}/setup.py

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

{slthcore-0.4.2 → slthcore-0.4.3}/slth/apps.py

@@ -21,8 +21,11 @@ class Thread(threading.Thread):
             # print('.')
             apps.get_model("slth", "email").objects.send()
             apps.get_model("slth", "pushnotification").objects.send()
-            apps.get_model("slth", "job").objects.execute() 
-            time.sleep(10)
+            apps.get_model("slth", "job").objects.execute()
+            for i in range(0, 10):
+                if self._stop_event.is_set():
+                    break
+                time.sleep(1)
     
     def stop(self):
         print("Stopping e-mail thread...")

{slthcore-0.4.2 → slthcore-0.4.3}/slth/components.py

@@ -302,7 +302,7 @@ class Scheduler(dict):
         end_time=23,
         chucks=2,
         start_day=None,
-        days=14,
+        days=7,
         single_selection=False,
         input_name="schedule",
         readonly=False,

{slthcore-0.4.2 → slthcore-0.4.3}/slth/endpoints/__init__.py

@@ -65,7 +65,7 @@ class Endpoint(metaclass=EnpointMetaclass):
     cache = cache
 
     def __init__(self):
-        self.baseurl = None
+        self.base_url = None
         self.request = None
         self.source = None
         self.instantiator = None
@@ -175,6 +175,8 @@ class Endpoint(metaclass=EnpointMetaclass):
 
     def serialize(self):
         output = self.process()
+        if isinstance(output, QuerySet) or isinstance(output, Serializer):
+            output.base_url = self.base_url
         if isinstance(output, Task):
             job = Job.objects.create(task=output)
             output = Response(f'Tarefa {job.id} iniciada.', task=job.id)
@@ -233,7 +235,7 @@ class Endpoint(metaclass=EnpointMetaclass):
         else:
             args = (source.pk,) if cls.has_args() else ()
         endpoint = cls(*args).configure(source).contextualize(request)
-        endpoint.baseurl = cls.get_api_url(*args)
+        endpoint.base_url = cls.get_api_url(*args)
         return endpoint
 
     @classmethod

{slthcore-0.4.2 → slthcore-0.4.3}/slth/forms.py

@@ -351,7 +351,7 @@ class FormMixin:
             elif ftype == "scheduler":
                 data.update(scheduler=field.scheduler)
             elif ftype == "choice" or pick:
-                choiceurl = self._endpoint.baseurl if self._endpoint else None
+                choiceurl = self._endpoint.base_url if self._endpoint else None
                 if name in self.request.GET and not choices_field_name:
                     data.update(type="hidden", value=self.request.GET[name])
                 else:

{slthcore-0.4.2 → slthcore-0.4.3}/slth/queryset.py

@@ -27,6 +27,7 @@ class QuerySet(models.QuerySet):
         self.metadata = {}
         self.instance = None
         self.request = None
+        self.base_url = None
         super().__init__(*args, **kwargs)
 
     def total(self, x=None):
@@ -252,7 +253,7 @@ class QuerySet(models.QuerySet):
         instance_actions = []
         queryset_actions = []
 
-        base_url = append_url(build_url(self.request), 'only={}'.format(attrname) if attrname else '')
+        base_url = append_url(build_url(self.request, self.base_url), 'only={}'.format(attrname) if attrname else '')
         if self.request.GET.urlencode():
             base_url = append_url(base_url, self.request.GET.urlencode())
 

{slthcore-0.4.2 → slthcore-0.4.3}/slth/serializer.py

@@ -118,6 +118,7 @@ class Serializer:
         else:
             self.title = None
         self.show_title = show_title
+        self.base_url = None
 
     def actions(self, *actions) -> 'Serializer':
         self.metadata['actions'].extend(actions)
@@ -313,6 +314,8 @@ class Serializer:
                         if endpoint.check_permission():
                             if not lazy:                     
                                 returned = endpoint.process()
+                                if isinstance(returned, QuerySet) or isinstance(returned, Serializer):
+                                    returned.base_url = endpoint.base_url
                             path = self.path + [key]
                             if wrap:
                                 data = dict(type='fieldset', key=key, title=title, url=None, data=serialize(returned))