arkitekt-next 0.8.13__tar.gz → 0.8.15__tar.gz

{arkitekt_next-0.8.13 → arkitekt_next-0.8.15}/PKG-INFO

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

{arkitekt_next-0.8.13 → arkitekt_next-0.8.15}/arkitekt_next/cli/commands/kabinet/publish.py

@@ -23,11 +23,11 @@ def check_if_build_already_deployed(build: Build) -> None:
         A click exception if the manifest has already been deployed
     """
     config = get_deployments()
-    for deployment in config.deployments:
+    for deployment in config.app_images:
         if (
             deployment.manifest.identifier == build.manifest.identifier
             and deployment.manifest.version == build.manifest.version
-            and deployment.flavour == build.flavour
+            and deployment.flavour_name == build.flavour
         ):
             raise click.ClickException(
                 f"Deployment of {build.manifest.identifier}/{build.manifest.version} in the {build.flavour} flavour already exists."

{arkitekt_next-0.8.13 → arkitekt_next-0.8.15}/arkitekt_next/cli/io.py

@@ -1,3 +1,5 @@
+import datetime
+import uuid
 from arkitekt_next.utils import create_arkitekt_next_folder
 import os
 from typing import Optional, List, Dict
@@ -8,7 +10,7 @@ from arkitekt_next.cli.types import (
     Flavour,
     DeploymentsConfigFile,
 )
-from kabinet.api.schema import InspectionInput, AppImageInput
+from kabinet.api.schema import InspectionInput, AppImageInput, DockerImageInput, ManifestInput
 
 import yaml
 import json
@@ -114,6 +116,18 @@ def get_builds(selected_run: Optional[str] = None) -> Dict[str, Build]:
         )
 
 
+
+
+def manifest_to_input(manifest: Manifest) -> ManifestInput:
+
+    return ManifestInput(**manifest.model_dump(by_alias=True))
+
+
+
+
+
+
+
 def generate_build(
     build_run: str,
     build_id: str,
@@ -147,7 +161,7 @@ def generate_build(
     config_file = os.path.join(path, "builds.yaml")
 
     build = Build(
-        manifest=manifest,
+        manifest=manifest_to_input(manifest),
         flavour=flavour_name,
         selectors=flavour.selectors,
         build_id=build_id,
@@ -225,24 +239,23 @@ def generate_deployment(
 
     config_file = os.path.join(path, "deployments.yaml")
 
-    deployment = AppImageInput(
-        build_id=build.build_id,
+    app_image = AppImageInput(
+        appImageId=uuid.uuid4().hex,
         manifest=build.manifest,
-        flavour_name=build.flavour,
+        flavourName=build.flavour,
         selectors=build.selectors,
         inspection=build.inspection,
-        image=image,
+        image=DockerImageInput(imageString=image, buildAt=datetime.datetime.now()),
+
     )
 
     if os.path.exists(config_file):
         with open(config_file, "r") as file:
             config = DeploymentsConfigFile(**yaml.safe_load(file))
-            config.app_images.append(deployment)
-            config.latest_app_image = deployment.release_id
+            config.app_images.append(app_image)
+            config.latest_app_image = app_image.app_image_id
     else:
-        config = DeploymentsConfigFile(deployments=[deployment])
-        config.app_images = deployment_run
-        config.latest_app_image = deployment.release_id
+        config = DeploymentsConfigFile(app_images=[app_image], latest_app_image=app_image.app_image_id)
 
     with open(config_file, "w") as file:
         yaml.safe_dump(
@@ -251,4 +264,4 @@ def generate_deployment(
             sort_keys=True,
         )
 
-    return deployment
+    return app_image

{arkitekt_next-0.8.13 → arkitekt_next-0.8.15}/arkitekt_next/cli/types.py

@@ -9,7 +9,7 @@ from arkitekt_next.base_models import Requirement
 from string import Formatter
 import os
 
-from kabinet.api.schema import AppImageInput, InspectionInput, SelectorInput
+from kabinet.api.schema import AppImageInput, InspectionInput, SelectorInput, ManifestInput
 from rekuest_next.api.schema import TemplateInput
 
 ALLOWED_BUILDER_KEYS = [
@@ -40,7 +40,6 @@ class Manifest(BaseModel):
     logo: Optional[str] = None
     entrypoint: str
     scopes: List[str]
-    created_at: datetime.datetime = Field(default_factory=datetime.datetime.now)
 
     @field_validator("version", mode="before")
     def version_must_be_semver(cls, v) -> str:
@@ -143,7 +142,7 @@ class Build(BaseModel):
     description: str = Field(default="")
     selectors: List[SelectorInput] = Field(default_factory=list)
     flavour: str = Field(default="vanilla")
-    manifest: Manifest
+    manifest: ManifestInput
     build_at: datetime.datetime = Field(default_factory=datetime.datetime.now)
     base_docker_command: List[str] = Field(
         default_factory=lambda: ["docker", "run", "-it", "--net", "host"]

{arkitekt_next-0.8.13 → arkitekt_next-0.8.15}/pyproject.toml

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