tmp

Author: jobselko

pulp_python/app/migrations/0019_create_missing_metadata_artifacts.py

@@ -155,12 +155,12 @@ def create_missing_metadata_artifacts(apps, schema_editor):
         PythonPackageContent.objects.filter(metadata_sha256__isnull=False)
         .exclude(metadata_sha256="")
         .prefetch_related("contentartifact_set")
+        .only("filename", "metadata_sha256")
     )
     # todo: only for testing, remove later
     created_count = 0
     skipped_count = 0
 
-    # todo: do i need temp dir? (not needed in localhost)
     with tempfile.TemporaryDirectory(dir=settings.WORKING_DIRECTORY) as temp_dir:
         for package in packages:
             metadata_relative_path = f"{package.filename}.metadata"
@@ -195,7 +195,7 @@ def create_missing_metadata_artifacts(apps, schema_editor):
                 )
                 created_count += 1
             except Exception:
-                # Failed to save metadata artifact
+                # Failed to save metadata content artifact
                 skipped_count += 1
 
     print(f"Created {created_count} missing metadata artifacts. Skipped {skipped_count} packages.")

pulp_python/app/tasks/sync.py

@@ -255,6 +255,7 @@ async def create_content(self, pkg):
                     if upstream_pkg.has_metadata:
                         url = upstream_pkg.metadata_url
                         md_sha256 = upstream_pkg.metadata_digests.get("sha256")
+                        package.metadata_sha256 = md_sha256
                         artifact = Artifact(sha256=md_sha256)
 
                         metadata_artifact = DeclarativeArtifact(

pulp_python/app/utils.py

@@ -1,6 +1,5 @@
 import hashlib
 import logging
-import os
 import pkginfo
 import re
 import shutil
@@ -273,40 +272,32 @@ def artifact_to_metadata_artifact(
 
     temp_wheel_path = None
     temp_metadata_path = None
+
+    with tempfile.NamedTemporaryFile("wb", dir=tmp_dir, suffix=filename, delete=False) as temp_file:
+        temp_wheel_path = temp_file.name
+        artifact.file.seek(0)
+        shutil.copyfileobj(artifact.file, temp_file)
+        temp_file.flush()
+
+    metadata_content = extract_wheel_metadata(temp_wheel_path)
+    if not metadata_content:
+        return None
+
+    with tempfile.NamedTemporaryFile(
+        "wb", dir=tmp_dir, suffix=".metadata", delete=False
+    ) as temp_md:
+        temp_metadata_path = temp_md.name
+        temp_md.write(metadata_content)
+        temp_md.flush()
+
+    metadata_artifact = Artifact.init_and_validate(temp_metadata_path)
     try:
-        with tempfile.NamedTemporaryFile(
-            "wb", dir=tmp_dir, suffix=filename, delete=False
-        ) as temp_file:
-            temp_wheel_path = temp_file.name
-            artifact.file.seek(0)
-            shutil.copyfileobj(artifact.file, temp_file)
-            temp_file.flush()
-
-        metadata_content = extract_wheel_metadata(temp_wheel_path)
-        if not metadata_content:
-            return None
-
-        with tempfile.NamedTemporaryFile(
-            "wb", dir=tmp_dir, suffix=".metadata", delete=False
-        ) as temp_md:
-            temp_metadata_path = temp_md.name
-            temp_md.write(metadata_content)
-            temp_md.flush()
-
-        metadata_artifact = Artifact.init_and_validate(temp_metadata_path)
-        try:
-            metadata_artifact.save()
-        except IntegrityError:
-            metadata_artifact = Artifact.objects.get(
-                sha256=metadata_artifact.sha256, pulp_domain=get_domain()
-            )
-        return metadata_artifact
-
-    finally:
-        if temp_wheel_path and os.path.exists(temp_wheel_path):
-            os.unlink(temp_wheel_path)
-        if temp_metadata_path and os.path.exists(temp_metadata_path):
-            os.unlink(temp_metadata_path)
+        metadata_artifact.save()
+    except IntegrityError:
+        metadata_artifact = Artifact.objects.get(
+            sha256=metadata_artifact.sha256, pulp_domain=get_domain()
+        )
+    return metadata_artifact
 
 
 def fetch_json_release_metadata(name: str, version: str, remotes: set[Remote]) -> dict: