shipit-cli 0.3.4__py3-none-any.whl → 0.4.0__py3-none-any.whl

shipit/cli.py

@@ -55,6 +55,7 @@ class Serve:
     build: List["Step"]
     deps: List["Package"]
     commands: Dict[str, str]
+    cwd: Optional[str] = None
     assets: Optional[Dict[str, str]] = None
     prepare: Optional[List["PrepareStep"]] = None
     workers: Optional[List[str]] = None
@@ -577,18 +578,33 @@ class LocalBuilder:
             self.create_file(asset_path, assets[asset])
 
     def build_prepare(self, serve: Serve) -> None:
-        app_dir = self.get_build_path()
         self.prepare_bash_script.parent.mkdir(parents=True, exist_ok=True)
         commands: List[str] = []
+        if serve.cwd:
+            commands.append(f"cd {serve.cwd}")
         if serve.prepare:
             for step in serve.prepare:
                 if isinstance(step, RunStep):
                     commands.append(step.command)
                 elif isinstance(step, WorkdirStep):
                     commands.append(f"cd {step.path}")
-        content = "#!/bin/bash\ncd {app_dir}\n{body}".format(
-            app_dir=app_dir, body="\n".join(commands)
+        content = "#!/bin/bash\n{body}".format(
+            body="\n".join(commands)
         )
+        console.print(f"\n[bold]Created prepare.sh script to run before packaging ✅[/bold]")
+        manifest_panel = Panel(
+            Syntax(
+                content,
+                "bash",
+                theme="monokai",
+                background_color="default",
+                line_numbers=True,
+            ),
+            box=box.SQUARE,
+            border_style="bright_black",
+            expand=False,
+        )
+        console.print(manifest_panel, markup=False, highlight=True)
         self.prepare_bash_script.write_text(content)
         self.prepare_bash_script.chmod(0o755)
 
@@ -739,15 +755,35 @@ class WasmerBuilder:
             env_lines = ""
 
         commands: List[str] = []
+        if serve.cwd:
+            commands.append(f"cd {serve.cwd}")
+
         if serve.prepare:
             for step in serve.prepare:
                 if isinstance(step, RunStep):
                     commands.append(step.command)
                 elif isinstance(step, WorkdirStep):
                     commands.append(f"cd {step.path}")
+
         body = "\n".join(filter(None, [env_lines, *commands]))
+        content = f"#!/bin/bash\n\n{body}"
+        console.print(f"\n[bold]Created prepare.sh script to run before packaging ✅[/bold]")
+        manifest_panel = Panel(
+            Syntax(
+                content,
+                "bash",
+                theme="monokai",
+                background_color="default",
+                line_numbers=True,
+            ),
+            box=box.SQUARE,
+            border_style="bright_black",
+            expand=False,
+        )
+        console.print(manifest_panel, markup=False, highlight=True)
+
         (prepare_dir / "prepare.sh").write_text(
-            f"#!/bin/bash\n\n{body}",
+            content,
         )
         (prepare_dir / "prepare.sh").chmod(0o755)
 
@@ -842,7 +878,8 @@ class WasmerBuilder:
                 command.add("module", program_binary["script"])
                 command.add("runner", "wasi")
                 wasi_args = table()
-                wasi_args.add("cwd", "/app")
+                if serve.cwd:
+                    wasi_args.add("cwd", serve.cwd)
                 wasi_args.add("main-args", parts[1:])
                 env = program_binary.get("env") or {}
                 if serve.env:
@@ -1024,6 +1061,7 @@ class Ctx:
         build: List[str],
         deps: List[str],
         commands: Dict[str, str],
+        cwd: Optional[str] = None,
         assets: Optional[Dict[str, str]] = None,
         prepare: Optional[List[str]] = None,
         workers: Optional[List[str]] = None,
@@ -1043,6 +1081,7 @@ class Ctx:
             name=name,
             provider=provider,
             build=build_refs,
+            cwd=cwd,
             assets=assets,
             deps=dep_refs,
             commands=commands,
@@ -1433,7 +1472,7 @@ def main() -> None:
         app()
     except Exception as e:
         console.print(f"[bold red]{type(e).__name__}[/bold red]: {e}")
-        raise e
+        # raise e
 
 
 if __name__ == "__main__":

shipit/generator.py

@@ -115,8 +115,10 @@ def generate_shipit(path: Path) -> str:
             env_lines = ",\n".join([f'    "{k}": {v}' for k, v in plan.env.items()])
     assets_block = _render_assets(plan.assets)
     mounts_block = None
+    attach_serve_names: list[str] = []
     if plan.mounts:
-        mounts = filter(lambda m: m.attach_to_serve, plan.mounts)
+        mounts = list(filter(lambda m: m.attach_to_serve, plan.mounts))
+        attach_serve_names = [m.name for m in mounts]
         mounts_block = ",\n".join([f"    {m.name}" for m in mounts])
 
     out: List[str] = []
@@ -131,6 +133,9 @@ def generate_shipit(path: Path) -> str:
     out.append("serve(")
     out.append(f'  name="{plan.serve_name}",')
     out.append(f'  provider="{plan.provider}",')
+    # If app is mounted for serve, set cwd to the app serve path
+    if "app" in attach_serve_names:
+        out.append('  cwd=app["serve"],')
     out.append("  build=[")
     out.append(build_steps_block)
     out.append("  ],")

shipit/providers/python.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
+import re
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Dict, Optional, Set
+from enum import Enum
 
 from .base import (
     DetectResult,
@@ -12,9 +14,140 @@ from .base import (
 )
 
 
+class PythonFramework(Enum):
+    Django = "django"
+    FastAPI = "fastapi"
+    Flask = "flask"
+    FastHTML = "python-fasthtml"
+
+
+class PythonServer(Enum):
+    Hypercorn = "hypercorn"
+    Uvicorn = "uvicorn"
+    # Gunicorn = "gunicorn"
+    Daphne = "daphne"
+
+class DatabaseType(Enum):
+    MySQL = "mysql"
+    PostgreSQL = "postgresql"
+
+
 class PythonProvider:
+    framework: Optional[PythonFramework] = None
+    server: Optional[PythonServer] = None
+    database: Optional[DatabaseType] = None
+    extra_dependencies: Set[str]
+    asgi_application: Optional[str] = None
+    wsgi_application: Optional[str] = None
+
     def __init__(self, path: Path):
         self.path = path
+        if _exists(self.path, ".python-version"):
+            python_version = (self.path / ".python-version").read_text().strip()
+        else:
+            python_version = "3.13"
+        self.default_python_version = python_version
+        self.extra_dependencies = set()
+
+        pg_deps = {
+            "asyncpg",
+            "aiopg",
+            "psycopg",
+            "psycopg2",
+            "psycopg-binary",
+            "psycopg2-binary"}
+        mysql_deps = {"mysqlclient", "pymysql", "mysql-connector-python", "aiomysql"}
+        found_deps = self.check_deps(
+            "django",
+            "fastapi",
+            "flask",
+            "python-fasthtml",
+            "daphne",
+            "hypercorn",
+            "uvicorn",
+            # "gunicorn",
+            *mysql_deps,
+            *pg_deps,
+        )
+
+        # ASGI/WSGI Server
+        if "uvicorn" in found_deps:
+            server = PythonServer.Uvicorn
+        elif "hypercorn" in found_deps:
+            server = PythonServer.Hypercorn
+        # elif "gunicorn" in found_deps:
+        #     server = PythonServer.Gunicorn
+        elif "daphne" in found_deps:
+            server = PythonServer.Daphne
+        else:
+            server = None
+        self.server = server
+
+        # Set framework
+        if _exists(self.path, "manage.py") and ("django" in found_deps):
+            framework = PythonFramework.Django
+            # Find the settings.py file using glob
+            settings_file = next(self.path.glob( "**/settings.py"))
+            if settings_file:
+                asgi_match = re.search(r"ASGI_APPLICATION\s*=\s*['\"](.*)['\"]", settings_file.read_text())
+                if asgi_match:
+                    self.asgi_application = asgi_match.group(1)
+                else:
+                    wsgi_match = re.search(r"WSGI_APPLICATION\s*=\s*['\"](.*)['\"]", settings_file.read_text())
+                    if wsgi_match:
+                        self.wsgi_application = wsgi_match.group(1)
+
+            if not self.server:
+                if self.asgi_application:
+                    self.extra_dependencies = {"uvicorn"}
+                    self.server = PythonServer.Uvicorn
+                elif self.wsgi_application:
+                    # gunicorn can't run with Wasmer atm
+                    self.extra_dependencies = {"uvicorn"}
+                    self.server = PythonServer.Uvicorn
+        elif "fastapi" in found_deps:
+            framework = PythonFramework.FastAPI
+            if not self.server:
+                self.extra_dependencies = {"uvicorn"}
+                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
+        elif "python-fasthtml" in found_deps:
+            framework = PythonFramework.FastHTML
+        else:
+            framework = None
+        self.framework = framework
+
+        # Database
+        if mysql_deps & found_deps:
+            database = DatabaseType.MySQL
+        elif pg_deps & found_deps:
+            database = DatabaseType.PostgreSQL
+        else:
+            database = None
+        self.database = database
+
+    def check_deps(self, *deps: str) -> Set[str]:
+        deps = set([dep.lower() for dep in deps])
+        initial_deps = set(deps)
+        for file in ["requirements.txt", "pyproject.toml"]:
+            if _exists(self.path, file):
+                for line in (self.path / file).read_text().splitlines():
+                    for dep in set(deps):
+                        if dep in line.lower():
+                            deps.remove(dep)
+                            if not deps:
+                                break
+                    if not deps:
+                        break
+            if not deps:
+                break
+        return initial_deps-deps
+
     @classmethod
     def name(cls) -> str:
         return "python"
@@ -37,16 +170,11 @@ class PythonProvider:
         return "python"
 
     def dependencies(self) -> list[DependencySpec]:
-        if _exists(self.path, ".python-version"):
-            python_version = (self.path / ".python-version").read_text().strip()
-        else:
-            python_version = "3.13"
-
         return [
             DependencySpec(
                 "python",
                 env_var="SHIPIT_PYTHON_VERSION",
-                default_version=python_version,
+                default_version=self.default_python_version,
                 use_in_build=True,
                 use_in_serve=True,
             ),
@@ -63,7 +191,8 @@ class PythonProvider:
             "cross_platform = getenv(\"SHIPIT_PYTHON_CROSS_PLATFORM\")\n"
             "python_extra_index_url = getenv(\"SHIPIT_PYTHON_EXTRA_INDEX_URL\")\n"
             "precompile_python = getenv(\"SHIPIT_PYTHON_PRECOMPILE\") in [\"true\", \"True\", \"TRUE\", \"1\", \"on\", \"yes\", \"y\", \"Y\", \"YES\", \"On\", \"ON\"]\n"
-            "python_cross_packages_path = venv[\"build\"] + f\"/lib/python{python_version}/site-packages\""
+            "python_cross_packages_path = venv[\"build\"] + f\"/lib/python{python_version}/site-packages\"\n"
+            "python_serve_path = \"{}/lib/python{}/site-packages\".format(venv[\"serve\"], python_version)\n"
         )
 
     def build_steps(self) -> list[str]:
@@ -78,13 +207,15 @@ class PythonProvider:
                 input_files.append("uv.lock")
                 extra_args = " --locked"
             inputs = ", ".join([f"\"{input}\"" for input in input_files])
-            steps += [
+            extra_deps = ", ".join([f"{dep}" for dep in self.extra_dependencies])
+            steps += list(filter(None, [
                 "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",
-                "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",
-            ]
+            ]))
         if _exists(self.path, "requirements.txt"):
             steps += [
                 "env(UV_PROJECT_ENVIRONMENT=local_venv[\"build\"] if cross_platform else venv[\"build\"])",
@@ -103,24 +234,57 @@ class PythonProvider:
 
     def prepare_steps(self) -> Optional[list[str]]:
         return [
-            'workdir(app["serve"])',
             'run("echo \\\"Precompiling Python code...\\\"") if precompile_python else None',
-            'run("python -m compileall -o 2 $PYTHONPATH") if precompile_python else None',
+            'run(f"python -m compileall -o 2 {python_serve_path}") if precompile_python else None',
             'run("echo \\\"Precompiling package code...\\\"") if precompile_python else None',
-            'run("python -m compileall -o 2 .") if precompile_python else None',
+            'run("python -m compileall -o 2 {}".format(app["serve"])) if precompile_python else None',
         ]
 
     def commands(self) -> Dict[str, str]:
-        if _exists(self.path, "manage.py"):
-            start_cmd = '"python manage.py runserver 0.0.0.0:8000"'
+        if self.framework == PythonFramework.Django:
+            start_cmd = None
+            if self.server == PythonServer.Daphne and self.asgi_application:
+                asgi_application = format_app_import(self.asgi_application)
+                start_cmd = f'"python -m daphne {asgi_application} --bind 0.0.0.0 --port 8000"'
+            elif self.server == PythonServer.Uvicorn:
+                if self.asgi_application:
+                    asgi_application = format_app_import(self.asgi_application)
+                    start_cmd = f'"python -m uvicorn {asgi_application} --host 0.0.0.0 --port 8000"'
+                elif self.wsgi_application:
+                    wsgi_application = format_app_import(self.wsgi_application)
+                    start_cmd = f'"python -m uvicorn {wsgi_application} --interface=wsgi --host 0.0.0.0 --port 8000"'
+            # elif self.server == PythonServer.Gunicorn:
+            #     start_cmd = f'"python -m gunicorn {self.wsgi_application} --bind 0.0.0.0 --port 8000"'
+            if not start_cmd:
+                # We run the default runserver command if no server is specified
+                start_cmd = '"python manage.py runserver 0.0.0.0:8000"'
             migrate_cmd = '"python manage.py migrate"'
             return {"start": start_cmd, "after_deploy": migrate_cmd}
+        elif self.framework == PythonFramework.FastAPI:
+            if _exists(self.path, "main.py"):
+                path = "main:app"
+            elif _exists(self.path, "src/main.py"):
+                path = "src.main:app"
+            
+            if self.server == PythonServer.Uvicorn:
+                start_cmd = f'"python -m uvicorn {path} --host 0.0.0.0 --port 8000"'
+            elif self.server == PythonServer.Hypercorn:
+                start_cmd = f'"python -m hypercorn {path} --bind 0.0.0.0:8000"'
+            else:
+                start_cmd = '"python -c \'print(\\\"No start command detected, please provide a start command manually\\\")\'"'
+            return {"start": start_cmd}
+        elif self.framework == PythonFramework.FastHTML:
+            if _exists(self.path, "main.py"):
+                path = "main:app"
+            elif _exists(self.path, "src/main.py"):
+                path = "src.main:app"
+            start_cmd = f'"python -m uvicorn {path} --host 0.0.0.0 --port 8000"'
         elif _exists(self.path, "main.py"):
             start_cmd = '"python main.py"'
         elif _exists(self.path, "src/main.py"):
             start_cmd = '"python src/main.py"'
         else:
-            start_cmd = '"python -c \'print(\\\"Hello, World!\\\")\'"'
+            start_cmd = '"python -c \'print(\\\"No start command detected, please provide a start command manually\\\")\'"'
         return {"start": start_cmd}
 
     def assets(self) -> Optional[Dict[str, str]]:
@@ -137,5 +301,9 @@ class PythonProvider:
         # 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": "\"{}/lib/python{}/site-packages\".format(venv[\"serve\"], python_version)"
+            "PYTHONPATH": "python_serve_path"
         }
+
+def format_app_import(asgi_application: str) -> str:
+    # Transform "mysite.asgi.application" to "mysite.asgi:application" using regex
+    return re.sub(r"\.([^.]+)$", r":\1", asgi_application)

shipit/version.py

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

{shipit_cli-0.3.4.dist-info → shipit_cli-0.4.0.dist-info}/METADATA

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

{shipit_cli-0.3.4.dist-info → shipit_cli-0.4.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 shipit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shipit/cli.py,sha256=extuf-zJzjddNXbQR5m-e_SfpdtJmL7WaFHSsBtZZqM,48402
-shipit/generator.py,sha256=qU619Qa17nqERTC2kf0-TDUFUz4x5BQw9Wf6_wuJ0ow,5513
-shipit/version.py,sha256=YaMLXH-p3IyMxUWoEEPfD6W-m8ydr8DTML_Nv8fy5HM,95
+shipit/cli.py,sha256=5b5e1H-SscXBraZXxJ5cVs_IJSNqjWUt2IjcZtOdALE,49615
+shipit/generator.py,sha256=4pezEo4OzpDFSFqiFpGCpdwo72VkItS490R_f2rIz2k,5755
+shipit/version.py,sha256=zmMUF3ZPl6yX0INjIEDY59a3aBdXE4OLXagX09Ji9cE,95
 shipit/assets/php/php.ini,sha256=f4irndAjB4GuuouEImRkNV22Q-yw1KqR-43jAMDw730,2531
 shipit/providers/base.py,sha256=a_5VA1tV4_QbH83yjPCTHsNR23EJT2CiKUpWA_pu_lo,2373
 shipit/providers/gatsby.py,sha256=uwNjIJloS9JwKXqkbhihgdTTpJL4iL4bLCZ5kuzqqNs,2138
@@ -10,10 +10,10 @@ shipit/providers/laravel.py,sha256=rDpfx7RyF4sK0xxDAWefX0IiguU2xdgEXP2jJp1Jdzo,2
 shipit/providers/mkdocs.py,sha256=QJFNt7QWMvYbWeo7WjOgFVKGVcdUnUmUNfFbe4c8ThM,2812
 shipit/providers/node_static.py,sha256=K55BXkNz4QXSXR2wdg5diP6HLpmksC70ph16zox7v6Y,2309
 shipit/providers/php.py,sha256=Hmtv47K5qtYbQ3v9SSk-_KTNlhXedStg2MxhTTOK9ac,2594
-shipit/providers/python.py,sha256=h6QZ9gDwQu2e-FaIVLrogHXpr6FwofhQZNFdZK0aw8A,6393
+shipit/providers/python.py,sha256=KnDH7nB1Ipz_oAqXPBz7FbEo3s7kwvQOhOZSHKCpltw,13430
 shipit/providers/registry.py,sha256=UisII1dr24ZxmDD8GnpTsyNwPN9W8MnAHQ1Px1iJ-OQ,661
 shipit/providers/staticfile.py,sha256=Y4oqw6dNDU2crzcWQ5SEgnXHoDy0CXRntABwlgdf1mo,1827
-shipit_cli-0.3.4.dist-info/METADATA,sha256=6EE4IOFyNKDiXZW6aN1Gww_ZUT_fz-heyN8GFMBdca4,462
-shipit_cli-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shipit_cli-0.3.4.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
-shipit_cli-0.3.4.dist-info/RECORD,,
+shipit_cli-0.4.0.dist-info/METADATA,sha256=_B-0rn-0ASJDMFL4faoV5mTzOSpi5ge5bdJuFjio3tc,462
+shipit_cli-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shipit_cli-0.4.0.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
+shipit_cli-0.4.0.dist-info/RECORD,,