', '', conteudo)
+ conteudo = re.sub(r'align=".*?"', '', conteudo)
+ conteudo = re.sub(r'', '', conteudo)
# OSTicket Ticket #796450
- conteudo = re.sub('', '
', conteudo)
+ conteudo = re.sub(r'', '
', conteudo)
conteudo = html.unescape(conteudo)
# escape special character '&'
@@ -875,7 +875,7 @@ def get_sessao_plenaria(sessao, casa, user):
# unescape HTML codes
# https://github.com/interlegis/sapl/issues/1046
- conteudo = re.sub('style=".*?"', '', conteudo)
+ conteudo = re.sub(r'style=".*?"', '', conteudo)
conteudo = html.unescape(conteudo)
# escape special character '&'
@@ -895,7 +895,7 @@ def get_sessao_plenaria(sessao, casa, user):
# unescape HTML codes
# https://github.com/interlegis/sapl/issues/1046
- conteudo = re.sub('style=".*?"', '', conteudo)
+ conteudo = re.sub(r'style=".*?"', '', conteudo)
conteudo = html.unescape(conteudo)
# escape special character '&'
@@ -1322,13 +1322,13 @@ def get_pauta_sessao(sessao, casa):
if not is_empty(conteudo):
# unescape HTML codes
# https://github.com/interlegis/sapl/issues/1046
- conteudo = re.sub('style=".*?"', '', conteudo)
- conteudo = re.sub('class=".*?"', '', conteudo)
+ conteudo = re.sub(r'style=".*?"', '', conteudo)
+ conteudo = re.sub(r'class=".*?"', '', conteudo)
# OSTicket Ticket #796450
- conteudo = re.sub('align=".*?"', '', conteudo)
- conteudo = re.sub('', '', conteudo)
+ conteudo = re.sub(r'align=".*?"', '', conteudo)
+ conteudo = re.sub(r'', '', conteudo)
# OSTicket Ticket #796450
- conteudo = re.sub('', '
', conteudo)
+ conteudo = re.sub(r'', '
', conteudo)
conteudo = html.unescape(conteudo)
# escape special character '&'
diff --git a/sapl/settings.py b/sapl/settings.py
index 9b7fa3c55..b946fb565 100644
--- a/sapl/settings.py
+++ b/sapl/settings.py
@@ -24,6 +24,8 @@ from unipath import Path
logging.captureWarnings(True)
+logger = logging.getLogger(__name__)
+
host = socket.gethostbyname_ex(socket.gethostname())[0]
BASE_DIR = Path(__file__).ancestor(1)
@@ -68,37 +70,37 @@ SAPL_APPS = (
)
INSTALLED_APPS = (
- 'django_admin_bootstrapped', # must come before django.contrib.admin
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'django.forms',
+ 'django_admin_bootstrapped', # must come before django.contrib.admin
+ 'django.contrib.admin',
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
+ 'django.forms',
- 'django_extensions',
+ 'django_extensions',
- 'crispy_forms',
+ 'crispy_forms',
- 'waffle',
+ 'waffle',
- 'drf_spectacular',
- 'rest_framework',
- 'rest_framework.authtoken',
- 'django_filters',
+ 'drf_spectacular',
+ 'rest_framework',
+ 'rest_framework.authtoken',
+ 'django_filters',
- 'easy_thumbnails',
- 'image_cropping',
+ 'easy_thumbnails',
+ 'image_cropping',
- 'haystack',
- 'django.contrib.postgres',
+ 'haystack',
+ 'django.contrib.postgres',
- 'webpack_loader',
+ 'webpack_loader',
- 'django_prometheus',
+ 'django_prometheus',
-) + SAPL_APPS
+ ) + SAPL_APPS
# FTS = Full Text Search
# Desabilita a indexação textual até encontramos uma solução para a issue
@@ -112,6 +114,10 @@ USE_SOLR = config('USE_SOLR', cast=bool, default=False)
SOLR_URL = config('SOLR_URL', cast=str, default='http://localhost:8983')
SOLR_COLLECTION = config('SOLR_COLLECTION', cast=str, default='sapl')
+# FOR HAYSTACK 3.3.1 (Django >= 3)
+# SOLR_USER = config('SOLR_USER', cast=str)
+# SOLR_PASSWORD = config('SOLR_PASSWORD', cast=str)
+
if USE_SOLR:
HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' # enable auto-index
SEARCH_BACKEND = 'haystack.backends.solr_backend.SolrEngine'
@@ -124,6 +130,10 @@ HAYSTACK_CONNECTIONS = {
SEARCH_URL[0]: SEARCH_URL[1],
'BATCH_SIZE': 1000,
'TIMEOUT': 20,
+ # 'KWARGS': {
+ # 'timeout': 60,
+ # 'auth': (SOLR_USER, SOLR_PASSWORD), # Basic Auth
+ # },
},
}
@@ -194,7 +204,7 @@ CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
'LOCATION': '/var/tmp/django_cache',
- 'OPTIONS': {"MAX_ENTRIES": 1000},
+ 'OPTIONS': {"MAX_ENTRIES": 10000},
}
}
@@ -230,17 +240,47 @@ WSGI_APPLICATION = 'sapl.wsgi.application'
# Database
# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
+# Parse DATABASE_URL
+# dj-database-url==0.5.0 is the latest compatible with Django 2.2, later versions required Django >= 4
+# but it doesn't support OPTIONS tag, so we need setup_db_tz
+# This should be removed once we are able to upgrade to Django >= 4
DATABASES = {
- 'default': config(
- 'DATABASE_URL', default='sqlite://:memory:',
- cast=db_url,
- )
+ "default": config("DATABASE_URL", cast=db_url)
}
+
+def setup_db_tz():
+ db = DATABASES["default"]
+ # Normalize legacy engine alias returned by old dj-database-url
+ if db.get("ENGINE") == "django.db.backends.postgresql_psycopg2":
+ db["ENGINE"] = "django.db.backends.postgresql"
+
+ # Force UTC per connection for Postgres (fixes Django’s utc_tzinfo_factory assertion)
+ if db.get("ENGINE") == "django.db.backends.postgresql":
+ opts = db.setdefault("OPTIONS", {})
+ existing = (opts.get("options") or "").strip()
+ force_utc = "-c timezone=UTC"
+ opts["options"] = f"{existing} {force_utc}".strip() if existing else force_utc
+
+ # ensure default TCP port if you use HOST; leave sockets alone if HOST is empty
+ if db.get("HOST") and not db.get("PORT"):
+ db["PORT"] = "5432"
+
+ # Add connection lifetime
+ # in recent dj-database-url versions, replace by config("DATABASE_URL", conn_max_age=300)
+ db["CONN_MAX_AGE"] = 300 # keep connections for 5 minutes
+
+ # Log if DEBUG mode
+ if config("DEBUG", default=False, cast=bool):
+ logger.debug("DB config: %r", db)
+
+
+setup_db_tz()
+
IMAGE_CROPPING_JQUERY_URL = None
THUMBNAIL_PROCESSORS = (
- 'image_cropping.thumbnail_processors.crop_corners',
-) + thumbnail_settings.THUMBNAIL_PROCESSORS
+ 'image_cropping.thumbnail_processors.crop_corners',
+ ) + thumbnail_settings.THUMBNAIL_PROCESSORS
THUMBNAIL_SOURCE_GENERATORS = (
'sapl.utils.pil_image',
@@ -271,7 +311,6 @@ WAFFLE_CREATE_MISSING_SWITCHES = True
WAFFLE_LOG_MISSING_SWITCHES = True
WAFFLE_ENABLE_ADMIN_PAGES = True
-
MAX_DOC_UPLOAD_SIZE = 150 * 1024 * 1024 # 150MB
MAX_IMAGE_UPLOAD_SIZE = 2 * 1024 * 1024 # 2MB
DATA_UPLOAD_MAX_MEMORY_SIZE = 10 * 1024 * 1024 # 10MB
@@ -291,6 +330,30 @@ if not TIME_ZONE:
USE_I18N = True
USE_L10N = True
USE_TZ = True
+
+
+##
+## Monkey patch of the Django 2.2 because latest version of psycopg2 returns DB time zone as UTC,
+## but Django 2.2 requires an int! This should be removed once we are able to upgrade to Django >= 4
+##
+import importlib
+from django.utils.timezone import utc
+
+pg_utils = importlib.import_module("django.db.backends.postgresql.utils")
+
+
+def _compat_utc_tzinfo_factory(offset):
+ try:
+ minutes = int(offset.total_seconds() // 60) if hasattr(offset, "total_seconds") else int(offset)
+ except Exception:
+ raise AssertionError("database connection isn't set to UTC")
+ if minutes != 0:
+ raise AssertionError("database connection isn't set to UTC")
+ return utc
+
+
+pg_utils.utc_tzinfo_factory = _compat_utc_tzinfo_factory
+
# DATE_FORMAT = 'N j, Y'
DATE_FORMAT = 'd/m/Y'
SHORT_DATE_FORMAT = 'd/m/Y'
diff --git a/sapl/utils.py b/sapl/utils.py
index 757e698d0..19c9e4d4c 100644
--- a/sapl/utils.py
+++ b/sapl/utils.py
@@ -850,7 +850,7 @@ def texto_upload_path(instance, filename, subpath='', pk_first=False):
seguida para armazenar o arquivo.
"""
- filename = re.sub('\s', '_', normalize(filename.strip()).lower())
+ filename = re.sub(r'\s', '_', normalize(filename.strip()).lower())
from sapl.materia.models import Proposicao
from sapl.protocoloadm.models import DocumentoAdministrativo