Merge pull request #269 from calkit/foil2

Add support for rendering Plotly JSON and HTML figures

backend/app/api/routes/projects.py

@@ -849,12 +849,8 @@ def get_project_contents(
             in_repo=os.path.isdir(os.path.join(repo.working_dir, dirname)),
         )
     # We're looking for a file
-    # Check if it exists in the repo,
-    # but only if it doesn't exist in the DVC outputs
-    if (
-        os.path.isfile(os.path.join(repo_dir, path))
-        and ck_outs.get(path) is None
-    ):
+    # Check if it exists in the repo
+    if os.path.isfile(os.path.join(repo_dir, path)):
         with open(os.path.join(repo_dir, path), "rb") as f:
             content = f.read()
         return ContentsItem.model_validate(

backend/app/dvc.py

@@ -59,7 +59,7 @@ def output_from_pipeline(
           size: 9536
 
     """
-    stage = pipeline.get("stages", {}).get(stage_name)
+    stage = pipeline.get("stages", {}).get(stage_name.split("@")[0])
     if stage is None:
         return
     wdir = stage.get("wdir", "")

backend/app/models.py

@@ -461,7 +461,7 @@ class Question(SQLModel, table=True):
 class Figure(SQLModel):
     path: str
     title: str
-    description: str
+    description: str | None = None
     stage: str | None = None
     dataset: str | None = None
     content: str | None = None  # Base64 encoded

backend/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
     "stripe==10.11.0",
     "mixpanel==4.10.1",
     "gcsfs==2024.10.0",
-    "calkit-python>=0.10.1",
+    "calkit-python>=0.12.0",
 ]
 
 [tool.uv]