arkitekt-next 0.7.18__py3-none-any.whl → 0.7.19__py3-none-any.whl

arkitekt_next/cli/commands/init/main.py

@@ -125,14 +125,6 @@ def ensure_semver(ctx, param, value):
     default=False,
     callback=check_overwrite_app,
 )
-@click.option(
-    "--requirements",
-    "-r",
-    help="Dedicated hardware requirements for this app. They will be used to inform Plugin Schedulers like port, on which compute resources to put your plugin app, once deployed.You can choose multiple for your app. For a list of requirements, run `arkitekt_next manifest requirements available`",
-    type=click.Choice(compile_requirements()),
-    multiple=True,
-    default=[],
-)
 @click.option(
     "--scopes",
     "-s",

arkitekt_next/cli/commands/kabinet/build.py

@@ -140,7 +140,7 @@ def inspect_requirements(build_id: str) -> Dict[str, Requirement]:
 
         # Parse the JSON output
         correct_part = result.stdout.split("--START_REQUIREMENTS--")[1].split(
-            "--START_REQUIREMENTS--"
+            "--END_REQUIREMENTS--"
         )[0]
 
         try:
@@ -151,7 +151,7 @@ def inspect_requirements(build_id: str) -> Dict[str, Requirement]:
                 f"Could not decode JSON output of docker inspect. {combined_error}"
             ) from e
 
-        return output.values()
+        return output
     except subprocess.CalledProcessError as e:
         combined_error = e.stdout + e.stderr
 
@@ -167,8 +167,9 @@ def inspect_requirements(build_id: str) -> Dict[str, Requirement]:
 def inspect_build(build_id: str) -> Inspection:
     size, size_root_fs = inspect_docker_container(build_id)
     templates = inspect_templates(build_id)
+    requirements = inspect_requirements(build_id)
 
-    return Inspection(size=size, templates=templates)
+    return Inspection(size=size, templates=templates , requirements=requirements)
 
 
 def get_flavours(ctx: Context, select: Optional[str] = None) -> Dict[str, Flavour]:

arkitekt_next/cli/constants.py

@@ -9,10 +9,6 @@ def compile_scopes() -> List[str]:
     return ["read", "write"]
 
 
-def compile_requirements():
-    """Compile all available requirements"""
-    return [Requirement.GPU.value]
-
 
 def compile_builders():
     return ["arkitekt_next.builders.easy", "arkitekt_next.builders.port"]

arkitekt_next/cli/types.py

@@ -1,9 +1,10 @@
 from pydantic import BaseModel, Field, validator
 import datetime
-from typing import List, Optional, Union, Literal
+from typing import List, Optional, Union, Literal, Dict
 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
@@ -24,12 +25,6 @@ class Framework(str, Enum):
     PYTORCH = "pytorch"
 
 
-class Requirement(str, Enum):
-    """ """
-
-    GPU = "gpu"
-
-
 class Packager(str, Enum):
     CONDA = "conda"
     POETRY = "poetry"
@@ -43,7 +38,6 @@ class Manifest(BaseModel):
     logo: Optional[str]
     entrypoint: str
     scopes: List[str]
-    requirements: List[Requirement] = Field(default_factory=list)
     created_at: datetime.datetime = Field(default_factory=datetime.datetime.now)
 
     @validator("version", pre=True)
