Merge branch 'master' into release

Author: gounux

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+exclude =
+    .git,
+    __pycache__
+select = CLB100

.pre-commit-config.yaml

@@ -30,6 +30,12 @@ repos:
         args: [--target-version, '4.2', '--skip', 'admin_register']
         files: '^docker-app/qfieldcloud/.*.py$'
 
+  - repo: https://github.com/pycqa/flake8
+    rev: '7.1.2'
+    hooks:
+    -   id: flake8
+        additional_dependencies: [flake8-clean-block]
+
   # Lint and format
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.

docker-app/manage.py

@@ -13,6 +13,7 @@ def main():
             "available on your PYTHONPATH environment variable? Did you "
             "forget to activate a virtual environment?"
         ) from exc
+
     execute_from_command_line(sys.argv)
 
 

docker-app/qfieldcloud/authentication/apps.py

@@ -14,6 +14,7 @@ def initialize(cls):
 
         if cls.initialized:
             return
+
         cls.initialized = True
 
         from .conf import settings  # noqa

docker-app/qfieldcloud/authentication/auth_backends.py

@@ -38,4 +38,5 @@ def get_user(self, user_id):
             user = UserModel.objects.get(pk=user_id)
         except UserModel.DoesNotExist:
             return None
+
         return user if self.user_can_authenticate(user) else None

docker-app/qfieldcloud/authentication/models.py

@@ -99,9 +99,11 @@ def save(self, *args, **kwargs) -> None:
         if self.client_type in self.single_token_clients:
             # expire all other tokens
             now = timezone.now()
+
             AuthToken.objects.filter(
                 user=self.user,
                 client_type=self.client_type,
                 expires_at__gt=now,
             ).exclude(pk=self.pk).update(expires_at=now)
+
         return super().save(*args, **kwargs)

docker-app/qfieldcloud/core/admin.py

@@ -78,6 +78,7 @@ def get_ordering(self, request, queryset):
         order_fields = super().get_ordering(request, queryset)
         if len(order_fields) > 1 and "-pk" in order_fields:
             order_fields.remove("-pk")
+
         return order_fields
 
 
