shipit-cli 0.4.0__tar.gz → 0.5.0__tar.gz

{shipit_cli-0.4.0 → shipit_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.4.0
+Version: 0.5.0
 Summary: Add your description here
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit

{shipit_cli-0.4.0 → shipit_cli-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.4.0"
+version = "0.5.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"

{shipit_cli-0.4.0 → shipit_cli-0.5.0}/src/shipit/cli.py

@@ -499,12 +499,18 @@ class LocalBuilder:
             ignore_matches = step.ignore if step.ignore else []
             ignore_matches.append(".shipit")
             ignore_matches.append("Shipit")
-            copytree(
-                (self.src_dir / step.source),
-                (build_path / step.target),
-                dirs_exist_ok=True,
-                ignore=ignore_patterns(*ignore_matches),
-            )
+            if (self.src_dir / step.source).is_dir():
+                copytree(
+                    (self.src_dir / step.source),
+                    (build_path / step.target),
+                    dirs_exist_ok=True,
+                    ignore=ignore_patterns(*ignore_matches),
+                )
+            else:
+                copy(
+                    (self.src_dir / step.source),
+                    (build_path / step.target),
+                )
         elif isinstance(step, EnvStep):
             print(f"Setting environment variables: {step}")
             env.update(step.variables)

{shipit_cli-0.4.0 → shipit_cli-0.5.0}/src/shipit/providers/python.py

@@ -16,9 +16,11 @@ from .base import (
 
 class PythonFramework(Enum):
     Django = "django"
+    Streamlit = "streamlit"
     FastAPI = "fastapi"
     Flask = "flask"
     FastHTML = "python-fasthtml"
+    MCP = "mcp"
 
 
 class PythonServer(Enum):
@@ -58,7 +60,9 @@ class PythonProvider:
             "psycopg2-binary"}
         mysql_deps = {"mysqlclient", "pymysql", "mysql-connector-python", "aiomysql"}
         found_deps = self.check_deps(
+            "streamlit",
             "django",
+            "mcp",
             "fastapi",
             "flask",
             "python-fasthtml",
@@ -105,6 +109,11 @@ class PythonProvider:
                     # gunicorn can't run with Wasmer atm
                     self.extra_dependencies = {"uvicorn"}
                     self.server = PythonServer.Uvicorn
+        elif "streamlit" in found_deps:
+            framework = PythonFramework.Streamlit
+        elif "mcp" in found_deps:
+            framework = PythonFramework.MCP
+            self.extra_dependencies = {"mcp[cli]"}
         elif "fastapi" in found_deps:
             framework = PythonFramework.FastAPI
             if not self.server:
@@ -112,10 +121,9 @@ class PythonProvider:
                 self.server = PythonServer.Uvicorn
         elif "flask" in found_deps:
             framework = PythonFramework.Flask
-        elif "fastapi" in found_deps:
-            framework = PythonFramework.FastAPI
-        elif "flask" in found_deps:
-            framework = PythonFramework.Flask
+            if not self.server:
+                self.extra_dependencies = {"uvicorn"}
+                self.server = PythonServer.Uvicorn
         elif "python-fasthtml" in found_deps:
             framework = PythonFramework.FastHTML
         else:
@@ -200,6 +208,7 @@ class PythonProvider:
             "workdir(app[\"build\"])"
         ]
 
+        extra_deps = ", ".join([f"{dep}" for dep in self.extra_dependencies])
         if _exists(self.path, "pyproject.toml"):
             input_files = ["pyproject.toml"]
             extra_args = ""
@@ -207,22 +216,22 @@ class PythonProvider:
                 input_files.append("uv.lock")
                 extra_args = " --locked"
             inputs = ", ".join([f"\"{input}\"" for input in input_files])
-            extra_deps = ", ".join([f"{dep}" for dep in self.extra_dependencies])
-            steps += list(filter(None, [
+            steps += [
                 "env(UV_PROJECT_ENVIRONMENT=local_venv[\"build\"] if cross_platform else venv[\"build\"])",
-                "run(f\"uv sync --compile --python python{python_version} --no-managed-python" + extra_args + "\", inputs=[" + inputs + "], group=\"install\")",
-                f"run(\"uv add {extra_deps}\", inputs=[\"pyproject.toml\"], group=\"install\")" if extra_deps else None,
-                "run(f\"uv pip compile pyproject.toml --python-version={python_version} --universal --extra-index-url {python_extra_index_url} --index-url=https://pypi.org/simple --emit-index-url --only-binary :all: -o cross-requirements.txt\", inputs=[\"pyproject.toml\"], outputs=[\"cross-requirements.txt\"]) if cross_platform else None",
+                f"run(f\"uv sync --compile --python python{{python_version}} --no-managed-python{extra_args}\", inputs=[{inputs}], group=\"install\")",
+                "copy(\"pyproject.toml\", \"pyproject.toml\")",
+                f"run(\"uv add {extra_deps}\", group=\"install\")" if extra_deps else None,
+                "run(f\"uv pip compile pyproject.toml --python-version={python_version} --universal --extra-index-url {python_extra_index_url} --index-url=https://pypi.org/simple --emit-index-url --only-binary :all: -o cross-requirements.txt\", outputs=[\"cross-requirements.txt\"]) if cross_platform else None",
                 f"run(f\"uvx pip install -r cross-requirements.txt {extra_deps} --target {{python_cross_packages_path}} --platform {{cross_platform}} --only-binary=:all: --python-version={{python_version}} --compile\") if cross_platform else None",
                 "run(\"rm cross-requirements.txt\") if cross_platform else None",
-            ]))
+            ]
         if _exists(self.path, "requirements.txt"):
             steps += [
                 "env(UV_PROJECT_ENVIRONMENT=local_venv[\"build\"] if cross_platform else venv[\"build\"])",
                 "run(f\"uv init --no-managed-python --python python{python_version}\", inputs=[], outputs=[\"uv.lock\"], group=\"install\")",
-                "run(f\"uv add -r requirements.txt\", inputs=[\"requirements.txt\"], group=\"install\")",
+                f"run(\"uv add -r requirements.txt {extra_deps}\", inputs=[\"requirements.txt\"], group=\"install\")",
                 "run(f\"uv pip compile requirements.txt --python-version={python_version} --universal --extra-index-url {python_extra_index_url} --index-url=https://pypi.org/simple --emit-index-url --only-binary :all: -o cross-requirements.txt\", inputs=[\"requirements.txt\"], outputs=[\"cross-requirements.txt\"]) if cross_platform else None",
-                "run(f\"uvx pip install -r cross-requirements.txt --target {python_cross_packages_path} --platform {cross_platform} --only-binary=:all: --python-version={python_version} --compile\") if cross_platform else None",
+                f"run(f\"uvx pip install -r cross-requirements.txt {extra_deps} --target {{python_cross_packages_path}} --platform {{cross_platform}} --only-binary=:all: --python-version={{python_version}} --compile\") if cross_platform else None",
                 "run(\"rm cross-requirements.txt\") if cross_platform else None",
             ]
 
@@ -230,7 +239,12 @@ class PythonProvider:
             "path((local_venv[\"build\"] if cross_platform else venv[\"build\"]) + \"/bin\")",
             "copy(\".\", \".\", ignore=[\".venv\", \".git\", \"__pycache__\"])",
         ]
-        return steps
+        if self.framework == PythonFramework.MCP:
+            steps += [
+                "run(\"mkdir -p {}/bin\".format(venv[\"build\"])) if cross_platform else None",
+                "run(\"cp {}/bin/mcp {}/bin/mcp\".format(local_venv[\"build\"], venv[\"build\"])) if cross_platform else None",
+            ]
+        return list(filter(None, steps))
 
     def prepare_steps(self) -> Optional[list[str]]:
         return [
@@ -273,6 +287,42 @@ class PythonProvider:
             else:
                 start_cmd = '"python -c \'print(\\\"No start command detected, please provide a start command manually\\\")\'"'
             return {"start": start_cmd}
+        elif self.framework == PythonFramework.Streamlit:
+            if _exists(self.path, "main.py"):
+                path = "main.py"
+            elif _exists(self.path, "src/main.py"):
+                path = "src/main.py"
+            if _exists(self.path, "app.py"):
+                path = "app.py"
+            elif _exists(self.path, "src/app.py"):
+                path = "src/app.py"
+            elif _exists(self.path, "src/streamlit_app.py"):
+                path = "src/streamlit_app.py"
+            elif _exists(self.path, "streamlit_app.py"):
+                path = "streamlit_app.py"
+            elif _exists(self.path, "Home.py"):
+                path = "Home.py"
+
+            start_cmd = f'"python -m streamlit run {path} --server.port 8000 --server.address 0.0.0.0 --server.headless true"'
+        elif self.framework == PythonFramework.Flask:
+            if _exists(self.path, "main.py"):
+                path = "main:app"
+            if _exists(self.path, "app.py"):
+                path = "app:app"
+            elif _exists(self.path, "src/main.py"):
+                path = "src.main:app"
+            # start_cmd = f'"python -m flask --app {path} run --debug --host 0.0.0.0 --port 8000"'
+            start_cmd = f'"python -m uvicorn {path} --interface=wsgi --host 0.0.0.0 --port 8000"'
+        elif self.framework == PythonFramework.MCP:
+            if _exists(self.path, "main.py"):
+                path = "main.py"
+            else:
+                path = next(self.path.glob( "**/main.py"))
+                if path:
+                    path = path.relative_to(self.path)
+                else:
+                    path = "main.py"
+            start_cmd = f'"python {{}}/bin/mcp run {path} --transport=streamable-http".format(venv[\"serve\"])'
         elif self.framework == PythonFramework.FastHTML:
             if _exists(self.path, "main.py"):
                 path = "main:app"
@@ -300,9 +350,16 @@ class PythonProvider:
     def env(self) -> Optional[Dict[str, str]]:
         # For Django projects, generate an empty env dict to surface the field
         # in the Shipit file. Other Python projects omit it by default.
-        return {
-            "PYTHONPATH": "python_serve_path"
+        env_vars = {
+            "PYTHONPATH": "python_serve_path",
+            "HOME": "app[\"serve\"]"
         }
+        if self.framework == PythonFramework.Streamlit:
+            env_vars["STREAMLIT_SERVER_HEADLESS"] = '"true"'
+        elif self.framework == PythonFramework.MCP:
+            env_vars["FASTMCP_HOST"] = "\"0.0.0.0\""
+            env_vars["FASTMCP_PORT"] = "\"8000\""
+        return env_vars
 
 def format_app_import(asgi_application: str) -> str:
     # Transform "mysite.asgi.application" to "mysite.asgi:application" using regex

shipit_cli-0.5.0/src/shipit/version.py

@@ -0,0 +1,5 @@
+__all__ = ["version", "version_info"]
+
+
+version = "0.5.0"
+version_info = (0, 5, 0, "final", 0)

shipit_cli-0.4.0/src/shipit/version.py

@@ -1,5 +0,0 @@
-__all__ = ["version", "version_info"]
-
-
-version = "0.4.0"
-version_info = (0, 4, 0, "final", 0)