udata 7.0.7.dev28410__py2.py3-none-any.whl → 7.0.7.dev28435__py2.py3-none-any.whl

udata/core/reuse/constants.py

@@ -0,0 +1,37 @@
+from udata.i18n import lazy_gettext as _
+
+REUSE_TYPES = {
+    'api': _('API'),
+    'application': _('Application'),
+    'idea': _('Idea'),
+    'news_article': _('News Article'),
+    'paper': _('Paper'),
+    'post': _('Post'),
+    'visualization': _('Visualization'),
+    'hardware': _('Connected device'),
+}
+
+REUSE_TOPICS = {
+    'health': _('Health'),
+    'transport_and_mobility': _('Transport and mobility'),
+    'housing_and_development': _('Housing and development'),
+    'food_and_agriculture': _('Food and agriculture'),
+    'culture_and_recreation': _('Culture and recreation'),
+    'economy_and_business': _('Economy and business'),
+    'environment_and_energy': _('Environment and energy'),
+    'work_and_training': _('Work and training'),
+    'politics_and_public_life': _('Politics and public life'),
+    'safety_and_security': _('Safety and security'),
+    'education_and_research': _('Education and research'),
+    'society_and_demography': _('Society and demography'),
+    'law_and_justice': _('Law and justice'),
+    'open_data_tools': _('Open data tools'),
+    'others': _('Others'),
+}
+
+
+IMAGE_SIZES = [500, 100, 50, 25]
+IMAGE_MAX_SIZE = 800
+
+TITLE_SIZE_LIMIT = 350
+DESCRIPTION_SIZE_LIMIT = 100000

udata/core/reuse/factories.py

@@ -6,7 +6,8 @@ from udata.core.dataset.factories import DatasetFactory
 from udata.factories import ModelFactory
 from udata.utils import faker
 
-from .models import Reuse, REUSE_TYPES, REUSE_TOPICS
+from .models import Reuse
+from .constants import REUSE_TYPES, REUSE_TOPICS
 
 
 class ReuseFactory(ModelFactory):

udata/core/reuse/forms.py

@@ -1,8 +1,9 @@
 from udata.forms import ModelForm, fields, validators
 from udata.i18n import lazy_gettext as _
-from udata.models import Reuse, REUSE_TYPES, REUSE_TOPICS
+from udata.models import Reuse
+from udata.core.reuse.constants import REUSE_TYPES, REUSE_TOPICS
 
-from .models import IMAGE_SIZES, TITLE_SIZE_LIMIT, DESCRIPTION_SIZE_LIMIT
+from .constants import IMAGE_SIZES, TITLE_SIZE_LIMIT, DESCRIPTION_SIZE_LIMIT
 
 __all__ = ('ReuseForm', )
 

udata/core/reuse/models.py

@@ -8,45 +8,9 @@ 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 .constants import IMAGE_MAX_SIZE, IMAGE_SIZES, REUSE_TOPICS, REUSE_TYPES
 
-__all__ = ('Reuse', 'REUSE_TYPES', 'REUSE_TOPICS')
-
-
-REUSE_TYPES = {
-    'api': _('API'),
-    'application': _('Application'),
-    'idea': _('Idea'),
-    'news_article': _('News Article'),
-    'paper': _('Paper'),
-    'post': _('Post'),
-    'visualization': _('Visualization'),
-    'hardware': _('Connected device'),
-}
-
-REUSE_TOPICS = {
-    'health': _('Health'),
-    'transport_and_mobility': _('Transport and mobility'),
-    'housing_and_development': _('Housing and development'),
-    'food_and_agriculture': _('Food and agriculture'),
-    'culture_and_recreation': _('Culture and recreation'),
-    'economy_and_business': _('Economy and business'),
-    'environment_and_energy': _('Environment and energy'),
-    'work_and_training': _('Work and training'),
-    'politics_and_public_life': _('Politics and public life'),
-    'safety_and_security': _('Safety and security'),
-    'education_and_research': _('Education and research'),
-    'society_and_demography': _('Society and demography'),
-    'law_and_justice': _('Law and justice'),
-    'open_data_tools': _('Open data tools'),
-    'others': _('Others'),
-}
-
-
-IMAGE_SIZES = [500, 100, 50, 25]
-IMAGE_MAX_SIZE = 800
-
-TITLE_SIZE_LIMIT = 350
-DESCRIPTION_SIZE_LIMIT = 100000
+__all__ = ('Reuse',)
 
 
 class ReuseQuerySet(db.OwnedQuerySet):

