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

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

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

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

@@ -1,6 +1,7 @@
 FROM python:3.11-slim-buster
+ARG ARKITEKT_VERSION=0.8.0
 
-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.1}/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.1}/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
 
@@ -229,6 +229,8 @@ class Flavour(BaseModel):
             "-f",
             "{dockerfile}",
             ".",
+            "--build-arg",
+            "ARKITEKT_VERSION={package_version}",
         ]
     )
 
@@ -246,9 +248,18 @@ 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) for v in self.build_command]
+        return [v.format(tag=tag, dockerfile=dockerfile, package_version=package_version) 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.0 → arkitekt_next-0.8.1}/pyproject.toml

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