Skip to content

Commit a9fbf6d

Browse files
jpopesculianjpopesculian
committed
feat: add template for kubimo
1 parent 054d2d0 commit a9fbf6d

File tree

15 files changed

+354
-49
lines changed

15 files changed

+354
-49
lines changed

‎.dockerignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/target
2+
.env*
3+
.venv
4+
dist
5+
__pycache__/
6+
*.so

‎.github/workflows/cd.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ jobs:
128128
permissions:
129129
contents: read
130130
packages: write
131-
needs: release
132131
steps:
133132
- uses: actions/checkout@v4
134133
- name: Docker setup
@@ -139,27 +138,28 @@ jobs:
139138
registry: ghcr.io
140139
username: ${{ github.actor }}
141140
password: ${{ secrets.GITHUB_TOKEN }}
142-
- name: Docker meta
143-
id: meta
141+
- name: Docker meta kubimo
142+
id: meta-kubimo
144143
uses: docker/metadata-action@v5
145144
with:
146-
images: ghcr.io/aqora-io/cli
147-
flavor: |
148-
latest=false
145+
images: ghcr.io/aqora-io/cli-kubimo
146+
bake-target: docker-metadata-kubimo
149147
tags: |
150-
type=schedule
151-
type=ref,event=branch,prefix=${{ env.TAG_PREFIX }}branch-
152-
type=ref,event=tag,prefix=${{ env.TAG_PREFIX }}tag-
153-
type=ref,event=pr,prefix=${{ env.TAG_PREFIX }}pr-
154-
type=raw,value=latest,prefix=${{ env.TAG_PREFIX }},enable={{is_default_branch}}
155-
- name: Docker build and push
156-
uses: docker/build-push-action@v5
157-
with:
148+
type=ref,event=branch
149+
type=ref,event=pr
150+
type=semver,pattern={{version}}
151+
type=semver,pattern={{major}}.{{minor}}
152+
type=semver,pattern={{major}}
153+
- name: Build and push
154+
uses: docker/bake-action@v6
155+
with:
156+
set: |
157+
kubimo*.cache-from=type=registry,ref=ghcr.io/aqora-io/cli-kubimo:latest
158+
*.cache-to=type=inline
159+
files: |
160+
./docker-bake.hcl
161+
cwd://${{ steps.meta-kubimo.outputs.bake-file }}
158162
push: ${{ github.event_name != 'pull_request' }}
159-
tags: ${{ steps.meta.outputs.tags }}
160-
labels: ${{ steps.meta.outputs.labels }}
161-
cache-from: type=gha
162-
cache-to: type=gha,mode=max
163163

164164
npm:
165165
name: Build and publish npm package

