simplify: remove filename as it's redundant

Author: chrisirhc

python/private/pypi/index_sources.bzl

@@ -32,8 +32,7 @@ def index_sources(line):
             * `marker` - str; the marker expression, as per PEP508 spec.
             * `requirement` - str; a requirement line without the marker. This can
                 be given to `pip` to install a package.
-            * `url` - str; URL if the requirement specifies a direct URL.
-            * `filename` - str; filename if URL is present, extracted from the URL.
+            * `url` - str, optional; URL if the requirement specifies a direct URL.
     """
     line = line.replace("\\", " ")
     head, _, maybe_hashes = line.partition(";")
@@ -58,28 +57,21 @@ def index_sources(line):
         " ".join(["--hash=sha256:{}".format(sha) for sha in shas]),
     ).strip()
 
-    # Extract URL if present
     if "@" in head:
         requirement = requirement_line
 
-        # Extract URL from direct URL format
+        _, _, url_and_rest = requirement.partition("@")
         _, _, url_and_rest = requirement.partition("@")
         url = url_and_rest.strip().partition(" ")[0].strip()
 
-        # Extract filename from URL
         if url:
-            filename = url.rpartition("/")[2]
-            if not filename:
-                filename = url.rpartition("/")[0].rpartition("/")[2]
-
             return struct(
                 requirement = requirement,
                 requirement_line = requirement_line,
                 version = version,
                 shas = sorted(shas),
                 marker = marker,
                 url = url,
-                filename = filename,
             )
 
     return struct(

python/private/pypi/parse_requirements.bzl

@@ -295,14 +295,16 @@ def _add_dists(*, requirement, index_urls, logger = None):
 
     # Handle direct URLs in requirements
     if hasattr(requirement.srcs, "url"):
-        # Create a struct that matches the expected format for direct URLs
+        url = requirement.srcs.url
+        _, _, filename = url.rpartition("/")
         direct_url_dist = struct(
-            url = requirement.srcs.url,
-            filename = requirement.srcs.filename,
-            # TODO: if more than one hash is present, we should use all of them
-            sha256 = requirement.srcs.shas[0] if requirement.srcs.shas else "",  # Use hash if provided
+            url = url,
+            filename = filename,
+            sha256 = requirement.srcs.shas[0] if requirement.srcs.shas else "",
             yanked = False,
         )
+
+        # TODO should be able to handle sdist by checking the filename extension
         return [direct_url_dist], None
 
     if not index_urls:

tests/pypi/index_sources/index_sources_tests.bzl

@@ -29,26 +29,22 @@ def _test_no_simple_api_sources(env):
             requirement = "foo==0.0.1 @ https://someurl.org",
             marker = "",
             url = "https://someurl.org",
-            filename = "someurl.org",
         ),
         "foo==0.0.1 @ https://someurl.org/package.whl": struct(
             requirement = "foo==0.0.1 @ https://someurl.org/package.whl",
             marker = "",
             url = "https://someurl.org/package.whl",
-            filename = "package.whl",
         ),
         "foo==0.0.1 @ https://someurl.org/package.whl --hash=sha256:deadbeef": struct(
             requirement = "foo==0.0.1 @ https://someurl.org/package.whl --hash=sha256:deadbeef",
             marker = "",
             url = "https://someurl.org/package.whl",
-            filename = "package.whl",
             shas = ["deadbeef"],
         ),
         "foo==0.0.1 @ https://someurl.org/package.whl; python_version < \"2.7\"\\    --hash=sha256:deadbeef": struct(
             requirement = "foo==0.0.1 @ https://someurl.org/package.whl --hash=sha256:deadbeef",
             marker = "python_version < \"2.7\"",
             url = "https://someurl.org/package.whl",
-            filename = "package.whl",
             shas = ["deadbeef"],
         ),
     }
@@ -61,8 +57,6 @@ def _test_no_simple_api_sources(env):
         env.expect.that_str(got.marker).equals(want.marker)
         if hasattr(want, "url"):
             env.expect.that_str(got.url).equals(want.url)
-        if hasattr(want, "filename"):
-            env.expect.that_str(got.filename).equals(want.filename)
 
 _tests.append(_test_no_simple_api_sources)
 

tests/pypi/parse_requirements/parse_requirements_tests.bzl

@@ -147,7 +147,6 @@ def _test_direct_urls(env):
                     shas = ["deadbeef"],
                     version = "",
                     url = "https://example.org/bar-1.0.whl",
-                    filename = "bar-1.0.whl",
                 ),
                 target_platforms = ["linux_x86_64"],
                 whls = [struct(
@@ -171,7 +170,6 @@ def _test_direct_urls(env):
                     shas = ["deadb00f"],
                     version = "",
                     url = "https://test.com/baz-2.0.whl",
-                    filename = "baz-2.0.whl",
                 ),
                 target_platforms = ["linux_x86_64"],
                 whls = [struct(
@@ -195,7 +193,6 @@ def _test_direct_urls(env):
                     shas = [],
                     version = "",
                     url = "https://some-url/package.whl",
-                    filename = "package.whl",
                 ),
                 target_platforms = ["linux_x86_64"],
                 whls = [struct(