shipit-cli 0.5.2__tar.gz → 0.6.1__tar.gz

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/PKG-INFO

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

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/pyproject.toml

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

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/cli.py

@@ -16,6 +16,7 @@ from typing import (
     Set,
     TypedDict,
     Union,
+    Literal,
     cast,
 )
 from shutil import copy, copytree, ignore_patterns
@@ -48,6 +49,12 @@ class Mount:
     serve_path: Path
 
 
+@dataclass
+class Service:
+    name: str
+    provider: Literal["postgres", "mysql", "redis"] # Right now we only support postgres and mysql
+
+
 @dataclass
 class Serve:
     name: str
@@ -61,6 +68,7 @@ class Serve:
     workers: Optional[List[str]] = None
     mounts: Optional[List[Mount]] = None
     env: Optional[Dict[str, str]] = None
+    services: Optional[List[Service]] = None
 
 
 @dataclass
@@ -309,10 +317,10 @@ RUN chmod {oct(mode)[2:]} {path.absolute()}
             return
         if dependency.version:
             self.docker_file_contents += (
-                f"RUN pkgm install {dependency.name}@{dependency.version}\n"
+                f"RUN mise use --global {dependency.name}@{dependency.version}\n"
             )
         else:
-            self.docker_file_contents += f"RUN pkgm install {dependency.name}\n"
+            self.docker_file_contents += f"RUN mise use --global {dependency.name}\n"
 
     def build(
         self, env: Dict[str, str], mounts: List[Mount], steps: List[Step]
@@ -320,15 +328,26 @@ RUN chmod {oct(mode)[2:]} {path.absolute()}
         base_path = self.docker_path
         shutil.rmtree(base_path, ignore_errors=True)
         base_path.mkdir(parents=True, exist_ok=True)
-        self.docker_file_contents = "FROM debian:bookworm-slim AS build\n"
+        self.docker_file_contents = "FROM debian:trixie-slim AS build\n"
+
         self.docker_file_contents += """
 RUN apt-get update \\
-    && apt-get -y --no-install-recommends install sudo curl ca-certificates locate git zip unzip \\
+    && apt-get -y --no-install-recommends install \\
+        build-essential gcc make \\
+        dpkg-dev pkg-config \\
+        libmariadb-dev libmariadb-dev-compat libpq-dev \\
+        sudo curl ca-certificates \\
     && rm -rf /var/lib/apt/lists/*
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-RUN curl https://pkgx.sh | sh
+ENV MISE_DATA_DIR="/mise"
+ENV MISE_CONFIG_DIR="/mise"
+ENV MISE_CACHE_DIR="/mise/cache"
+ENV MISE_INSTALL_PATH="/usr/local/bin/mise"
+ENV PATH="/mise/shims:$PATH"
+# ENV MISE_VERSION="..."
+
+RUN curl https://mise.run | sh
 """
         # docker_file_contents += "RUN curl https://mise.run | sh\n"
         #         self.docker_file_contents += """
@@ -624,20 +643,31 @@ class LocalBuilder:
 
     def build_serve(self, serve: Serve) -> None:
         console.print("\n[bold]Building serve[/bold]")
-        build_path = self.get_build_path()
         serve_command_path = self.get_serve_path() / "bin"
         serve_command_path.mkdir(parents=True, exist_ok=False)
         path = self.get_path() / ".path"
-        # path_resolved = [str((build_path/path).resolve()) for path in path.read_text().split(os.pathsep) if path]
-        # path_text = os.pathsep.join(path_resolved)
         path_text = path.read_text()
         console.print(f"[bold]Serve Commands:[/bold]")
         for command in serve.commands:
             console.print(f"* {command}")
             command_path = serve_command_path / command
+            content = f"#!/bin/bash\ncd {serve.cwd}\nPATH={path_text}:$PATH {serve.commands[command]}"
             command_path.write_text(
-                f"#!/bin/bash\ncd {build_path}\nPATH={path_text}:$PATH {serve.commands[command]}"
+                content
+            )
+            manifest_panel = Panel(
+                Syntax(
+                    content.strip(),
+                    "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)
             command_path.chmod(0o755)
 
     def run_serve_command(self, command: str) -> None:
@@ -686,6 +716,13 @@ class WasmerBuilder:
             },
             "scripts": {"pandoc"},
         },
+        "ffmpeg": {
+            "dependencies": {
+                "latest": "wasmer/ffmpeg@=1.0.5",
+                "N-111519": "wasmer/ffmpeg@=1.0.5",
+            },
+            "scripts": {"ffmpeg"},
+        },
         "php": {
             "dependencies": {
                 "latest": "php/php-32@=8.3.2104",
@@ -943,8 +980,46 @@ class WasmerBuilder:
             }
         # Update the app to use the new package
         yaml_config["package"] = "."
+        if serve.services:
+            capabilities = yaml_config.get("capabilities", {})
+            has_mysql = any(service.provider == "mysql" for service in serve.services)
+            # has_postgres = any(service.provider == "postgres" for service in serve.services)
+            # has_redis = any(service.provider == "redis" for service in serve.services)
+            if has_mysql:
+                capabilities["database"] = {
+                    "engine": "mysql"
+                }
+            yaml_config["capabilities"] = capabilities
+
+        if "after_deploy" in serve.commands:
+            jobs = yaml_config.get("jobs", [])
+            jobs.append({
+                "name": "after_deploy",
+                "trigger": "post-deployment",
+                "action": {
+                    "execute": {
+                        "command": "after_deploy"
+                    }
+                }
+            })
+            yaml_config["jobs"] = jobs
 
         app_yaml = yaml.dump(yaml_config)
+
+        console.print(f"\n[bold]Created app.yaml manifest ✅[/bold]")
+        app_yaml_panel = Panel(
+            Syntax(
+                app_yaml.strip(),
+                "yaml",
+                theme="monokai",
+                background_color="default",
+                line_numbers=True,
+            ),
+            box=box.SQUARE,
+            border_style="bright_black",
+            expand=False,
+        )
+        console.print(app_yaml_panel, markup=False, highlight=True)
         (self.wasmer_dir_path / "app.yaml").write_text(app_yaml)
 
         # self.inner_builder.build_serve(serve)
@@ -1026,12 +1101,17 @@ class Ctx:
         self.steps: List[Step] = []
         self.serves: Dict[str, Serve] = {}
         self.mounts: List[Mount] = []
+        self.services: Dict[str, Service] = {}
 
     def add_package(self, package: Package) -> str:
         index = f"{package.name}@{package.version}" if package.version else package.name
         self.packages[index] = package
         return f"ref:package:{index}"
 
+    def add_service(self, service: Service) -> str:
+        self.services[service.name] = service
+        return f"ref:service:{service.name}"
+
     def get_ref(self, index: str) -> Any:
         if index.startswith("ref:package:"):
             return self.packages[index[len("ref:package:") :]]
@@ -1043,6 +1123,8 @@ class Ctx:
             return self.steps[int(index[len("ref:step:") :])]
         elif index.startswith("ref:mount:"):
             return self.mounts[int(index[len("ref:mount:") :])]
+        elif index.startswith("ref:service:"):
+            return self.services[index[len("ref:service:") :]]
         else:
             raise Exception(f"Invalid reference: {index}")
 
@@ -1072,6 +1154,10 @@ class Ctx:
     def dep(self, name: str, version: Optional[str] = None) -> str:
         package = Package(name, version)
         return self.add_package(package)
+    
+    def service(self, name: str, provider: Literal["postgres", "mysql", "redis"]) -> str:
+        service = Service(name, provider)
+        return self.add_service(service)
 
     def serve(
         self,
@@ -1086,6 +1172,7 @@ class Ctx:
         workers: Optional[List[str]] = None,
         mounts: Optional[List[Mount]] = None,
         env: Optional[Dict[str, str]] = None,
+        services: Optional[List[str]] = None,
     ) -> str:
         build_refs = [cast(Step, r) for r in self.get_refs(build)]
         prepare_steps: Optional[List[PrepareStep]] = None
@@ -1110,6 +1197,7 @@ class Ctx:
             if mounts
             else None,
             env=env,
+            services=self.get_refs(services) if services else None,
         )
         return self.add_serve(serve)
 
@@ -1435,6 +1523,7 @@ def build(
     glb = sl.Globals.standard()
     mod = sl.Module()
 
+    mod.add_callable("service", ctx.service)
     mod.add_callable("getenv", ctx.getenv)
     mod.add_callable("dep", ctx.dep)
     mod.add_callable("serve", ctx.serve)

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/generator.py

@@ -89,6 +89,7 @@ def generate_shipit(path: Path) -> str:
         dependencies=provider.dependencies(),
         build_steps=provider.build_steps(),
         prepare=provider.prepare_steps(),
+        services=provider.services(),
         commands=provider.commands(),
         env=provider.env(),
     )
@@ -127,6 +128,10 @@ def generate_shipit(path: Path) -> str:
         out.append("")
     for m in plan.mounts:
         out.append(f"{m.name} = mount(\"{m.name}\")")
+    if plan.services:
+        for s in plan.services:
+            out.append(f"{s.name} = service(\n  name=\"{s.name}\",\n  provider=\"{s.provider}\"\n)")
+
     if plan.declarations:
         out.append(plan.declarations)
         out.append("")
@@ -157,6 +162,11 @@ def generate_shipit(path: Path) -> str:
     out.append("  commands = {")
     out.append(commands_lines)
     out.append("  },")
+    if plan.services:
+        out.append("  services=[")
+        for s in plan.services:
+            out.append(f"    {s.name},")
+        out.append("  ],")
     if mounts_block:
         out.append("  mounts=[")
         out.append(mounts_block)

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/base.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Dict, List, Optional, Protocol
+from typing import Dict, List, Optional, Protocol, Literal
 
 
 @dataclass
@@ -28,6 +28,7 @@ class Provider(Protocol):
     def prepare_steps(self) -> Optional[List[str]]: ...
     def commands(self) -> Dict[str, str]: ...
     def assets(self) -> Optional[Dict[str, str]]: ...
+    def services(self) -> List["ServiceSpec"]: ...
     def mounts(self) -> List["MountSpec"]: ...
     def env(self) -> Optional[Dict[str, str]]: ...
 
@@ -49,6 +50,12 @@ class MountSpec:
     attach_to_serve: bool = True
 
 
+@dataclass
+class ServiceSpec:
+    name: str
+    provider: Literal["postgres", "mysql", "redis"]
+
+
 @dataclass
 class ProviderPlan:
     serve_name: str
@@ -58,6 +65,7 @@ class ProviderPlan:
     dependencies: List[DependencySpec] = field(default_factory=list)
     build_steps: List[str] = field(default_factory=list)
     prepare: Optional[List[str]] = None
+    services: List[ServiceSpec] = field(default_factory=list)
     commands: Dict[str, str] = field(default_factory=dict)
     assets: Optional[Dict[str, str]] = None
     env: Optional[Dict[str, str]] = None

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/gatsby.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, _has_dependency, MountSpec
+from .base import DetectResult, DependencySpec, Provider, _exists, _has_dependency, MountSpec, ServiceSpec
 
 
 class GatsbyProvider:
@@ -70,3 +70,6 @@ class GatsbyProvider:
 
     def env(self) -> Optional[Dict[str, str]]:
         return None
+    
+    def services(self) -> list[ServiceSpec]:
+        return []

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/hugo.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists
+from .base import DetectResult, DependencySpec, Provider, _exists, ServiceSpec
 from .staticfile import StaticFileProvider
 
 class HugoProvider(StaticFileProvider):
@@ -45,3 +45,6 @@ class HugoProvider(StaticFileProvider):
             'copy(".", ".", ignore=[".git"])',
             'run("hugo build --destination={}".format(app["build"]), group="build")',
         ]
