udata 7.0.7.dev28605__py2.py3-none-any.whl → 7.0.7.dev28628__py2.py3-none-any.whl

udata/core/contact_point/models.py

@@ -1,13 +1,13 @@
 from udata.mongo import db
-
+from udata.core.owned import Owned, OwnedQuerySet
 
 __all__ = ('ContactPoint', )
 
 
-class ContactPoint(db.Document, db.Owned):
+class ContactPoint(db.Document, Owned):
     email = db.StringField(max_length=255, required=True)
     name = db.StringField(max_length=255, required=True)
 
     meta = {
-        'queryset_class': db.OwnedQuerySet
+        'queryset_class': OwnedQuerySet
     }

udata/core/dataset/models.py

@@ -23,6 +23,7 @@ from udata.i18n import lazy_gettext as _
 from udata.utils import get_by, hash_url, to_naive_datetime
 from udata.uris import ValidationError, endpoint_for
 from udata.uris import validate as validate_url
+from udata.core.owned import Owned, OwnedQuerySet
 from .constants import CHECKSUM_TYPES, CLOSED_FORMATS, DEFAULT_LICENSE, LEGACY_FREQUENCIES, MAX_DISTANCE, PIVOTAL_DATA, RESOURCE_FILETYPES, RESOURCE_TYPES, SCHEMA_CACHE_DURATION, UPDATE_FREQUENCIES
 
 from .preview import get_preview_url
@@ -258,7 +259,7 @@ class License(db.Document):
         return cls.objects(id=DEFAULT_LICENSE['id']).first()
 
 
-class DatasetQuerySet(db.OwnedQuerySet):
+class DatasetQuerySet(OwnedQuerySet):
     def visible(self):
         return self(private__ne=True, deleted=None, archived=None)
 
@@ -456,7 +457,7 @@ class Resource(ResourceMixin, WithMetrics, db.EmbeddedDocument):
         self.dataset.save(*args, **kwargs)
 
 
-class Dataset(WithMetrics, BadgeMixin, db.Owned, db.Document):
+class Dataset(WithMetrics, BadgeMixin, Owned, db.Document):
     title = db.StringField(required=True)
     acronym = db.StringField(max_length=128)
     # /!\ do not set directly the slug when creating or updating a dataset
@@ -516,7 +517,7 @@ class Dataset(WithMetrics, BadgeMixin, db.Owned, db.Document):
             'slug',
             'resources.id',
             'resources.urlhash',
-        ] + db.Owned.meta['indexes'],
+        ] + Owned.meta['indexes'],
         'ordering': ['-created_at_internal'],
         'queryset_class': DatasetQuerySet,
         'auto_create_index_on_save': True
@@ -903,7 +904,7 @@ pre_save.connect(Dataset.pre_save, sender=Dataset)
 post_save.connect(Dataset.post_save, sender=Dataset)
 
 