‎Dockerfile‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Dockerfile.kubimo‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM ghcr.io/aqora-io/kubimo-marimo:0.1.0 AS build
2+
3+
USER 0
4+
RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --no-update-default-toolchain
5+
ENV PATH="/root/.cargo/bin:${PATH}"
6+
7+
WORKDIR /build
8+
COPY rust-toolchain .
9+
RUN rustc --version
10+
COPY . .
11+
RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
12+
--mount=type=cache,target=/usr/local/cargo/git,sharing=locked \
13+
--mount=type=cache,target=target,sharing=locked \
14+
cargo build --release \
15+
&& cp target/release/aqora /bin/aqora
16+
17+
WORKDIR /workspace
18+
RUN aqora new dataset-marimo user/workspace -v 0.0.0 . && rm readme.py
19+
20+
FROM ghcr.io/aqora-io/kubimo-marimo:0.1.0
21+
22+
COPY --from=build /bin/aqora /bin/aqora
23+
COPY --chown=1000:1000 --from=build /workspace/* .
24+
RUN uv venv && uv sync

‎docker-bake.hcl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
group "default" {
2+
targets = ["kubimo"]
3+
}
4+
5+
target "docker-metadata-kubimo" {}
6+
7+
target "kubimo" {
8+
inherits = ["docker-metadata-kubimo"]
9+
context = "."
10+
dockerfile = "Dockerfile.kubimo"
11+
}

‎src/commands/new/dataset_marimo.rs‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
use std::path::PathBuf;
2+
3+
use aqora_template::DatasetMarimoTemplate;
4+
use clap::Args;
5+
use graphql_client::GraphQLQuery;
6+
use serde::Serialize;
7+
8+
use crate::commands::GlobalArgs;
9+
use crate::error::{self, format_permission_error, Result};
10+
use crate::graphql_client::custom_scalars::*;
11+
12+
#[derive(Args, Debug, Serialize)]
13+
pub struct DatasetMarimo {
14+
#[arg(short, long)]
15+
version: Option<String>,
16+
slug: String,
17+
dest: Option<PathBuf>,
18+
}
19+
20+
#[derive(GraphQLQuery)]
21+
#[graphql(
22+
query_path = "src/graphql/get_latest_dataset_version.graphql",
23+
schema_path = "schema.graphql",
24+
response_derives = "Debug"
25+
)]
26+
pub struct GetLatestDatasetVersion;
27+
28+
pub async fn dataset_marimo(args: DatasetMarimo, global: GlobalArgs) -> Result<()> {
29+
let pb = global.spinner().with_message(format!(
30+
"Creating dataset marimo notebook for '{}'",
31+
args.slug
32+
));
33+
34+
let (owner, local_slug) = args
35+
.slug
36+
.split_once('/')
37+
.ok_or_else(|| error::user("Malformed slug", "Expected a slug like: {owner}/{dataset}"))?;
38+
39+
let version = if let Some(version) = args.version {
40+
version
41+
} else {
42+
global
43+
.graphql_client()
44+
.await?
45+
.send::<GetLatestDatasetVersion>(get_latest_dataset_version::Variables {
46+
owner: owner.to_string(),
47+
local_slug: local_slug.to_string(),
48+
})
49+
.await?
50+
.dataset_by_slug
51+
.and_then(|d| d.latest_version)
52+
.map(|v| v.version)
53+
.ok_or_else(|| {
54+
error::user(
55+
"No version found",
56+
"Please publish a version or specify a draft version",
57+
)
58+
})?
59+
};
60+
61+
let dest = args.dest.unwrap_or_else(|| PathBuf::from(local_slug));
62+
DatasetMarimoTemplate::builder()
63+
.owner(owner)
64+
.local_slug(local_slug)
65+
.version(version)
66+
.render(&dest)
67+
.map_err(|e| format_permission_error("create use case", &dest, &e))?;
68+
69+
pb.finish_with_message(format!(
70+
"Created dataset marimo noteboook in '{}'",
71+
dest.display()
72+
));
73+
Ok(())
74+
}

‎src/commands/new/mod.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
mod dataset_marimo;
12
mod use_case;
23

34
use clap::Subcommand;
@@ -7,15 +8,19 @@ use crate::error::Result;
78

89
use super::GlobalArgs;
910

11+
use dataset_marimo::{dataset_marimo, DatasetMarimo};
1012
use use_case::{use_case, UseCase};
1113

1214
#[derive(Subcommand, Debug, Serialize)]
1315
pub enum New {
1416
UseCase(UseCase),
17+
#[clap(hide = true)]
18+
DatasetMarimo(DatasetMarimo),
1519
}
1620

1721
pub async fn new(args: New, global: GlobalArgs) -> Result<()> {
1822
match args {
1923
New::UseCase(args) => use_case(args, global).await,
24+
New::DatasetMarimo(args) => dataset_marimo(args, global).await,
2025
}
2126
}

‎src/graphql/get_latest_dataset_version.graphql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
query GetLatestDatasetVersion($owner: String!, $local_slug: String!) {
2+
datasetBySlug(owner: $owner, localSlug: $local_slug) {
3+
latestVersion {
4+
version
5+
}
6+
}
7+
}

‎template/assets/dataset_marimo/.gitignore.hbs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Python-generated files
2+
__pycache__/
3+
*.py[oc]
4+
build/
5+
dist/
6+
wheels/
7+
.pdm-build/
8+
*.egg-info
9+
10+
# Virtual environments
11+
.venv
12+
13+
# Marimo
14+
__marimo__/
15+
16+
# aqora
17+
.aqora
18+
__aqora__/

‎template/assets/dataset_marimo/pyproject.toml.hbs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[project]
2+
name = "{{ local_slug }}"
3+
version = "0.1.0"
4+
requires-python = ">={{ python_version }}"
5+
6+
dependencies = [
7+
"marimo[recommended,lsp]>={{ marimo_version }}",
8+
"aqora-cli[pyarrow]>={{ cli_version }}",
9+
]
10+
11+
[dependency-groups]
12+
dev = ["ty"]
13+
14+
[build-system]
15+
requires = ["pdm-backend"]
16+
build-backend = "pdm.backend"

0 commit comments

Comments
 (0)