arkitekt-next 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

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/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/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.dist-info → arkitekt_next-0.8.2.dist-info}/METADATA

@@ -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.dist-info → arkitekt_next-0.8.2.dist-info}/RECORD

@@ -67,7 +67,7 @@ arkitekt_next/cli/commands/inspect/templates.py,sha256=U99SLBYWiD-ZiIYV7pVWhQK3X
 arkitekt_next/cli/commands/inspect/variables.py,sha256=LonDlbS2qH1v-jD6RfEhTv-mxmgeBMKqD3oO2iDJRjE,2698
 arkitekt_next/cli/commands/kabinet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/kabinet/build.py,sha256=JyMgvp5X0j2DE4w3aLPyM6ffSulfFZ1mNkS4--3wlZM,8671
-arkitekt_next/cli/commands/kabinet/init.py,sha256=FMozj1kzrgdoZ13VR9BrPU8aqSlSynRRyoTPSkerBzU,2970
+arkitekt_next/cli/commands/kabinet/init.py,sha256=T6D7Vz05PUyyJ6noNqrMhVjz8hyZUfKv4Vgi1JVxz_k,3599
 arkitekt_next/cli/commands/kabinet/main.py,sha256=U5EWekRTsMZZ34abWFfwilhzrd-zZtpZbl8RsLN_bC8,1008
 arkitekt_next/cli/commands/kabinet/publish.py,sha256=zbjnoMliowje1nEuKFolFX5pZA2D_DzLjXlSxBbD88k,3596
 arkitekt_next/cli/commands/kabinet/stage.py,sha256=bXpC8fDmG6qFQVuLhqTCieOJnvFafj3Flg1BdIeciEw,2025
@@ -87,7 +87,7 @@ arkitekt_next/cli/commands/run/prod.py,sha256=EqDMa_eYNaffHZOBHGQEGNJVKdq8NHCgfo
 arkitekt_next/cli/commands/run/utils.py,sha256=zH-MNNEfKgyOYQvwP6Ph8KUHVqH48fw3ZI6tiQ9unwQ,325
 arkitekt_next/cli/configs/base.yaml,sha256=9IJ7B4Fq3swHsLUbKn1MlhhzJKqDI1wnR5PAG_VKs8A,30097
 arkitekt_next/cli/constants.py,sha256=ONXKA8LRxXQkOQ56ZElVMZSTiaIH1LE_ikmUUKem98g,1410
-arkitekt_next/cli/dockerfiles/vanilla.dockerfile,sha256=Gz-EJ7u2vQl-wVO1xQkgX21pI2-C2Rhi7byi7rtVxCA,208
+arkitekt_next/cli/dockerfiles/vanilla.dockerfile,sha256=0ujdG22rZ6v2n5TMHNA4HR5f1PP9KJvAQORz-DGHBpo,184
 arkitekt_next/cli/errors.py,sha256=zLTjaCbun6qM2nTldjyZd-DvykqKn5A3Gn80uYdx7Vc,93
 arkitekt_next/cli/inspect.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 arkitekt_next/cli/io.py,sha256=uRhq3SCI-sCiRp9TXK_hFqu5xub1h49XNixFqybHCpc,6821
@@ -110,7 +110,7 @@ arkitekt_next/cli/schemas/unlok.schema.graphql,sha256=fXR846snIBIqkuQ-PlYnSkQjkF
 arkitekt_next/cli/templates/filter.py,sha256=mD2jdNEXrZNagC_8WtuTisGJrGIbJDSylCvh19cF49I,650
 arkitekt_next/cli/templates/simple.py,sha256=IbcThJ5LryXVFQUdzxfHQCtzSNxEQWTxbD__Ygxsp4M,1171
 arkitekt_next/cli/texts.py,sha256=080QLAe8dhklkfoA8Yk6fLrQeRoUrTQLgWCZiWl7bNk,689
-arkitekt_next/cli/types.py,sha256=lpZFJaFOtYG4YyLe2JFY274laM5WFdbb0FLYuEj2Olw,10813
+arkitekt_next/cli/types.py,sha256=s6xhxNaoLxv_0SKPp_NoWHFbwZSRuGlId-HNm5Yf3F8,10443
 arkitekt_next/cli/ui.py,sha256=BR_AOsBIIHwojI5otBzT_560-ep5Dw1xAHKsO2zOOJQ,3493
 arkitekt_next/cli/utils.py,sha256=rl1hfQIVzepLHPN_ZWuvfVH-IIVqcSfiFGyfNtL1XCo,445
 arkitekt_next/cli/validators.py,sha256=XkLrOrDzBJwcG1keTawa_NJPt3QIBhb5KjepeH4N1KA,719
@@ -136,8 +136,8 @@ arkitekt_next/qt/utils.py,sha256=MgBPtPmCSBkIuATov3UgREESwxAHh77lWNNxyE7Qs48,773
 arkitekt_next/service_registry.py,sha256=oryaRLS2kalmV1Qf4_SWdLotBopTsdHNaVlnt1TGZyI,3607
 arkitekt_next/tqdm.py,sha256=FgrwpAwFTXBTEPY4rS7K4Gs8Wdjp74mUk4_OEU8hWZM,1526
 arkitekt_next/utils.py,sha256=csBRBnxnErMRTilNBYAtIe0lPBb6E3uplqwsVGs5Wkk,2390
-arkitekt_next-0.8.1.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.8.1.dist-info/METADATA,sha256=Htwl_oDy55g5Mu_kLq_c-ZIart__uHgWwqATY-oX_oc,6084
-arkitekt_next-0.8.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.8.1.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.8.1.dist-info/RECORD,,
+arkitekt_next-0.8.2.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.8.2.dist-info/METADATA,sha256=5xGJosqJBHVY4l4675ZssX42wjIJEcoAeq51xmHddXs,6084
+arkitekt_next-0.8.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.8.2.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.8.2.dist-info/RECORD,,