udata 9.1.2.dev30355__py2.py3-none-any.whl → 9.1.2.dev30454__py2.py3-none-any.whl

udata/sitemap.py

@@ -1,13 +1,13 @@
 from functools import wraps
+
 from flask import current_app, request
 from flask_sitemap import Sitemap, sitemap_page_needed
 
 from udata.app import cache
 
-
 sitemap = Sitemap()
 
-CACHE_KEY = 'sitemap-page-{0}'
+CACHE_KEY = "sitemap-page-{0}"
 
 
 @sitemap_page_needed.connect
@@ -19,22 +19,24 @@ def create_page(app, page, urlset):
 def load_page(fn):
     @wraps(fn)
     def loader(*args, **kwargs):
-        page = kwargs.get('page')
+        page = kwargs.get("page")
         key = CACHE_KEY.format(page)
         return cache.get(key) or fn(*args, **kwargs)
+
     return loader
 
 
 def set_scheme(fn):
     @wraps(fn)
     def set_scheme_on_call(*args, **kwargs):
-        scheme = 'https' if request.is_secure else 'http'
-        current_app.config['SITEMAP_URL_SCHEME'] = scheme
+        scheme = "https" if request.is_secure else "http"
+        current_app.config["SITEMAP_URL_SCHEME"] = scheme
         return fn(*args, **kwargs)
+
     return set_scheme_on_call
 
 
 def init_app(app):
     sitemap.decorators = []
-    app.config['SITEMAP_VIEW_DECORATORS'] = [load_page, set_scheme]
+    app.config["SITEMAP_VIEW_DECORATORS"] = [load_page, set_scheme]
     sitemap.init_app(app)

udata/storage/s3.py

@@ -1,20 +1,22 @@
+import json
 from typing import Any
+
 import boto3
 from flask import current_app
-import json
+
 
 def get_client():
-    url = current_app.config.get('S3_URL')
+    url = current_app.config.get("S3_URL")
     if url is None:
-        raise ValueError('No S3_URL provided')
-    
-    access_key_id = current_app.config.get('S3_ACCESS_KEY_ID')
+        raise ValueError("No S3_URL provided")
+
+    access_key_id = current_app.config.get("S3_ACCESS_KEY_ID")
     if access_key_id is None:
-        raise ValueError('No S3_ACCESS_KEY_ID provided')
-    
-    secret_access_key = current_app.config.get('S3_SECRET_ACCESS_KEY')
+        raise ValueError("No S3_ACCESS_KEY_ID provided")
+
+    secret_access_key = current_app.config.get("S3_SECRET_ACCESS_KEY")
     if secret_access_key is None:
-        raise ValueError('No S3_SECRET_ACCESS_KEY provided')
+        raise ValueError("No S3_SECRET_ACCESS_KEY provided")
 
     return boto3.client(
         "s3",
@@ -23,6 +25,7 @@ def get_client():
         aws_secret_access_key=secret_access_key,
     )
 
+
 def store_bytes(bucket: str, filename: str, bytes: bytes):
     return get_client().put_object(
         Bucket=bucket,
@@ -30,25 +33,29 @@ def store_bytes(bucket: str, filename: str, bytes: bytes):
         Body=bytes,
     )
 
+
 def store_as_json(bucket: str, filename: str, value):
-    return store_bytes(bucket, filename, bytes(json.dumps(value).encode('UTF-8')))
+    return store_bytes(bucket, filename, bytes(json.dumps(value).encode("UTF-8")))
+
 
 def get_bytes(bucket: str, filename: str) -> bytes | None:
     client = get_client()
     try:
-        return client.get_object(Bucket=bucket, Key=filename)['Body'].read()
+        return client.get_object(Bucket=bucket, Key=filename)["Body"].read()
     except client.exceptions.NoSuchKey:
         return None
 
+
 def get_from_json(bucket: str, filename: str) -> Any | None:
     bytes = get_bytes(bucket, filename)
     if bytes is None:
         return None
 
-    return json.loads(bytes.decode('utf-8'))
+    return json.loads(bytes.decode("utf-8"))
+
 
 def delete_file(bucket: str, filename: str):
     return get_client().delete_object(
         Bucket=bucket,
         Key=filename,
-    )
+    )

udata/tags.py

@@ -2,9 +2,8 @@ from flask import current_app
 from slugify import slugify
 from werkzeug.local import LocalProxy
 
-
-MIN_TAG_LENGTH = LocalProxy(lambda: current_app.config['TAG_MIN_LENGTH'])
-MAX_TAG_LENGTH = LocalProxy(lambda: current_app.config['TAG_MAX_LENGTH'])
+MIN_TAG_LENGTH = LocalProxy(lambda: current_app.config["TAG_MIN_LENGTH"])
+MAX_TAG_LENGTH = LocalProxy(lambda: current_app.config["TAG_MAX_LENGTH"])
 
 
 def slug(value):
