morango 0.7.0__py2.py3-none-any.whl → 0.7.1__py2.py3-none-any.whl

morango/__init__.py

@@ -3,4 +3,4 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 default_app_config = "morango.apps.MorangoConfig"
-__version__ = "0.7.0"
+__version__ = "0.7.1"

morango/management/commands/cleanupsyncs.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+import uuid
 
 from django.core.management.base import BaseCommand
 from django.db import transaction
@@ -29,6 +30,36 @@ class Command(BaseCommand):
             default=6,
             help="Number of hours of inactivity after which a session should be considered stale",
         )
+        parser.add_argument(
+            "--client-instance-id",
+            type=uuid.UUID,
+            default=None,
+            help="Filters the SyncSession models to those with matching 'client_instance_id'",
+        )
+        parser.add_argument(
+            "--server-instance-id",
+            type=uuid.UUID,
+            default=None,
+            help="Filters the SyncSession models to those with matching 'server_instance_id'",
+        )
+        parser.add_argument(
+            "--sync-filter",
+            type=str,
+            default=None,
+            help="Filters the TransferSession models to those with 'filters' starting with 'sync_filter'",
+        )
+        parser.add_argument(
+            "--push",
+            type=bool,
+            default=None,
+            help="Filters the TransferSession models to those with 'push' set to True",
+        )
+        parser.add_argument(
+            "--pull",
+            type=bool,
+            default=None,
+            help="Filters the TransferSession models to those with 'push' set to False",
+        )
 
     def handle(self, *args, **options):
 
@@ -37,10 +68,17 @@ class Command(BaseCommand):
 
         sync_sessions = SyncSession.objects.filter(active=True)
 
-        # if ids arg was passed, filter down sessions to only those IDs if included by expiration filter
+        # if ids arg was passed, filter down sessions to only those IDs
+        # if included by expiration filter
         if options["ids"]:
             sync_sessions = sync_sessions.filter(id__in=options["ids"])
 
+        if options["client_instance_id"]:
+            sync_sessions = sync_sessions.filter(client_instance_id=options["client_instance_id"])
+
+        if options["server_instance_id"]:
+            sync_sessions = sync_sessions.filter(server_instance_id=options["server_instance_id"])
+
         # retrieve all sessions still marked as active but with no activity since the cutoff
         transfer_sessions = TransferSession.objects.filter(
             sync_session_id__in=sync_sessions.values("id"),
@@ -48,11 +86,19 @@ class Command(BaseCommand):
             last_activity_timestamp__lt=cutoff,
         )
 
+        if options["sync_filter"]:
+            transfer_sessions = transfer_sessions.filter(filter__startswith=options["sync_filter"])
+
+        if options["push"] and not options["pull"]:
+            transfer_sessions = transfer_sessions.filter(push=True)
+
+        if options["pull"] and not options["push"]:
+            transfer_sessions = transfer_sessions.filter(push=False)
+
         transfer_count = transfer_sessions.count()
 
         # loop over the stale sessions one by one to close them out