+    
+    def services(self) -> list[ServiceSpec]:
+        return []

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/laravel.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec
+from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec, ServiceSpec
 
 
 class LaravelProvider:
@@ -81,3 +81,6 @@ class LaravelProvider:
 
     def env(self) -> Optional[Dict[str, str]]:
         return None
+    
+    def services(self) -> list[ServiceSpec]:
+        return []

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/mkdocs.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec
+from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec, ServiceSpec
 from .staticfile import StaticFileProvider
 from .python import PythonProvider
 
@@ -58,3 +58,6 @@ class MkdocsProvider(StaticFileProvider):
 
     def env(self) -> Optional[Dict[str, str]]:
         return self.python_provider.env()
+    
+    def services(self) -> list[ServiceSpec]:
+        return []

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/node_static.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, _has_dependency, MountSpec
+from .base import DetectResult, DependencySpec, Provider, _exists, _has_dependency, MountSpec, ServiceSpec
 
 
 class NodeStaticProvider:
@@ -71,3 +71,6 @@ class NodeStaticProvider:
 
     def env(self) -> Optional[Dict[str, str]]:
         return None
+    
+    def services(self) -> list[ServiceSpec]:
+        return []

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/php.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec
+from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec, ServiceSpec
 
 
 class PhpProvider:
