Merge branch 'main' of github.com:readthedocs/readthedocs.org into diataxis/main

Author: benjaoming

docs/user/guides/jupyter.rst

@@ -175,15 +175,15 @@ For example, this is how a simple notebook looks like in MyST Markdown format:
 
    ---
    jupytext:
-   text_representation:
-      extension: .md
-      format_name: myst
-      format_version: 0.13
-      jupytext_version: 1.10.3
+     text_representation:
+       extension: .md
+       format_name: myst
+       format_version: 0.13
+       jupytext_version: 1.10.3
    kernelspec:
-   display_name: Python 3
-   language: python
-   name: python3
+     display_name: Python 3
+     language: python
+     name: python3
    ---
 
    # Plain-text notebook formats

readthedocs/analytics/proxied_api.py

@@ -8,7 +8,7 @@
 
 from readthedocs.analytics.models import PageView
 from readthedocs.api.v2.permissions import IsAuthorizedToViewVersion
-from readthedocs.core.unresolver import unresolve
+from readthedocs.core.unresolver import UnresolverError, unresolve
 from readthedocs.core.utils.extend import SettingsOverrideObject
 from readthedocs.projects.models import Project
 
@@ -59,8 +59,14 @@ def get(self, request, *args, **kwargs):
     # pylint: disable=no-self-use
     def increase_page_view_count(self, project, version, absolute_uri):
         """Increase the page view count for the given project."""
-        unresolved = unresolve(absolute_uri)
-        if not unresolved or not unresolved.filename:
+        try:
+            unresolved = unresolve(absolute_uri)
+        except UnresolverError:
+            # If we were unable to resolve the URL, it
+            # isn't pointing to a valid RTD project.
+            return
+
+        if not unresolved.filename:
             return
 
         path = unresolved.filename

readthedocs/analytics/tests.py

@@ -118,6 +118,16 @@ def setUp(self):
         self.tomorrow = timezone.now() + timezone.timedelta(days=1)
         self.yesterday = timezone.now() - timezone.timedelta(days=1)
 
+    def test_invalid_uri(self):
+        assert PageView.objects.all().count() == 0
+        url = (
+            reverse("analytics_api")
+            + f"?project={self.project.slug}&version={self.version.slug}"
+            f"&absolute_uri=https://docs.example.com"
+        )
+        self.client.get(url, HTTP_HOST=self.host)
+        assert PageView.objects.all().count() == 0
+
     def test_increase_page_view_count(self):
         assert (
             PageView.objects.all().count() == 0

requirements/docs.in

@@ -10,7 +10,7 @@ sphinx-tabs==3.3.1
 sphinx-intl==2.0.1
 sphinx-design==0.2.0
 sphinx-multiproject==1.0.0rc1
-readthedocs-sphinx-search==0.1.2
+readthedocs-sphinx-search
 
 # Test out hoverxref
 git+https://github.com/readthedocs/sphinx-hoverxref

requirements/docs.txt

@@ -57,9 +57,9 @@ pygments==2.14.0
     #   sphinx-tabs
 pytz==2022.7.1
     # via babel
-pyyaml==5.4.1
+pyyaml==6.0
     # via myst-parser
-readthedocs-sphinx-search==0.1.2
+readthedocs-sphinx-search==0.2.0
     # via -r requirements/docs.in
 requests==2.28.2
     # via sphinx