Merge pull request #181 from morph-data/release/v0.3.0

Author: tslcls

core/morph/api/app.py

@@ -21,9 +21,6 @@
     inertia_request_validation_exception_handler,
     inertia_version_conflict_exception_handler,
 )
-from starlette.middleware.cors import CORSMiddleware
-from starlette.middleware.sessions import SessionMiddleware
-
 from morph.api.error import ApiBaseError, InternalError, render_error_html
 from morph.api.handler import router
 from morph.api.plugin import plugin_app
@@ -32,6 +29,8 @@
     MorphFunctionMetaObjectCacheManager,
     MorphGlobalContext,
 )
+from starlette.middleware.cors import CORSMiddleware
+from starlette.middleware.sessions import SessionMiddleware
 
 # configuration values
 
@@ -42,10 +41,11 @@
 # set true to MORPH_LOCAL_DEV_MODE to use local frontend server
 is_local_dev_mode = True if os.getenv("MORPH_LOCAL_DEV_MODE") == "true" else False
 
+project_root = find_project_root_dir()
+
 
 def custom_compile_logic():
     logger.info("Compiling python and sql files...")
-    project_root = find_project_root_dir()
     context = MorphGlobalContext.get_instance()
     errors = context.load(project_root)
     if len(errors) > 0:
@@ -129,8 +129,6 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
     inertia_request_validation_exception_handler,
 )
 
-frontend_dir = os.path.join(os.getcwd(), ".morph", "frontend")
-
 
 def get_inertia_config():
     templates_dir = os.path.join(Path(__file__).resolve().parent, "templates")
@@ -148,15 +146,16 @@ def get_inertia_config():
             use_flash_messages=True,
             use_flash_errors=True,
             entrypoint_filename="main.tsx",
-            assets_prefix="/src",
+            root_directory=".morph/frontend",
             dev_url=frontend_url,
         )
 
     return InertiaConfig(
         templates=Jinja2Templates(directory=templates_dir),
-        manifest_json_path=os.path.join(frontend_dir, "dist", "manifest.json"),
+        manifest_json_path=os.path.join(project_root, "dist", "manifest.json"),
         environment="production",
         entrypoint_filename="main.tsx",
+        root_directory=".morph/frontend",
     )
 
 
@@ -167,13 +166,13 @@ def get_inertia_config():
 if is_local_dev_mode:
     app.mount(
         "/src",
-        StaticFiles(directory=os.path.join(frontend_dir, "src")),
+        StaticFiles(directory=os.path.join(project_root, "src")),
         name="src",
     )
 else:
     app.mount(
         "/assets",
-        StaticFiles(directory=os.path.join(frontend_dir, "dist", "assets")),
+        StaticFiles(directory=os.path.join(project_root, "dist", "assets")),
         name="assets",
     )
 

core/morph/api/cloud/client.py

@@ -132,14 +132,20 @@ def verify_api_secret(self) -> MorphClientResponse:
 
     @validate_project_id
     def initiate_deployment(
-        self, project_id: str, image_build_log: str, image_checksum: str
+        self,
+        project_id: str,
+        image_build_log: str,
+        image_checksum: str,
+        config: Optional[dict[str, Any]] = None,
     ) -> MorphClientResponse:
         path = "deployment"
-        body = {
+        body: dict[str, Any] = {
             "projectId": project_id,
             "imageBuildLog": image_build_log,
             "imageChecksum": image_checksum,
         }
+        if config:
+            body["config"] = config
 
         return self.request(method="POST", path=path, data=body)
 

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
@@ -284,11 +283,11 @@ async def file_upload_service(input: UploadFileService) -> Any:
         )
 
         # Read the saved file path from the cache (always created as following path)
-        cache_file = Path(find_project_root_dir()).joinpath(
-            ".morph/cache/file_upload.md"
-        )
-        with open(cache_file, "r") as f:
-            saved_filepath = f.read()
+        saved_filepath = ""
+        cache_file = "/tmp/file_upload.cache"
+        if os.path.exists(cache_file):
+            with open(cache_file, "r") as f:
+                saved_filepath = f.read()
 
         # Remove the temporary directory
         if os.path.exists(temp_dir):

core/morph/api/templates/index.html

@@ -16,13 +16,6 @@
       window.__vite_plugin_react_preamble_installed__ = true;
     </script>
     {% endif %}
-
-    <script src="https://cdn.tailwindcss.com"></script>
-    <script>
-      tailwind.config = {
-        darkMode: "class",
-      };
-    </script>
   </head>
   <body>
     {% inertia_body %}

core/morph/config/project.py

@@ -1,5 +1,5 @@
 import os
-from typing import List, Optional
+from typing import Dict, List, Optional
 
 import yaml
 from pydantic import BaseModel, Field
@@ -13,6 +13,20 @@
 from morph.task.utils.morph import find_project_root_dir
 
 
+class BuildConfig(BaseModel):
+    runtime: Optional[str] = None
+    framework: Optional[str] = "morph"
+    package_manager: Optional[str] = None
+    context: Optional[str] = None
+    build_args: Optional[Dict[str, str]] = None
+
+
+class DeploymentConfig(BaseModel):
+    provider: Optional[str] = "aws"
+    aws: Optional[Dict[str, Optional[str]]] = None
+    gcp: Optional[Dict[str, Optional[str]]] = None
+
+
 class MorphProject(BaseModel):
     profile: Optional[str] = "default"
     source_paths: List[str] = Field(default_factory=lambda: ["src"])
@@ -21,6 +35,8 @@ class MorphProject(BaseModel):
     package_manager: str = Field(
         default="pip", description="Package manager to use, e.g., pip or poetry."
     )
+    build: Optional[BuildConfig] = Field(default_factory=BuildConfig)
+    deployment: Optional[DeploymentConfig] = Field(default_factory=DeploymentConfig)
 
     class Config:
         arbitrary_types_allowed = True
@@ -72,9 +88,115 @@ 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_runtime = ""
+    build_framework = ""
+    build_package_manager = ""
+    build_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.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 = 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)
+                if build_args_items
+                else "\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"""
+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.
+    # 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 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}
+
+# 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}
+"""