-        for i in range(transfer_count):
-            transfer_session = transfer_sessions[0]
+        for i, transfer_session in enumerate(transfer_sessions):
             logger.info(
                 "TransferSession {} of {}: deleting {} Buffers and {} RMC Buffers...".format(
                     i + 1,
@@ -68,17 +114,21 @@ class Command(BaseCommand):
                 transfer_session.active = False
                 transfer_session.save()
 
+        # in order to close a sync session, it must have no active transfer sessions
+        # and must have no activity since the cutoff
+        sync_sessions = sync_sessions.filter(
+            last_activity_timestamp__lt=cutoff,
+        ).exclude(
+            transfersession__active=True,
+        )
         sync_count = sync_sessions.count()
 
-        # finally loop over sync sessions and close out if there are no other active transfer sessions
-        for i in range(sync_count):
-            sync_session = sync_sessions[0]
-            if not sync_session.transfersession_set.filter(active=True).exists():
-                logger.info(
-                    "Closing SyncSession {} of {}".format(
-                        i + 1,
-                        sync_count,
-                    )
+        for i, sync_session in enumerate(sync_sessions):
+            logger.info(
+                "Closing SyncSession {} of {}".format(
+                    i + 1,
+                    sync_count,
                 )
-                sync_session.active = False
-                sync_session.save()
+            )
+            sync_session.active = False
+            sync_session.save()

morango/models/core.py

@@ -17,6 +17,7 @@ from django.db.models import F
 from django.db.models import Func
 from django.db.models import Max
 from django.db.models import Q
+from django.db.models import signals
 from django.db.models import TextField
 from django.db.models import Value
 from django.db.models.deletion import Collector
@@ -468,13 +469,13 @@ class Store(AbstractStore):
         klass_model = syncable_models.get_model(self.profile, self.model_name)
         # if store model marked as deleted, attempt to delete in app layer
         if self.deleted:
-            # if hard deleted, propagate to related models
-            if self.hard_deleted:
-                try:
-                    klass_model.objects.get(id=self.id).delete(hard_delete=True)
-                except klass_model.DoesNotExist:
-                    pass
-            else:
+            # Don't differentiate between deletion and hard deletion here,
+            # as we don't want to add additional tracking for models in either case,
+            # just to actually delete them.
+            # Import here to avoid circular import, as the utils module
+            # imports core models.
+            from morango.sync.utils import mute_signals
+            with mute_signals(signals.post_delete):
                 klass_model.objects.filter(id=self.id).delete()
             return None, deferred_fks
         else:

morango/sync/session.py

@@ -1,11 +1,13 @@
 import logging
 
 from requests import exceptions
+from morango import __version__
 from requests.sessions import Session
 from requests.utils import super_len
 from requests.packages.urllib3.util.url import parse_url
 
 from morango.utils import serialize_capabilities_to_client_request
+from morango.utils import SETTINGS
 
 
 logger = logging.getLogger(__name__)
@@ -35,6 +37,15 @@ class SessionWrapper(Session):
     bytes_sent = 0
     bytes_received = 0
 
+    def __init__(self):
+        super(SessionWrapper, self).__init__()
+        user_agent_header = "morango/{}".format(__version__)
+        if SETTINGS.CUSTOM_INSTANCE_INFO is not None:
+            instances = list(SETTINGS.CUSTOM_INSTANCE_INFO)
+            if instances:
+                user_agent_header += " " + "{}/{}".format(instances[0], SETTINGS.CUSTOM_INSTANCE_INFO.get(instances[0]))
+        self.headers["User-Agent"] = "{} {}".format(user_agent_header, self.headers["User-Agent"])
+
     def request(self, method, url, **kwargs):
         response = None
         try:

morango/sync/syncsession.py

@@ -260,12 +260,16 @@ class NetworkSyncConnection(Connection):
         sync_session = SyncSession.objects.create(**data)
         return SyncSessionClient(self, sync_session)
 
-    def resume_sync_session(self, sync_session_id, chunk_size=None):
+    def resume_sync_session(self, sync_session_id, chunk_size=None, ignore_existing_process=False):
         """
         Resumes an existing sync session given an ID
 
         :param sync_session_id: The UUID of the `SyncSession` to resume
         :param chunk_size: An optional parameter specifying the size for each transferred chunk
+        :type chunk_size: int
+        :param ignore_existing_process:An optional parameter specifying whether to ignore an
+            existing active process ID
+        :type ignore_existing_process: bool
         :return: A SyncSessionClient instance
         :rtype: SyncSessionClient
         """
@@ -281,7 +285,8 @@ class NetworkSyncConnection(Connection):
 
         # check that process of existing session isn't still running
         if (
-            sync_session.process_id
+            not ignore_existing_process
+            and sync_session.process_id
             and sync_session.process_id != os.getpid()
             and pid_exists(sync_session.process_id)
         ):

{morango-0.7.0.dist-info → morango-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morango
-Version: 0.7.0
+Version: 0.7.1
 Summary: Pure Python sqlite-based Django DB replication engine.
 Home-page: https://github.com/learningequality/morango
 Author: Learning Equality
@@ -20,12 +20,14 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Description-Content-Type: text/markdown
-Requires-Dist: django (<2,>=1.10)
-Requires-Dist: django-mptt (<0.10.0)
-Requires-Dist: rsa (<3.5,>=3.4.2)
-Requires-Dist: djangorestframework (==3.9.1)
-Requires-Dist: django-ipware (<1.2,>=1.1.6)
-Requires-Dist: future (==0.16.0)
+License-File: LICENSE
+License-File: AUTHORS.md
+Requires-Dist: django <2,>=1.10
+Requires-Dist: django-mptt <0.10.0
+Requires-Dist: rsa <3.5,>=3.4.2
+Requires-Dist: djangorestframework ==3.9.1
+Requires-Dist: django-ipware <1.2,>=1.1.6
+Requires-Dist: future ==0.16.0
 Requires-Dist: requests
 Requires-Dist: ifcfg
 

{morango-0.7.0.dist-info → morango-0.7.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-morango/__init__.py,sha256=Ou8LIEKHUoQQBn7VeoYWZvCz8vDRklNUI0mc_9p8pKU,190
+morango/__init__.py,sha256=4JEWqdXPhqGXLmHDKnCM3ASxeQQ1jNJYFbtMSpnikdQ,190
 morango/apps.py,sha256=qJ0Tu2YmprNC-7iYlOb1OTG-JxRAweHLnbyb5kHlU9U,546
 morango/errors.py,sha256=okjt7FqSHIf3x9SmnmoW6aqNJ_g7Ye3Fx7tuQSNUYEI,1223
 morango/proquint.py,sha256=oHlbNPi7bkqylUhRbq9GbpdtywxU0AXKslJrowcsrqg,3735
@@ -20,7 +20,7 @@ morango/constants/transfer_stages.py,sha256=nmM-ywKPFcwOICPkHN_1e4xFOWTxwnvb99hr
 morango/constants/transfer_statuses.py,sha256=__Reiqxal53Obq-Hch-Ty-HJwlEUZLFSBdRF9ytim0I,510
 morango/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 morango/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-morango/management/commands/cleanupsyncs.py,sha256=cOgm5p9hO_xyPUSOmNw5r76WyGej2n7h9SN7bTmuAiE,3044
+morango/management/commands/cleanupsyncs.py,sha256=Huaz8etLNbmW8X-Vy4x1QY801JYln0iyaeUTJF2L3kE,4833
 morango/migrations/0001_initial.py,sha256=ZUmqmw6DneAFBfsfhapyC3cIDneV9zqC7Lws61UN2VA,11933
 morango/migrations/0002_auto_20170511_0400.py,sha256=6gTEf4g56Y6ZvL0UHGK0AQvURPaWuAmpRVKONdP1GH4,2304
 morango/migrations/0003_auto_20170519_0543.py,sha256=ltBTLl130cjwtRao0zw_FXkEWMrGMTRj1mpgpJmaWP0,682
@@ -47,7 +47,7 @@ morango/migrations/0023_add_instance_id_fields.py,sha256=lgTETXKFcXM1CnNwXb6kqJ3
 morango/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 morango/models/__init__.py,sha256=6sTAlg7gpmX9xRmjw4GPLdjh6_FzZJEN-WEtRBsgGA8,1983
 morango/models/certificates.py,sha256=Kc4aDNJZMp4JQMqdpZDx6zp-qqG_OhAa5n4f-Q605r8,15331
-morango/models/core.py,sha256=z4JDnyys5p_VJqEco2_7Ut7F4xZ1T_yUdZcJpEtKdjs,38771
+morango/models/core.py,sha256=64iEy1DTm_gEyJs4L9BQ8m7FTXkVMyawglIuziqrKmc,38940
 morango/models/fsic_utils.py,sha256=B9RM-uPZFvEXWbsPeeit5qA21gKGpA0NkKCLFIdNI_0,7130
 morango/models/manager.py,sha256=fzzX7k8qV5W5dMBb0ASOBNRJRpvQZbEG1hgyuMtzt4g,163
 morango/models/morango_mptt.py,sha256=K_ZF0lRv3EX6n5K5iCSCjDx4qVnMIG_gq9dAyIIQLIU,1024
@@ -61,17 +61,17 @@ morango/sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 morango/sync/context.py,sha256=_gqfE-RfTIn0UMKFeI2snIJEGCbmR_NRl-Ts5u35B7Q,17815
 morango/sync/controller.py,sha256=rcibQcq579hneUef2p41Ze4OCysLI7rVz6FCFIfYiVA,11575
 morango/sync/operations.py,sha256=jDIHPF8IdqoUOer3aaoq9VHcL0-BVeS7-wlMxMHA1-w,69494
-morango/sync/session.py,sha256=SDM120mzRItszCpVmWBGNWbJX9S-f8kUj0NB9MFmPDI,3293
-morango/sync/syncsession.py,sha256=KxKGayO_fy0TMPf_NOa0XfltMLWd2Eymt9aLTeXC7HI,25198
+morango/sync/session.py,sha256=9CTLhpEPM8q1M_b2HHxouZbzm7vBJoImoqPWqdodgII,3853
+morango/sync/syncsession.py,sha256=82u95pFN68-Fk9fm63q8dueZ4lZyuDsvhtEe3fZFrMI,25479
 morango/sync/utils.py,sha256=BrG8CYVmaAhRNa_HYuPCYSnncskSsW_ig0Cf7xsY2mo,8792
 morango/sync/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 morango/sync/backends/base.py,sha256=zQP5hOB2Qw0qv0G00LXFHl2GQ3b0bheyujdNVl5rT-8,10867
 morango/sync/backends/postgres.py,sha256=N0IeXN67AkdQKlD20b8LQZ1ocdarapL8pqu8FQAc6lM,19850
 morango/sync/backends/sqlite.py,sha256=vg7kWFIF346-NjVwexYfjYbrrOyzzvcCmk5uUkqhabw,12850
 morango/sync/backends/utils.py,sha256=KaTfj8dKrhRhl6wua2m_jKifmLZ2Kzsd8wPi1NWEtHM,5198
-morango-0.7.0.dist-info/AUTHORS.md,sha256=9Ussd3Fq3RPjHyQT_3AyGss5jiVbn858WQuIBOi1ajI,276
-morango-0.7.0.dist-info/LICENSE,sha256=RkI6MjmrrTKa3aoPAVyk9QdeLZclcrKds6FH3phRSRU,1074
-morango-0.7.0.dist-info/METADATA,sha256=aTyd64Bu8qBI2D_ofrJgNCkZbS0RcatdPaMmItqSpHw,2520
-morango-0.7.0.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-morango-0.7.0.dist-info/top_level.txt,sha256=pzREWN0EeEq3yHDRast9XI081Ow_rtcm7WV0ZQTlIPY,8
-morango-0.7.0.dist-info/RECORD,,
+morango-0.7.1.dist-info/AUTHORS.md,sha256=9Ussd3Fq3RPjHyQT_3AyGss5jiVbn858WQuIBOi1ajI,276
+morango-0.7.1.dist-info/LICENSE,sha256=RkI6MjmrrTKa3aoPAVyk9QdeLZclcrKds6FH3phRSRU,1074
+morango-0.7.1.dist-info/METADATA,sha256=GdViBtA_HnZnDsaz7tPeGjNegrsO4C6FBS1XHwAZ4sg,2555
+morango-0.7.1.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+morango-0.7.1.dist-info/top_level.txt,sha256=pzREWN0EeEq3yHDRast9XI081Ow_rtcm7WV0ZQTlIPY,8
+morango-0.7.1.dist-info/RECORD,,

{morango-0.7.0.dist-info → morango-0.7.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any