slthcore 0.5.0__tar.gz → 0.5.2__tar.gz

{slthcore-0.5.0/slthcore.egg-info → slthcore-0.5.2}/PKG-INFO

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

{slthcore-0.5.0 → slthcore-0.5.2}/setup.py

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

{slthcore-0.5.0 → slthcore-0.5.2}/slth/db/models.py

@@ -1,13 +1,11 @@
 from uuid import uuid1
-import pytz
-from datetime import datetime, timedelta
-from django.utils import timezone
 from django.db.models import Model as DjangoModel, fields as DjangoFields
 from django.db.models import *
 from django.utils.translation import gettext_lazy as _
 from . import generic
 from .. import ModelMixin
 from slth import  dumps, loads
+from slth import timezone
 
 GenericField = generic.GenericField
 
@@ -116,16 +114,10 @@ class TextField(TextField):
 class DateTimeField(DateTimeField):
 
     def get_db_prep_value(self, value, *args, **kwargs):
-        return self.get_current_timezone().localize(value).astimezone(timezone.get_default_timezone()).replace(tzinfo=None) if value else None
+        return timezone.get_default_timezone().localize(value).astimezone(timezone.get_current_timezone()).replace(tzinfo=None) if value else None
     
     def from_db_value(self, value, *args, **kwargs):
-        return pytz.timezone(timezone.get_default_timezone_name()).localize(value).astimezone(self.get_current_timezone()).replace(tzinfo=None) if value else None
-
-    def get_current_timezone(self):
-        current_timezone_name = timezone.get_current_timezone_name()
-        if current_timezone_name and current_timezone_name[0] in ('+', '-'):
-            current_timezone_name = "Etc/GMT{}".format(int(current_timezone_name))
-        return pytz.timezone(current_timezone_name)
+        return timezone.get_current_timezone().localize(value).astimezone(timezone.get_default_timezone()).replace(tzinfo=None) if value else None
 
 
 class TaskFied(TextField):
@@ -154,7 +146,6 @@ class FileField(FileField):
     
     def generate_filename(self, instance, filename):
         filename = '{}.{}'.format(uuid1().hex, filename.split('.')[-1].lower())
-        print(filename)
         return super().generate_filename(instance, filename)
     
 class ImageField(ImageField):

{slthcore-0.5.0 → slthcore-0.5.2}/slth/endpoints/__init__.py

@@ -136,7 +136,10 @@ class Endpoint(metaclass=EnpointMetaclass):
                     doc = HTML(string=html).render()
                     pages.extend(doc.pages)
             new_doc = doc.copy(pages=pages)
-            new_doc.write_pdf(buffer, base_url=base_url, stylesheets=[])
+            try:
+                new_doc.write_pdf(buffer, base_url=base_url, stylesheets=[])
+            except Exception:
+                new_doc.write_pdf(buffer)
             buffer.seek(0)
             raise ReadyResponseException(HttpResponse(buffer, content_type='application/pdf'))
         return TemplateContent(template, data, autoreload=autoreload)

{slthcore-0.5.0 → slthcore-0.5.2}/slth/endpoints/auth.py

@@ -12,12 +12,15 @@ from django.utils import timezone
 def login_response(user, redirect='/api/dashboard/'):
     token = Token.objects.create(user=user)
     current_timezone = timezone.get_current_timezone()
-    timezone_instance = TimeZone.objects.get_or_create(name=current_timezone.__str__())[0]
+    current_timezone_name = current_timezone.__str__()
+    timezone_instance = TimeZone.objects.filter(name=current_timezone_name).first()
+    if timezone_instance is None:
+        timezone_instance = TimeZone.objects.create(name=current_timezone_name)
     user_timezone = UserTimeZone.objects.filter(user=user).first()
     if user_timezone is None:
         UserTimeZone.objects.create(user=user, timezone=timezone_instance)
     else:
-        user_timezone.key = current_timezone.__str__()
+        user_timezone.timezone = timezone_instance
         user_timezone.save()
     return Response(
         message="Bem-vindo!",

slthcore-0.5.2/slth/middleware/timezone.py

@@ -0,0 +1,15 @@
+from slth import timezone
+
+
+class Middleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        tz = request.path[0] == '/' and (request.META.get('HTTP_TZ') or request.META.get('TZ'))
+        if tz:
+            timezone.activate(tz)
+        response = self.get_response(request)
+        if tz:
+            timezone.deactivate()
+        return response

slthcore-0.5.2/slth/migrations/0015_auto_20250412_1126.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.1 on 2025-04-12 11:26
+
+from django.db import migrations
+from slth import timezone
+
+def migrate(apps, editor):
+    TimeZone = apps.get_model('slth', 'TimeZone')
+    TimeZone.objects.filter(name='Etc/GMT+4').update(name='Etc/GMT-4')
+    TimeZone.objects.filter(name='Etc/GMT+3').update(name='Etc/GMT-3')
+    for instance in TimeZone.objects.all():
+        name = timezone.get_timezone(instance.name).zone
+        print(instance.name, name)
+        instance.name = name
+        instance.save()
+
+def unmigrate(apps, editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("slth", "0014_settings"),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate, unmigrate)
+    ]

{slthcore-0.5.0 → slthcore-0.5.2}/slth/models.py

@@ -4,6 +4,7 @@ import pytz
 import binascii
 from uuid import uuid1
 import traceback
+from . import timezone
 from .db import models, meta
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
@@ -18,7 +19,6 @@ from django.template.loader import render_to_string
 from django.core.mail import EmailMultiAlternatives
 from .notifications import send_push_web_notification, send_whatsapp_notification
 from .components import HtmlContent
-from django.utils import timezone
 from slth.application import Application as ApplicationConfig
 from django.contrib.auth.models import BaseUserManager
 
@@ -611,8 +611,7 @@ class TimeZone(models.Model):
         return self.name
     
     def localtime(self, value):
-        value_in_default_time_zone = pytz.timezone(timezone.get_current_timezone_name()).localize(value).astimezone(timezone.get_default_timezone()).replace(tzinfo=None)
-        return value_in_default_time_zone.astimezone(pytz.timezone(self.name)).replace(tzinfo=None)
+        return timezone.get_timezone(self.name).localize(value).astimezone(timezone.get_default_timezone()).replace(tzinfo=None) if value else None
 
 
 class UserTimeZone(models.Model):

{slthcore-0.5.0 → slthcore-0.5.2}/slth/serializer.py

@@ -57,7 +57,10 @@ def serialize(obj, primitive=False, request=None, logging=False):
         if logging:
             return f'{obj.pk}:{str(obj)}'
         else:
-            return str(obj) if primitive else dict(pk=obj.pk, str=str(obj))
+            try:
+                return str(obj) if primitive else dict(pk=obj.pk, str="{}".format(obj))
+            except TypeError:
+                return str(obj) if primitive else dict(pk=obj.pk, str="?")
     elif isinstance(obj, QuerySet) or isinstance(obj, Manager) or type(obj).__name__ == 'ManyRelatedManager':
         if logging:
             return [f'{obj.pk}:{str(obj)}' for obj in obj.filter()]