Gate restricted-license task selection (part 3)

tasks/task_083/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "LGPL-3.0-family",
   "license_source": "LICENSE",
   "gpl_family": true,
+  "restricted_license": true,
+  "license_gate": "gpl-family",
   "public_payload_sha256": "48f2557e6046a003e567fb8b9055d9a6f9a93401f664313f9c04cedadd30780c"
 }

tasks/task_084/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "LGPL-3.0-family",
   "license_source": "LICENSE",
   "gpl_family": true,
+  "restricted_license": true,
+  "license_gate": "gpl-family",
   "public_payload_sha256": "0b14a30b4b7ceb203ee7c08d2196b2c8b6a4efa48f85b12627a87a49f5f8b83d"
 }

tasks/task_085/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "AGPL-family",
   "license_source": "COPYING",
   "gpl_family": true,
+  "restricted_license": true,
+  "license_gate": "gpl-family",
   "public_payload_sha256": "2db37177603a05c62b276b94c738f8592f40853359df72a3f25205c1d5bb5748"
 }

tasks/task_086/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "dd83643eed59e22c0cf5fa9d29e4de990944b8add3edd5058391df75a585f537"
 }

tasks/task_087/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "442792643e44ca3c36c70b3d63c80708e9f58b5972e5bdf43e90834720834814"
 }

tasks/task_088/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "Apache-2.0",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "5e7474f8aa8269a9d76e03f048cce31b30e91fadfa8bb5e3401d63b59c63ddbf"
 }

tasks/task_089/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "fe78fd81c8f3bde1750d471aec4416de4b93ff45a1490008fe50e529855c6782"
 }

tasks/task_090/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE.txt",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "dd119886283401127edc350f562371a2bad9d92d79cfe0488afeaa26a8dde9b4"
 }

tasks/task_091/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "ee6d2a8fa5af6c99aded10bacf8ffa2910bcb148ed68fb80707b9cebe7eb0437"
 }

tasks/task_092/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE.txt",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "873bfddc79c4be961e1b653f28bf7718df73b74df7a12102e96a97ac64f51f07"
 }

tasks/task_093/metadata.json

@@ -5,8 +5,10 @@
   "language": "python",
   "source_repository": "https://github.com/Project-MONAI/MONAI",
   "source_commit": "5a644e4edcc37e5c963e52fda6fab4c85b3ff02e",
-  "source_license": "UNKNOWN",
-  "license_source": "not-detected",
+  "source_license": "Apache-2.0",
+  "license_source": "github-api:LICENSE@5a644e4edcc37e5c963e52fda6fab4c85b3ff02e",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "0756b99aa4bc899129a72159146d991cddcd1544c136b1d3e76eb47f583c1cf3"
 }

tasks/task_094/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE.rst",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "83caaa6fe0d259a727975a11f4606bee8784fe286c6fec89eb78769b09ba9b44"
 }

tasks/task_095/metadata.json

@@ -5,8 +5,10 @@
   "language": "python",
   "source_repository": "https://github.com/PMEAL/OpenPNM",
   "source_commit": "d8efaa211ea6721cc4a718890f11fb60b8b43326",
-  "source_license": "UNKNOWN",
-  "license_source": "not-detected",
+  "source_license": "MIT",
+  "license_source": "github-api:LICENSE@d8efaa211ea6721cc4a718890f11fb60b8b43326",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "9682714aad6233c65f16201b2c737da9e0e133cf60cfc3203b375a3dd3b9487c"
 }

tasks/task_096/metadata.json

@@ -5,8 +5,10 @@
   "language": "python",
   "source_repository": "https://github.com/CLIMADA-project/climada_python",
   "source_commit": "104dfdb64ed00fce6c49a5d67be371f4fca016dd",
-  "source_license": "UNKNOWN",
-  "license_source": "not-detected",
-  "gpl_family": false,
+  "source_license": "GPL-3.0",
+  "license_source": "github-api:LICENSE@104dfdb64ed00fce6c49a5d67be371f4fca016dd",
+  "gpl_family": true,
+  "restricted_license": true,
+  "license_gate": "gpl-family",
   "public_payload_sha256": "5da44df229cac52680b35b0d4806ec17dd1e8a8851512c04cbcdf3159e88c977"
 }

tasks/task_097/metadata.json

@@ -5,8 +5,10 @@
   "language": "python",
   "source_repository": "https://github.com/deepmodeling/deepmd-kit",
   "source_commit": "6c3b985cbc6e2dec51976a20ae51214186c693b5",
-  "source_license": "UNKNOWN",
-  "license_source": "not-detected",
-  "gpl_family": false,
+  "source_license": "LGPL-3.0-or-later",
+  "license_source": "source/deepmd/utils/spin.py",
+  "gpl_family": true,
+  "restricted_license": true,
+  "license_gate": "gpl-family",
   "public_payload_sha256": "0be2c62ea59a56d67afb0a87a5e2d6699169c73794c50b096a0d77f1f9474945"
 }

