uv-scripts

Author: martindurant

src/projspec/proj/uv.py

@@ -3,95 +3,14 @@
 from projspec.proj.base import ProjectSpec
 from projspec.utils import AttrDict
 
-# UV also allows dependencies (and other metadata)
-# to be declared inside scripts, which means you can have one-file projects.
-# https://docs.astral.sh/uv/guides/scripts/#declaring-script-dependencies
-# example:
-# /// script
-# # dependencies = [
-# #   "requests<3",
-# #   "rich",
-# # ]
-# # ///
-
-
-class UVScript(ProjectSpec):
-    """Single-file project runnable by UV as a script
-
-    Metadata are declared inline in the script header
-    See https://docs.astral.sh/uv/guides/scripts/#declaring-script-dependencies
-
-    Note that UV explicitly allows running these directly from HTTP URLs.
-    """
-
-    spec_doc = "https://docs.astral.sh/uv/reference/settings/"
-
-    def match(self):
-        # this is a file, not a directory
-        return self.root.url.endswith(("py", "pyw"))
-
-    def parse(self):
-        try:
-            with self.root.fs.open(self.root.url) as f:
-                txt = f.read().decode()
-        except OSError as e:
-            raise ValueError from e
-        lines = txt.split("# /// script\n", 1)[1].txt.split("# ///\n", 1)[0]
-        meta = "\n".join(line[2:] for line in lines.split("\n"))
-        toml.loads(meta)
-        # TODO: once we have the meta, we can reuse UVProject
-        #
-        # Apparently, uv.lock may or may not be in the same directory.
-
 
-class UV(ProjectSpec):
-    """UV-runnable project
-
-    Note: uv can run any python project, but this tests for uv-specific
-    config.
-    """
-
-    def match(self):
-        if not {"uv.lock", "uv.toml", ".python-version"}.isdisjoint(
-            self.root.basenames
-        ):
-            return True
-        if "uv" in self.root.pyproject.get("tools", {}):
-            return True
-        if (
-            self.root.pyproject.get("build-system", {}).get("build-backend", "")
-            == "uv_build"
-        ):
-            return True
-        if ".venv" in self.root.basenames:
-            try:
-                with self.root.fs.open(
-                    f"{self.root.url}/.venv/pyvenv.cfg", "rt"
-                ) as f:
-                    txt = f.read()
-                return b"uv =" in txt
-            except (OSError, FileNotFoundError):
-                pass
-        return False
-
-    def parse(self):
+class UVMixin:
+    def _parse_meta(self, conf):
         from projspec.artifact.installable import Wheel
         from projspec.artifact.python_env import LockFile, VirtualEnv
         from projspec.content.environment import Environment, Precision, Stack
 
         meta = self.root.pyproject
-        conf = meta.get("tools", {}).get("uv", {})
-        try:
-            with self.root.fs.open(f"{self.root.url}/uv.toml", "rt") as f:
-                conf2 = toml.load(f)
-        except (OSError, FileNotFoundError):
-            conf2 = {}
-        conf.update(conf2)
-        try:
-            with self.root.fs.open(f"{self.root.url}/uv.lock", "rt") as f:
-                lock = toml.load(f)
-        except (OSError, FileNotFoundError):
-            lock = {}
 
         envs = AttrDict()
         # TODO: uv allows dependencies with source=, which would show us where the
@@ -155,6 +74,84 @@ def parse(self):
                 cmd=["uv", "build"],
             )
 
+
+class UVScript(ProjectSpec, UVMixin):
+    """Single-file project runnable by UV as a script
+
+    Metadata are declared inline in the script header
+    See https://docs.astral.sh/uv/guides/scripts/#declaring-script-dependencies
+
+    """
+
+    spec_doc = "https://docs.astral.sh/uv/reference/settings/"
+
+    def match(self):
+        # this is a file, not a directory
+        return self.root.url.endswith(("py", "pyw"))
+
+    def parse(self):
+        try:
+            with self.root.fs.open(self.root.url) as f:
+                txt = f.read().decode()
+        except OSError as e:
+            raise ValueError from e
+        lines = txt.split("# /// script\n", 1)[1].txt.split("# ///\n", 1)[0]
+        meta = "\n".join(line[2:] for line in lines.split("\n"))
+        self._parse_meta(toml.loads(meta))
+        # if URL is local or http(s):
+        # self.artifacts["process"] = Process(
+        #     proj=self.root, cmd=['uv', 'run', self.root.url]
+        # )
+
+
+class UV(ProjectSpec, UVMixin):
+    """UV-runnable project
+
+    Note: uv can run any python project, but this tests for uv-specific
+    config.
+    """
+
+    def match(self):
+        if not {"uv.lock", "uv.toml", ".python-version"}.isdisjoint(
+            self.root.basenames
+        ):
+            return True
+        if "uv" in self.root.pyproject.get("tools", {}):
+            return True
+        if (
+            self.root.pyproject.get("build-system", {}).get("build-backend", "")
+            == "uv_build"
+        ):
+            return True
+        if ".venv" in self.root.basenames:
+            try:
+                with self.root.fs.open(
+                    f"{self.root.url}/.venv/pyvenv.cfg", "rt"
+                ) as f:
+                    txt = f.read()
+                return b"uv =" in txt
+            except (OSError, FileNotFoundError):
+                pass
+        return False
+
+    def parse(self):
+        from projspec.content.environment import Environment, Precision, Stack
+
+        meta = self.root.pyproject
+        conf = meta.get("tools", {}).get("uv", {})
+        try:
+            with self.root.fs.open(f"{self.root.url}/uv.toml", "rt") as f:
+                conf2 = toml.load(f)
+        except (OSError, FileNotFoundError):
+            conf2 = {}
+        conf.update(conf2)
+        try:
+            with self.root.fs.open(f"{self.root.url}/uv.lock", "rt") as f:
+                lock = toml.load(f)
+        except (OSError, FileNotFoundError):
+            lock = {}
+        self._parse_meta(conf)
+
         if lock:
             pkg = [f"python {lock['requires-python']}"]
             # TODO: check for source= packages as opposed to pip wheel installs
@@ -164,7 +161,7 @@ def parse(self):
                     for _ in lock["package"]
                 ]
             )
-            envs["lockfile"] = Environment(
+            self.contents.environment["lockfile"] = Environment(
                 proj=self.root,
                 stack=Stack.PIP,
                 precision=Precision.LOCK,