@@ -14,11 +13,11 @@ def slug(value):
 def normalize(value):
     value = slug(value)
     if len(value) < MIN_TAG_LENGTH:
-        value = ''
+        value = ""
     elif len(value) > MAX_TAG_LENGTH:
         value = value[:MAX_TAG_LENGTH]
     return value
 
 
 def tags_list(value):
-    return list(set(slug(tag) for tag in value.split(',') if tag.strip()))
+    return list(set(slug(tag) for tag in value.split(",") if tag.strip()))

udata/tasks.py

@@ -1,5 +1,4 @@
 import logging
-
 from urllib.parse import urlparse
 
 from celery import Celery, Task
@@ -26,7 +25,7 @@ class ContextTask(Task):
 
 class JobTask(ContextTask):
     abstract = True
-    default_queue = 'low'
+    default_queue = "low"
 
     @property
     def log(self):
@@ -35,7 +34,7 @@ class JobTask(ContextTask):
 
 class Scheduler(MongoScheduler):
     def apply_async(self, entry, **kwargs):
-        '''A MongoScheduler storing the last task_id'''
+        """A MongoScheduler storing the last task_id"""
         result = super(Scheduler, self).apply_async(entry, **kwargs)
         entry._task.last_run_id = result.id
         return result
@@ -45,43 +44,42 @@ celery = Celery(task_cls=ContextTask)
 
 
 def router(name, args, kwargs, options, task=None, **kw):
-    '''
+    """
     A celery router using the predeclared :class:`ContextTask`
     attributes (`router` or `default_queue` and/or `default routing_key`).
-    '''
+    """
     # Fetch task by name if necessary
     task = task or celery.tasks.get(name)
     if not task:
         return
     # Single route param override everything
     if task.route:
-        queue = task.route.split('.', 1)[0]
-        return {'queue': queue, 'routing_key': task.route}
+        queue = task.route.split(".", 1)[0]
+        return {"queue": queue, "routing_key": task.route}
     # queue parameter, routing_key computed if not present
     if task.default_queue:
         key = task.default_routing_key
-        key = key or '{0.default_queue}.{0.name}'.format(task)
-        return {'queue': task.default_queue, 'routing_key': key}
+        key = key or "{0.default_queue}.{0.name}".format(task)
+        return {"queue": task.default_queue, "routing_key": key}
     # only routing_key, queue should not be returned to fallback on default
     elif task.default_routing_key:
-        return {'routing_key': task.default_routing_key}
+        return {"routing_key": task.default_routing_key}
 
 
 def task(*args, **kwargs):
-    for arg in 'queue', 'routing_key':
+    for arg in "queue", "routing_key":
         if arg in kwargs:
-            kwargs['default_{0}'.format(arg)] = kwargs.pop(arg)
+            kwargs["default_{0}".format(arg)] = kwargs.pop(arg)
     return celery.task(*args, **kwargs)
 
 
 def job(name, **kwargs):
-    '''A shortcut decorator for declaring jobs'''
-    return task(name=name, schedulable=True, base=JobTask,
-                bind=True, **kwargs)
+    """A shortcut decorator for declaring jobs"""
+    return task(name=name, schedulable=True, base=JobTask, bind=True, **kwargs)
 
 
 def as_task_param(obj):
-    '''Pass a document as task parameter'''
+    """Pass a document as task parameter"""
     return obj.__class__.__name__, (obj.pk if isinstance(obj.pk, str) else str(obj.pk))
 
 
@@ -91,7 +89,7 @@ def get_logger(name):
 
 
 def connect(signal, *args, **kwargs):
-    by_id = kwargs.pop('by_id', False)
+    by_id = kwargs.pop("by_id", False)
 
     def wrapper(func):
         t = task(func, *args, **kwargs)
@@ -101,34 +99,35 @@ def connect(signal, *args, **kwargs):
 
         signal.connect(call_task, weak=False)
         return t
+
     return wrapper
 
 
-@job('test-log')
+@job("test-log")
 def log_test(self):
-    self.log.debug('This is a DEBUG message')
-    self.log.info('This is an INFO message')
-    self.log.warning('This is a WARNING message')
-    self.log.error('This is a ERROR message')
+    self.log.debug("This is a DEBUG message")
+    self.log.info("This is an INFO message")
+    self.log.warning("This is a WARNING message")
+    self.log.error("This is a ERROR message")
 
 
-@job('test-low-queue', queue='low')
-@job('test-default-queue', queue='default')
-@job('test-high-queue', queue='high')
+@job("test-low-queue", queue="low")
+@job("test-default-queue", queue="default")
+@job("test-high-queue", queue="high")
 def queue_test(self, raises=False):
-    '''
+    """
     An empty task to test the queues.
     Set raise to True if you want a notification (ie. Sentry)