tasks/task_098/metadata.json

@@ -3,10 +3,12 @@
   "title": "Repair inconsistent satellite parallax geolocation",
   "domain": "remote-sensing-and-geostationary-geolocation",
   "language": "python",
-  "source_repository": "",
-  "source_commit": "",
-  "source_license": "UNKNOWN",
-  "license_source": "not-detected",
-  "gpl_family": false,
+  "source_repository": "https://github.com/pytroll/satpy",
+  "source_commit": "0ef189634030bda38bd069de30b60f8769995050",
+  "source_license": "GPL-3.0-or-later",
+  "license_source": "source/satpy/utils.py",
+  "gpl_family": true,
+  "restricted_license": true,
+  "license_gate": "gpl-family",
   "public_payload_sha256": "551331a7c8d9ec732af39574c53fd2f2139520ba8eb5a322aed7d412101fe61d"
 }

tasks/task_099/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "fff992d5304213d729a9c9bac0a2bd157c983e49cf4ca9f4d49da3d4fef14c0f"
 }

tasks/task_100/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "LGPL-2.1-family",
   "license_source": "COPYING",
   "gpl_family": true,
+  "restricted_license": true,
+  "license_gate": "gpl-family",
   "public_payload_sha256": "1e14eacadfc8bee10ae95178b7335c5fa6d923d9c528037c54d0d52c051c65c5"
 }

tasks/task_101/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE.txt",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "7ca613711ba2cbfcb078328bc5fe977dda892c408974f1d7140f7f1d7d0228b3"
 }

tasks/task_102/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "Apache-2.0",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "2152837000fbb33fc8d41e69096794de10a4c9bfe7e3ca4f6237362e5d33a560"
 }

tasks/task_103/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE.md",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "637633ba5229cbf0bf969d215196618fbee0a970d14266a1c9942dbef3eabc86"
 }

tasks/task_104/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE.txt",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "b9b443a00cc7b5c3a4e14a66c2c1462517649ad3dda55c2db9c549ecf8a07e67"
 }

tasks/task_105/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "license.txt",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "d496a6d39aae48fa19d84c6a4abeb31ffdcb47c89055e7f92e5cd9cf6309608c"
 }

tasks/task_106/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE.md",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "e94e60a0ebbd19494438edfdc820c664f7f9d4a72a7a4e9f4a5158e65019d996"
 }

tasks/task_107/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "9938aee4065bf2710315908c516fc18766d810d19943994ca58551f7b178794a"
 }

tasks/task_108/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "444409e8fe5c224b3165318b5a161d72cb6c9781565eabad46a5c08fe59685dc"
 }

tasks/task_109/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "8570c909ae4c3289c01426c7f2720de40ea02ac9dd32e04d729be0a44d48ac5e"
 }

tasks/task_110/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "5da464679f638b67d9409b9d680c9a4e5f7bb314f46ae0fc14a693500f22d5bb"
 }

tasks/task_111/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "bc051a4f26a75f73535918cd1a8bc8754a4b1da712860acdff481ba9ff0efe8a"
 }

tasks/task_112/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "bb313b40e78959c6b6aa7c2e1d88bc13135cabb91be96ead6c7b02b595e09c91"
 }

tasks/task_113/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "abff131018164171256d840b24b28f75874d438199c298730bb9e67a418069d1"
 }

tasks/task_114/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE.txt",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "11ed0f893a747a442a803de74162c64d83f5d2faaa768350901af033f8f20baf"
 }

tasks/task_115/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "9fd0984b691e2f02e10254a1bd81bce154c5487a07bdd0b418feb9a291468abc"
 }

tasks/task_116/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "dbc513a429a96f2f932c6361a67d673a4473c834f540432b3c60d51c91cfcc9d"
 }

tasks/task_117/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "MIT",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "576548fdac2012b5964ab55f374077468fdce4afddd9599cfbf6301b1f3ea490"
 }

tasks/task_118/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "AGPL-family",
   "license_source": "COPYING",
   "gpl_family": true,
+  "restricted_license": true,
+  "license_gate": "gpl-family",
   "public_payload_sha256": "1d2f2929496088cc56e5ace00807c26de51b2ca99b758ced06ebe7b6f8a057e1"
 }

tasks/task_119/metadata.json

@@ -8,5 +8,7 @@
   "source_license": "BSD-3-Clause",
   "license_source": "LICENSE",
   "gpl_family": false,
+  "restricted_license": false,
+  "license_gate": "none",
   "public_payload_sha256": "3871acb535cf909a57445869a10486318e8941c87fba318374acd51d562b1ee8"
 }

tools/materialize.py

