chore: merge beta to main (#3637)

* feat: add graphql (#3632)

* feat: add GraphQL support with schema and queries for articles, blogs, and reports

* feat: extend GraphQL schema to include Launch and Event types with new queries for articles and blogs by news site, launch, and event

* refactor: remove logging configuration from settings.py

* feat: add NewsSite type to GraphQL schema and fix typo in LaunchType fields

* feat: implement GraphQL types and queries for Article, Blog, Report, Launch, Event, and NewsSite

* feat: update GraphQL types to use custom filter classes for Article, Blog, and Report

* feat: enhance article and blog queries with ordering by published date

* fix: remove ordering from all_articles query in GraphQL schema

* chore: sync pyproject

* chore: ignore type beceause it's not available

* build: 4.17.0-rc.1

Automatically generated by python-semantic-release

* chore: update harvester to 0.10.0

* fix: update commit message format for semantic release

* build: 4.17.0-rc.2

Automatically generated by python-semantic-release

* chore: remove unused pika-stubs

* feat: generate the label dynamically

* feat(#3630): add django admin dark theme (#3633)

* feat(#3630): django admin dark theme

* fix: update STATIC_ROOT and add STATICFILES_DIRS for improved static file handling

---------

Co-authored-by: Derk Weijers <[email protected]>

* chore: package updates

---------

Co-authored-by: semantic-release <semantic-release>
Co-authored-by: Arnaud Muller <[email protected]>

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "snapy"
-version = "4"
+version = "4.17.0-rc.2"
 description = "Spaceflight News API (SNAPI) enables developers to add the latest spaceflight news to their apps."
 authors = [{ name = "Derk Weijers", email = "[email protected]" }]
 readme = "README.md"
@@ -26,7 +26,8 @@ dependencies = [
     "pyyaml>=6.0.2",
     "sentry-sdk>=2.14.0",
     "uritemplate>=4.1.1",
-    "harvester>=0.9.0",
+    "harvester>=0.10.0",
+    "graphene-django>=3.2.2",
 ]
 
 [tool.uv]
@@ -37,7 +38,6 @@ dev-dependencies = [
     "django-filter-stubs>=0.1.3",
     "djangorestframework-stubs[compatible-mypy]>=3.14.0,<3.15.0",
     "mypy>=1.7.0,<1.8.0",
-    "pika-stubs>=0.1.3",
     "pytest>=8.3.3",
     "pytest-codspeed>=2.2.1",
     "pytest-cov>=5.0.0",
@@ -91,7 +91,7 @@ update_changelog_on_bump = false
 
 [tool.semantic_release]
 assets = []
-commit_message = "{version}\n\nAutomatically generated by python-semantic-release"
+commit_message = "build: {version}\n\nAutomatically generated by python-semantic-release"
 commit_parser = "angular"
 logging_use_named_masks = false
 major_on_zero = true

src/api/schema.py

@@ -0,0 +1,61 @@
+# type: ignore
+
+from graphene import ObjectType, relay
+from graphene_django import DjangoObjectType
+from graphene_django.filter import DjangoFilterConnectionField
+
+from api.models import Article, Blog, Event, Launch, NewsSite, Report
+from api.views.filters import BaseFilter, DocsFilter
+
+
+class ArticleType(DjangoObjectType):
+    class Meta:
+        model = Article
+        exclude = ["is_deleted"]
+        filterset_class = DocsFilter
+        interfaces = (relay.Node,)
+
+
+class BlogType(DjangoObjectType):
+    class Meta:
+        model = Blog
+        exclude = ["is_deleted"]
+        filterset_class = DocsFilter
+        interfaces = (relay.Node,)
+
+
+class ReportType(DjangoObjectType):
+    class Meta:
+        model = Report
+        exclude = ["is_deleted"]
+        filterset_class = BaseFilter
+        interfaces = (relay.Node,)
+
+
+class LaunchType(DjangoObjectType):
+    class Meta:
+        model = Launch
+        interfaces = (relay.Node,)
+
+
+class EventType(DjangoObjectType):
+    class Meta:
+        model = Event
+        interfaces = (relay.Node,)
+
+
+class NewsSiteType(DjangoObjectType):
+    class Meta:
+        model = NewsSite
+        interfaces = (relay.Node,)
+
+
+class Query(ObjectType):
+    article = relay.Node.Field(ArticleType)
+    all_articles = DjangoFilterConnectionField(ArticleType)
+
+    blog = relay.Node.Field(BlogType)
+    all_blogs = DjangoFilterConnectionField(BlogType)
+
+    report = relay.Node.Field(ReportType)
+    all_reports = DjangoFilterConnectionField(ReportType)

src/api/views/articles.py

@@ -1,5 +1,5 @@
 from django_filters import rest_framework
-from rest_framework import filters, viewsets
+from rest_framework import viewsets
 
 from api.models import Article
 from api.serializers import ArticleSerializer
@@ -15,9 +15,6 @@ class ArticleViewSet(viewsets.ReadOnlyModelViewSet):  # type: ignore
     filter_backends = [
         rest_framework.DjangoFilterBackend,
         SearchFilter,
-        filters.OrderingFilter,
     ]
     filterset_class = DocsFilter
     search_fields = ["title", "summary", "news_site__name"]
-    ordering = ["-published_at"]
-    ordering_fields = ["published_at", "updated_at"]

src/api/views/blogs.py

@@ -1,5 +1,5 @@
 from django_filters import rest_framework
-from rest_framework import filters, viewsets
+from rest_framework import viewsets
 
 from api.models import Blog
 from api.serializers import BlogSerializer
@@ -13,9 +13,6 @@ class BlogViewSet(viewsets.ReadOnlyModelViewSet):  # type: ignore
     filter_backends = [
         rest_framework.DjangoFilterBackend,
         SearchFilter,
-        filters.OrderingFilter,
     ]
     filterset_class = DocsFilter
     search_fields = ["title", "summary", "news_site__name"]
-    ordering = ["-published_at"]
-    ordering_fields = ["published_at", "updated_at"]

src/api/views/filters.py

@@ -8,6 +8,7 @@
     FilterSet,
     IsoDateTimeFilter,
     NumberFilter,
+    OrderingFilter,
     UUIDFilter,
 )
 from rest_framework import filters
@@ -98,6 +99,21 @@ def filter_keywords(self, queryset: QuerySet[Any], name: str, value: str) -> Any
         return queryset.filter(q)
 
 
+class OrderingFilterWithLabel(OrderingFilter):
+    def __init__(self, **kwargs: Any) -> None:
+        self.fields = kwargs.get("fields")
+
+        assert self.fields, "The 'fields' argument is required."
+
+        # Itterate over the tupple, generating a string of all first elements, including negative ones.
+        fields = ", ".join([f"{field[0]}, -{field[0]}" for field in self.fields])
+
+        super().__init__(
+            label=f"Order the result on `{fields}`.",
+            **kwargs,
+        )
+
+
 class BaseFilter(FilterSet):
     title_contains = CharFilter(
         field_name="title",
@@ -156,6 +172,16 @@ class BaseFilter(FilterSet):
         label="Get all documents updated before a given ISO8601 " "timestamp (excluded).",
     )
 
+    ordering = OrderingFilterWithLabel(
+        fields=(
+            (
+                "published_at",
+                "published_at",
+            ),
+            ("updated_at", "updated_at"),
+        ),
+    )
+
 
 class DocsFilter(BaseFilter):
     launch = UUIDInFilter(

src/api/views/reports.py

@@ -1,5 +1,5 @@
 from django_filters import rest_framework
-from rest_framework import filters, viewsets
+from rest_framework import viewsets
 
 from api import serializers
 from api.models.report import Report
@@ -14,8 +14,5 @@ class ReportViewSet(viewsets.ReadOnlyModelViewSet):  # type: ignore
     filter_backends = [
         rest_framework.DjangoFilterBackend,
         SearchFilter,
-        filters.OrderingFilter,
     ]
     search_fields = ["title", "summary", "news_site__name"]
-    ordering = ["-published_at"]
-    ordering_fields = ["published_at", "updated_at"]

src/snapy/schema.py

@@ -0,0 +1,12 @@
+#  type: ignore
+
+from graphene import ObjectType, Schema
+
+from api.schema import Query as ApiQuery
+
+
+class Query(ApiQuery, ObjectType):
+    pass
+
+
+schema = Schema(query=Query)

src/snapy/settings.py

@@ -77,6 +77,7 @@
     "health_check",
     "health_check.db",
     "health_check.contrib.s3boto3_storage",
+    "graphene_django",
 ]
 
 MIDDLEWARE = [
@@ -110,6 +111,8 @@
     },
 ]
 
+JET_DEFAULT_THEME = "dark"
+
 WSGI_APPLICATION = "snapy.wsgi.application"
 
 # Database
@@ -165,7 +168,9 @@
     STATICFILES_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 else:
     STATIC_URL = "static/"
-    STATIC_ROOT = BASE_DIR / "staticfiles"
+    STATIC_ROOT = BASE_DIR.joinpath("staticfiles")
+
+STATICFILES_DIRS = [BASE_DIR.joinpath("static")]
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
@@ -208,16 +213,6 @@
     },
 }
 
-LOGGING = {
-    "version": 1,
-    "disable_existing_loggers": False,
-    "handlers": {
-        "console": {
-            "class": "logging.StreamHandler",
-        },
-    },
-    "root": {
-        "handlers": ["console"],
-        "level": "INFO",
-    },
+GRAPHENE = {
+    "SCHEMA": "snapy.schema.schema",
 }

src/snapy/urls.py

@@ -19,12 +19,15 @@
 
 from django.contrib import admin
 from django.urls import include, re_path
+from django.views.decorators.csrf import csrf_exempt
+from graphene_django.views import GraphQLView  # type: ignore
 
 urlpatterns = [
     re_path(r"^v4/jet/", include("jet.urls", "jet")),  # Django JET URLS
     re_path(r"^v4/jet/dashboard/", include("jet.dashboard.urls", "jet-dashboard")),  # Django JET dashboard URLS
     re_path(r"^v4/admin/", admin.site.urls),
     re_path(r"^v4/", include(("api.urls", "api"), namespace="v4")),
+    re_path(r"^v4/graphql/", csrf_exempt(GraphQLView.as_view(graphiql=True))),
     # Non v4 URLs
     re_path(r"health/", include("health_check.urls")),
 ]

src/static/jet/css/themes/dark/_variables.scss

@@ -0,0 +1,3 @@
+/*
+ * These theme uses default variables at ../_variables.scss
+ */