arkitekt-next 0.7.18__tar.gz → 0.7.20__tar.gz

{arkitekt_next-0.7.18 → arkitekt_next-0.7.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.18
+Version: 0.7.20
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -17,17 +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.67) ; extra == "all"
+Requires-Dist: fluss-next (>=0.1.68) ; extra == "all"
 Requires-Dist: herre (>=0.4.3)
-Requires-Dist: kabinet (>=0.1.5) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.6) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=0.3.6)
 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: reaktion-next (>=0.1.58) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
+Requires-Dist: rekuest-next (>=0.2.12) ; (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: unlok-next (>=0.1.63) ; 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.18 → arkitekt_next-0.7.20}/arkitekt_next/builders.py

@@ -143,7 +143,7 @@ def easy(
         fakts=fakts,
         herre=herre,
         manifest=manifest,
-        services=registry.build_service_map(fakts=fakts, herre=herre, params=params),
+        services=registry.build_service_map(fakts=fakts, herre=herre, params=params, manifest=manifest),
     )
 
     print()

{arkitekt_next-0.7.18 → arkitekt_next-0.7.20}/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-0.7.18 → arkitekt_next-0.7.20}/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-0.7.18 → arkitekt_next-0.7.20}/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-0.7.18 → arkitekt_next-0.7.20}/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 → arkitekt_next-0.7.20}/arkitekt_next/constants.py

@@ -3,4 +3,4 @@ REPO_URL = (
 )
 
 
-DEFAULT_ARKITEKT_URL = "http://127.0.0.1:12000"
+DEFAULT_ARKITEKT_URL = "http://127.0.0.1"

{arkitekt_next-0.7.18 → arkitekt_next-0.7.20}/arkitekt_next/service_registry.py

@@ -1,7 +1,7 @@
 from pydantic import BaseModel, Field
 from herre import Herre
 from fakts import Fakts
-from .model import Requirement
+from .model import Manifest, Requirement
 from typing import Callable, Dict
 import importlib
 import sys
@@ -40,8 +40,8 @@ class ServiceBuilderRegistry:
         return self.services.get(name)
     
 
-    def build_service_map(self, fakts: Fakts, herre: Herre, params: Params):
-        return {name: builder(fakts, herre, params) for name, builder in self.service_builders.items()}
+    def build_service_map(self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest):
+        return {name: builder(fakts, herre, params, manifest) for name, builder in self.service_builders.items()}
     
     def get_requirements(self):
         return self.requirements

{arkitekt_next-0.7.18 → arkitekt_next-0.7.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.18"
+version = "0.7.20"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -12,11 +12,11 @@ python = "^3.8"
 herre = ">=0.4.3"
 fakts = ">=0.5.0"
 mikro-next = { version = ">=0.1.13", python = "^3.10", optional = true }
-kabinet = { version = ">=0.1.5", optional = true,  python = "^3.9" }
-fluss-next = { version = ">=0.1.67", optional = true }
-reaktion-next= { version = ">=0.1.57", python = "^3.8", optional = true }
-rekuest-next= { version = ">=0.2.10", python = "^3.8", optional = true }
-unlok-next= { version = ">=0.1.62", python = "^3.8", optional = true }
+kabinet = { version = ">=0.1.6", optional = true,  python = "^3.9" }
+fluss-next = { version = ">=0.1.68", optional = true }
+reaktion-next= { version = ">=0.1.58", python = "^3.8", optional = true }
+rekuest-next= { version = ">=0.2.12", python = "^3.8", optional = true }
+unlok-next= { version = ">=0.1.63", python = "^3.8", optional = true }
 rich-click = { version = ">=1.6.1", optional = true }
 watchfiles = { version = ">=0.18.1", optional = true }
 turms = { version = ">=0.5.0", python = "^3.9", optional = true }