arkitekt-next 0.7.17__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/inspect/main.py

@@ -4,6 +4,7 @@ import rich_click as click
 import rich_click as click
 from .variables import variables
 from .templates import templates
+from .requirements import requirements
 
 
 @click.group()
@@ -19,4 +20,5 @@ def inspect(ctx):
 
 
 inspect.add_command(variables, "variables")
+inspect.add_command(requirements, "requirements")
 inspect.add_command(templates, "templates")

arkitekt_next/cli/commands/inspect/requirements.py

@@ -0,0 +1,83 @@
+import rich_click as click
+from importlib import import_module
+from arkitekt_next.apps.types import App
+from arkitekt_next.cli.commands.run.utils import import_builder
+from arkitekt_next.cli.vars import get_console, get_manifest
+from arkitekt_next.cli.options import with_builder
+import json
+import os
+
+
+async def run_app(app):
+    async with app:
+        await app.rekuest.run()
+
+
+@click.command("prod")
+@click.pass_context
+@click.option(
+    "--pretty",
+    "-p",
+    help="Should we just output json?",
+    is_flag=True,
+    default=False,
+)
+@click.option(
+    "--machine-readable",
+    "-mr",
+    help="Should we just output json?",
+    is_flag=True,
+    default=False,
+)
+@with_builder
+def requirements(
+    ctx,
+    pretty: bool,
+    machine_readable: bool,
+    builder: str = "arkitekt_next.builders.easy",
+):
+    """Runs the app in production mode
+
+    \n
+    You can specify the builder to use with the --builder flag. By default, the easy builder is used, which is designed to be easy to use and to get started with.
+
+    """
+    from rekuest.definition.registry import get_default_definition_registry
+
+    manifest = get_manifest(ctx)
+    console = get_console(ctx)
+
+    entrypoint = manifest.entrypoint
+    identifier = manifest.identifier
+    entrypoint_file = f"{manifest.entrypoint}.py"
+    os.path.realpath(entrypoint_file)
+
+    builder_func = import_builder(builder)
+
+    entrypoint = manifest.entrypoint
+
+    with console.status("Loading entrypoint module..."):
+        try:
+            import_module(entrypoint)
+        except ModuleNotFoundError as e:
+            console.print(f"Could not find entrypoint module {entrypoint}")
+            raise e
+
+    app: App = builder_func(
+        identifier=identifier,
+        version="dev",
+        logo=manifest.logo,
+    )
+
+    x = {
+        key: item.dict(by_alias=True)
+        for key, item in app.manifest.requirements.items()
+    }
+    if machine_readable:
+        print("--START_REQUIREMENTS--" + json.dumps(x) + "--END_REQUIREMENTS--")
+
+    else:
+        if pretty:
+            console.print(json.dumps(x, indent=2))
+        else:
+            print(json.dumps(x))

arkitekt_next/cli/commands/kabinet/build.py

@@ -10,6 +10,7 @@ from arkitekt_next.cli.types import Flavour, Inspection
 import yaml
 from typing import Dict, Optional
 import json
+from arkitekt_next.model import Requirement
 from arkitekt_next.utils import create_arkitekt_next_folder
 from rekuest_next.api.schema import TemplateInput
 
@@ -125,13 +126,50 @@ def inspect_templates(build_id: str) -> list[TemplateInput]:
             )
 
         raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
+    
+def inspect_requirements(build_id: str) -> Dict[str, Requirement]:
+    try:
+        # Run 'docker inspect' with the container ID or name
+        result = subprocess.run(
+            ["docker", "run", build_id, "arkitekt-next", "inspect", "requirements", "-mr"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            check=True,
+            text=True,
+        )
+
+        # Parse the JSON output
+        correct_part = result.stdout.split("--START_REQUIREMENTS--")[1].split(
+            "--END_REQUIREMENTS--"
+        )[0]
+
+        try:
+            output = json.loads(correct_part)
+        except json.decoder.JSONDecodeError as e:
+            combined_error = result.stdout + result.stderr
+            raise InspectionError(
+                f"Could not decode JSON output of docker inspect. {combined_error}"
+            ) from e
+
+        return output
+    except subprocess.CalledProcessError as e:
+        combined_error = e.stdout + e.stderr
+
+        if "No such command" in combined_error:
+            raise InspectionError(
+                "Could not find the command `arkitekt_next inspect definitions` in the container. Maybe"
+                + "you forgot to install arkitekt_next in the container? "
+            )
+
+        raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
 
 
 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.17.dist-info → arkitekt_next-0.7.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.17
+Version: 0.7.19
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -17,16 +17,17 @@ Provides-Extra: all
 Provides-Extra: cli
 Requires-Dist: dokker (>=0.1.21)
 Requires-Dist: fakts (>=0.5.0)
-Requires-Dist: fluss-next (>=0.1.65) ; extra == "all"
+Requires-Dist: fluss-next (>=0.1.67) ; extra == "all"
 Requires-Dist: herre (>=0.4.3)
-Requires-Dist: kabinet (>=0.1.4) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.5) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=0.3.6)
-Requires-Dist: mikro-next (>=0.1.11) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
-Requires-Dist: reaktion-next (>=0.1.55) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: mikro-next (>=0.1.13) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: reaktion-next (>=0.1.57) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
+Requires-Dist: rekuest-next (>=0.2.10) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
 Requires-Dist: rich-click (>=1.6.1) ; extra == "cli" or extra == "all"
 Requires-Dist: semver (>=3.0.1) ; extra == "cli" or extra == "all"
 Requires-Dist: turms (>=0.5.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: unlok-next (>=0.1.62) ; python_version >= "3.8" and python_version < "4.0"
 Requires-Dist: watchfiles (>=0.18.1) ; extra == "cli" or extra == "all"
 Description-Content-Type: text/markdown
 

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

@@ -28,13 +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=Eab0t-oQzrnVIQuj5Rzq4Jm__awfOSMACM2vLEZlvEE,537
+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=H6Hu3Df2GZiJDEFAvxfSCdn_OwSeikFhW9bybF7mT1A,7085
+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
@@ -64,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
@@ -88,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
@@ -113,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.17.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.7.17.dist-info/METADATA,sha256=-qKK5NZ2A5VG1YNmqcyEfoPm-mlfp748Gd4b3kDiCQs,5409
-arkitekt_next-0.7.17.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.7.17.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.7.17.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,,