udata/core/spam/api.py

@@ -4,7 +4,7 @@ from udata.api import api, API
 from udata.auth import admin_permission
 from udata.core.discussions.models import Discussion
 from udata.core.spam.fields import potential_spam_fields
-from udata.core.spam.models import POTENTIAL_SPAM
+from udata.core.spam.constants import POTENTIAL_SPAM
 from udata.utils import id_or_404
 
 

udata/core/spam/constants.py

@@ -0,0 +1,5 @@
+NOT_CHECKED = 'not_checked'
+POTENTIAL_SPAM = 'potential_spam'
+NO_SPAM = 'no_spam'
+
+SPAM_STATUS_CHOICES = [NOT_CHECKED, POTENTIAL_SPAM, NO_SPAM]

udata/core/spam/fields.py

@@ -1,5 +1,5 @@
 from udata.api import api, fields
-from .models import SPAM_STATUS_CHOICES
+from .constants import SPAM_STATUS_CHOICES
 
 spam_fields = api.model('Spam', {
     'status': fields.String(description='Status', enum=SPAM_STATUS_CHOICES, readonly=True),

udata/core/spam/models.py

@@ -1,15 +1,11 @@
 from flask import current_app
 from langdetect import detect
 
-from udata.models import db
+from udata.mongo import db
 from .signals import on_new_potential_spam
 from mongoengine import signals
 
-NOT_CHECKED = 'not_checked'
-POTENTIAL_SPAM = 'potential_spam'
-NO_SPAM = 'no_spam'
-
-SPAM_STATUS_CHOICES = [NOT_CHECKED, POTENTIAL_SPAM, NO_SPAM]
+from .constants import NO_SPAM, POTENTIAL_SPAM, SPAM_STATUS_CHOICES, NOT_CHECKED
 
 
 class SpamInfo(db.EmbeddedDocument):

udata/core/spam/tests/test_spam.py

@@ -1,10 +1,10 @@
 import logging
 import pytest
 from udata.tests import TestCase
-from udata.tests.helpers import assert_not_emit
-from udata.models import db
+from udata.mongo import db
 
-from ..models import POTENTIAL_SPAM, SpamMixin
+from ..models import SpamMixin
+from ..constants import POTENTIAL_SPAM
 
 
 log = logging.getLogger(__name__)

udata/core/spatial/constants.py

@@ -0,0 +1,9 @@
+from udata.i18n import L_
+
+BASE_GRANULARITIES = [
+    ('poi', L_('POI')),
+    ('other', L_('Other')),
+]
+
+ADMIN_LEVEL_MIN = 1
+ADMIN_LEVEL_MAX = 110

udata/core/spatial/models.py

@@ -4,25 +4,14 @@ from werkzeug.utils import cached_property
 
 from udata.app import cache
 from udata.uris import endpoint_for
-from udata.i18n import _, L_, get_locale, language
-from udata.models import db
+from udata.i18n import _, get_locale, language
+from udata.mongo import db
 
 from . import geoids
+from .constants import ADMIN_LEVEL_MIN, ADMIN_LEVEL_MAX, BASE_GRANULARITIES
 
 
-__all__ = (
-    'GeoLevel', 'GeoZone', 'SpatialCoverage', 'BASE_GRANULARITIES',
-    'spatial_granularities',
-)
-
-
-BASE_GRANULARITIES = [
-    ('poi', L_('POI')),
-    ('other', L_('Other')),
-]
-
-ADMIN_LEVEL_MIN = 1
-ADMIN_LEVEL_MAX = 110
+__all__ = ('GeoLevel', 'GeoZone', 'SpatialCoverage', 'spatial_granularities')
 
 
 class GeoLevel(db.Document):

udata/core/spatial/tests/test_fields.py

@@ -5,7 +5,7 @@ from datetime import timedelta
 from werkzeug.datastructures import MultiDict
 
 from udata.forms import Form
-from udata.models import db
+from udata.mongo import db
 from udata.tests import TestCase
 from udata.tests.helpers import assert_json_equal
 from udata.utils import faker

udata/core/tags/models.py

@@ -1,6 +1,6 @@
 import logging
 
-from udata.models import db
+from udata.mongo import db
 
 log = logging.getLogger(__name__)
 

udata/core/user/api_fields.py

@@ -1,9 +1,7 @@
 from udata.auth.helpers import current_user_is_admin_or_self
 from udata.api import api, fields, base_reference
 
-from .models import AVATAR_SIZES
-
-BIGGEST_AVATAR_SIZE = AVATAR_SIZES[0]
+from .constants import BIGGEST_AVATAR_SIZE
 
 
 user_ref_fields = api.inherit('UserReference', base_reference, {

udata/core/user/constants.py

@@ -0,0 +1,2 @@
+AVATAR_SIZES = [500, 200, 100, 32, 25]
+BIGGEST_AVATAR_SIZE = AVATAR_SIZES[0]

udata/core/user/forms.py

@@ -2,7 +2,7 @@ from udata.forms import ModelForm, fields, validators
 from udata.i18n import lazy_gettext as _
 from udata.models import User
 
-from .models import AVATAR_SIZES
+from .constants import AVATAR_SIZES
 
 
 __all__ = ('UserProfileForm', 'UserProfileAdminForm')

udata/core/user/models.py

@@ -19,10 +19,10 @@ from udata.i18n import lazy_gettext as _
 from udata.models import db, WithMetrics, Follow
 from udata.core.discussions.models import Discussion
 from udata.core.storages import avatars, default_image_basename
+from .constants import AVATAR_SIZES
 
 __all__ = ('User', 'Role', 'datastore')
 
-AVATAR_SIZES = [500, 200, 100, 32, 25]
 
 
 # TODO: use simple text for role

udata/factories.py

@@ -1,6 +1,6 @@
 import factory
 
-from .models import DateRange
+from .models import db
 
 
 class ModelFactory(factory.mongoengine.MongoEngineFactory):
@@ -14,7 +14,7 @@ class ModelFactory(factory.mongoengine.MongoEngineFactory):
 
 class DateRangeFactory(ModelFactory):
     class Meta:
-        model = DateRange
+        model = db.DateRange
 
     start = factory.Faker('date_between', start_date='-10y', end_date='-5y')
     end = factory.Faker('date_between', start_date='-5y', end_date='-2y')

udata/features/transfer/models.py

@@ -3,7 +3,7 @@ import logging
 from datetime import datetime
 
 from udata.i18n import lazy_gettext as _
-from udata.models import db
+from udata.mongo import db
 
 log = logging.getLogger(__name__)
 

udata/frontend/csv.py

@@ -8,7 +8,7 @@ from datetime import datetime, date
 
 from flask import Response, stream_with_context
 
-from udata.models import db
+from udata.mongo import db
 from udata.utils import recursive_get
 
 

udata/linkchecker/models.py

@@ -1,4 +1,4 @@
-from udata.models import db
+from udata.mongo import db
 from udata.core.dataset.models import ResourceMixin
 
 # Register harvest extras

udata/models/__init__.py

@@ -1,81 +1,7 @@
-import logging
-import warnings
-
-from urllib.parse import urlparse
-
-from bson import ObjectId, DBRef
-from flask_mongoengine import MongoEngine, MongoEngineSessionInterface
-from mongoengine.base import TopLevelDocumentMetaclass, get_document
 from mongoengine.errors import ValidationError
-from mongoengine.signals import pre_save, post_save
-
-from flask_storage.mongo import FileField, ImageField
 
 from udata import entrypoints
-from udata.errors import ConfigError
-
-from .badges_field import BadgesField
-from .taglist_field import TagListField
-from .datetime_fields import DateField, DateRange, Datetimed
-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
-
-log = logging.getLogger(__name__)
-
-class UDataMongoEngine(MongoEngine):
-    '''Customized mongoengine with extra fields types and helpers'''
-    def __init__(self, app=None):
-        super(UDataMongoEngine, self).__init__(app)
-        self.BadgesField = BadgesField
-        self.TagListField = TagListField
-        self.DateField = DateField
-        self.Datetimed = Datetimed
-        self.ExtrasField = ExtrasField
-        self.OrganizationExtrasField = OrganizationExtrasField
-        self.SlugField = SlugField
-        self.AutoUUIDField = AutoUUIDField
-        self.Document = UDataDocument
-        self.DomainModel = DomainModel
-        self.DateRange = DateRange
-        self.BaseQuerySet = UDataQuerySet
-        self.BaseDocumentMetaclass = TopLevelDocumentMetaclass
-        self.FileField = FileField
-        self.ImageField = ImageField
-        self.URLField = URLField
-        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
-
-    def resolve_model(self, model):
-        '''
-        Resolve a model given a name or dict with `class` entry.
-
-        :raises ValueError: model specification is wrong or does not exists
-        '''
-        if not model:
-            raise ValueError('Unsupported model specifications')
-        if isinstance(model, str):
-            classname = model
-        elif isinstance(model, dict) and 'class' in model:
-            classname = model['class']
-        else:
-            raise ValueError('Unsupported model specifications')
-
-        try:
-            return get_document(classname)
-        except self.NotRegistered:
-            message = 'Model "{0}" does not exist'.format(classname)
-            raise ValueError(message)
-
+from udata.mongo import *
 
 class FieldValidationError(ValidationError):
     field: str
@@ -84,11 +10,6 @@ class FieldValidationError(ValidationError):
         self.field = field
         super().__init__(*args, **kwargs)
 
-
-db = UDataMongoEngine()
-session_interface = MongoEngineSessionInterface(db)
-
-
 # Load all core models and mixins
 from udata.core.spatial.models import *  # noqa
 from udata.core.metrics.models import *  # noqa
@@ -117,43 +38,5 @@ from udata.harvest.models import HarvestSource as Harvest  # noqa
 import udata.linkchecker.models  # noqa
 
 
-MONGODB_DEPRECATED_SETTINGS = 'MONGODB_PORT', 'MONGODB_DB'
-MONGODB_DEPRECATED_MSG = '{0} is deprecated, use the MONGODB_HOST url syntax'
-
-
-
-def validate_config(config):
-    for setting in MONGODB_DEPRECATED_SETTINGS:
-        if setting in config:
-            msg = MONGODB_DEPRECATED_MSG.format(setting)
-            log.warning(msg)
-            warnings.warn(msg, category=DeprecationWarning, stacklevel=2)
-    url = config['MONGODB_HOST']
-    parsed_url = urlparse(url)
-    if not all((parsed_url.scheme, parsed_url.netloc)):
-        raise ConfigError('{0} is not a valid MongoDB URL'.format(url))
-    if len(parsed_url.path) <= 1:
-        raise ConfigError('{0} is missing the database path'.format(url))
-
-
-def build_test_config(config):
-    if 'MONGODB_HOST_TEST' in config:
-        config['MONGODB_HOST'] = config['MONGODB_HOST_TEST']
-    else:
-        # use `{database_name}-test` database for testing
-        parsed_url = urlparse(config['MONGODB_HOST'])
-        parsed_url = parsed_url._replace(path='%s-test' % parsed_url.path)
-        config['MONGODB_HOST'] = parsed_url.geturl()
-    validate_config(config)
-
-
-# Avoid nose misdetecting this function as a test
-build_test_config.__test__ = False
-
-
 def init_app(app):
-    validate_config(app.config)
-    if app.config['TESTING']:
-        build_test_config(app.config)
-    db.init_app(app)
     entrypoints.get_enabled('udata.models', app)

udata/mongo/__init__.py

@@ -0,0 +1,42 @@
+import logging
+import warnings
+from urllib.parse import urlparse
+
+from udata.errors import ConfigError
+
+from .engine import db
+
+log = logging.getLogger(__name__)
+
+MONGODB_DEPRECATED_SETTINGS = 'MONGODB_PORT', 'MONGODB_DB'
+MONGODB_DEPRECATED_MSG = '{0} is deprecated, use the MONGODB_HOST url syntax'
+
+def validate_config(config):
+    for setting in MONGODB_DEPRECATED_SETTINGS:
+        if setting in config:
+            msg = MONGODB_DEPRECATED_MSG.format(setting)
+            log.warning(msg)
+            warnings.warn(msg, category=DeprecationWarning, stacklevel=2)
+    url = config['MONGODB_HOST']
+    parsed_url = urlparse(url)
+    if not all((parsed_url.scheme, parsed_url.netloc)):
+        raise ConfigError('{0} is not a valid MongoDB URL'.format(url))
+    if len(parsed_url.path) <= 1:
+        raise ConfigError('{0} is missing the database path'.format(url))
+
+
+def build_test_config(config):
+    if 'MONGODB_HOST_TEST' in config:
+        config['MONGODB_HOST'] = config['MONGODB_HOST_TEST']
+    else:
+        # use `{database_name}-test` database for testing
+        parsed_url = urlparse(config['MONGODB_HOST'])
+        parsed_url = parsed_url._replace(path='%s-test' % parsed_url.path)
+        config['MONGODB_HOST'] = parsed_url.geturl()
+    validate_config(config)
+
+def init_app(app):
+    validate_config(app.config)
+    if app.config['TESTING']:
+        build_test_config(app.config)
+    db.init_app(app)

udata/mongo/engine.py

@@ -0,0 +1,73 @@
+from bson import ObjectId, DBRef
+from flask_mongoengine import MongoEngine, MongoEngineSessionInterface
+from mongoengine.base import TopLevelDocumentMetaclass, get_document
+from mongoengine.errors import ValidationError
+from mongoengine.signals import pre_save, post_save
+
+from flask_storage.mongo import FileField, ImageField
+
+from .badges_field import BadgesField
+from .taglist_field import TagListField
+from .datetime_fields import DateField, DateRange, Datetimed
+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
+
+
+class UDataMongoEngine(MongoEngine):
+    '''Customized mongoengine with extra fields types and helpers'''
+    def __init__(self, app=None):
+        super(UDataMongoEngine, self).__init__(app)
+        self.BadgesField = BadgesField
+        self.TagListField = TagListField
+        self.DateField = DateField
+        self.Datetimed = Datetimed
+        self.ExtrasField = ExtrasField
+        self.OrganizationExtrasField = OrganizationExtrasField
+        self.SlugField = SlugField
+        self.AutoUUIDField = AutoUUIDField
+        self.Document = UDataDocument
+        self.DomainModel = DomainModel
+        self.DateRange = DateRange
+        self.BaseQuerySet = UDataQuerySet
+        self.BaseDocumentMetaclass = TopLevelDocumentMetaclass
+        self.FileField = FileField
+        self.ImageField = ImageField
+        self.URLField = URLField
+        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
+
+    def resolve_model(self, model):
+        '''
+        Resolve a model given a name or dict with `class` entry.
+
+        :raises ValueError: model specification is wrong or does not exists
+        '''
+        if not model:
+            raise ValueError('Unsupported model specifications')
+        if isinstance(model, str):
+            classname = model
+        elif isinstance(model, dict) and 'class' in model:
+            classname = model['class']
+        else:
+            raise ValueError('Unsupported model specifications')
+
+        try:
+            return get_document(classname)
+        except self.NotRegistered:
+            message = 'Model "{0}" does not exist'.format(classname)
+            raise ValueError(message)
+
+
+
+db = UDataMongoEngine()
+session_interface = MongoEngineSessionInterface(db)

udata/routing.py

@@ -8,7 +8,7 @@ from werkzeug.routing import BaseConverter, PathConverter
 from werkzeug.urls import url_quote
 
 from udata import models
-from udata.models import db
+from udata.mongo import db
 from udata.core.spatial.models import GeoZone
 from udata.i18n import ISO_639_1_CODES
 

udata/search/__init__.py

@@ -6,7 +6,7 @@ import udata.event  # noqa
 from flask import current_app
 from mongoengine.signals import post_save, post_delete
 
-from udata.models import db
+from udata.mongo import db
 from udata.tasks import task, as_task_param
 
 log = logging.getLogger(__name__)

udata/tests/api/test_datasets_api.py

@@ -25,9 +25,8 @@ from udata.core.spatial.factories import SpatialCoverageFactory
 from udata.core.topic.factories import TopicFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.i18n import gettext as _
-from udata.models import (LEGACY_FREQUENCIES, RESOURCE_TYPES,
-                          UPDATE_FREQUENCIES, CommunityResource, Dataset,
-                          Follow, Member, db)
+from udata.models import CommunityResource, Dataset, Follow, Member, db
+from udata.core.dataset.constants import LEGACY_FREQUENCIES, RESOURCE_TYPES, UPDATE_FREQUENCIES
 from udata.tags import MAX_TAG_LENGTH, MIN_TAG_LENGTH
 from udata.tests.features.territories import create_geozones_fixtures
 from udata.tests.helpers import assert200, assert404, assert204

udata/tests/api/test_reuses_api.py

@@ -10,7 +10,8 @@ from udata.core.user.factories import AdminFactory
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import UserFactory
-from udata.models import Reuse, Follow, Member, REUSE_TOPICS, REUSE_TYPES
+from udata.models import Reuse, Follow, Member
+from udata.core.reuse.constants import REUSE_TOPICS, REUSE_TYPES
 from udata.utils import faker
 
 from udata.tests.helpers import (

udata/tests/dataset/test_dataset_model.py

@@ -3,12 +3,11 @@ from datetime import datetime, timedelta
 import pytest
 import requests
 from flask import current_app
-from mongoengine import post_save, ValidationError
+from mongoengine import post_save
 
 from udata.app import cache
-from udata.models import (
-    db, Dataset, License, LEGACY_FREQUENCIES, ResourceSchema, UPDATE_FREQUENCIES, Schema, FieldValidationError
-)
+from udata.models import db, Dataset, License, ResourceSchema, Schema
+from udata.core.dataset.constants import LEGACY_FREQUENCIES, UPDATE_FREQUENCIES
 from udata.core.dataset.models import HarvestDatasetMetadata, HarvestResourceMetadata
 from udata.core.dataset.factories import (
     ResourceFactory, DatasetFactory, CommunityResourceFactory, LicenseFactory, ResourceSchemaMockData

udata/tests/dataset/test_dataset_rdf.py

@@ -10,7 +10,7 @@ from rdflib import Graph, URIRef, Literal, BNode
 from rdflib.namespace import FOAF, RDF
 from rdflib.resource import Resource as RdfResource
 
-from udata.models import db
+from udata.mongo import db
 from udata.core.dataset.models import Dataset, Resource, License, Checksum, HarvestDatasetMetadata
 from udata.core.dataset.factories import (
     DatasetFactory, ResourceFactory, LicenseFactory

udata/tests/forms/test_basic_fields.py

@@ -1,7 +1,7 @@
 from werkzeug.datastructures import MultiDict
 
 from udata.forms import Form, fields
-from udata.models import db
+from udata.mongo import db
 from udata.tests import TestCase
 from udata.utils import faker
 

udata/tests/forms/test_daterange_field.py

@@ -3,7 +3,7 @@ from datetime import date, timedelta
 from werkzeug.datastructures import MultiDict
 
 from udata.forms import Form, fields
-from udata.models import db
+from udata.mongo import db
 from udata.tests import TestCase
 from udata.utils import to_iso_date