-    '''
-    self.log.info('Just a test task')
+    """
+    self.log.info("Just a test task")
     if raises:
-        raise Exception('Test task processing')
+        raise Exception("Test task processing")
 
 
-@job('test-error')
+@job("test-error")
 def error_test(self):
-    self.log.info('There should be an error soon')
-    raise Exception('There is an error')
+    self.log.info("There should be an error soon")
+    raise Exception("There is an error")
 
 
 def schedulables():
@@ -137,23 +136,25 @@ def schedulables():
 
 def default_scheduler_config(url):
     parsed_url = urlparse(url)
-    default_url = '{0}://{1}'.format(*parsed_url)
+    default_url = "{0}://{1}".format(*parsed_url)
     return parsed_url.path[1:], default_url
 
 
 def init_app(app):
     celery.main = app.import_name
 
-    db, url = default_scheduler_config(app.config['MONGODB_HOST'])
+    db, url = default_scheduler_config(app.config["MONGODB_HOST"])
 
-    app.config.setdefault('CELERY_MONGODB_SCHEDULER_DB', db)
-    app.config.setdefault('CELERY_MONGODB_SCHEDULER_URL', url)
+    app.config.setdefault("CELERY_MONGODB_SCHEDULER_DB", db)
+    app.config.setdefault("CELERY_MONGODB_SCHEDULER_URL", url)
 
-    celery.conf.update(**dict(
-        (k.replace('CELERY_', '').lower(), v)
-        for k, v in app.config.items()
-        if k.startswith('CELERY_')
-    ))
+    celery.conf.update(
+        **dict(
+            (k.replace("CELERY_", "").lower(), v)
+            for k, v in app.config.items()
+            if k.startswith("CELERY_")
+        )
+    )
 
     ContextTask.current_app = app
 
@@ -172,6 +173,6 @@ def init_app(app):
     import udata.harvest.tasks  # noqa
     import udata.db.tasks  # noqa
 
-    entrypoints.get_enabled('udata.tasks', app)
+    entrypoints.get_enabled("udata.tasks", app)
 
     return celery

udata/tests/__init__.py

@@ -1,6 +1,9 @@
 import unittest
+
 import pytest
+
 from udata import settings
+
 from . import helpers
 
 
@@ -13,9 +16,9 @@ class TestCase(unittest.TestCase):
         return self.create_app()
 
     def create_app(self):
-        '''
+        """
         Here for compatibility legacy test classes
-        '''
+        """
         return self.app
 
     def assertEqualDates(self, datetime1, datetime2, limit=1):  # Seconds.
@@ -29,9 +32,9 @@ class WebTestMixin(object):
 
     @pytest.fixture(autouse=True)
     def inject_client(self, client):
-        '''
+        """
         Inject test client for compatibility with Flask-Testing.
-        '''
+        """
         self.client = client
 
     def get(self, url, **kwargs):
@@ -70,11 +73,11 @@ class WebTestMixin(object):
 
 
 for code in 200, 201, 204, 400, 401, 403, 404, 410, 500:
-    name = 'assert{0}'.format(code)
+    name = "assert{0}".format(code)
     helper = getattr(helpers, name)
     setattr(WebTestMixin, name, lambda s, r, h=helper: h(r))
 
 
-@pytest.mark.usefixtures('clean_db')
+@pytest.mark.usefixtures("clean_db")
 class DBTestMixin(object):
     pass

udata/tests/api/__init__.py

@@ -1,18 +1,17 @@
-import pytest
-
 from contextlib import contextmanager
 
+import pytest
+
 from ..frontend import FrontTestCase
 
 
-@pytest.mark.usefixtures('instance_path')
+@pytest.mark.usefixtures("instance_path")
 class APITestCase(FrontTestCase):
-
     @pytest.fixture(autouse=True)
     def inject_api(self, api):
-        '''
+        """
         Inject API test client for compatibility with legacy tests.
-        '''
+        """
         self.api = api
 
     @contextmanager
@@ -34,3 +33,6 @@ class APITestCase(FrontTestCase):
 
     def delete(self, url, data=None, *args, **kwargs):
         return self.api.delete(url, data=data, *args, **kwargs)
+
+    def options(self, url, data=None, *args, **kwargs):
+        return self.api.options(url, data=data, *args, **kwargs)