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

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

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

{arkitekt_next-0.8.0 → 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.0 → arkitekt_next-0.8.2}/arkitekt_next/cli/dockerfiles/vanilla.dockerfile

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

{arkitekt_next-0.8.0 → arkitekt_next-0.8.2}/arkitekt_next/cli/io.py

@@ -9,7 +9,6 @@ from arkitekt_next.cli.types import (
     Deployment,
     Flavour,
     DeploymentsConfigFile,
-    DefinitionInput,
 )
 import yaml
 import json
@@ -202,7 +201,6 @@ def generate_deployment(
     deployment_run: str,
     build: Build,
     image: str,
-    definitions: Optional[List[DefinitionInput]] = None,
 ) -> Deployment:
     """Generates a deployment from a build and an image
 

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

@@ -1,3 +1,4 @@
+from importlib.metadata import version
 from pydantic import BaseModel, Field, validator
 import datetime
 from typing import List, Optional, Union, Literal, Dict
@@ -5,7 +6,6 @@ from enum import Enum
 import semver
 import uuid
 from arkitekt_next.model import Requirement
-from rekuest.api.schema import DefinitionInput
 from string import Formatter
 import os
 
@@ -14,6 +14,7 @@ from rekuest_next.api.schema import TemplateInput
 ALLOWED_BUILDER_KEYS = [
     "tag",
     "dockerfile",
+    "package_version",
 ]
 
 
@@ -246,6 +247,7 @@ class Flavour(BaseModel):
     def generate_build_command(self, tag: str, relative_dir: str):
         """Generates the build command for this flavour"""
 
+
         dockerfile = os.path.join(relative_dir, self.dockerfile)
 
         return [v.format(tag=tag, dockerfile=dockerfile) for v in self.build_command]

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

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