@@ -80,3 +80,6 @@ class PhpProvider:
 
     def env(self) -> Optional[Dict[str, str]]:
         return None
+    
+    def services(self) -> list[ServiceSpec]:
+        return []

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/python.py

@@ -11,6 +11,7 @@ from .base import (
     Provider,
     _exists,
     MountSpec,
+    ServiceSpec,
 )
 
 
@@ -74,7 +75,7 @@ class PythonProvider:
             "psycopg-binary",
             "psycopg2-binary",
         }
-        mysql_deps = {"mysqlclient", "pymysql", "mysql-connector-python", "aiomysql"}
+        mysql_deps = {"mysqlclient", "pymysql", "mysql-connector-python", "aiomysql", "asyncmy"}
         found_deps = self.check_deps(
             "file://",  # This is not really a dependency, but as a way to check if the install script requires all files
             "streamlit",
@@ -238,6 +239,15 @@ class PythonProvider:
                     use_in_serve=True,
                 )
             )
+        if self.uses_ffmpeg:
+            deps.append(
+                DependencySpec(
+                    "ffmpeg",
+                    env_var="SHIPIT_FFMPEG_VERSION",
+                    use_in_build=False,
+                    use_in_serve=True,
+                )
+            )
         return deps
 
     def declarations(self) -> Optional[str]:
@@ -438,6 +448,13 @@ class PythonProvider:
             env_vars["FASTMCP_HOST"] = '"0.0.0.0"'
             env_vars["FASTMCP_PORT"] = '"8000"'
         return env_vars
+    
+    def services(self) -> list[ServiceSpec]:
+        if self.database == DatabaseType.MySQL:
+            return [ServiceSpec(name="database", provider="mysql")]
+        elif self.database == DatabaseType.PostgreSQL:
+            return [ServiceSpec(name="database", provider="postgres")]
+        return []
 
 
 def format_app_import(asgi_application: str) -> str:

{shipit_cli-0.5.2 → shipit_cli-0.6.1}/src/shipit/providers/staticfile.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Dict, Optional
 
-from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec
+from .base import DetectResult, DependencySpec, Provider, _exists, MountSpec, ServiceSpec
 
 
 class StaticFileProvider:
@@ -68,3 +68,6 @@ class StaticFileProvider:
 
     def env(self) -> Optional[Dict[str, str]]:
         return None
+    
+    def services(self) -> list[ServiceSpec]:
+        return []

shipit_cli-0.6.1/src/shipit/version.py

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

shipit_cli-0.5.2/src/shipit/version.py

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