arkitekt-next 0.7.25__tar.gz → 0.7.28__tar.gz

{arkitekt_next-0.7.25 → arkitekt_next-0.7.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.25
+Version: 0.7.28
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs

{arkitekt_next-0.7.25 → arkitekt_next-0.7.28}/arkitekt_next/cli/commands/kabinet/init.py

@@ -4,7 +4,8 @@ from arkitekt_next.cli.utils import build_relative_dir
 import rich_click as click
 from click import Context
 from rich import get_console
-from arkitekt_next.utils import create_arkitekt_next_folder
+from arkitekt_next.cli.vars import get_manifest
+from arkitekt_next.utils import create_arkitekt_next_folder, create_devcontainer_file
 import yaml
 from rich.panel import Panel
 
@@ -38,9 +39,16 @@ import os
     default="vanilla",
     type=click.Choice(compile_dockerfiles()),
 )
+@click.option(
+    "--devcontainer",
+    "-d",
+    help="Shouwld we create a devcontainer.json file?",
+    is_flag=True,
+    default=False,
+)
 @click.pass_context
 def init(
-    ctx: Context, description: str, overwrite: bool, flavour: str, template: str
+    ctx: Context, description: str, overwrite: bool, flavour: str, template: str, devcontainer: bool
 ) -> None:
     """Runs the port wizard to generate a dockerfile to be used with port"""
 
@@ -57,6 +65,8 @@ def init(
     config_file = os.path.join(flavour_folder, "config.yaml")
     dockerfile = os.path.join(flavour_folder, "Dockerfile")
 
+    manifest = get_manifest(ctx)
+
     fl = Flavour(
         selectors=[],
         description=description,
@@ -72,6 +82,11 @@ def init(
     with open(dockerfile, "w") as f:
         f.write(dockerfile_content)
 
+
+    if devcontainer or click.confirm("Do you want to create a devcontainer.json file?"):
+        create_devcontainer_file(manifest, flavour, dockerfile)
+
+
     panel = Panel(
         title=f"Created new flavour [bold]{flavour}[/bold]\n",
         renderable="You can now edit the Dockerfile and add selectors to the config.yaml file\n"

{arkitekt_next-0.7.25 → arkitekt_next-0.7.28}/arkitekt_next/cli/types.py

@@ -329,7 +329,7 @@ class Build(BaseModel):
         default_factory=lambda: ["docker", "run", "-it", "--net", "host"]
     )
     base_arkitekt_next_command: List[str] = Field(
-        default_factory=lambda: ["arkitekt_next", "run", "prod", "--headless"]
+        default_factory=lambda: ["arkitekt-next", "run", "prod", "--headless"]
     )
 
     def build_docker_command(self) -> List[str]:

{arkitekt_next-0.7.25 → arkitekt_next-0.7.28}/arkitekt_next/utils.py

@@ -1,4 +1,6 @@
 import os
+from arkitekt_next.model import Manifest
+import json 
 
 
 def create_arkitekt_next_folder(with_cache: bool = True) -> str:
@@ -36,3 +38,37 @@ def create_arkitekt_next_folder(with_cache: bool = True) -> str:
             )
 
     return os.path.abspath(".arkitekt_next")
+
+
+
+def create_devcontainer_file(manifest: Manifest, flavour: str, docker_file_path, devcontainer_path=".devcontainer", ) -> None:
+    """Creates a devcontainer.json file in the flavour folder.
+
+    Parameters
+    ----------
+    flavour_folder : str
+        The path to the flavour folder.
+    """
+
+    os.makedirs(devcontainer_path, exist_ok=True)
+
+    flavour_container = os.path.join(devcontainer_path, flavour)
+    os.makedirs(os.path.join(devcontainer_path, flavour), exist_ok=True)
+
+
+
+
+    
+
+
+    devcontainer_file = os.path.join(flavour_container, "devcontainer.json")
+
+    
+    devcontainer_content = {}
+    devcontainer_content["name"] = f"{manifest.identifier} {flavour} Devcontainer"
+    devcontainer_content["build"] = {}
+    devcontainer_content["build"]["dockerfile"] = os.path.join("..", docker_file_path)
+    devcontainer_content["build"]["context"] = "../.." # This is the root of the project
+    devcontainer_content["runArgs"] = ["--network=host"]
+    
+    json.dump(devcontainer_content, open(devcontainer_file, "w"), indent=4)

{arkitekt_next-0.7.25 → arkitekt_next-0.7.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.25"
+version = "0.7.28"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"