@@ -218,6 +212,7 @@ Selector = Union[
 
 class Inspection(BaseModel):
     templates: List[TemplateInput]
+    requirements: Dict[str, Requirement]
     size: int
 
 

{arkitekt_next-0.7.18.dist-info → arkitekt_next-0.7.19.dist-info}/METADATA

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

{arkitekt_next-0.7.18.dist-info → arkitekt_next-0.7.19.dist-info}/RECORD

@@ -28,14 +28,14 @@ arkitekt_next/cli/commands/gen/init.py,sha256=JV9x27Iy80QlmigXd7TSG2YIBHPGJBdEQ_
 arkitekt_next/cli/commands/gen/main.py,sha256=_BdkcsXoWY5_3gmboq2e0pGYM6lAnwqQgBAyxmvdf6U,947
 arkitekt_next/cli/commands/gen/watch.py,sha256=nf4QckdTJOWxvKoeNRwvC4rXQ4xhIx8LCDDJzpPhcY8,1189
 arkitekt_next/cli/commands/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arkitekt_next/cli/commands/init/main.py,sha256=1ACgJn3RH5UIbsaX3KxKmwwvw9bkmJJgSWG4JDHPfow,5936
+arkitekt_next/cli/commands/init/main.py,sha256=7pqr_06xooe-KJfnliBhyd2XvQbPUcglbulyp5goWQs,5507
 arkitekt_next/cli/commands/inspect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/inspect/main.py,sha256=Bu1vAZudkFCtjDnZAB8yQLDt-UKY9pJGhLBlEfDqtkw,626
 arkitekt_next/cli/commands/inspect/requirements.py,sha256=17rK6zviRpBDpaR-qpw5spb4ClTbKaG1d2ZQ-KiNV7I,2133
 arkitekt_next/cli/commands/inspect/templates.py,sha256=U99SLBYWiD-ZiIYV7pVWhQK3XWn1PLUIyTKzgSFF6MQ,2325
 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=QRaOgpBYO6qqowTKLR4qZ7rTKNKVAS3IaARWiVwSdBc,8481
+arkitekt_next/cli/commands/kabinet/build.py,sha256=A1C84ZNRtD1nMv5erJGQPx9DDx493VxDR7SRd2__7IA,8548
 arkitekt_next/cli/commands/kabinet/init.py,sha256=NNEb5SITLNM1TBED0moyBhE-JGkkr0cvNh33A4OGnfc,2525
 arkitekt_next/cli/commands/kabinet/main.py,sha256=U5EWekRTsMZZ34abWFfwilhzrd-zZtpZbl8RsLN_bC8,1008
 arkitekt_next/cli/commands/kabinet/publish.py,sha256=zbjnoMliowje1nEuKFolFX5pZA2D_DzLjXlSxBbD88k,3596
@@ -65,7 +65,7 @@ arkitekt_next/cli/commands/server/stop.py,sha256=fPiF5zBa4zOEdchMIQqi88gsNAEhq6W
 arkitekt_next/cli/commands/server/up.py,sha256=QfXEN_IDYrL4kFJ-DZ4BGK3eMfkW4YpoSkr9bGpzFjM,1757
 arkitekt_next/cli/commands/server/utils.py,sha256=GhUiJx2eXSBMdIfukEaZAetAtkfy_dZG4yb2L6vxTio,846
 arkitekt_next/cli/configs/base.yaml,sha256=9IJ7B4Fq3swHsLUbKn1MlhhzJKqDI1wnR5PAG_VKs8A,30097
-arkitekt_next/cli/constants.py,sha256=-PdzHYOgxoE9ss1uFCzQ9S4pGkEbyp8EFn1xzQ5-dfw,1520
+arkitekt_next/cli/constants.py,sha256=xHG2lfXw_4atx9B4ICAY45fbNbQN0UQAfdxZQbduz_w,1411
 arkitekt_next/cli/dockerfiles/vanilla.dockerfile,sha256=Cn0MSaopz_hsAyNguJCLSxUIxI7Kcr8uk3Rji2nP8AU,168
 arkitekt_next/cli/errors.py,sha256=zLTjaCbun6qM2nTldjyZd-DvykqKn5A3Gn80uYdx7Vc,93
 arkitekt_next/cli/inspect.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -89,7 +89,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=csMefyCnwnvDnriTy0VJ4L24VFIbcXoC9ayopP4RxIc,697
-arkitekt_next/cli/types.py,sha256=YH3wfQRO23xe6yw8_1ew63OWT_Z_l4EpgOUdoMipnIo,10456
+arkitekt_next/cli/types.py,sha256=LJmyWFzKvvq2KpgYtZHgrq6_YAKp_RhmF-MEh5kTuFY,10420
 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
@@ -114,8 +114,8 @@ arkitekt_next/qt/utils.py,sha256=MgBPtPmCSBkIuATov3UgREESwxAHh77lWNNxyE7Qs48,773
 arkitekt_next/service_registry.py,sha256=Aq5bgu4UHRl1P6E2JOQ2gMCwFI8pQfASWte0BvtKE3g,3365
 arkitekt_next/tqdm.py,sha256=DlrxPluHao7TvW-Cqgt0UokRS-fM2_ZNiWiddqvCqCc,1488
 arkitekt_next/utils.py,sha256=WA3AtqQFcz2h-yOadAsQkkr0qKJmKcGMi2aclxaVI_o,1278
-arkitekt_next-0.7.18.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.7.18.dist-info/METADATA,sha256=7mvdrH58p6atu_9p-vUlP797psC_AQTBOlDn05E3Gw0,5500
-arkitekt_next-0.7.18.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.7.18.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.7.18.dist-info/RECORD,,
+arkitekt_next-0.7.19.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.7.19.dist-info/METADATA,sha256=eEz94kggp2E_CJU9K9fCFuANSKjbvKgagvldY2L9fTE,5500
+arkitekt_next-0.7.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.7.19.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.7.19.dist-info/RECORD,,