kinto 23.0.2__tar.gz → 23.1.0__tar.gz

{kinto-23.0.2 → kinto-23.1.0}/CONTRIBUTORS.rst

@@ -112,3 +112,4 @@ Contributors
 * Dan Milgram <danm@intervivo.com>
 * Dex Devlon <@bxff>
 * Varun Koranne <@varun-dhruv>
+* Robin Sharma <robinrythm123@gmail.com>

{kinto-23.0.2 → kinto-23.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinto
-Version: 23.0.2
+Version: 23.1.0
 Summary: Kinto Web Service - Store, Sync, Share, and Self-Host.
 Author-email: Mozilla Services <developers@kinto-storage.org>
 License: Copyright 2012 - Mozilla Foundation
@@ -229,3 +229,4 @@ Contributors
 * Dan Milgram <danm@intervivo.com>
 * Dex Devlon <@bxff>
 * Varun Koranne <@varun-dhruv>
+* Robin Sharma <robinrythm123@gmail.com>

{kinto-23.0.2 → kinto-23.1.0}/constraints.txt

@@ -60,7 +60,7 @@ jsonpointer==2.4
     #   jsonschema
 jsonref==1.1.0
     # via bravado-core
-jsonschema==4.23.0
+jsonschema==4.24.0
     # via
     #   -r constraints.in
     #   bravado-core
@@ -73,7 +73,7 @@ markupsafe==2.1.4
     # via werkzeug
 msgpack==1.0.7
     # via bravado-core
-newrelic==10.12.0
+newrelic==10.14.0
     # via -r constraints.in
 packaging==23.2
     # via
@@ -88,16 +88,20 @@ plaster==1.1.2
     #   pyramid
 plaster-pastedeploy==1.0.1
     # via pyramid
-playwright==1.52.0
+playwright==1.53.0
     # via -r constraints.in
 pluggy==1.5.0
-    # via pytest
-prometheus-client==0.22.0
+    # via
+    #   pytest
+    #   pytest-cov
+prometheus-client==0.22.1
     # via -r constraints.in
 psycopg2-binary==2.9.10
     # via -r constraints.in
 pyee==13.0.0
     # via playwright
+pygments==2.19.1
+    # via pytest
 pyproject-hooks==1.0.0
     # via build
 pyramid==2.0.2
@@ -109,14 +113,14 @@ pyramid-multiauth==1.0.2
     # via -r constraints.in
 pyramid-tm==2.6
     # via -r constraints.in
-pytest==8.3.5
+pytest==8.4.1
     # via
     #   -r constraints.in
     #   pytest-cache
     #   pytest-cov
 pytest-cache==1.0
     # via -r constraints.in
-pytest-cov==6.1.1
+pytest-cov==6.2.1
     # via -r constraints.in
 python-dateutil==2.9.0.post0
     # via
@@ -137,7 +141,7 @@ referencing==0.32.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.3
+requests==2.32.4
     # via
     #   -r constraints.in
     #   bravado-core
@@ -149,7 +153,7 @@ rpds-py==0.17.1
     # via
     #   jsonschema
     #   referencing
-ruff==0.11.10
+ruff==0.12.3
     # via -r constraints.in
 sentry-sdk==2.8.0
     # via -r constraints.in
@@ -162,7 +166,7 @@ six==1.16.0
     #   rfc3339-validator
 soupsieve==2.5
     # via beautifulsoup4
-sqlalchemy==2.0.40
+sqlalchemy==2.0.41
     # via
     #   -r constraints.in
     #   sentry-sdk
@@ -189,7 +193,7 @@ typing-extensions==4.9.0
     #   swagger-spec-validator
 uri-template==1.3.0
     # via jsonschema
-urllib3==2.2.2
+urllib3==2.5.0
     # via
     #   requests
     #   sentry-sdk

{kinto-23.0.2 → kinto-23.1.0}/docs/api/1.x/errors.rst

@@ -53,7 +53,7 @@ Precondition errors
 As detailed in the :ref:`timestamps  <server-timestamps>` section, it is
 possible to add concurrency control using ``ETag`` request headers.
 
-When a the provided preconditions are not met, a |status-412| error response
+When the provided preconditions are not met, a |status-412| error response
 is returned.
 
 Additional information about the record currently stored on the server will be

{kinto-23.0.2 → kinto-23.1.0}/docs/api/1.x/openapi.rst

@@ -102,7 +102,7 @@ The current implementation supports extensions as follows:
   `Cornice Swagger documentation <https://cornices.github.io/cornice.ext.swagger/>`_.
 
 - If the plugin changes the possible responses for a Resource, you can
-  document it by subclassing :class:`kinto.core.resource.schema.ResourceReponses` and
+  document it by subclassing :class:`kinto.core.resource.schema.ResourceResponses` and
   changing the ``responses`` attribute on your Resource ``ViewSet``.
 
 - If the plugin adds an authentication method, you may declare it using

{kinto-23.0.2 → kinto-23.1.0}/docs/core/cache.rst

@@ -36,3 +36,9 @@ interface:
 
 .. autoclass:: kinto.core.cache.CacheBase
     :members:
+
+Cache Metrics Adapter
+=====================
+
+.. autoclass:: kinto.core.cache.CacheMetricsBackend
+    :members:

{kinto-23.0.2 → kinto-23.1.0}/docs/requirements.txt

@@ -5,7 +5,7 @@ sphinxcontrib-httpdomain==1.8.1
 sphinx-github-changelog==1.7.1
 kinto
 mock==5.2.0
-webtest==3.0.4
+webtest==3.0.6
 pyramid==2.0.2
-python-rapidjson==1.20
+python-rapidjson==1.21
 SQLAlchemy==2.0.41

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/cache/__init__.py

@@ -10,10 +10,15 @@ _HEARTBEAT_KEY = "__heartbeat__"
 _HEARTBEAT_TTL_SECONDS = 3600
 
 
+_CACHE_HIT_METRIC_KEY = "cache_hits"
+_CACHE_MISS_METRIC_KEY = "cache_misses"
+
+
 class CacheBase:
     def __init__(self, *args, **kwargs):
         self.prefix = kwargs["cache_prefix"]
         self.max_size_bytes = kwargs.get("cache_max_size_bytes")
+        self.set_metrics_backend(kwargs.get("metrics_backend"))
 
     def initialize_schema(self, dry_run=False):
         """Create every necessary objects (like tables or indices) in the
@@ -71,6 +76,36 @@ class CacheBase:
         """
         raise NotImplementedError
 
+    def set_metrics_backend(self, metrics_backend):
+        """Set a metrics backend via the `CacheMetricsBackend` adapter.
+
+        :param metrics_backend: A metrics backend implementing the IMetricsService interface.
+        """
+        self.metrics_backend = CacheMetricsBackend(metrics_backend)
+
+
+class CacheMetricsBackend:
+    """
+    A simple adapter for tracking cache-related metrics.
+    """
+
+    def __init__(self, metrics_backend, *args, **kwargs):
+        """Initialize with a given metrics backend.
+
+        :param metrics_backend: A metrics backend implementing the IMetricsService interface.
+        """
+        self._backend = metrics_backend
+
+    def count_hit(self):
+        """Increment the cache hit counter."""
+        if self._backend:
+            self._backend.count(key=_CACHE_HIT_METRIC_KEY)
+
+    def count_miss(self):
+        """Increment the cache miss counter."""
+        if self._backend:
+            self._backend.count(key=_CACHE_MISS_METRIC_KEY)
+
 
 def heartbeat(backend):
     def ping(request):

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/cache/memcached.py

@@ -68,7 +68,9 @@ class Cache(CacheBase):
     def _get(self, key):
         value = self._client.get(self.prefix + key)
         if not value:
+            self.metrics_backend.count_miss()
             return None, 0
+        self.metrics_backend.count_hit()
         data = json.loads(value)
         return data["value"], data["ttl"]
 

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/cache/memory.py

@@ -73,7 +73,12 @@ class Cache(CacheBase):
     @synchronized
     def get(self, key):
         self._clean_expired()
-        return self._store.get(self.prefix + key)
+        value = self._store.get(self.prefix + key)
+        if value is None:
+            self.metrics_backend.count_miss()
+            return None
+        self.metrics_backend.count_hit()
+        return value
 
     @synchronized
     def delete(self, key):

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/cache/postgresql/__init__.py

@@ -156,8 +156,11 @@ class Cache(CacheBase):
             conn.execute(sa.text(purge))
             result = conn.execute(sa.text(query), dict(key=self.prefix + key))
             if result.rowcount > 0:
+                self.metrics_backend.count_hit()
                 value = result.fetchone().value
                 return json.loads(value)
+            self.metrics_backend.count_miss()
+            return None
 
     def delete(self, key):
         query = "DELETE FROM cache WHERE key = :key RETURNING value;"

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/initialization.py

@@ -228,7 +228,9 @@ def _end_of_life_tween_factory(handler, registry):
         else:
             code = "hard-eol"
             request.response = errors.http_error(
-                HTTPGone(), errno=errors.ERRORS.SERVICE_DEPRECATED, message=deprecation_msg
+                HTTPGone(),
+                errno=errors.ERRORS.SERVICE_DEPRECATED,
+                message=deprecation_msg,
             )
 
         errors.send_alert(request, eos_message, url=eos_url, code=code)
@@ -459,6 +461,11 @@ def setup_metrics(config):
         else:
             metrics.watch_execution_time(metrics_service, policy, prefix="authentication")
 
+        # Set cache metrics backend
+        cache_backend = config.registry.cache
+        if isinstance(cache_backend, cache.CacheBase):
+            cache_backend.set_metrics_backend(metrics_service)
+
     config.add_subscriber(on_app_created, ApplicationCreated)
 
     def on_new_response(event):
@@ -468,8 +475,9 @@ def setup_metrics(config):
         # Count unique users.
         user_id = request.prefixed_userid
         if user_id:
-            # Get rid of colons in metric packet (see #1282).
-            auth, user_id = user_id.split(":")
+            auth, user_id = user_id.split(":", 1)
+            # Get rid of colons in metric packet (see #1282 and  #3571).
+            user_id = user_id.replace(":", ".")
             metrics_service.count("users", unique=[("auth", auth), ("userid", user_id)])
 
         status = event.response.status_code

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/resource/__init__.py

@@ -319,7 +319,7 @@ class Resource:
     #
 
     def plural_head(self):
-        """Model ``HEAD`` endpoint: empty reponse with a ``Total-Objects`` header.
+        """Model ``HEAD`` endpoint: empty response with a ``Total-Objects`` header.
 
         :raises: :exc:`~pyramid:pyramid.httpexceptions.HTTPNotModified` if
             ``If-None-Match`` header is provided and collection not
@@ -1135,6 +1135,14 @@ class Resource:
             if field == self.model.modified_field and not is_valid_timestamp(value):
                 raise_invalid(self.request, **error_details)
 
+            if field in (self.model.modified_field, self.model.id_field) and operator in (
+                COMPARISON.CONTAINS,
+                COMPARISON.CONTAINS_ANY,
+            ):
+                error_msg = f"Field '{field}' is not an array"
+                error_details["description"] = error_msg
+                raise_invalid(self.request, **error_details)
+
             filters.append(Filter(field, value, operator))
 
         # If a plural endpoint is reached, and if the user does not have the

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/resource/schema.py

@@ -21,7 +21,7 @@ positive_big_integer = colander.Range(min=0, max=POSTGRESQL_MAX_INTEGER_VALUE)
 
 
 class TimeStamp(TimeStamp):
-    """This schema is deprecated, you shoud use `kinto.core.schema.TimeStamp` instead."""
+    """This schema is deprecated, you should use `kinto.core.schema.TimeStamp` instead."""
 
     def __init__(self, *args, **kwargs):
         message = (
@@ -33,7 +33,7 @@ class TimeStamp(TimeStamp):
 
 
 class URL(URL):
-    """This schema is deprecated, you shoud use `kinto.core.schema.URL` instead."""
+    """This schema is deprecated, you should use `kinto.core.schema.URL` instead."""
 
     def __init__(self, *args, **kwargs):
         message = (
@@ -422,7 +422,7 @@ class PluralResponseSchema(colander.MappingSchema):
         return datalist
 
 
-class ResourceReponses:
+class ResourceResponses:
     """Class that wraps and handles Resource responses."""
 
     default_schemas = {
@@ -448,7 +448,7 @@ class ResourceReponses:
     }
     default_get_schemas = {
         "304": NotModifiedResponseSchema(
-            description="Reponse has not changed since value in If-None-Match header"
+            description="Response has not changed since value in If-None-Match header"
         )
     }
     default_post_schemas = {

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/resource/viewset.py

@@ -16,7 +16,7 @@ from .schema import (
     PluralGetQuerySchema,
     PluralQuerySchema,
     RequestSchema,
-    ResourceReponses,
+    ResourceResponses,
 )
 
 
@@ -64,7 +64,7 @@ class ViewSet:
 
     factory = authorization.RouteFactory
 
-    responses = ResourceReponses()
+    responses = ResourceResponses()
 
     service_arguments = {"description": "Set of {resource_name}"}
 

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/storage/postgresql/__init__.py

@@ -884,6 +884,14 @@ class Storage(StorageBase, MigratorMixin):
                 operator = "IS NOT NULL" if filtr.value else "IS NULL"
                 cond = f"{sql_field} {operator}"
 
+            elif filtr.operator == COMPARISON.CONTAINS:
+                value_holder = f"{prefix}_value_{i}"
+                holders[value_holder] = value
+                # In case the field is not a sequence, we ignore the object.
+                is_json_sequence = f"jsonb_typeof({sql_field}) = 'array'"
+                sql_operator = operators[filtr.operator]
+                cond = f"{is_json_sequence} AND {sql_field} {sql_operator} :{value_holder}"
+
             elif filtr.operator == COMPARISON.CONTAINS_ANY:
                 value_holder = f"{prefix}_value_{i}"
                 holders[value_holder] = value

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/storage/testing.py

@@ -491,6 +491,14 @@ class BaseTestStorage:
         objects = self.storage.list_all(filters=filters, **self.storage_kw)
         self.assertEqual(len(objects), 0)
 
+    def test_list_all_contains_ignores_object_if_field_is_not_array(self):
+        self.create_object({"code": "black"})
+        self.create_object({"fib": ["a", "b", "c"]})
+
+        filters = [Filter("fib", ["a"], utils.COMPARISON.CONTAINS)]
+        objects = self.storage.list_all(filters=filters, **self.storage_kw)
+        self.assertEqual(len(objects), 1)
+
     def test_list_all_can_filter_on_array_with_contains_any_and_unsupported_type(self):
         self.create_object({"code": "black"})
         self.create_object({"fib": [2, 3, 5]})

{kinto-23.0.2 → kinto-23.1.0}/kinto/core/utils.py

@@ -422,7 +422,7 @@ def follow_subrequest(request, subrequest, **kwargs):
     """Run a subrequest (e.g. batch), and follow the redirection if any.
 
     :rtype: tuple
-    :returns: the reponse and the redirection request (or `subrequest`
+    :returns: the response and the redirection request (or `subrequest`
               if no redirection happened.)
     """
     try:

kinto-23.1.0/kinto/plugins/admin/VERSION

@@ -0,0 +1 @@
+4.3.0

kinto-23.1.0/kinto/plugins/admin/build/VERSION

@@ -0,0 +1 @@
+4.3.0