-class CommunityResource(ResourceMixin, WithMetrics, db.Owned, db.Document):
+class CommunityResource(ResourceMixin, WithMetrics, Owned, db.Document):
     '''
     Local file, remote file or API added by the community of the users to the
     original dataset
@@ -916,7 +917,7 @@ class CommunityResource(ResourceMixin, WithMetrics, db.Owned, db.Document):
 
     meta = {
         'ordering': ['-created_at_internal'],
-        'queryset_class': db.OwnedQuerySet,
+        'queryset_class': OwnedQuerySet,
     }
 
     @property

udata/core/organization/metrics.py

@@ -1,5 +1,5 @@
-from udata.models import db, Dataset, Reuse, Organization
-
+from udata.models import Dataset, Reuse, Organization
+from udata.core.owned import Owned
 
 @Dataset.on_create.connect
 @Dataset.on_update.connect
@@ -17,7 +17,7 @@ def update_reuses_metrics(document, **kwargs):
         document.organization.count_reuses()
 
 
-@db.Owned.on_owner_change.connect
+@Owned.on_owner_change.connect
 def update_org_metrics(document, previous):
     if not isinstance(previous, Organization):
         return

udata/{mongo → core}/owned.py

@@ -4,7 +4,7 @@ from blinker import signal
 from mongoengine import NULLIFY, Q, post_save
 from mongoengine.fields import ReferenceField
 
-from .queryset import UDataQuerySet
+from udata.mongo.queryset import UDataQuerySet
 
 log = logging.getLogger(__name__)
 

udata/core/reuse/models.py

@@ -8,12 +8,13 @@ from udata.i18n import lazy_gettext as _
 from udata.models import db, BadgeMixin, WithMetrics
 from udata.utils import hash_url
 from udata.uris import endpoint_for
+from udata.core.owned import Owned, OwnedQuerySet
 from .constants import IMAGE_MAX_SIZE, IMAGE_SIZES, REUSE_TOPICS, REUSE_TYPES
 
 __all__ = ('Reuse',)
 
 
-class ReuseQuerySet(db.OwnedQuerySet):
+class ReuseQuerySet(OwnedQuerySet):
     def visible(self):
         return self(private__ne=True, datasets__0__exists=True, deleted=None)
 
@@ -23,7 +24,7 @@ class ReuseQuerySet(db.OwnedQuerySet):
                     db.Q(deleted__ne=None))
 
 
-class Reuse(db.Datetimed, WithMetrics, BadgeMixin, db.Owned, db.Document):
+class Reuse(db.Datetimed, WithMetrics, BadgeMixin, Owned, db.Document):
     title = db.StringField(required=True)
     slug = db.SlugField(max_length=255, required=True, populate_from='title',
                         update=True, follow=True)
@@ -68,7 +69,7 @@ class Reuse(db.Datetimed, WithMetrics, BadgeMixin, db.Owned, db.Document):
                     'metrics.datasets',
                     'metrics.followers',
                     'metrics.views',
-                    'urlhash'] + db.Owned.meta['indexes'],
+                    'urlhash'] + Owned.meta['indexes'],
         'ordering': ['-created_at'],
         'queryset_class': ReuseQuerySet,
         'auto_create_index_on_save': True

udata/core/topic/models.py

@@ -3,12 +3,13 @@ from mongoengine.signals import pre_save
 from udata.models import db, SpatialCoverage
 from udata.search import reindex
 from udata.tasks import as_task_param
+from udata.core.owned import Owned
 
 
 __all__ = ('Topic', )
 
 
-class Topic(db.Document, db.Owned, db.Datetimed):
+class Topic(db.Document, Owned, db.Datetimed):
     name = db.StringField(required=True)
     slug = db.SlugField(max_length=255, required=True, populate_from='name',
                         update=True, follow=True)
@@ -33,7 +34,7 @@ class Topic(db.Document, db.Owned, db.Datetimed):
             '$name',
             'created_at',
             'slug'
-        ] + db.Owned.meta['indexes'],
+        ] + Owned.meta['indexes'],
         'ordering': ['-created_at'],
         'auto_create_index_on_save': True
     }

udata/core/user/metrics.py

@@ -1,6 +1,6 @@
 from udata.models import db, Dataset, Reuse, User
 from udata.core.followers.signals import on_follow, on_unfollow
-
+from udata.core.owned import Owned
 
 @Dataset.on_create.connect
 @Dataset.on_update.connect
@@ -24,7 +24,7 @@ def update_user_following_metric(follow):
     follow.follower.count_following()
 
 
-@db.Owned.on_owner_change.connect
+@Owned.on_owner_change.connect
 def update_owner_metrics(document, previous):
     if not isinstance(previous, User):
         return

udata/core/user/tests/test_user_model.py

@@ -5,7 +5,8 @@ from udata.core.discussions.factories import (
 )
 from udata.core.followers.models import Follow
 from udata.core.user.factories import UserFactory
-from udata.core.user.models import Discussion, User
+from udata.core.user.models import User
+from udata.core.discussions.models import Discussion
 from udata.core.organization.factories import OrganizationFactory
 
 pytestmark = pytest.mark.usefixtures('clean_db')

udata/harvest/models.py

@@ -8,6 +8,7 @@ from werkzeug.utils import cached_property
 from udata.core.dataset.models import HarvestDatasetMetadata
 from udata.models import db, Dataset
 from udata.i18n import lazy_gettext as _
+from udata.core.owned import Owned, OwnedQuerySet
 
 log = logging.getLogger(__name__)
 
@@ -83,12 +84,12 @@ class HarvestSourceValidation(db.EmbeddedDocument):
     comment = db.StringField()
 
 
-class HarvestSourceQuerySet(db.OwnedQuerySet):
+class HarvestSourceQuerySet(OwnedQuerySet):
     def visible(self):
         return self(deleted=None)
 
 
-class HarvestSource(db.Owned, db.Document):
+class HarvestSource(Owned, db.Document):
     name = db.StringField(max_length=255)
     slug = db.SlugField(max_length=255, required=True, unique=True,
                         populate_from='name', update=True)
@@ -140,7 +141,7 @@ class HarvestSource(db.Owned, db.Document):
             '-created_at',
             'slug',
             ('deleted', '-created_at'),
-        ] + db.Owned.meta['indexes'],
+        ] + Owned.meta['indexes'],
         'ordering': ['-created_at'],
         'queryset_class': HarvestSourceQuerySet,
     }

udata/mongo/engine.py

@@ -13,7 +13,6 @@ from .extras_fields import ExtrasField, OrganizationExtrasField
 from .slug_fields import SlugField
 from .url_field import URLField
 from .uuid_fields import AutoUUIDField
-from .owned import Owned, OwnedQuerySet
 from .queryset import UDataQuerySet
 from .document import UDataDocument, DomainModel
 
@@ -41,8 +40,6 @@ class UDataMongoEngine(MongoEngine):
         self.ValidationError = ValidationError
         self.ObjectId = ObjectId
         self.DBRef = DBRef
-        self.Owned = Owned
-        self.OwnedQuerySet = OwnedQuerySet
         self.post_save = post_save
         self.pre_save = pre_save