arkitekt-next 0.8.1__tar.gz → 0.8.2__tar.gz

{arkitekt_next-0.8.1 → arkitekt_next-0.8.2}/PKG-INFO

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

{arkitekt_next-0.8.1 → arkitekt_next-0.8.2}/arkitekt_next/cli/commands/kabinet/init.py

@@ -1,3 +1,4 @@
+from importlib.metadata import version
 from arkitekt_next.cli.constants import compile_dockerfiles
 from arkitekt_next.cli.types import Flavour
 from arkitekt_next.cli.utils import build_relative_dir
@@ -46,6 +47,13 @@ import os
     is_flag=True,
     default=False,
 )
+@click.option(
+    "--arkitekt-version",
+    "-av",
+    help="Which Arkitekt-version should we use to mount in the container?",
+    default=None,
+    type=str,
+)
 @click.pass_context
 def init(
     ctx: Context,
@@ -54,6 +62,7 @@ def init(
     flavour: str,
     template: str,
     devcontainer: bool,
+    arkitekt_version: str = None,
 ) -> None:
     """Runs the port wizard to generate a dockerfile to be used with port"""
 
@@ -78,6 +87,15 @@ def init(
         dockerfile="Dockerfile",
     )
 
+
+    try:
+        package_version = arkitekt_version or version('arkitekt_next')
+        print(f"Detected Arkitekt Package version: {package_version}")
+    except:
+        raise click.ClickException("Could not detect the Arkitekt package version (maybe you are running a dev version). Please provide it with the --arkitekt-version flag")
+        
+
+
     with open(config_file, "w") as file:
         yaml.dump(fl.dict(), file)
 
@@ -85,7 +103,7 @@ def init(
         dockerfile_content = f.read()
 
     with open(dockerfile, "w") as f:
-        f.write(dockerfile_content)
+        f.write(dockerfile_content.format(__arkitekt_version__=package_version))
 
     if devcontainer or click.confirm("Do you want to create a devcontainer.json file?"):
         create_devcontainer_file(manifest, flavour, dockerfile)

{arkitekt_next-0.8.1 → arkitekt_next-0.8.2}/arkitekt_next/cli/dockerfiles/vanilla.dockerfile

@@ -1,7 +1,6 @@
 FROM python:3.11-slim-buster
-ARG ARKITEKT_VERSION=0.8.0
 
-RUN pip install "arkitekt-next[all]>=${ARKITEKT_VERSION}"
+RUN pip install "arkitekt-next[all]>={__arkitekt_version__}"
 
 RUN mkdir /app
 WORKDIR /app

{arkitekt_next-0.8.1 → arkitekt_next-0.8.2}/arkitekt_next/cli/types.py

@@ -14,6 +14,7 @@ from rekuest_next.api.schema import TemplateInput
 ALLOWED_BUILDER_KEYS = [
     "tag",
     "dockerfile",
+    "package_version",
 ]
 
 
@@ -229,8 +230,6 @@ class Flavour(BaseModel):
             "-f",
             "{dockerfile}",
             ".",
-            "--build-arg",
-            "ARKITEKT_VERSION={package_version}",
         ]
     )
 
@@ -248,18 +247,10 @@ class Flavour(BaseModel):
     def generate_build_command(self, tag: str, relative_dir: str):
         """Generates the build command for this flavour"""
 
-        try:
-            package_version = version('arkitekt_next')
-            print(f"Detected Arkitekt Package version: {package_version}")
-        except:
-            package_version = "0.8.0"
-            print("Could not detect Arkitekt Package version. Using 0.8.0")
-        
-
 
         dockerfile = os.path.join(relative_dir, self.dockerfile)
 
-        return [v.format(tag=tag, dockerfile=dockerfile, package_version=package_version) for v in self.build_command]
+        return [v.format(tag=tag, dockerfile=dockerfile) for v in self.build_command]
 
     def check_relative_paths(self, flavour_folder: str):
         """Checks that the paths are relative to the flavour folder"""

{arkitekt_next-0.8.1 → arkitekt_next-0.8.2}/pyproject.toml

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