Merge branch 'dev-r85-v2-pull' into dev-backend-libs-upgrade

Author: varmar05

deployment/community/docker-compose.yml

@@ -23,7 +23,7 @@ services:
     networks:
       - merginmaps
   server:
-    image: lutraconsulting/merginmaps-backend:2025.2.2
+    image: lutraconsulting/merginmaps-backend:2025.7.3
     container_name: merginmaps-server
     restart: always
     user: 901:999
@@ -39,7 +39,7 @@ services:
     networks:
       - merginmaps
   celery-beat:
-    image: lutraconsulting/merginmaps-backend:2025.2.2
+    image: lutraconsulting/merginmaps-backend:2025.7.3
     container_name: celery-beat
     restart: always
     env_file:
@@ -54,7 +54,7 @@ services:
     networks:
       - merginmaps
   celery-worker:
-    image: lutraconsulting/merginmaps-backend:2025.2.2
+    image: lutraconsulting/merginmaps-backend:2025.7.3
     container_name: celery-worker
     restart: always
     user: 901:999
@@ -73,7 +73,7 @@ services:
     networks:
       - merginmaps
   web:
-    image: lutraconsulting/merginmaps-frontend:2025.2.2
+    image: lutraconsulting/merginmaps-frontend:2025.7.3
     container_name: merginmaps-web
     restart: always
     depends_on:

deployment/enterprise/.env.template

@@ -117,7 +117,7 @@ LOCAL_PROJECTS=/data
 
 # data download
 
-#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024  # max total files size in bytes for archive download
+#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024 * 10  # max total files size in bytes for archive download
 
 #USE_X_ACCEL=False  # use nginx (in front of gunicorn) to serve files (https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/)
 USE_X_ACCEL=1
@@ -214,12 +214,8 @@ VECTOR_TILES_URL=https://tiles-ee.merginmaps.com/data/default/{z}/{x}/{y}.pbf
 
 VECTOR_TILES_STYLE_URL=https://tiles-ee.merginmaps.com//styles/default.json
 
-#QGIS_EXTRACTOR_API_URL=http://mergin-qgis-extractor:8000
-
 #WMTS_SERVER_URL=http://mergin-qgis-nginx:80
 
-#QGIS_EXTRACTOR_TIMEOUT=60
-
 #OVERVIEW_MAX_FILE_SIZE=1048576 # 1MB
 
 ### Diagnostic logs from Mobile and QGIS Plugin

deployment/enterprise/docker-compose.maps.yml

@@ -30,13 +30,16 @@ services:
       - ./qgis_nginx.conf:/etc/nginx/conf.d/default.conf
   qgis_extractor:
     container_name: mergin-qgis-extractor
-    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/qgis-extractor-ee:2025.1.0
+    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/qgis-extractor-ee:2025.3.0
     user: 901:999
     networks:
       - mergin-net
     environment:
       - OVERVIEWS_DATA_DIR=/data
       - MM_WMS_TILE_BUFFER=100
       - MM_WMS_AVOID_ARTIFACTS=1
+      - BROKER_URL=redis://merginmaps-redis:6379/0
+      - CELERY_RESULT_BACKEND=redis://merginmaps-redis:6379/0
+      - 'CELERY_TASK_ROUTES={"src.maps.tasks.finish_overview": {"queue": "celery"}}'
     volumes:
       - ./map_data:/data

deployment/enterprise/docker-compose.yml

@@ -5,7 +5,7 @@ networks:
 
 services:
   server:
-    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
+    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3
     container_name: merginmaps-server
     restart: always
     user: 901:999
@@ -22,7 +22,7 @@ services:
     networks:
       - mergin
   web:
-    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.5.1
+    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.7.3
     container_name: merginmaps-web
     restart: always
     depends_on:
@@ -52,7 +52,7 @@ services:
       - server
 
   celery-beat:
-    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
+    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3
     container_name: merginmaps-celery-beat
     restart: always
     user: 901:999
@@ -66,7 +66,7 @@ services:
       - mergin
 
   celery-worker:
-    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
+    image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3
     container_name: merginmaps-celery-worker
     restart: always
     user: 901:999
@@ -76,6 +76,8 @@ services:
       - ./map_data:/overviews
     env_file:
       - .prod.env
+    environment:
+      - CELERY_ROUTES={ 'qgis-extractor.*':{'queue':'extractor'} }
     depends_on:
       - db
       - redis

server/mergin/auth/api.yaml

@@ -753,6 +753,11 @@ components:
           type: string
           format: date-time
           example: 2023-07-30T08:47:58Z
+        last_signed_in:
+          nullable: true
+          type: string
+          format: date-time
+          example: 2025-12-18T08:47:58Z
         profile:
           $ref: "#/components/schemas/UserProfile"
     PaginatedUsers:

server/mergin/auth/controller.py

@@ -424,6 +424,9 @@ def register_user():  # pylint: disable=W0613,W0612
 @auth_required(permissions=["admin"])
 def get_user(username):
     user = User.query.filter(User.username == username).first_or_404()
+    if not user.last_signed_in:
+        last_signed_in = LoginHistory.get_users_last_signed_in([user.id])
+        user.last_signed_in = last_signed_in.get(user.id)
     data = UserSchema().dump(user)
     return data, 200
 

server/mergin/auth/models.py

@@ -268,7 +268,7 @@ class UserProfile(db.Model):
         ),
     )
 
-    def name(self):
+    def name(self) -> Optional[str]:
         return f'{self.first_name if self.first_name else ""} {self.last_name if self.last_name else ""}'.strip()
 
 

server/mergin/auth/schemas.py

@@ -11,7 +11,7 @@
 
 class UserProfileSchema(ma.SQLAlchemyAutoSchema):
     name = ma.Function(
-        lambda obj: f'{obj.first_name if obj.first_name else ""} {obj.last_name if obj.last_name else ""}'.strip(),
+        lambda obj: obj.name(),
         dump_only=True,
     )
     storage = fields.Method("get_storage", dump_only=True)
@@ -70,6 +70,7 @@ class Meta:
             "profile",
             "scheduled_removal",
             "registration_date",
+            "last_signed_in",
         )
         load_instance = True
 

server/mergin/sync/config.py

@@ -77,3 +77,6 @@ class Configuration(object):
     )
     # whether client can pull using v2 apis
     V2_PULL_ENABLED = config("V2_PULL_ENABLED", default=True, cast=bool)
+    EXCLUDED_CLONE_FILENAMES = config(
+        "EXCLUDED_CLONE_FILENAMES", default="qgis_cfg.xml", cast=Csv()
+    )

server/mergin/sync/models.py

@@ -339,6 +339,7 @@ def get_member(self, user_id: int) -> Optional[ProjectMember]:
                 project_role=ProjectRole(member.role),
                 workspace_role=self.workspace.get_user_role(member.user),
                 role=ProjectPermissions.get_user_project_role(self, member.user),
+                name=member.user.profile.name(),
             )
 
     def members_by_role(self, role: ProjectRole) -> List[int]:
@@ -456,6 +457,7 @@ class ProjectMember:
     workspace_role: WorkspaceRole
     project_role: Optional[ProjectRole]
     role: ProjectRole
+    name: Optional[str]
 
 
 @dataclass