@@ -10,7 +10,6 @@ from pathlib import Path
 
 
 ROOT = Path(__file__).resolve().parents[1]
-GPL_IDS = {"003", "021", "023", "057", "066", "074", "075", "083", "084", "085", "100", "118"}
 
 
 def normalize_task_id(value: str) -> str:
@@ -50,13 +49,22 @@ def load_rows() -> list[dict[str, object]]:
     return [json.loads(line) for line in (ROOT / "manifests" / "tasks.jsonl").read_text(encoding="utf-8").splitlines() if line.strip()]
 
 
-def task_source(task_path: str, *, root: Path = ROOT) -> Path:
+def task_source(
+    task_path: str,
+    *,
+    root: Path = ROOT,
+    include_build_context: bool = False,
+) -> Path:
     source = root / task_path
-    if source.is_dir():
-        return source
+    if include_build_context:
+        if source.is_dir():
+            return source
+        raise FileNotFoundError(f"full build context is absent: {task_path}")
     snapshot_source = root / "huggingface" / task_path
     if snapshot_source.is_dir():
         return snapshot_source
+    if source.is_dir():
+        return source
     raise FileNotFoundError(f"task bundle is absent from local and HF snapshots: {task_path}")
 
 
@@ -68,8 +76,10 @@ def main() -> int:
         help="Task id selector; repeat or use commas/ranges, e.g. 002,005-007",
     )
     parser.add_argument(
-        "--allow-GPL", "--allow-gpl", action="store_true", dest="allow_gpl",
-        help="Allow the 12 GPL-family tasks in the materialized selection",
+        "--allow-restricted-licenses",
+        action="store_true",
+        dest="allow_restricted_licenses",
+        help="Allow GPL-family and non-commercial/restricted-license tasks in the materialized selection",
     )
     parser.add_argument(
         "--include-build-context",
@@ -89,19 +99,31 @@ def main() -> int:
         row for row in available_rows
         if selected is None or str(row["release_id"]) in selected
     ]
-    gated = [str(row["release_id"]) for row in matched if bool(row.get("gpl_family"))]
-    if gated and not args.allow_gpl:
+    restricted_gated = [
+        str(row["release_id"])
+        for row in matched
+        if str(row.get("license_gate", "none")) != "none"
+    ]
+    if selected is not None and restricted_gated and not args.allow_restricted_licenses:
         raise ValueError(
-            "GPL-family task selection requires --allow-GPL: " + ", ".join(gated)
+            "restricted-license task selection requires --allow-restricted-licenses: "
+            + ", ".join(restricted_gated)
         )
-    rows = [row for row in matched if args.allow_gpl or not bool(row.get("gpl_family"))]
+    rows = [
+        row for row in matched
+        if str(row.get("license_gate", "none")) == "none"
+        or args.allow_restricted_licenses
+    ]
     if args.output.exists():
         if not args.force:
             raise FileExistsError(f"output exists; use --force: {args.output}")
         shutil.rmtree(args.output)
     args.output.mkdir(parents=True)
     for row in rows:
-        source = task_source(str(row["task_path"]))
+        source = task_source(
+            str(row["task_path"]),
+            include_build_context=args.include_build_context,
+        )
         destination = args.output / source.name
         if args.include_build_context:
             if not (source / "environment" / "repo").is_dir():
@@ -126,7 +148,7 @@ def main() -> int:
                 target.parent.mkdir(parents=True, exist_ok=True)
                 shutil.copy2(path, target)
     selection = {
-        "allow_gpl": args.allow_gpl,
+        "allow_restricted_licenses": args.allow_restricted_licenses,
         "task_ids": [str(row["release_id"]) for row in rows],
     }
     (args.output / "selection.json").write_text(json.dumps(selection, indent=2) + "\n", encoding="utf-8")

tools/run_batch.py

@@ -74,7 +74,10 @@ def selection_payload(root: Path, dirs: list[Path]) -> dict[str, object]:
         task_ids = [str(value) for value in payload.get("task_ids", [])]
     else:
         task_ids = [path.name.removeprefix("task_") for path in dirs]
-        payload = {"allow_gpl": None, "task_ids": task_ids}
+        payload = {
+            "allow_restricted_licenses": None,
+            "task_ids": task_ids,
+        }
     canonical = json.dumps({"task_ids": task_ids}, sort_keys=True).encode("utf-8")
     payload["task_ids"] = task_ids
     payload["selection_sha256"] = hashlib.sha256(canonical).hexdigest()
@@ -223,7 +226,7 @@ def main() -> int:
 
     metadata = {
         "task_ids": selection["task_ids"],
-        "allow_gpl": selection.get("allow_gpl"),
+        "allow_restricted_licenses": selection.get("allow_restricted_licenses"),
         "selection_sha256": selection["selection_sha256"],
         "image_refs": image_refs,
         "platform": args.platform,