@@ -108,6 +109,7 @@ def has_delete_permission(self, request, obj=None):
         """
         if hasattr(self, "has_direct_delete_permission"):
             perm = f"admin:{self.model._meta.app_label}_{self.model._meta.model_name}"
+
             if request.resolver_match.view_name.startswith(perm):
                 if callable(self.has_direct_delete_permission):
                     return self.has_direct_delete_permission(request, obj)
@@ -367,16 +369,19 @@ class MemberOrganizationInline(admin.TabularInline):
     def has_add_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type in (User.Type.PERSON, User.Type.ORGANIZATION)
 
     def has_direct_delete_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type in (User.Type.PERSON, User.Type.ORGANIZATION)
 
     def has_change_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type in (User.Type.PERSON, User.Type.ORGANIZATION)
 
 
@@ -387,16 +392,19 @@ class MemberTeamInline(admin.TabularInline):
     def has_add_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type in (User.Type.PERSON, User.Type.ORGANIZATION)
 
     def has_direct_delete_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type in (User.Type.PERSON, User.Type.ORGANIZATION)
 
     def has_change_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type in (User.Type.PERSON, User.Type.ORGANIZATION)
 
 
@@ -434,16 +442,19 @@ class UserProjectCollaboratorInline(admin.TabularInline):
     def has_add_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type == User.Type.PERSON
 
     def has_direct_delete_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type == User.Type.PERSON
 
     def has_change_permission(self, request, obj):
         if obj is None:
             return True
+
         return obj.type == User.Type.PERSON
 
 
@@ -540,6 +551,7 @@ def get_urls(self):
                 name="password_reset_url",
             ),
         ]
+
         return urls
 
     @method_decorator(never_cache)
@@ -565,6 +577,7 @@ def password_reset_url(self, request, user_id, form_url=""):
                 "key": token_generator.make_token(user),
             },
         )
+
         return TemplateResponse(
             request,
             "admin/password_reset_url.html",
@@ -623,6 +636,7 @@ class Meta:
     def get_initial_for_field(self, field, field_name):
         if self.instance.pk and field_name == "value":
             return ""
+
         return super().get_initial_for_field(field, field_name)
 
     def clean(self):
@@ -632,9 +646,11 @@ def clean(self):
             type = self.instance.type
         else:
             type = cleaned_data.get("type")
+
         if type == Secret.Type.PGSERVICE:
             # validate the pg_service.conf
             value = cleaned_data.get("value")
+
             if value:
                 try:
                     pg_service_file.validate_pg_service_conf(value)
@@ -686,6 +702,7 @@ def save_model(self, request, obj, form, change):
         # only set created_by during the first save
         if not change:
             obj.created_by = request.user
+
         super().save_model(request, obj, form, change)
 
     def get_changeform_initial_data(self, request):
@@ -798,7 +815,10 @@ class ProjectAdmin(QFieldCloudModelAdmin):
         "data_last_packaged_at",
         "project_details__pre",
     )
-    inlines = (ProjectCollaboratorInline, ProjectSecretInline)
+    inlines = (
+        ProjectSecretInline,
+        ProjectCollaboratorInline,
+    )
     search_fields = (
         "id",
         "name__icontains",
@@ -962,8 +982,10 @@ def get_queryset(self, request):
 
     def get_object(self, request, object_id, from_field=None):
         obj = super().get_object(request, object_id, from_field)
+
         if obj and obj.type == Job.Type.DELTA_APPLY:
             obj = ApplyJob.objects.get(pk=obj.pk)
+
         return obj
 
     def get_inline_instances(self, request, obj=None):
@@ -1297,8 +1319,8 @@ class OrganizationAdmin(QFieldCloudModelAdmin):
     inlines = (
         UserAccountInline,
         GeodbInline,
-        OrganizationMemberInline,
         ProjectInline,
+        OrganizationMemberInline,
         TeamInline,
     )
     fields = (
@@ -1339,8 +1361,10 @@ class OrganizationAdmin(QFieldCloudModelAdmin):
     def active_users_links(self, instance) -> str:
         persons = instance.useraccount.current_subscription.active_users
         userlinks = "<p> - </p>"
+
         if persons:
             userlinks = "<br>".join(model_admin_url(p, p.username) for p in persons)
+
         help_text = """
         <p style="font-size: 11px; color: var(--body-quiet-color)">
             Active members have triggererd at least one job or uploaded at least one delta in the current billing period.
@@ -1428,6 +1452,7 @@ class TeamAdmin(QFieldCloudModelAdmin):
     def save_model(self, request, obj, form, change):
         if not obj.username.startswith("@"):
             obj.username = f"@{obj.team_organization.username}/{obj.username}"
+
         obj.save()
 
     def get_form(

docker-app/qfieldcloud/core/constance_backends.py

@@ -13,13 +13,16 @@ class DatabaseBackend(BaseDatabaseBackend):
 
     def get(self, key):
         key = self.add_prefix(key)
+
         if self._cache:
             value = self._cache.get(key)
+
             if value is None:
                 self.autofill()
                 value = self._cache.get(key)
         else:
             value = None
+
         if value is None:
             try:
                 value = self._model._default_manager.get(key=key).value
@@ -28,4 +31,5 @@ def get(self, key):
                     self._cache.add(key, value)
             except self._model.DoesNotExist:  # Only catch DoesNotExist exceptions here
                 pass
+
         return value

docker-app/qfieldcloud/core/drf_utils.py

@@ -39,6 +39,7 @@ def _get_query_field(self, fields: Iterable[str], term: str) -> str | None:
                 continue
 
             return field
+
         return None
 
     def _parse_tokenized_attributes(self, raw: str) -> dict[str, str]:

docker-app/qfieldcloud/core/models.py

@@ -710,10 +710,12 @@ def active_users(self, period_since: datetime, period_until: datetime):
 
     def save(self, *args, **kwargs):
         self.type = User.Type.ORGANIZATION
+
         if getattr(self, "created_by", None) is not None:
             self.created_by = self.created_by
         else:
             self.created_by = self.organization_owner
+
         return super().save(*args, **kwargs)
 
 
@@ -1821,6 +1823,7 @@ def get_feedback_step_data(self, step_name: str) -> dict[str, Any] | None:
         for step in self.feedback["steps"]:
             if step["id"] == step_name:
                 return step
+
         return None