-
-
-
-
-
-
-
- );
- }
-
- return (
- Select cell to view details
-
-
- );
-};
-
-const BasicInfo = ({
- alias,
- resources,
-}: {
- alias: string;
- resources: Resource[];
-}) => {
- const resource = resources.find((r) => r.alias === alias);
-
- if (!resource) {
- return {selectedAlias}
-Something went wrong
; - } - - return ( -
-
- );
-};
-
-const ScheduledJobs = ({ alias }: { alias: string }) => {
- const scheduledJobs = useScheduledJobsQuery();
-
- if (scheduledJobs.status === "loading") {
- return null;
- }
-
- if (scheduledJobs.status === "error") {
- return
- Defined at {resource.path}
-
Something went wrong
; - } - - const scheduledJobsForAlias = scheduledJobs.data[alias]?.schedules ?? []; - - return ( -
-
- );
-};
diff --git a/core/morph/frontend/template/src/admin/datapipeline/ResourceNode.tsx b/core/morph/frontend/template/src/admin/datapipeline/ResourceNode.tsx
deleted file mode 100644
index 048d6d3..0000000
--- a/core/morph/frontend/template/src/admin/datapipeline/ResourceNode.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { tv } from "tailwind-variants";
-import { Resource } from "../common/useResourcesQuery";
-import {
- Handle,
- Node,
- NodeProps,
- Position,
- useOnSelectionChange,
-} from "@xyflow/react";
-import React from "react";
-import databaseIcon from "../../assets/icons/database.svg";
-import pythonIcon from "../../assets/icons/python.svg";
-
-export type ResourceNode = Node<
- {
- resource: Resource;
- },
- "resource"
->;
-
-const useSelected = (id: string) => {
- const [selected, setSelected] = React.useState(false);
-
- useOnSelectionChange({
- onChange: React.useCallback(({ nodes }) => {
- setSelected(nodes.some((node) => node.id === id));
- }, []),
- });
-
- return selected;
-};
-
-const ResourceNode = ({ id, data }: NodePropsScheduled Jobs
- {scheduledJobsForAlias.length === 0 && ( -No scheduled jobs
- )} - {scheduledJobsForAlias.map((job, i) => ( -
-
- )} -
- ))}
- {`${job.cron} (${ - job.timezone ?? "UTC" - })`}
- - {job.variables ? ( -
-
- Variables
-
-
-
-
-
- ) : (
-
- No variables
-
- )}
-
- {i < scheduledJobsForAlias.length - 1 && (
- | Key | -Value | -
|---|---|
| {key} | -{String(value)} | -
- )} -
-
- );
-};
-
-const Icon = ({ resource }: { resource: Resource }) => {
- if (resource.path.endsWith(".py")) {
- return
-
- );
-};
-
-export default ErrorPage;
diff --git a/core/morph/frontend/template/src/main.tsx b/core/morph/frontend/template/src/main.tsx
deleted file mode 100644
index 1eb916c..0000000
--- a/core/morph/frontend/template/src/main.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import "vite/modulepreload-polyfill";
-import { createRoot } from "react-dom/client";
-import { createInertiaApp, Head } from "@inertiajs/react";
-import React, { StrictMode, useMemo } from "react";
-import { PageSkeleton } from "./page-skeleton.tsx";
-import "@morph-data/components/css";
-import { MDXComponents } from "mdx/types";
-import type { Toc } from "@stefanprobst/rehype-extract-toc";
-import { AdminPage } from "./admin/AdminPage.tsx";
-import { ErrorPage } from "./error-page.tsx";
-import { useRefresh } from "@morph-data/components";
-import { mdxComponents } from "./mdx-componens.tsx";
-
-type MDXProps = {
- children?: React.ReactNode;
- components?: MDXComponents;
-};
-
-export type MDXComponent = (props: MDXProps) => JSX.Element;
-
-type PageModule = {
- default: MDXComponent;
- title?: string;
- tableOfContents?: Toc;
-}; // types MDX default export
-type Pages = RecordPage Not Found
-Oops! The page you're looking for doesn't exist or has been moved.
-Please select an exsiting page from below.
-
- {/* {props.routes.map((route) => (
-
-
-
- ))} */}
-
- Trouble shoot
-
-
- Newly added files are not displayed.
-
-
- You need to re-start mdx dev server.
--
-
- 1. Close preview window on code editor -
-
- 2. Stop process with putting{" "}
-
- Ctrl + C -{" "} - to the terminal -
- - - 3. Open preview window on code editor again - -
-
- );
-}
-
-type PageSkeletonProps = React.PropsWithChildren<{
- routes: Array<{ path: string; title: string }>;
- title: string;
- showAdminPage: boolean;
- toc?: TocEntries;
-}>;
-
-export const PageSkeleton: React.FCSomething went wrong:
-{error.message}
-
-
-
-
-
-
-
-
- {props.routes.map((route) => (
-
-
-
- {route.title}
-
-
-
- ))}
- {props.showAdminPage && (
- <>
- Admin Page
-
-
- )}
-
-
-
- {props.title}
-
-
- Made with
-
- 
-
-
-
-
-
-
-
-
- {props.children}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/core/morph/include/starter_template/src/pages/_app.tsx b/core/morph/include/starter_template/src/pages/_app.tsx
index ba534c0..c77c0cf 100644
--- a/core/morph/include/starter_template/src/pages/_app.tsx
+++ b/core/morph/include/starter_template/src/pages/_app.tsx
@@ -1,21 +1,38 @@
-import { Head, Toc } from "@morph-data/components";
-import { RootErrorBoundary, Header } from "../lib";
+import { Head } from "@morph-data/frontend/components";
+import { RootErrorBoundary, Header, TableOfContents } from "./_morph-data-lib";
import {
usePageMeta,
MdxComponentsProvider,
Outlet,
+ StateProvider,
+ extractComponents,
} from "@morph-data/frontend/components";
+import "./index.css";
+
+const uiComponents = extractComponents(
+ import.meta.glob("./_components/ui/**/*.tsx", {
+ eager: true,
+ })
+);
+
+const morphComponents = extractComponents(
+ import.meta.glob("./_components/*.tsx", {
+ eager: true,
+ })
+);
export default function App() {
const pageMeta = usePageMeta();
return (
404
+Page not found
+
-
+
-
+
+
+
+
+ {pages.map((page) => (
+
+
+ {page.title}
+
+
+ ))}
+ {/* {props.showAdminPage && (
+ <>
+ Admin Page
+
+
+ )} */}
+
+
+ );
+};
+
+const PageTitle = ({ title }: { title: string }) => {
+ return {children}
+ );
+};
diff --git a/core/morph/include/starter_template/src/pages/_morph-data-lib/table-of-contents.tsx b/core/morph/include/starter_template/src/pages/_morph-data-lib/table-of-contents.tsx
new file mode 100644
index 0000000..c51e666
--- /dev/null
+++ b/core/morph/include/starter_template/src/pages/_morph-data-lib/table-of-contents.tsx
@@ -0,0 +1,65 @@
+import {
+ HoverCard,
+ HoverCardTrigger,
+ HoverCardContent,
+} from "@/pages/_components/ui/hover-card";
+import { Card } from "@/pages/_components/ui/card";
+import { Button } from "@/pages/_components/ui/button";
+import { LucideTableOfContents } from "lucide-react";
+import { cn } from "@/pages/_lib/utils";
+import { Toc } from "@morph-data/frontend/components";
+
+export interface TocProps {
+ toc?: Toc;
+ className?: string;
+}
+
+export const TableOfContents: React.FC = ({ toc, className }) => {
+ if (!toc) {
+ return null;
+ }
+
+ return (
+ <>
+
Date: Mon, 17 Mar 2025 19:14:20 +0900
Subject: [PATCH 17/39] fix: file upload cache path
---
core/morph/api/service.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/core/morph/api/service.py b/core/morph/api/service.py
index 8de3426..d5a350e 100644
--- a/core/morph/api/service.py
+++ b/core/morph/api/service.py
@@ -7,7 +7,6 @@
import time
import uuid
from contextlib import redirect_stdout
-from pathlib import Path
from typing import Any
import click
@@ -285,8 +284,8 @@ async def file_upload_service(input: UploadFileService) -> Any:
# Read the saved file path from the cache (always created as following path)
saved_filepath = ""
- cache_file = Path(temp_dir).joinpath("file_upload.cache")
- if cache_file.exists():
+ cache_file = "/tmp/file_upload.cache"
+ if os.path.exists(cache_file):
with open(cache_file, "r") as f:
saved_filepath = f.read()
From dac8114469a9f1f37059165bfb98746e89b8a1d5 Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Wed, 19 Mar 2025 10:28:00 +0900
Subject: [PATCH 18/39] chore: update @morph-data/frontend
---
core/morph/include/starter_template/package.json | 2 +-
core/morph/include/starter_template/src/pages/_app.tsx | 8 ++++----
core/morph/task/api.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/morph/include/starter_template/package.json b/core/morph/include/starter_template/package.json
index 52b3630..fbd4e4b 100644
--- a/core/morph/include/starter_template/package.json
+++ b/core/morph/include/starter_template/package.json
@@ -14,7 +14,7 @@
"vite": "^6.2.1"
},
"dependencies": {
- "@morph-data/frontend": "0.3.0-beta.7",
+ "@morph-data/frontend": "0.3.0-beta.8",
"class-variance-authority": "^0.7.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
diff --git a/core/morph/include/starter_template/src/pages/_app.tsx b/core/morph/include/starter_template/src/pages/_app.tsx
index c77c0cf..29c8966 100644
--- a/core/morph/include/starter_template/src/pages/_app.tsx
+++ b/core/morph/include/starter_template/src/pages/_app.tsx
@@ -4,7 +4,7 @@ import {
usePageMeta,
MdxComponentsProvider,
Outlet,
- StateProvider,
+ useRefresh,
extractComponents,
} from "@morph-data/frontend/components";
import "./index.css";
@@ -24,6 +24,8 @@ const morphComponents = extractComponents(
export default function App() {
const pageMeta = usePageMeta();
+ useRefresh();
+
return (
@@ -43,9 +45,7 @@ export default function App() {
None:
self._run_process(
["npm", "run", "dev", "--", "--port", f"{self.front_port}"],
cwd=self.project_root,
- is_debug=False,
+ is_debug=True,
)
def _run_process(
From f8b36439f527d51cd6e3b237e13f6b380f38ce6f Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Fri, 21 Mar 2025 01:22:24 +0900
Subject: [PATCH 19/39] get dockerfile by calling api
---
core/morph/task/deploy.py | 54 +++++++++++-------------
core/morph/task/utils/load_dockerfile.py | 39 +++++++++++++++++
2 files changed, 63 insertions(+), 30 deletions(-)
create mode 100644 core/morph/task/utils/load_dockerfile.py
diff --git a/core/morph/task/deploy.py b/core/morph/task/deploy.py
index 629c0e3..8884b3a 100644
--- a/core/morph/task/deploy.py
+++ b/core/morph/task/deploy.py
@@ -8,14 +8,16 @@
import click
import requests
+from tqdm import tqdm
+
from morph.api.cloud.client import MorphApiKeyClientImpl
from morph.api.cloud.types import EnvVarObject
from morph.cli.flags import Flags
from morph.config.project import load_project
from morph.task.base import BaseTask
from morph.task.utils.file_upload import FileWithProgress
+from morph.task.utils.load_dockerfile import get_dockerfile_from_api
from morph.task.utils.morph import find_project_root_dir
-from tqdm import tqdm
class DeployTask(BaseTask):
@@ -49,9 +51,24 @@ def __init__(self, args: Flags):
# Check Dockerfile existence
self.dockerfile = os.path.join(self.project_root, "Dockerfile")
- if not os.path.exists(self.dockerfile):
- click.echo(click.style(f"Error: {self.dockerfile} not found", fg="red"))
- sys.exit(1)
+ if self.project.build is not None and self.project.build.use_custom_dockerfile:
+ if not os.path.exists(self.dockerfile):
+ click.echo(click.style(f"Error: {self.dockerfile} not found", fg="red"))
+ sys.exit(1)
+ else:
+ if self.project.build is None:
+ dockerfile, dockerignore = get_dockerfile_from_api("morph", None, None)
+ else:
+ dockerfile, dockerignore = get_dockerfile_from_api(
+ self.project.build.framework,
+ self.project.build.package_manager,
+ self.project.build.runtime,
+ )
+ with open(self.dockerfile, "w") as f:
+ f.write(dockerfile)
+ dockerignore_path = os.path.join(self.project_root, ".dockerignore")
+ with open(dockerignore_path, "w") as f:
+ f.write(dockerignore)
# Check Docker availability
try:
@@ -105,7 +122,7 @@ def run(self):
click.echo(click.style("Initiating deployment sequence...", fg="blue"))
# 1. Build the source code
- self._copy_and_build_source()
+ self._build_source()
# 2. Build the Docker image
click.echo(click.style("Building Docker image...", fg="blue"))
@@ -387,31 +404,8 @@ def _validate_api_key(self):
)
sys.exit(1)
- def _copy_and_build_source(self):
- click.echo(click.style("Building frontend...", fg="blue"))
- try:
- # Run npm install and build
- subprocess.run(
- ["npm", "install"],
- cwd=self.project_root,
- check=True,
- shell=True if sys.platform == "win32" else False,
- )
- subprocess.run(
- ["npm", "run", "build"],
- cwd=self.project_root,
- check=True,
- shell=True if sys.platform == "win32" else False,
- )
-
- except subprocess.CalledProcessError as e:
- click.echo(click.style(f"Error building frontend: {str(e)}", fg="red"))
- sys.exit(1)
- except Exception as e:
- click.echo(click.style(f"Unexpected error: {str(e)}", fg="red"))
- sys.exit(1)
-
- click.echo(click.style("Building backend...", fg="blue"))
+ def _build_source(self):
+ click.echo(click.style("Compiling morph project...", fg="blue"))
try:
# Compile the morph project
subprocess.run(
diff --git a/core/morph/task/utils/load_dockerfile.py b/core/morph/task/utils/load_dockerfile.py
new file mode 100644
index 0000000..64c950f
--- /dev/null
+++ b/core/morph/task/utils/load_dockerfile.py
@@ -0,0 +1,39 @@
+from typing import Any, Dict, Optional, Tuple
+
+import requests
+
+
+def get_dockerfile_from_api(
+ framework: Optional[str] = "morph",
+ package_manager: Optional[str] = None,
+ runtime: Optional[str] = None,
+) -> Tuple[str, str]:
+ """
+ Fetch dockerfile and dockerignore from the Morph API.
+
+ Args:
+ framework: The framework to get the dockerfile for
+ package_manager: Optional package manager to use
+ language_version: Optional language version to use
+
+ Returns:
+ Tuple containing (dockerfile, dockerignore)
+ """
+ url = f"https://backend-api-public.morph-cb9.workers.dev/dockerfile/{framework}"
+
+ params: Dict[str, Any] = {}
+ if package_manager:
+ params["packageManager"] = package_manager
+ if runtime:
+ params["runtime"] = runtime
+
+ response = requests.get(url, params=params)
+
+ response.raise_for_status()
+
+ data = response.json()
+
+ if "error" in data:
+ raise ValueError(data["error"])
+
+ return data["dockerfile"], data["dockerignore"]
From 5e699bf6db5de62aabb98385ec2c6c8678485190 Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Fri, 21 Mar 2025 10:36:12 +0900
Subject: [PATCH 20/39] update version as v0.3.0rc1
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index ccca382..9c1bd08 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "morph-data"
-version = "0.2.1"
+version = "0.3.0rc1"
description = "Morph is a python-centric full-stack framework for building and deploying data apps."
authors = ["Morph "]
packages = [
From 35d89ddac5eac76d9971b436b8468d45d3da82f4 Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 13:37:35 +0900
Subject: [PATCH 21/39] chore: update index.mdx
---
.../include/starter_template/src/pages/404.mdx | 3 +++
.../include/starter_template/src/pages/404.tsx | 8 --------
.../include/starter_template/src/pages/index.mdx | 14 ++++++++++++++
3 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 core/morph/include/starter_template/src/pages/404.mdx
delete mode 100644 core/morph/include/starter_template/src/pages/404.tsx
diff --git a/core/morph/include/starter_template/src/pages/404.mdx b/core/morph/include/starter_template/src/pages/404.mdx
new file mode 100644
index 0000000..04d6977
--- /dev/null
+++ b/core/morph/include/starter_template/src/pages/404.mdx
@@ -0,0 +1,3 @@
+# 404
+
+Page not found
diff --git a/core/morph/include/starter_template/src/pages/404.tsx b/core/morph/include/starter_template/src/pages/404.tsx
deleted file mode 100644
index 6aa94d6..0000000
--- a/core/morph/include/starter_template/src/pages/404.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-export default function NotFound() {
- return (
-
+ <>
{pageMeta?.title}
@@ -57,6 +58,6 @@ export default function App() {
-
+
);
}
diff --git a/core/morph/include/starter_template/src/pages/_components/header.tsx b/core/morph/include/starter_template/src/pages/_components/header.tsx
new file mode 100644
index 0000000..2be7531
--- /dev/null
+++ b/core/morph/include/starter_template/src/pages/_components/header.tsx
@@ -0,0 +1,86 @@
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuItem,
+} from "@/pages/_components/ui/dropdown-menu";
+import { Button } from "@/pages/_components/ui/button";
+import { usePages, Link } from "@morph-data/frontend/components";
+import { PropsWithChildren } from "react";
+
+const Root = ({ children }: PropsWithChildren) => {
+ return
+
+
+
+
+ {pages.map((page) => (
+
+
+ {page.title}
+
+
+ ))}
+ {/* {props.showAdminPage && (
+ <>
+ Admin Page
+
+
+ )} */}
+
+
+ );
+};
+
+const PageTitle = ({ title }: { title: string }) => {
+ return = ({ toc, className }) => {
+ if (!toc) {
+ return null;
+ }
+
+ return (
+ <>
+
+ Something went wrong
+
+);
From 0639723ce7aaab805a7bb0103de95573ee8af575 Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 14:57:06 +0900
Subject: [PATCH 26/39] fix: toc style
---
.../pages/_components/table-of-contents.tsx | 39 ++++++++-----------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx b/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
index c51e666..4f31532 100644
--- a/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
+++ b/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
@@ -3,7 +3,6 @@ import {
HoverCardTrigger,
HoverCardContent,
} from "@/pages/_components/ui/hover-card";
-import { Card } from "@/pages/_components/ui/card";
import { Button } from "@/pages/_components/ui/button";
import { LucideTableOfContents } from "lucide-react";
import { cn } from "@/pages/_lib/utils";
@@ -24,13 +23,12 @@ export const TableOfContents: React.FC = ({ toc, className }) => {
= ({ toc, className }) => {
-
-
+
From 81d6b61d7dc63588ff5b49c79ab1d3b8844e197d Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 14:58:54 +0900
Subject: [PATCH 27/39] chore: remove _morph-data-lib from template
---
.../src/pages/_morph-data-lib/header.tsx | 86 -------------------
.../src/pages/_morph-data-lib/index.ts | 3 -
.../_morph-data-lib/root-error-boundary.tsx | 18 ----
.../_morph-data-lib/table-of-contents.tsx | 65 --------------
4 files changed, 172 deletions(-)
delete mode 100644 core/morph/include/starter_template/src/pages/_morph-data-lib/header.tsx
delete mode 100644 core/morph/include/starter_template/src/pages/_morph-data-lib/index.ts
delete mode 100644 core/morph/include/starter_template/src/pages/_morph-data-lib/root-error-boundary.tsx
delete mode 100644 core/morph/include/starter_template/src/pages/_morph-data-lib/table-of-contents.tsx
diff --git a/core/morph/include/starter_template/src/pages/_morph-data-lib/header.tsx b/core/morph/include/starter_template/src/pages/_morph-data-lib/header.tsx
deleted file mode 100644
index 2be7531..0000000
--- a/core/morph/include/starter_template/src/pages/_morph-data-lib/header.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import {
- DropdownMenu,
- DropdownMenuTrigger,
- DropdownMenuContent,
- DropdownMenuItem,
-} from "@/pages/_components/ui/dropdown-menu";
-import { Button } from "@/pages/_components/ui/button";
-import { usePages, Link } from "@morph-data/frontend/components";
-import { PropsWithChildren } from "react";
-
-const Root = ({ children }: PropsWithChildren) => {
- return
-
-
-
-
- {pages.map((page) => (
-
-
- {page.title}
-
-
- ))}
- {/* {props.showAdminPage && (
- <>
- Admin Page
-
-
- )} */}
-
-
- );
-};
-
-const PageTitle = ({ title }: { title: string }) => {
- return {children}
- );
-};
diff --git a/core/morph/include/starter_template/src/pages/_morph-data-lib/table-of-contents.tsx b/core/morph/include/starter_template/src/pages/_morph-data-lib/table-of-contents.tsx
deleted file mode 100644
index c51e666..0000000
--- a/core/morph/include/starter_template/src/pages/_morph-data-lib/table-of-contents.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import {
- HoverCard,
- HoverCardTrigger,
- HoverCardContent,
-} from "@/pages/_components/ui/hover-card";
-import { Card } from "@/pages/_components/ui/card";
-import { Button } from "@/pages/_components/ui/button";
-import { LucideTableOfContents } from "lucide-react";
-import { cn } from "@/pages/_lib/utils";
-import { Toc } from "@morph-data/frontend/components";
-
-export interface TocProps {
- toc?: Toc;
- className?: string;
-}
-
-export const TableOfContents: React.FC = ({ toc, className }) => {
- if (!toc) {
- return null;
- }
-
- return (
- <>
- = ({ toc, className }) => {
@@ -43,13 +37,7 @@ export const TableOfContents: React.FC = ({ toc, className }) => {
@@ -58,3 +46,19 @@ export const TableOfContents: React.FC = ({ toc, className }) => {
);
};
+
+const Heading = ({ entry }: { entry: Toc[number] }) => {
+ return (
+ <>
+
+ {entry.value}
+
+ {entry.children?.map((child) => (
+
Date: Fri, 21 Mar 2025 16:16:13 +0900
Subject: [PATCH 30/39] fix initial morph_project.yml
---
core/morph/config/project.py | 120 ++++++++++++++++++++++++++++++++++-
1 file changed, 118 insertions(+), 2 deletions(-)
diff --git a/core/morph/config/project.py b/core/morph/config/project.py
index f977565..ec5bf8f 100644
--- a/core/morph/config/project.py
+++ b/core/morph/config/project.py
@@ -89,9 +89,125 @@ def save_project(project_root: str, project: MorphProject) -> None:
old_config_path = os.path.join(project_root, "morph_project.yaml")
if os.path.exists(old_config_path):
with open(old_config_path, "w") as f:
- yaml.safe_dump(project.model_dump(), f)
+ f.write(dump_project_yaml(project))
return
config_path = os.path.join(project_root, "morph_project.yml")
with open(config_path, "w") as f:
- yaml.safe_dump(project.model_dump(), f)
+ f.write(dump_project_yaml(project))
+
+
+def dump_project_yaml(project: MorphProject) -> str:
+ source_paths = "\n- ".join([""] + project.source_paths)
+
+ # Default values
+ build_use_custom_dockerfile = "false"
+ build_runtime = ""
+ build_framework = ""
+ build_package_manager = ""
+ build_context = "# context: ."
+ build_args_str = "\n # - ARG_NAME=value\n # - ANOTHER_ARG=value"
+ deployment_provider = "aws"
+ deployment_aws_region = "us-east-1"
+ deployment_aws_memory = "1024"
+ deployment_aws_timeout = "300"
+ deployment_aws_concurrency = "1"
+ deployment_gcp_region = "us-central1"
+ deployment_gcp_memory = "1Gi"
+ deployment_gcp_cpu = "1"
+ deployment_gcp_concurrency = "80"
+ deployment_gcp_timeout = "300"
+
+ # Set values if build exists
+ if project.build:
+ if project.build.use_custom_dockerfile is not None:
+ build_use_custom_dockerfile = str(project.build.use_custom_dockerfile)
+ if project.build.runtime:
+ build_runtime = project.build.runtime or ""
+ if project.build.framework:
+ build_framework = project.build.framework or ""
+ if project.build.package_manager:
+ build_package_manager = project.build.package_manager or ""
+ if project.build.context:
+ build_context = project.build.context or "# context: ."
+ if project.build.build_args:
+ build_args_items = []
+ for key, value in project.build.build_args.items():
+ build_args_items.append(f"{key}={value}")
+ build_args_str = (
+ "\n - ".join([""] + build_args_items)
+ if build_args_items
+ else "\n # - ARG_NAME=value\n # - ANOTHER_ARG=value"
+ )
+ else:
+ # Use default BuildConfig
+ build_use_custom_dockerfile = "false"
+ build_runtime = ""
+ build_framework = ""
+ build_package_manager = ""
+ build_context = "# context: ."
+ build_args_str = "\n # - ARG_NAME=value\n # - ANOTHER_ARG=value"
+
+ # Set values if deployment exists
+ if project.deployment:
+ if project.deployment.provider:
+ deployment_provider = project.deployment.provider or "aws"
+ if project.deployment.aws:
+ deployment_aws_region = project.deployment.aws.get("region") or "us-east-1"
+ deployment_aws_memory = project.deployment.aws.get("memory") or "1024"
+ deployment_aws_timeout = project.deployment.aws.get("timeout") or "300"
+ deployment_aws_concurrency = (
+ project.deployment.aws.get("concurrency") or "1"
+ )
+ if project.deployment.gcp:
+ deployment_gcp_region = (
+ project.deployment.gcp.get("region") or "us-central1"
+ )
+ deployment_gcp_memory = project.deployment.gcp.get("memory") or "1Gi"
+ deployment_gcp_cpu = project.deployment.gcp.get("cpu") or "1"
+ deployment_gcp_concurrency = (
+ project.deployment.gcp.get("concurrency") or "80"
+ )
+ deployment_gcp_timeout = project.deployment.gcp.get("timeout") or "300"
+ else:
+ # Use default DeploymentConfig
+ deployment_provider = "aws"
+
+ return f"""
+# Cloud Settings
+profile: {project.profile} # Defined in the Profile Section in `~/.morph/credentials`
+project_id: {project.project_id}
+
+# Framework Settings
+default_connection: {project.default_connection}
+source_paths:{source_paths}
+
+# Build Settings
+build:
+ use_custom_dockerfile: {build_use_custom_dockerfile}
+ # These settings are required when use_custom_dockerfile is false
+ # They define the environment in which the project will be built
+ runtime: {build_runtime} # python3.9, python3.10, python3.11, python3.12
+ framework: {build_framework}
+ package_manager: {build_package_manager} # pip, poetry, uv
+ # These settings are required when use_custom_dockerfile is true
+ # They define how the Docker image will be built
+ context: {build_context if build_context != "# context: ." else "# context: ."}
+ build_args:{build_args_str}
+
+# Deployment Settings
+deployment:
+ provider: {deployment_provider} # aws or gcp (default is aws)
+ # These settings are used only when you want to customize the deployment settings
+ # aws:
+ # region: {deployment_aws_region}
+ # memory: {deployment_aws_memory}
+ # timeout: {deployment_aws_timeout}
+ # concurrency: {deployment_aws_concurrency}
+ # gcp:
+ # region: {deployment_gcp_region}
+ # memory: {deployment_gcp_memory}
+ # cpu: {deployment_gcp_cpu}
+ # concurrency: {deployment_gcp_concurrency}
+ # timeout: {deployment_gcp_timeout}
+"""
From 54bdda572627054972476720edd0c53377701d26 Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Fri, 21 Mar 2025 16:31:15 +0900
Subject: [PATCH 31/39] fix initial morph_project.yml
---
core/morph/config/project.py | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/core/morph/config/project.py b/core/morph/config/project.py
index ec5bf8f..b873853 100644
--- a/core/morph/config/project.py
+++ b/core/morph/config/project.py
@@ -105,7 +105,7 @@ def dump_project_yaml(project: MorphProject) -> str:
build_runtime = ""
build_framework = ""
build_package_manager = ""
- build_context = "# context: ."
+ build_context = "."
build_args_str = "\n # - ARG_NAME=value\n # - ANOTHER_ARG=value"
deployment_provider = "aws"
deployment_aws_region = "us-east-1"
@@ -121,7 +121,9 @@ def dump_project_yaml(project: MorphProject) -> str:
# Set values if build exists
if project.build:
if project.build.use_custom_dockerfile is not None:
- build_use_custom_dockerfile = str(project.build.use_custom_dockerfile)
+ build_use_custom_dockerfile = str(
+ project.build.use_custom_dockerfile
+ ).lower()
if project.build.runtime:
build_runtime = project.build.runtime or ""
if project.build.framework:
@@ -129,24 +131,16 @@ def dump_project_yaml(project: MorphProject) -> str:
if project.build.package_manager:
build_package_manager = project.build.package_manager or ""
if project.build.context:
- build_context = project.build.context or "# context: ."
+ build_context = f"{project.build.context}" or "."
if project.build.build_args:
build_args_items = []
for key, value in project.build.build_args.items():
build_args_items.append(f"{key}={value}")
build_args_str = (
- "\n - ".join([""] + build_args_items)
+ "\n # - ".join([""] + build_args_items)
if build_args_items
else "\n # - ARG_NAME=value\n # - ANOTHER_ARG=value"
)
- else:
- # Use default BuildConfig
- build_use_custom_dockerfile = "false"
- build_runtime = ""
- build_framework = ""
- build_package_manager = ""
- build_context = "# context: ."
- build_args_str = "\n # - ARG_NAME=value\n # - ANOTHER_ARG=value"
# Set values if deployment exists
if project.deployment:
@@ -176,7 +170,7 @@ def dump_project_yaml(project: MorphProject) -> str:
return f"""
# Cloud Settings
profile: {project.profile} # Defined in the Profile Section in `~/.morph/credentials`
-project_id: {project.project_id}
+project_id: {project.project_id or ""}
# Framework Settings
default_connection: {project.default_connection}
@@ -192,8 +186,8 @@ def dump_project_yaml(project: MorphProject) -> str:
package_manager: {build_package_manager} # pip, poetry, uv
# These settings are required when use_custom_dockerfile is true
# They define how the Docker image will be built
- context: {build_context if build_context != "# context: ." else "# context: ."}
- build_args:{build_args_str}
+ # context: {build_context}
+ # build_args:{build_args_str}
# Deployment Settings
deployment:
From 86622ec2e6f23a2a399220b97bd7b863b86dffb3 Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Fri, 21 Mar 2025 16:44:58 +0900
Subject: [PATCH 32/39] change dockerfile api call
---
core/morph/config/project.py | 2 +-
core/morph/task/deploy.py | 13 +++++++++++--
core/morph/task/utils/load_dockerfile.py | 10 +++++++---
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/core/morph/config/project.py b/core/morph/config/project.py
index b873853..36d9e01 100644
--- a/core/morph/config/project.py
+++ b/core/morph/config/project.py
@@ -170,7 +170,7 @@ def dump_project_yaml(project: MorphProject) -> str:
return f"""
# Cloud Settings
profile: {project.profile} # Defined in the Profile Section in `~/.morph/credentials`
-project_id: {project.project_id or ""}
+project_id: {project.project_id or "null"}
# Framework Settings
default_connection: {project.default_connection}
diff --git a/core/morph/task/deploy.py b/core/morph/task/deploy.py
index 8884b3a..8698db6 100644
--- a/core/morph/task/deploy.py
+++ b/core/morph/task/deploy.py
@@ -56,11 +56,20 @@ def __init__(self, args: Flags):
click.echo(click.style(f"Error: {self.dockerfile} not found", fg="red"))
sys.exit(1)
else:
+ provider = "aws"
+ if (
+ self.project.deployment is not None
+ and self.project.deployment.provider is not None
+ ):
+ provider = self.project.deployment.provider or "aws"
if self.project.build is None:
- dockerfile, dockerignore = get_dockerfile_from_api("morph", None, None)
+ dockerfile, dockerignore = get_dockerfile_from_api(
+ "morph", provider, None, None
+ )
else:
dockerfile, dockerignore = get_dockerfile_from_api(
- self.project.build.framework,
+ self.project.build.framework or "morph",
+ provider,
self.project.build.package_manager,
self.project.build.runtime,
)
diff --git a/core/morph/task/utils/load_dockerfile.py b/core/morph/task/utils/load_dockerfile.py
index 64c950f..77d8f1f 100644
--- a/core/morph/task/utils/load_dockerfile.py
+++ b/core/morph/task/utils/load_dockerfile.py
@@ -4,7 +4,8 @@
def get_dockerfile_from_api(
- framework: Optional[str] = "morph",
+ framework: str,
+ provider: str,
package_manager: Optional[str] = None,
runtime: Optional[str] = None,
) -> Tuple[str, str]:
@@ -13,15 +14,18 @@ def get_dockerfile_from_api(
Args:
framework: The framework to get the dockerfile for
+ provider: The provider to get the dockerfile for
package_manager: Optional package manager to use
- language_version: Optional language version to use
+ runtime: Optional runtime to use
Returns:
Tuple containing (dockerfile, dockerignore)
"""
url = f"https://backend-api-public.morph-cb9.workers.dev/dockerfile/{framework}"
- params: Dict[str, Any] = {}
+ params: Dict[str, Any] = {
+ "provider": provider,
+ }
if package_manager:
params["packageManager"] = package_manager
if runtime:
From f446d2359fbe9341099b84c12da626db8beb9a30 Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 16:48:38 +0900
Subject: [PATCH 33/39] =?UTF-8?q?fix:=20404.mdx=20=E2=86=92=20404.tsx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/morph/include/starter_template/src/pages/404.mdx | 3 ---
core/morph/include/starter_template/src/pages/404.tsx | 8 ++++++++
2 files changed, 8 insertions(+), 3 deletions(-)
delete mode 100644 core/morph/include/starter_template/src/pages/404.mdx
create mode 100644 core/morph/include/starter_template/src/pages/404.tsx
diff --git a/core/morph/include/starter_template/src/pages/404.mdx b/core/morph/include/starter_template/src/pages/404.mdx
deleted file mode 100644
index 04d6977..0000000
--- a/core/morph/include/starter_template/src/pages/404.mdx
+++ /dev/null
@@ -1,3 +0,0 @@
-# 404
-
-Page not found
diff --git a/core/morph/include/starter_template/src/pages/404.tsx b/core/morph/include/starter_template/src/pages/404.tsx
new file mode 100644
index 0000000..4a669ab
--- /dev/null
+++ b/core/morph/include/starter_template/src/pages/404.tsx
@@ -0,0 +1,8 @@
+export default function NotFound() {
+ return (
+ <>
+
Date: Fri, 21 Mar 2025 16:49:31 +0900
Subject: [PATCH 34/39] issue v0.3.0rc2
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 9c1bd08..e5fa843 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "morph-data"
-version = "0.3.0rc1"
+version = "0.3.0rc2"
description = "Morph is a python-centric full-stack framework for building and deploying data apps."
authors = ["Morph "]
packages = [
From dd7f1831bb9d0e5c605e4acc7b2542a761724cc5 Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Sat, 22 Mar 2025 14:59:49 +0900
Subject: [PATCH 35/39] change logic for checking use_custom_dockerfile
---
core/morph/config/project.py | 11 ++---------
core/morph/task/deploy.py | 13 +++++--------
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/core/morph/config/project.py b/core/morph/config/project.py
index 36d9e01..baffd98 100644
--- a/core/morph/config/project.py
+++ b/core/morph/config/project.py
@@ -14,7 +14,6 @@
class BuildConfig(BaseModel):
- use_custom_dockerfile: bool = False
runtime: Optional[str] = None
framework: Optional[str] = "morph"
package_manager: Optional[str] = None
@@ -101,7 +100,6 @@ def dump_project_yaml(project: MorphProject) -> str:
source_paths = "\n- ".join([""] + project.source_paths)
# Default values
- build_use_custom_dockerfile = "false"
build_runtime = ""
build_framework = ""
build_package_manager = ""
@@ -120,10 +118,6 @@ def dump_project_yaml(project: MorphProject) -> str:
# Set values if build exists
if project.build:
- if project.build.use_custom_dockerfile is not None:
- build_use_custom_dockerfile = str(
- project.build.use_custom_dockerfile
- ).lower()
if project.build.runtime:
build_runtime = project.build.runtime or ""
if project.build.framework:
@@ -178,13 +172,12 @@ def dump_project_yaml(project: MorphProject) -> str:
# Build Settings
build:
- use_custom_dockerfile: {build_use_custom_dockerfile}
- # These settings are required when use_custom_dockerfile is false
+ # These settings are required when there is no Dockerfile in the project root.
# They define the environment in which the project will be built
runtime: {build_runtime} # python3.9, python3.10, python3.11, python3.12
framework: {build_framework}
package_manager: {build_package_manager} # pip, poetry, uv
- # These settings are required when use_custom_dockerfile is true
+ # These settings are required when there is a Dockerfile in the project root.
# They define how the Docker image will be built
# context: {build_context}
# build_args:{build_args_str}
diff --git a/core/morph/task/deploy.py b/core/morph/task/deploy.py
index 8698db6..3996ff2 100644
--- a/core/morph/task/deploy.py
+++ b/core/morph/task/deploy.py
@@ -50,12 +50,9 @@ def __init__(self, args: Flags):
self.package_manager = self.project.package_manager
# Check Dockerfile existence
- self.dockerfile = os.path.join(self.project_root, "Dockerfile")
- if self.project.build is not None and self.project.build.use_custom_dockerfile:
- if not os.path.exists(self.dockerfile):
- click.echo(click.style(f"Error: {self.dockerfile} not found", fg="red"))
- sys.exit(1)
- else:
+ self.dockerfile_path = os.path.join(self.project_root, "Dockerfile")
+ self.use_custom_dockerfile = os.path.exists(self.dockerfile_path)
+ if self.use_custom_dockerfile:
provider = "aws"
if (
self.project.deployment is not None
@@ -73,7 +70,7 @@ def __init__(self, args: Flags):
self.project.build.package_manager,
self.project.build.runtime,
)
- with open(self.dockerfile, "w") as f:
+ with open(self.dockerfile_path, "w") as f:
f.write(dockerfile)
dockerignore_path = os.path.join(self.project_root, ".dockerignore")
with open(dockerignore_path, "w") as f:
@@ -440,7 +437,7 @@ def _build_docker_image(self) -> str:
"-t",
self.image_name,
"-f",
- self.dockerfile,
+ self.dockerfile_path,
self.project_root,
]
if self.no_cache:
From b508198c9b564691e5197cbaedadeb19daf52aa1 Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Sat, 22 Mar 2025 15:14:45 +0900
Subject: [PATCH 36/39] change initial morph_project.yml
---
core/morph/config/project.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/morph/config/project.py b/core/morph/config/project.py
index baffd98..f600294 100644
--- a/core/morph/config/project.py
+++ b/core/morph/config/project.py
@@ -162,14 +162,16 @@ def dump_project_yaml(project: MorphProject) -> str:
deployment_provider = "aws"
return f"""
-# Cloud Settings
-profile: {project.profile} # Defined in the Profile Section in `~/.morph/credentials`
-project_id: {project.project_id or "null"}
+version: 1
# Framework Settings
default_connection: {project.default_connection}
source_paths:{source_paths}
+# Cloud Settings
+# profile: {project.profile} # Defined in the Profile Section in `~/.morph/credentials`
+# project_id: {project.project_id or "null"}
+
# Build Settings
build:
# These settings are required when there is no Dockerfile in the project root.
From 0552e288a436ebeb40ebabf957e8c1100e3a0280 Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Sat, 22 Mar 2025 15:20:18 +0900
Subject: [PATCH 37/39] fix version value as string
---
core/morph/config/project.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/morph/config/project.py b/core/morph/config/project.py
index f600294..7e6b914 100644
--- a/core/morph/config/project.py
+++ b/core/morph/config/project.py
@@ -162,7 +162,7 @@ def dump_project_yaml(project: MorphProject) -> str:
deployment_provider = "aws"
return f"""
-version: 1
+version: '1'
# Framework Settings
default_connection: {project.default_connection}
From 521044bb1176020c41db9e8811fe7d3692d8dfe2 Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Sun, 23 Mar 2025 14:37:37 +0900
Subject: [PATCH 38/39] update version as v0.3.0rc3
---
core/morph/task/utils/load_dockerfile.py | 2 +-
pyproject.toml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/morph/task/utils/load_dockerfile.py b/core/morph/task/utils/load_dockerfile.py
index 77d8f1f..cfbbddb 100644
--- a/core/morph/task/utils/load_dockerfile.py
+++ b/core/morph/task/utils/load_dockerfile.py
@@ -21,7 +21,7 @@ def get_dockerfile_from_api(
Returns:
Tuple containing (dockerfile, dockerignore)
"""
- url = f"https://backend-api-public.morph-cb9.workers.dev/dockerfile/{framework}"
+ url = f"https://dockerfile-template.morph-cb9.workers.dev/dockerfile/{framework}"
params: Dict[str, Any] = {
"provider": provider,
diff --git a/pyproject.toml b/pyproject.toml
index e5fa843..7905855 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "morph-data"
-version = "0.3.0rc2"
+version = "0.3.0rc3"
description = "Morph is a python-centric full-stack framework for building and deploying data apps."
authors = ["Morph "]
packages = [
From 52e1ceb103e8531a9e505d1044f24454345714d6 Mon Sep 17 00:00:00 2001
From: shibatanaoto
Date: Mon, 24 Mar 2025 12:35:13 +0900
Subject: [PATCH 39/39] update version as v0.3.0
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 7905855..a9a39d3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "morph-data"
-version = "0.3.0rc3"
+version = "0.3.0"
description = "Morph is a python-centric full-stack framework for building and deploying data apps."
authors = ["Morph "]
packages = [
{children}
;
+};
+
+const DropDownMenu = () => {
+ const pages = usePages();
+
+ return (
+ {title}
;
+};
+
+const Spacer = () => ;
+
+const MorphLogo = () => (
+
+ Made with
+
+
+
+
+);
+
+export const Header = {
+ Root,
+ DropDownMenu,
+ PageTitle,
+ Spacer,
+ MorphLogo,
+};
diff --git a/core/morph/include/starter_template/src/pages/_morph-data-lib/index.ts b/core/morph/include/starter_template/src/pages/_morph-data-lib/index.ts
new file mode 100644
index 0000000..81471bf
--- /dev/null
+++ b/core/morph/include/starter_template/src/pages/_morph-data-lib/index.ts
@@ -0,0 +1,3 @@
+export { RootErrorBoundary } from "./root-error-boundary";
+export { Header } from "./header";
+export { TableOfContents } from "./table-of-contents";
diff --git a/core/morph/include/starter_template/src/pages/_morph-data-lib/root-error-boundary.tsx b/core/morph/include/starter_template/src/pages/_morph-data-lib/root-error-boundary.tsx
new file mode 100644
index 0000000..0344c00
--- /dev/null
+++ b/core/morph/include/starter_template/src/pages/_morph-data-lib/root-error-boundary.tsx
@@ -0,0 +1,18 @@
+import { PropsWithChildren } from "react";
+import { ErrorBoundary, FallbackProps } from "react-error-boundary";
+
+function fallbackRender({ error }: FallbackProps) {
+ // Call resetErrorBoundary() to reset the error boundary and retry the render.
+ return (
+
+
+
+
+ );
+}
+
+export const RootErrorBoundary = ({ children }: PropsWithChildren) => {
+ return (
+ Something went wrong:
+{error.message}
+
+
+
+ {toc.map((entry) => (
+
+
+
+ {entry.value}
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/core/morph/include/starter_template/src/pages/index.css b/core/morph/include/starter_template/src/pages/index.css
new file mode 100644
index 0000000..f6a6be0
--- /dev/null
+++ b/core/morph/include/starter_template/src/pages/index.css
@@ -0,0 +1,214 @@
+@import "tailwindcss";
+
+@plugin "tailwindcss-animate";
+
+@custom-variant dark (&:is(.dark *));
+
+:root {
+ --background: oklch(1 0 0);
+ --foreground: oklch(0.145 0 0);
+ --card: oklch(1 0 0);
+ --card-foreground: oklch(0.145 0 0);
+ --popover: oklch(1 0 0);
+ --popover-foreground: oklch(0.145 0 0);
+ --primary: oklch(0.205 0 0);
+ --primary-foreground: oklch(0.985 0 0);
+ --secondary: oklch(0.97 0 0);
+ --secondary-foreground: oklch(0.205 0 0);
+ --muted: oklch(0.97 0 0);
+ --muted-foreground: oklch(0.556 0 0);
+ --accent: oklch(0.97 0 0);
+ --accent-foreground: oklch(0.205 0 0);
+ --destructive: oklch(0.577 0.245 27.325);
+ --destructive-foreground: oklch(0.577 0.245 27.325);
+ --border: oklch(0.922 0 0);
+ --input: oklch(0.922 0 0);
+ --ring: oklch(0.708 0 0);
+ --chart-1: oklch(0.646 0.222 41.116);
+ --chart-2: oklch(0.6 0.118 184.704);
+ --chart-3: oklch(0.398 0.07 227.392);
+ --chart-4: oklch(0.828 0.189 84.429);
+ --chart-5: oklch(0.769 0.188 70.08);
+ --radius: 0.625rem;
+ --sidebar: oklch(0.985 0 0);
+ --sidebar-foreground: oklch(0.145 0 0);
+ --sidebar-primary: oklch(0.205 0 0);
+ --sidebar-primary-foreground: oklch(0.985 0 0);
+ --sidebar-accent: oklch(0.97 0 0);
+ --sidebar-accent-foreground: oklch(0.205 0 0);
+ --sidebar-border: oklch(0.922 0 0);
+ --sidebar-ring: oklch(0.708 0 0);
+}
+
+.dark {
+ --background: oklch(0.145 0 0);
+ --foreground: oklch(0.985 0 0);
+ --card: oklch(0.145 0 0);
+ --card-foreground: oklch(0.985 0 0);
+ --popover: oklch(0.145 0 0);
+ --popover-foreground: oklch(0.985 0 0);
+ --primary: oklch(0.985 0 0);
+ --primary-foreground: oklch(0.205 0 0);
+ --secondary: oklch(0.269 0 0);
+ --secondary-foreground: oklch(0.985 0 0);
+ --muted: oklch(0.269 0 0);
+ --muted-foreground: oklch(0.708 0 0);
+ --accent: oklch(0.269 0 0);
+ --accent-foreground: oklch(0.985 0 0);
+ --destructive: oklch(0.396 0.141 25.723);
+ --destructive-foreground: oklch(0.637 0.237 25.331);
+ --border: oklch(0.269 0 0);
+ --input: oklch(0.269 0 0);
+ --ring: oklch(0.439 0 0);
+ --chart-1: oklch(0.488 0.243 264.376);
+ --chart-2: oklch(0.696 0.17 162.48);
+ --chart-3: oklch(0.769 0.188 70.08);
+ --chart-4: oklch(0.627 0.265 303.9);
+ --chart-5: oklch(0.645 0.246 16.439);
+ --sidebar: oklch(0.205 0 0);
+ --sidebar-foreground: oklch(0.985 0 0);
+ --sidebar-primary: oklch(0.488 0.243 264.376);
+ --sidebar-primary-foreground: oklch(0.985 0 0);
+ --sidebar-accent: oklch(0.269 0 0);
+ --sidebar-accent-foreground: oklch(0.985 0 0);
+ --sidebar-border: oklch(0.269 0 0);
+ --sidebar-ring: oklch(0.439 0 0);
+}
+
+@theme inline {
+ --color-background: var(--background);
+ --color-foreground: var(--foreground);
+ --color-card: var(--card);
+ --color-card-foreground: var(--card-foreground);
+ --color-popover: var(--popover);
+ --color-popover-foreground: var(--popover-foreground);
+ --color-primary: var(--primary);
+ --color-primary-foreground: var(--primary-foreground);
+ --color-secondary: var(--secondary);
+ --color-secondary-foreground: var(--secondary-foreground);
+ --color-muted: var(--muted);
+ --color-muted-foreground: var(--muted-foreground);
+ --color-accent: var(--accent);
+ --color-accent-foreground: var(--accent-foreground);
+ --color-destructive: var(--destructive);
+ --color-destructive-foreground: var(--destructive-foreground);
+ --color-border: var(--border);
+ --color-input: var(--input);
+ --color-ring: var(--ring);
+ --color-chart-1: var(--chart-1);
+ --color-chart-2: var(--chart-2);
+ --color-chart-3: var(--chart-3);
+ --color-chart-4: var(--chart-4);
+ --color-chart-5: var(--chart-5);
+ --radius-sm: calc(var(--radius) - 4px);
+ --radius-md: calc(var(--radius) - 2px);
+ --radius-lg: var(--radius);
+ --radius-xl: calc(var(--radius) + 4px);
+ --color-sidebar: var(--sidebar);
+ --color-sidebar-foreground: var(--sidebar-foreground);
+ --color-sidebar-primary: var(--sidebar-primary);
+ --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+ --color-sidebar-accent: var(--sidebar-accent);
+ --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+ --color-sidebar-border: var(--sidebar-border);
+ --color-sidebar-ring: var(--sidebar-ring);
+ --animate-accordion-down: accordion-down 0.2s ease-out;
+ --animate-accordion-up: accordion-up 0.2s ease-out;
+
+ @keyframes accordion-down {
+ from {
+ height: 0;
+ }
+ to {
+ height: var(--radix-accordion-content-height);
+ }
+ }
+
+ @keyframes accordion-up {
+ from {
+ height: var(--radix-accordion-content-height);
+ }
+ to {
+ height: 0;
+ }
+ }
+}
+
+@layer base {
+ * {
+ @apply border-border outline-ring/50;
+
+ /* Pre-defined Styles for user generated contents */
+ .morph-page {
+ h1 {
+ @apply mt-10 scroll-m-20 text-3xl font-bold tracking-tight lg:text-4xl;
+ }
+ h2 {
+ @apply mt-8 scroll-m-20 pb-2 text-2xl font-semibold tracking-tight transition-colors first:mt-0;
+ }
+ h3 {
+ @apply mt-6 scroll-m-20 text-xl font-semibold tracking-tight;
+ }
+ p {
+ @apply leading-relaxed [&:not(:first-child)]:mt-6;
+ }
+ a {
+ @apply font-medium underline underline-offset-4;
+ &.x-underline {
+ @apply no-underline;
+ }
+ }
+ blockquote {
+ @apply mt-6 border-l-2 pl-6 italic;
+ }
+ ul {
+ @apply my-3 ml-3 list-disc list-inside [&>li]:mt-2;
+ }
+ table {
+ @apply table-auto min-w-full text-sm text-left rtl:text-right py-4;
+ }
+ thead {
+ @apply [&_tr]:border-b;
+ }
+ th {
+ @apply py-2 px-2 text-left align-middle font-medium [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px];
+ }
+ tbody {
+ @apply [&_tr:last-child]:border-0;
+ }
+ td {
+ @apply p-2 align-middle [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px];
+ }
+ figure[data-rehype-pretty-code-figure] {
+ width: 100%;
+ max-width: 100%;
+ min-width: 100%;
+ }
+ pre {
+ @apply my-4;
+ width: 100%;
+ max-width: 100%;
+ min-width: 100%;
+ overflow-x: auto;
+ padding: 1rem 0;
+ border-radius: 0.5rem;
+ box-sizing: border-box;
+
+ [data-line] {
+ padding: 0 1rem;
+ font-size: 0.8rem;
+ }
+
+ > code {
+ display: block;
+ }
+ }
+ :not(pre) > code {
+ @apply font-mono text-sm rounded bg-gray-100 dark:bg-neutral-700 px-1.5 py-1;
+ }
+ }
+ }
+ body {
+ @apply bg-background text-foreground;
+ }
+}
diff --git a/core/morph/include/starter_template/src/pages/index.mdx b/core/morph/include/starter_template/src/pages/index.mdx
index 363d53e..5465bcd 100644
--- a/core/morph/include/starter_template/src/pages/index.mdx
+++ b/core/morph/include/starter_template/src/pages/index.mdx
@@ -1,17 +1,3 @@
# Welcome to Morph
Morph is a Python + Markdown framework for building internal AI apps.
-
-## 📚 Resources
-
-- [🚀 Deploy Now](https://app.morph-data.io)
-- [📖 Documentation](https://docs.morph-data.io)
-- [💻 GitHub](https://github.com/morph-data/morph)
-
-## 🛠️ Getting started
-
-### Tutorials
-
-- [🚀 Quickstart for AI App](https://docs.morph-data.io/docs/en/quickstart/building-app)
-- [📊 Dashboard tutorial](https://docs.morph-data.io/docs/en/develop/tutorials/plotly)
-- [📈 Pygwalker tutorial](https://docs.morph-data.io/docs/en/develop/tutorials/pygwalker)
diff --git a/core/morph/include/starter_template/tsconfig.app.json b/core/morph/include/starter_template/tsconfig.app.json
index 8c62397..98111af 100644
--- a/core/morph/include/starter_template/tsconfig.app.json
+++ b/core/morph/include/starter_template/tsconfig.app.json
@@ -1,7 +1,11 @@
{
"extends": "@morph-data/frontend/tsconfig.app.json",
"compilerOptions": {
- "composite": true
+ "composite": true,
+ "baseUrl": ".",
+ "paths": {
+ "@/*": ["./src/*"]
+ }
},
"include": ["src"]
}
diff --git a/core/morph/include/starter_template/tsconfig.json b/core/morph/include/starter_template/tsconfig.json
index ea9d0cd..1e17393 100644
--- a/core/morph/include/starter_template/tsconfig.json
+++ b/core/morph/include/starter_template/tsconfig.json
@@ -7,5 +7,11 @@
{
"path": "./tsconfig.node.json"
}
- ]
+ ],
+ "compilerOptions": {
+ "baseUrl": ".",
+ "paths": {
+ "@/*": ["./src/*"]
+ }
+ }
}
diff --git a/core/morph/include/starter_template/vite.config.ts b/core/morph/include/starter_template/vite.config.ts
index 4c7a434..e68cbc2 100644
--- a/core/morph/include/starter_template/vite.config.ts
+++ b/core/morph/include/starter_template/vite.config.ts
@@ -1,6 +1,13 @@
import { morph } from "@morph-data/frontend/plugin";
import { defineConfig } from "vite";
+import path from "path";
+import tailwindcss from "@tailwindcss/vite";
export default defineConfig({
- plugins: [morph()],
+ plugins: [morph(), tailwindcss()],
+ resolve: {
+ alias: {
+ "@": path.resolve(__dirname, "./src"),
+ },
+ },
});
diff --git a/core/morph/task/new.py b/core/morph/task/new.py
index d3bf63a..249231b 100644
--- a/core/morph/task/new.py
+++ b/core/morph/task/new.py
@@ -249,6 +249,24 @@ def run(self):
)
sys.exit(1)
+ # Setup Frontend
+ subprocess.run(
+ [
+ "npm",
+ "install",
+ ],
+ cwd=self.project_root,
+ )
+ subprocess.run(
+ [
+ "npx",
+ "shadcn@latest",
+ "add",
+ "https://morph-components.vercel.app/r/morph-components.json",
+ ],
+ cwd=self.project_root,
+ )
+
click.echo()
click.echo(click.style("Project setup completed successfully! 🎉", fg="green"))
return True
From e83122ccbefa900edf79207c8c0f8b9fade8a002 Mon Sep 17 00:00:00 2001
From: tslcls
+ {toc.map((entry) => (
+
+
+
+ {entry.value}
+
+
+ ))}
+
-
-
+
-
- );
-}
diff --git a/core/morph/include/starter_template/src/pages/index.mdx b/core/morph/include/starter_template/src/pages/index.mdx
index 5465bcd..363d53e 100644
--- a/core/morph/include/starter_template/src/pages/index.mdx
+++ b/core/morph/include/starter_template/src/pages/index.mdx
@@ -1,3 +1,17 @@
# Welcome to Morph
Morph is a Python + Markdown framework for building internal AI apps.
+
+## 📚 Resources
+
+- [🚀 Deploy Now](https://app.morph-data.io)
+- [📖 Documentation](https://docs.morph-data.io)
+- [💻 GitHub](https://github.com/morph-data/morph)
+
+## 🛠️ Getting started
+
+### Tutorials
+
+- [🚀 Quickstart for AI App](https://docs.morph-data.io/docs/en/quickstart/building-app)
+- [📊 Dashboard tutorial](https://docs.morph-data.io/docs/en/develop/tutorials/plotly)
+- [📈 Pygwalker tutorial](https://docs.morph-data.io/docs/en/develop/tutorials/pygwalker)
From 5e4f70be0883c00bc847e57cdc893899d5a3b786 Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 13:39:49 +0900
Subject: [PATCH 22/39] chore: add dist to .gitignore
---
core/morph/include/starter_template/.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/core/morph/include/starter_template/.gitignore b/core/morph/include/starter_template/.gitignore
index 7acf8d2..b4386bf 100644
--- a/core/morph/include/starter_template/.gitignore
+++ b/core/morph/include/starter_template/.gitignore
@@ -1,6 +1,9 @@
# Morph config files and directories
.morph
+# Morph build output
+dist
+
# Node.js
node_modules
From 42ad3e8ec5846a55f374830051cdb0a6cefa2233 Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 13:40:24 +0900
Subject: [PATCH 23/39] chore: bundle tsconfig.json
---
.../include/starter_template/tsconfig.app.json | 11 -----------
core/morph/include/starter_template/tsconfig.json | 14 ++++----------
.../include/starter_template/tsconfig.node.json | 7 -------
3 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 core/morph/include/starter_template/tsconfig.app.json
delete mode 100644 core/morph/include/starter_template/tsconfig.node.json
diff --git a/core/morph/include/starter_template/tsconfig.app.json b/core/morph/include/starter_template/tsconfig.app.json
deleted file mode 100644
index 98111af..0000000
--- a/core/morph/include/starter_template/tsconfig.app.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": "@morph-data/frontend/tsconfig.app.json",
- "compilerOptions": {
- "composite": true,
- "baseUrl": ".",
- "paths": {
- "@/*": ["./src/*"]
- }
- },
- "include": ["src"]
-}
diff --git a/core/morph/include/starter_template/tsconfig.json b/core/morph/include/starter_template/tsconfig.json
index 1e17393..98111af 100644
--- a/core/morph/include/starter_template/tsconfig.json
+++ b/core/morph/include/starter_template/tsconfig.json
@@ -1,17 +1,11 @@
{
- "files": [],
- "references": [
- {
- "path": "./tsconfig.app.json"
- },
- {
- "path": "./tsconfig.node.json"
- }
- ],
+ "extends": "@morph-data/frontend/tsconfig.app.json",
"compilerOptions": {
+ "composite": true,
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
}
- }
+ },
+ "include": ["src"]
}
diff --git a/core/morph/include/starter_template/tsconfig.node.json b/core/morph/include/starter_template/tsconfig.node.json
deleted file mode 100644
index ce779b4..0000000
--- a/core/morph/include/starter_template/tsconfig.node.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "extends": "@morph-data/frontend/tsconfig.node.json",
- "compilerOptions": {
- "composite": true
- },
- "include": ["vite.config.ts"]
-}
From ba8db6c096a45ecfb4751d68ff7dff4819749a62 Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 13:51:02 +0900
Subject: [PATCH 24/39] chore: move layout components to _components
---
.../starter_template/src/pages/_app.tsx | 7 +-
.../src/pages/_components/header.tsx | 86 +++++++++++++++++++
.../pages/_components/table-of-contents.tsx | 65 ++++++++++++++
3 files changed, 155 insertions(+), 3 deletions(-)
create mode 100644 core/morph/include/starter_template/src/pages/_components/header.tsx
create mode 100644 core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
diff --git a/core/morph/include/starter_template/src/pages/_app.tsx b/core/morph/include/starter_template/src/pages/_app.tsx
index 29c8966..b0339d0 100644
--- a/core/morph/include/starter_template/src/pages/_app.tsx
+++ b/core/morph/include/starter_template/src/pages/_app.tsx
@@ -1,5 +1,6 @@
import { Head } from "@morph-data/frontend/components";
-import { RootErrorBoundary, Header, TableOfContents } from "./_morph-data-lib";
+import { TableOfContents } from "./_components/table-of-contents";
+import { Header } from "./_components/header";
import {
usePageMeta,
MdxComponentsProvider,
@@ -27,7 +28,7 @@ export default function App() {
useRefresh();
return (
- 404
-Page not found
-{children}
;
+};
+
+const DropDownMenu = () => {
+ const pages = usePages();
+
+ return (
+ {title}
;
+};
+
+const Spacer = () => ;
+
+const MorphLogo = () => (
+
+ Made with
+
+
+
+
+);
+
+export const Header = {
+ Root,
+ DropDownMenu,
+ PageTitle,
+ Spacer,
+ MorphLogo,
+};
diff --git a/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx b/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
new file mode 100644
index 0000000..c51e666
--- /dev/null
+++ b/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
@@ -0,0 +1,65 @@
+import {
+ HoverCard,
+ HoverCardTrigger,
+ HoverCardContent,
+} from "@/pages/_components/ui/hover-card";
+import { Card } from "@/pages/_components/ui/card";
+import { Button } from "@/pages/_components/ui/button";
+import { LucideTableOfContents } from "lucide-react";
+import { cn } from "@/pages/_lib/utils";
+import { Toc } from "@morph-data/frontend/components";
+
+export interface TocProps {
+ toc?: Toc;
+ className?: string;
+}
+
+export const TableOfContents: React.FC
+
+
+
+
+ {toc.map((entry) => (
+
+
+
+ {entry.value}
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
From 838f7631595375d63daadb84b0d65337789b554d Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 13:58:43 +0900
Subject: [PATCH 25/39] chore: add error fallback
---
.../starter_template/src/pages/_app.tsx | 21 ++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/core/morph/include/starter_template/src/pages/_app.tsx b/core/morph/include/starter_template/src/pages/_app.tsx
index b0339d0..57f0dc1 100644
--- a/core/morph/include/starter_template/src/pages/_app.tsx
+++ b/core/morph/include/starter_template/src/pages/_app.tsx
@@ -8,6 +8,9 @@ import {
useRefresh,
extractComponents,
} from "@morph-data/frontend/components";
+import { ErrorBoundary } from "react-error-boundary";
+import { Callout } from "@/pages/_components/ui/callout";
+
import "./index.css";
const uiComponents = extractComponents(
@@ -46,7 +49,17 @@ export default function App() {
+ {toc.map((entry) => (
+
+
+
+ {entry.value}
+
+
+ ))}
+
- (
+
+ {typeof error.message === "string"
+ ? error.message
+ : "Something went wrong"}
+
+ )}
+ >
+
{toc.map((entry) => (
-
-
@@ -43,20 +41,17 @@ export const TableOfContents: React.FC
- {entry.value}
-
+
+ {entry.value}
))}
- {toc.map((entry) => (
-
-
-
- {entry.value}
-
-
- ))}
-
+ {toc.map((entry) => (
+
+ {entry.value}
+
+ ))}
+
{children}
;
-};
-
-const DropDownMenu = () => {
- const pages = usePages();
-
- return (
- {title}
;
-};
-
-const Spacer = () => ;
-
-const MorphLogo = () => (
-
- Made with
-
-
-
-
-);
-
-export const Header = {
- Root,
- DropDownMenu,
- PageTitle,
- Spacer,
- MorphLogo,
-};
diff --git a/core/morph/include/starter_template/src/pages/_morph-data-lib/index.ts b/core/morph/include/starter_template/src/pages/_morph-data-lib/index.ts
deleted file mode 100644
index 81471bf..0000000
--- a/core/morph/include/starter_template/src/pages/_morph-data-lib/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { RootErrorBoundary } from "./root-error-boundary";
-export { Header } from "./header";
-export { TableOfContents } from "./table-of-contents";
diff --git a/core/morph/include/starter_template/src/pages/_morph-data-lib/root-error-boundary.tsx b/core/morph/include/starter_template/src/pages/_morph-data-lib/root-error-boundary.tsx
deleted file mode 100644
index 0344c00..0000000
--- a/core/morph/include/starter_template/src/pages/_morph-data-lib/root-error-boundary.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { PropsWithChildren } from "react";
-import { ErrorBoundary, FallbackProps } from "react-error-boundary";
-
-function fallbackRender({ error }: FallbackProps) {
- // Call resetErrorBoundary() to reset the error boundary and retry the render.
- return (
-
-
-
-
- );
-}
-
-export const RootErrorBoundary = ({ children }: PropsWithChildren) => {
- return (
- Something went wrong:
-{error.message}
-
-
-
- {toc.map((entry) => (
-
-
-
- {entry.value}
-
-
- ))}
-
-
-
-
-
-
-
-
-
-
-
-
- );
-};
From 6a0bba2acbe5f0344f2cc2b6fa08a61bc1f6739d Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 15:02:11 +0900
Subject: [PATCH 28/39] fix: enalbe -y to install initial morph components
---
core/morph/task/new.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/morph/task/new.py b/core/morph/task/new.py
index 77f43d8..711c466 100644
--- a/core/morph/task/new.py
+++ b/core/morph/task/new.py
@@ -245,6 +245,7 @@ def run(self):
"npx",
"shadcn@latest",
"add",
+ "--yes",
"https://morph-components.vercel.app/r/morph-components.json",
],
cwd=self.project_root,
From d35293962fd78488438290965a7ef78b6905b48a Mon Sep 17 00:00:00 2001
From: Atsuki Hasegawa <58581243+atsuki44@users.noreply.github.com>
Date: Fri, 21 Mar 2025 15:35:47 +0900
Subject: [PATCH 29/39] fix: nested heading in toc
---
.../pages/_components/table-of-contents.tsx | 32 +++++++++++--------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx b/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
index 4f31532..25ba07c 100644
--- a/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
+++ b/core/morph/include/starter_template/src/pages/_components/table-of-contents.tsx
@@ -23,13 +23,7 @@ export const TableOfContents: React.FC
- {toc.map((entry) => (
-
-
-
- {entry.value}
-
-
- ))}
-
{toc.map((entry) => (
-
- {entry.value}
-
+
{toc.map((entry) => (
-
- {entry.value}
-
+
404
+Page not found
+ + ); +} From c3a49fe931f14e6a905dba54711a3cab321ee37a Mon Sep 17 00:00:00 2001 From: shibatanaoto