Merge branch 'develop' into feature/morph-data-frontend

Author: tslcls

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

@@ -284,11 +284,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 = Path(temp_dir).joinpath("file_upload.cache")
+        if cache_file.exists():
+            with open(cache_file, "r") as f:
+                saved_filepath = f.read()
 
         # Remove the temporary directory
         if os.path.exists(temp_dir):

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,21 @@
 from morph.task.utils.morph import find_project_root_dir
 
 
+class BuildConfig(BaseModel):
+    use_custom_dockerfile: bool = False
+    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 +36,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

core/morph/include/Dockerfile

@@ -33,19 +33,19 @@ def __init__(self, args: Flags):
             sys.exit(1)
 
         # Load morph_project.yml or equivalent
-        project = load_project(self.project_root)
-        if not project:
+        self.project = load_project(self.project_root)
+        if not self.project:
             click.echo(click.style("Project configuration not found.", fg="red"))
             sys.exit(1)
-        elif project.project_id is None:
+        elif self.project.project_id is None:
             click.echo(
                 click.style(
                     "Error: No project id found. Please fill project_id in morph_project.yml.",
                     fg="red",
                 )
             )
             sys.exit(1)
-        self.package_manager = project.package_manager
+        self.package_manager = self.project.package_manager
 
         # Check Dockerfile existence
         self.dockerfile = os.path.join(self.project_root, "Dockerfile")
@@ -125,6 +125,7 @@ def run(self):
                 project_id=self.client.project_id,
                 image_build_log=image_build_log,
                 image_checksum=image_checksum,
+                config=self.project.model_dump() if self.project else None,
             )
         except Exception as e:
             click.echo(

core/morph/include/starter_template/.dockerignore

@@ -9,7 +9,12 @@
 
 import click
 from morph.cli.flags import Flags
-from morph.config.project import default_initial_project, load_project, save_project
+from morph.config.project import (
+    BuildConfig,
+    default_initial_project,
+    load_project,
+    save_project,
+)
 from morph.constants import MorphConstant
 from morph.task.base import BaseTask
 from morph.task.utils.run_backend.state import MorphGlobalContext
@@ -105,42 +110,12 @@ def run(self):
             )
             project.package_manager = "poetry"
 
-        save_project(self.project_root, project)
-
-        # Generate the Dockerfile template
-        template_dir = Path(__file__).parents[1].joinpath("include")
-        docker_template_file = template_dir.joinpath("Dockerfile")
-        if not docker_template_file.exists():
-            click.echo(
-                click.style(
-                    f"Template file not found: {docker_template_file}", fg="red"
-                )
-            )
-            click.echo()
-            sys.exit(1)
-
-        # Generate the Dockerfile with the selected Python version
-        dockerfile_path = os.path.join(self.project_root, "Dockerfile")
-        try:
-            with docker_template_file.open("r", encoding="utf-8") as f:
-                dockerfile_content = f.read()
+        if project.build is None:
+            project.build = BuildConfig()
+        project.build.package_manager = project.package_manager
+        project.build.runtime = f"python{self.selected_python_version}"
 
-            # Replace the placeholder with the selected Python version
-            dockerfile_content = dockerfile_content.replace(
-                "${MORPH_PYTHON_VERSION}", self.selected_python_version
-            )
-
-            # Write the updated Dockerfile to the project directory
-            with open(dockerfile_path, "w") as output_file:
-                output_file.write(dockerfile_content)
-        except FileNotFoundError as e:
-            click.echo(
-                click.style(f"Error: Template Dockerfile not found: {e}", fg="red")
-            )
-            sys.exit(1)
-        except IOError as e:
-            click.echo(click.style(f"Error: Unable to write Dockerfile: {e}", fg="red"))
-            sys.exit(1)
+        save_project(self.project_root, project)
 
         try:
             morph_data_version = importlib.metadata.version("morph-data")
@@ -178,9 +153,13 @@ def run(self):
                 pyproject_path = Path(self.project_root) / "pyproject.toml"
                 pyproject_path.write_text(pyproject_content, encoding="utf-8")
 
+                # Run 'poetry install' to install the dependencies
+                click.echo(click.style("Running 'poetry install'...", fg="blue"))
+                subprocess.run(["poetry", "install"], cwd=self.project_root, check=True)
+
                 click.echo(
                     click.style(
-                        "Added 'morph-data' to pyproject.toml with 'morph-data'.",
+                        "Poetry initialized with 'morph-data' as a dependency.",
                         fg="green",
                     )
                 )
@@ -212,9 +191,13 @@ def run(self):
                 pyproject_path = Path(self.project_root) / "pyproject.toml"
                 pyproject_path.write_text(pyproject_content, encoding="utf-8")
 
+                # Run 'uv sync' to install dependencies
+                click.echo(click.style("Running 'uv sync'...", fg="blue"))
+                subprocess.run(["uv", "sync"], cwd=self.project_root, check=True)
+
                 click.echo(
                     click.style(
-                        "Added 'morph-data' to pyproject.toml with 'morph-data'.",
+                        "uv initialized with 'morph-data' as a dependency.",
                         fg="green",
                     )
                 )

core/morph/include/starter_template/src/__init__.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "morph-data"
-version = "0.2.0"
+version = "0.2.1"
 description = "Morph is a python-centric full-stack framework for building and deploying data apps."
 authors = ["Morph <contact@morphdb.io>"]
 packages = [