better repr

Author: martindurant

src/projspec/artifact/base.py

@@ -74,7 +74,10 @@ def clean(self):
         pass
 
     def __repr__(self):
-        return f"{type(self).__name__}, {self.state}"
+        return f"{type(self).__name__}, '{' '.join(self.cmd)}', {self.state}"
+
+    def _repr2(self):
+        return f"{' '.join(self.cmd)}, {self.state}"
 
 
 class FileArtifact(BaseArtifact):

src/projspec/content/base.py

@@ -2,9 +2,17 @@
 
 from projspec.artifact import BaseArtifact
 from projspec.proj.base import Project
+from projspec.utils import Enum
 
 
 @dataclass
 class BaseContent:
     proj: Project = field(repr=False)
     artifacts: set[BaseArtifact] = field(repr=False)
+
+    def _repr2(self):
+        return {
+            k: (v.name if isinstance(v, Enum) else v)
+            for k, v in self.__dict__.items()
+            if not k.startswith("_") and k not in ("proj", "artifacts")
+        }

src/projspec/content/executable.py

@@ -9,6 +9,7 @@
 class Command(BaseContent):
     """The simplest runnable thing - we don't know what it does"""
 
-    cmd: list[str]
-    background: bool = False
-    interactive: bool = False
+    cmd: list[str] | str
+
+    def _repr2(self):
+        return " ".join(self.cmd) if isinstance(self.cmd, list) else self.cmd

src/projspec/proj/__init__.py

@@ -2,6 +2,7 @@
 from .conda_package import CondaRecipe, RattlerRecipe
 from .conda_project import CondaProject
 from .pixi import Pixi
+from .pyscript import PyScriptSpec
 from .python_code import PythonCode, PythonLibrary
 from .uv import UVProject
 
@@ -12,6 +13,7 @@
     "CondaProject",
     "RattlerRecipe",
     "Pixi",
+    "PyScriptSpec",
     "PythonCode",
     "PythonLibrary",
     "UVProject",

src/projspec/proj/pyscript.py

@@ -6,15 +6,15 @@
 
 class PyScriptSpec(ProjectSpec):
     def match(self) -> bool:
-        basenames = [_.rsplit("/", 1)[0] for _ in self.root.filelist]
+        basenames = [_.rsplit("/", 1)[-1] for _ in self.root.filelist]
         return "pyscript.toml" in basenames or "pyscript.json" in basenames
 
     def parse(self) -> None:
         try:
-            with self.root.fs.open(f"{self.root.url}/pyscript.toml") as f:
+            with self.root.fs.open(f"{self.root.url}/pyscript.toml", "rt") as f:
                 meta = toml.load(f)
         except FileNotFoundError:
-            with self.root.fs.open(f"{self.root.url}/pyscript.json") as f:
+            with self.root.fs.open(f"{self.root.url}/pyscript.json", "rt") as f:
                 meta = toml.load(f)
         cont = AttrDict()
         if "packages" in meta:

src/projspec/utils.py

@@ -57,13 +57,7 @@ def to_dict(obj):
     if isinstance(obj, Iterable):
         return [to_dict(_) for _ in obj]
     if isinstance(obj, (BaseArtifact, BaseContent)):
-        return to_dict(
-            {
-                k: v
-                for k, v in obj.__dict__.items()
-                if k not in {"proj", "artifacts"}
-            }
-        )
+        return obj._repr2()
     return str(obj)
 
 
@@ -134,6 +128,8 @@ def __contains__(self, item):
 
 
 def _yaml_no_jinja(fileobj):
+    # TODO: rather than skip jinja stuff, we can copy conda code to parse it, but
+    #  templates can involve function calls and reference to env vars we don't have
     txt = fileobj.read().decode()
     lines = []
     for line in txt.splitlines():