Clean up imports

Author: dralley

pulp_rust/app/serializers.py

@@ -1,13 +1,10 @@
 import logging
 
 from gettext import gettext as _
-from django.db.utils import IntegrityError
-from pydantic import TypeAdapter, ValidationError
 from rest_framework import serializers
 
 from pulpcore.plugin import models as core_models
 from pulpcore.plugin import serializers as core_serializers
-from pulpcore.plugin.util import get_domain
 
 from . import models
 
@@ -23,7 +20,8 @@ class IndexRootSerializer(serializers.Serializer):
     api = serializers.CharField(help_text=_("URL of the API root"), read_only=True)
     auth_required = serializers.BooleanField(
         help_text=_(
-            "Indicates whether this is a private registry that requires all operations to be authenticated"
+            "Indicates whether this is a private registry that requires all operations to "
+            "be authenticated"
         ),
         read_only=True,
     )
@@ -199,176 +197,6 @@ class Meta:
         model = models.RustContent
 
 
-class RustDependencySerializer(serializers.ModelSerializer):
-    """
-    Serializer for RustDependency.
-
-    Represents a single dependency entry from the Cargo package index.
-    """
-
-    name = serializers.CharField(
-        help_text=_("Dependency name as used in code (may be renamed via 'package' field)")
-    )
-
-    req = serializers.CharField(
-        help_text=_("Version requirement string (e.g., '^1.0', '>=0.2.3,<0.3')")
-    )
-
-    features = serializers.ListField(
-        child=serializers.CharField(),
-        default=list,
-        required=False,
-        help_text=_("List of feature flags to enable for this dependency"),
-    )
-
-    optional = serializers.BooleanField(
-        default=False, required=False, help_text=_("Whether this is an optional dependency")
-    )
-
-    default_features = serializers.BooleanField(
-        default=True,
-        required=False,
-        help_text=_("Whether to enable the dependency's default features"),
-    )
-
-    target = serializers.CharField(
-        allow_null=True,
-        required=False,
-        help_text=_("Platform-specific target (e.g., 'cfg(unix)', 'cfg(windows)')"),
-    )
-
-    kind = serializers.ChoiceField(
-        choices=[("normal", "Normal"), ("dev", "Development"), ("build", "Build")],
-        default="normal",
-        required=False,
-        help_text=_(
-            "Dependency type: 'normal' (runtime), 'dev' (development), or 'build' (build script)"
-        ),
-    )
-
-    registry = serializers.CharField(
-        allow_null=True,
-        required=False,
-        help_text=_("Alternative registry URL if dependency is from a different registry"),
-    )
-
-    package = serializers.CharField(
-        allow_null=True,
-        required=False,
-        help_text=_("Original crate name if the dependency was renamed"),
-    )
-
-    class Meta:
-        model = models.RustDependency
-        fields = (
-            "name",
-            "req",
-            "features",
-            "optional",
-            "default_features",
-            "target",
-            "kind",
-            "registry",
-            "package",
-        )
-
-
-class RustContentSerializer(core_serializers.SingleArtifactContentSerializer):
-    """
-    Serializer for RustContent (Cargo package version).
-
-    Represents a single version of a Rust crate as defined in the Cargo registry
-    index specification. Includes package metadata, dependencies, and features.
-    """
-
-    name = serializers.CharField(help_text=_("Package name (crate name)"))
-
-    vers = serializers.CharField(help_text=_("Semantic version string (SemVer 2.0.0)"))
-
-    dependencies = RustDependencySerializer(
-        many=True, required=False, help_text=_("List of dependencies for this package version")
-    )
-
-    cksum = serializers.CharField(help_text=_("SHA256 checksum of the .crate file (tarball)"))
-
-    features = serializers.JSONField(
-        default=dict,
-        required=False,
-        help_text=_(
-            "Feature flags mapping - maps feature names to lists of features/dependencies "
-            "they enable"
-        ),
-    )
-
-    features2 = serializers.JSONField(
-        default=dict,
-        required=False,
-        allow_null=True,
-        help_text=_("Extended feature syntax support (newer registry format)"),
-    )
-
-    yanked = serializers.BooleanField(
-        default=False,
-        required=False,
-        help_text=_("Whether this version has been yanked (removed from normal use)"),
-    )
-
-    links = serializers.CharField(
-        allow_null=True,
-        required=False,
-        help_text=_("Name of native library this package links to (from Cargo.toml 'links' field)"),
-    )
-
-    v = serializers.IntegerField(
-        default=1, required=False, help_text=_("Schema version of the index entry format")
-    )
-    rust_version = serializers.CharField(
-        allow_null=True,
-        required=False,
-        help_text=_("Minimum Rust compiler version required (MSRV)"),
-    )
-
-    def create(self, validated_data):
-        """Create RustContent and related dependencies."""
-        dependencies_data = validated_data.pop("dependencies", [])
-        content = super().create(validated_data)
-
-        # Create dependency records
-        for dep_data in dependencies_data:
-            models.RustDependency.objects.create(content=content, **dep_data)
-
-        return content
-
-    def update(self, instance, validated_data):
-        """Update RustContent and related dependencies."""
-        dependencies_data = validated_data.pop("dependencies", None)
-
-        instance = super().update(instance, validated_data)
-
-        if dependencies_data is not None:
-            # Replace all dependencies
-            instance.dependencies.all().delete()
-            for dep_data in dependencies_data:
-                models.RustDependency.objects.create(content=instance, **dep_data)
-
-        return instance
-
-    class Meta:
-        fields = core_serializers.SingleArtifactContentSerializer.Meta.fields + (
-            "name",
-            "vers",
-            "dependencies",
-            "cksum",
-            "features",
-            "features2",
-            "yanked",
-            "links",
-            "v",
-            "rust_version",
-        )
-        model = models.RustContent
-
-
 class RustRemoteSerializer(core_serializers.RemoteSerializer):
     """
     A Serializer for RustRemote.

pulp_rust/app/tasks/synchronizing.py

@@ -73,7 +73,7 @@ async def run(self):
         downloader = self.remote.get_downloader(url=self.remote.url)
         result = await downloader.run()
         # Use ProgressReport to report progress
-        raise NotImplemented("Not implemented")
+        raise NotImplementedError("Not implemented")
 
         for entry in self.read_my_metadata_file_somehow(result.path):
             unit = RustContent(entry)  # make the content unit in memory-only

pulp_rust/app/urls.py

@@ -1,13 +1,11 @@
 from django.conf import settings
-from django.urls import path, re_path
+from django.urls import path
 
 from pulp_rust.app.views import IndexRoot, CargoIndexApiViewSet, CargoDownloadApiView
 
 if settings.DOMAIN_ENABLED:
-    path_re = r"(?P<pulp_domain>[-a-zA-Z0-9_]+)/(?P<name>[\w-]+)/(?P<path>.*)"
     CRATES_IO_URL = "pulp/cargo/<slug:pulp_domain>/<slug:repo>/"
 else:
-    path_re = r"(?P<name>[\w-]+)/(?P<path>.*)"
     CRATES_IO_URL = "pulp/cargo/<slug:repo>/"
 
 
@@ -23,5 +21,4 @@
         CargoIndexApiViewSet.as_view({"get": "retrieve"}),
         name="cargo-index-api",
     ),
-    # re_path(rf"^pulp/cargo/{path_re}$", CargoApiViewSet.as_view({"get": "retrieve"})),
 ]

pulp_rust/app/views.py

@@ -3,47 +3,32 @@
 
 from rest_framework.views import APIView
 from rest_framework.viewsets import ViewSet
-from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer, TemplateHTMLRenderer
 from rest_framework.response import Response
-from rest_framework.decorators import api_view
-from rest_framework.exceptions import NotAcceptable, Throttled
+from rest_framework.exceptions import Throttled
 from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import redirect
-from datetime import datetime, timezone, timedelta
+from django.shortcuts import redirect, get_object_or_404
 
-from django.contrib.sessions.models import Session
-from django.db import transaction
-from django.db.utils import DatabaseError
 from django.http.response import (
     Http404,
     HttpResponseNotFound,
-    HttpResponseForbidden,
-    HttpResponseBadRequest,
-    StreamingHttpResponse,
     HttpResponse,
 )
 from drf_spectacular.utils import extend_schema
 from dynaconf import settings
-from itertools import chain
-from packaging.utils import canonicalize_name
-from urllib.parse import urljoin, urlparse, urlunsplit
 from pathlib import PurePath
+from urllib.parse import urljoin
 
-from pulpcore.plugin.viewsets import OperationPostponedResponse
-from pulpcore.plugin.tasking import dispatch
-from pulpcore.plugin.util import get_domain, get_url
+from pulpcore.plugin.util import get_domain
 
 from pulp_rust.app.models import RustDistribution, RustRepository, RustContent
 from pulp_rust.app.serializers import (
     IndexRootSerializer,
     RustContentSerializer,
 )
-from pulp_rust.app import tasks
 
 log = logging.getLogger(__name__)
 
-ORIGIN_HOST = settings.CONTENT_ORIGIN if settings.CONTENT_ORIGIN else settings.PYPI_API_HOSTNAME
-BASE_CONTENT_URL = urljoin(ORIGIN_HOST, settings.CONTENT_PATH_PREFIX)
+BASE_CONTENT_URL = urljoin(settings.CONTENT_ORIGIN, settings.CONTENT_PATH_PREFIX)
 BASE_API_URL = urljoin(settings.CRATES_IO_API_HOSTNAME, "/pulp/cargo/")
 CRATES_IO_API = "/api/v1/crates/"
 
@@ -68,7 +53,7 @@ def get_distribution(repo):
         try:
             return distro_qs.get(base_path=repo, pulp_domain=get_domain())
         except ObjectDoesNotExist:
-            raise Http404(f"No RustDistribution found for base_path {path}")
+            raise Http404(f"No RustDistribution found for base_path {repo}")  # TODO: broken
 
     @staticmethod
     def get_repository_version(distribution):
@@ -248,13 +233,19 @@ class CargoDownloadApiView(APIView):
     authentication_classes = []
     permission_classes = []
 
+    def get_full_path(self, base_path, pulp_domain=None):  # TODO: replace with ApiMixin?
+        if settings.DOMAIN_ENABLED:
+            domain = pulp_domain or get_domain()
+            return f"{domain.name}/{base_path}"
+        return base_path
+
     def redirect_to_content_app(self, distribution, relative_path, request):
         scheme = request.META.get("HTTP_X_FORWARDED_PROTO", request.scheme)
         hostname = request.META.get("HTTP_X_FORWARDED_HOST", request.get_host())
         content_origin = f"{scheme}://{hostname}"
         return redirect(
             f"{content_origin}{settings.CONTENT_PATH_PREFIX}"
-            f"{get_full_path(distribution.base_path)}/{relative_path}"
+            f"{self.get_full_path(distribution.base_path)}/{relative_path}"
         )
 
     def get_repository_and_distributions(self, name):
@@ -270,7 +261,7 @@ def get(self, request, name, version):
         """
         repo, distro = self.get_repository_and_distributions(name)
         content = get_object_or_404(
-            RustPackage, name=name, vers=version, pk__in=repo.latest_version().content
+            RustContent, name=name, vers=version, pk__in=repo.latest_version().content
         )
         relative_path = content.contentartifact_set.get().relative_path
         return self.redirect_to_content_app(distro, relative_path, request)

pulp_rust/app/viewsets.py

@@ -193,15 +193,15 @@ def add_cached_content(self, request, pk):
         remote = serializer.validated_data.get("remote", repository.remote)
 
         result = dispatch(
-            add_cached_content_to_repository,
+            tasks.add_cached_content_to_repository,
             shared_resources=[remote],
             exclusive_resources=[repository],
             kwargs={
                 "remote_pk": str(remote.pk),
                 "repository_pk": str(repository.pk),
             },
         )
-        return OperationPostponedResponse(result, request)
+        return core.OperationPostponedResponse(result, request)
 
 
 class RustRepositoryVersionViewSet(core.RepositoryVersionViewSet):