arkitekt-next 0.8.60__py3-none-any.whl → 0.8.62__py3-none-any.whl

arkitekt_next/cli/io.py

@@ -5,18 +5,7 @@ import os
 from typing import Optional, List, Dict
 from arkitekt_next.cli.types import (
     Manifest,
-    Build,
-    BuildsConfigFile,
-    Flavour,
-    DeploymentsConfigFile,
 )
-from kabinet.api.schema import (
-    InspectionInput,
-    AppImageInput,
-    DockerImageInput,
-    ManifestInput,
-)
-
 import yaml
 import json
 import rich_click as click
@@ -83,184 +72,3 @@ def write_manifest(manifest: Manifest):
             file,
             sort_keys=True,
         )
-
-
-def get_builds(selected_run: Optional[str] = None) -> Dict[str, Build]:
-    """Will load the builds.yaml file and return a dictionary of builds
-
-    Will load the builds.yaml file and return a dictionary of builds
-    where the key is the build_id and the value is the build object.
-
-
-    Returns
-    -------
-    Dict[str, Build]
-        The loaded builds
-    """
-    path = create_arkitekt_next_folder()
-    config_file = os.path.join(path, "builds.yaml")
-
-    builds = {}
-
-    if os.path.exists(config_file):
-        with open(config_file, "r") as file:
-            config = BuildsConfigFile(**yaml.safe_load(file))
-
-            # We will only return the builds from the selected run
-            selected_run = selected_run or config.latest_build_run
-
-            builds = {
-                build.build_id: build
-                for build in config.builds
-                if build.build_run == selected_run
-            }
-            return builds
-    else:
-        raise click.ClickException(
-            "Could not find any builds. Please run `arkitekt_next port build` first"
-        )
-
-
-def manifest_to_input(manifest: Manifest) -> ManifestInput:
-
-    return ManifestInput(**manifest.model_dump(by_alias=True))
-
-
-def generate_build(
-    build_run: str,
-    build_id: str,
-    flavour_name: str,
-    flavour: Flavour,
-    manifest: Manifest,
-    inspection: Optional[InspectionInput],
-) -> Build:
-    """Generates a build from a builder, build_id and manifest
-
-    Will generate a build from a builder, build_id and manifest,
-    and write it to the builds.yaml file in the arkitekt_next folder.
-
-
-    Parameters
-    ----------
-    builder : str
-        The builder that was used to build the build
-    build_id : str
-        The build_id of the build
-    manifest : Manifest
-        The manifest of the build
-
-    Returns
-    -------
-    Build
-        The generated build
-    """
-    path = create_arkitekt_next_folder()
-
-    config_file = os.path.join(path, "builds.yaml")
-
-    build = Build(
-        manifest=manifest_to_input(manifest),
-        flavour=flavour_name,
-        selectors=flavour.selectors,
-        build_id=build_id,
-        build_run=build_run,
-        description=flavour.description,
-        inspection=inspection,
-    )
-
-    if os.path.exists(config_file):
-        with open(config_file, "r") as file:
-            config = BuildsConfigFile(**yaml.safe_load(file))
-            config.builds.append(build)
-            config.latest_build_run = build_run
-    else:
-        config = BuildsConfigFile(builds=[build], latest_build_run=build_run)
-
-    with open(config_file, "w") as file:
-        yaml.safe_dump(
-            json.loads(
-                config.json(exclude_none=True, exclude_unset=True, by_alias=True)
-            ),
-            file,
-            sort_keys=True,
-        )
-
-    return build
-
-
-def get_deployments() -> DeploymentsConfigFile:
-    """Loads the deployments.yaml file and returns the deployments
-
-    Will load the deployments.yaml file and return the deployments
-    as a DeploymentsConfigFile object. If no deployments.yaml file
-    exists, it will return an empty DeploymentsConfigFile object.
-
-    Returns
-    -------
-    DeploymentsConfigFile
-        The deployments as a DeploymentsConfigFile object
-    """
-    path = create_arkitekt_next_folder()
-    config_file = os.path.join(path, "deployments.yaml")
-    if os.path.exists(config_file):
-        with open(config_file, "r") as file:
-            return DeploymentsConfigFile(**yaml.safe_load(file))
-    else:
-        return DeploymentsConfigFile()
-
-
-def generate_deployment(
-    deployment_run: str,
-    build: Build,
-    image: str,
-) -> AppImageInput:
-    """Generates a deployment from a build and an image
-
-    Parameters
-    ----------
-
-    build : Build
-        The build that should be deployed
-    image: str
-        The image that is the actuall deployment of the build
-    with_definitions: bool:
-        Should we generated and inspect definitions to bundle with
-        the deployment?
-
-    Returns:
-    ------
-    Deployment: The created deployment
-
-    """
-
-    path = create_arkitekt_next_folder()
-
-    config_file = os.path.join(path, "deployments.yaml")
-
-    app_image = AppImageInput(
-        appImageId=uuid.uuid4().hex,
-        manifest=build.manifest,
-        flavourName=build.flavour,
-        selectors=build.selectors,
-        inspection=build.inspection,
-        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(app_image)
-            config.latest_app_image = app_image.app_image_id
-    else:
-        config = DeploymentsConfigFile(
-            app_images=[app_image], latest_app_image=app_image.app_image_id
-        )
-
-    with open(config_file, "w") as file:
-        yaml.safe_dump(
-            json.loads(config.model_dump_json(exclude_none=True, by_alias=True)),
-            file,
-            sort_keys=True,
-        )
-
-    return app_image

arkitekt_next/cli/types.py

@@ -1,5 +1,5 @@
 from importlib.metadata import version
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 import datetime
 from typing import List, Optional, Union, Literal, Dict
 from enum import Enum
@@ -9,34 +9,6 @@ from arkitekt_next.base_models import Requirement
 from string import Formatter
 import os
 
-from kabinet.api.schema import (
-    AppImageInput,
-    InspectionInput,
-    SelectorInput,
-    ManifestInput,
-)
-from rekuest_next.api.schema import TemplateInput
-
-ALLOWED_BUILDER_KEYS = [
-    "tag",
-    "dockerfile",
-    "package_version",
-]
-
-
-class Framework(str, Enum):
-    """Do we support other frameworks?"""
-
-    VANILLA = "vanilla"
-    TENSORFLOW = "tensorflow"
-    PYTORCH = "pytorch"
-
-
-class Packager(str, Enum):
-    CONDA = "conda"
-    POETRY = "poetry"
-    PIP = "pip"
-
 
 class Manifest(BaseModel):
     identifier: str
@@ -45,6 +17,7 @@ class Manifest(BaseModel):
     logo: Optional[str] = None
     entrypoint: str
     scopes: List[str]
+    model_config = ConfigDict(extra="forbid", validate_assignment=True)
 
     @field_validator("version", mode="before")
     def version_must_be_semver(cls, v) -> str:
@@ -67,121 +40,3 @@ class Manifest(BaseModel):
             "scopes": self.scopes,
         }
 
-    class Config:
-        validate_assignment = True
-
-
-class SelectorType(str, Enum):
-    RAM = "ram"
-    CPU = "cpu"
-    GPU = "gpu"
-    LABEL = "label"
-
-
-class Flavour(BaseModel):
-    selectors: List[SelectorInput]
-    description: str = Field(default="")
-    dockerfile: str = Field(default="Dockerfile")
-    build_command: List[str] = Field(
-        default_factory=lambda: [
-            "docker",
-            "build",
-            "-t",
-            "{tag}",
-            "-f",
-            "{dockerfile}",
-            ".",
-        ]
-    )
-
-    @field_validator("build_command", mode="before")
-    def check_valid_template_name(cls, value):
-        """Checks that the build_command templates are valid"""
-
-        for v in value:
-            for literal_text, field_name, format_spec, conversion in Formatter().parse(
-                v
-            ):
-                if field_name is not None:
-                    assert (
-                        field_name in ALLOWED_BUILDER_KEYS
-                    ), f"Invalid template key {field_name}. Allowed keys are {ALLOWED_BUILDER_KEYS}"
-
-        return value
-
-    def generate_build_command(self, tag: str, relative_dir: str):
-        """Generates the build command for this flavour"""
-
-        dockerfile = os.path.join(relative_dir, self.dockerfile)
-
-        return [v.format(tag=tag, dockerfile=dockerfile) for v in self.build_command]
-
-    def check_relative_paths(self, flavour_folder: str):
-        """Checks that the paths are relative to the flavour folder"""
-
-        dockerfile_path = os.path.join(flavour_folder, self.dockerfile)
-
-        if not os.path.exists(dockerfile_path):
-            raise Exception(
-                f"Could not find Dockerfile {self.dockerfile} in flavour {flavour_folder}"
-            )
-
-
-class DeploymentsConfigFile(BaseModel):
-    """The ConfigFile is a pydantic model that represents the deployments.yaml file
-
-
-    Parameters
-    ----------
-    BaseModel : _type_
-        _description_
-    """
-
-    app_images: List[AppImageInput] = []
-    latest_app_image: Optional[str] = None
-
-
-class Build(BaseModel):
-    build_run: str
-    build_id: str
-    inspection: Optional[InspectionInput] = None
-    description: str = Field(default="")
-    selectors: List[SelectorInput] = Field(default_factory=list)
-    flavour: str = Field(default="vanilla")
-    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"]
-    )
-    base_arkitekt_next_command: List[str] = Field(
-        default_factory=lambda: ["arkitekt-next", "run", "prod", "--headless"]
-    )
-
-    def build_docker_command(self) -> List[str]:
-        """Builds the docker command for this build"""
-
-        base_command = self.base_docker_command
-
-        for selector in self.selectors:
-            base_command = base_command + selector.build_docker_params()
-
-        base_command = base_command + [self.build_id]
-
-        return base_command
-
-    def build_arkitekt_next_command(self, fakts_next_url: str):
-        """Builds the arkitekt_next command for this build"""
-
-        base_command = self.base_arkitekt_next_command
-
-        for selector in self.selectors:
-            base_command = base_command + selector.build_arkitekt_next_params()
-
-        base_command = base_command + ["--url", fakts_next_url]
-
-        return base_command
-
-
-class BuildsConfigFile(BaseModel):
-    builds: List[Build] = Field(default_factory=list)
-    latest_build_run: Optional[str] = None

arkitekt_next/cli/ui.py

@@ -65,7 +65,7 @@ def construct_app_group(app: App) -> Group:
     if rekuest is None:
         return Group(panel_header, service_tree)
 
-    for key, extension in rekuest.agent.extensions.items():
+    for key, extension in rekuest.agent.extension_registry.agent_extensions.items():
         tree = actor_tree.add(key)
         for template in extension.definition_registry.templates.values():
             tree.add(template.interface + "-" + template.definition.name)

arkitekt_next/init_registry.py

@@ -102,20 +102,17 @@ class InitHookRegisty:
 
     def __init__(self):
         self.init_hooks: Dict[str, InitHook] = {}
-        
 
     def register(
         self,
         function: InitHook,
         name: Optional[str] = None,
         only_cli: bool = False,
-
     ):
-        
+
         if name is None:
             name = function.__name__
 
-
         if name not in self.init_hooks:
             self.init_hooks[name] = function
         else:
@@ -126,12 +123,9 @@ class InitHookRegisty:
             hook(app)
 
 
-
 T = TypeVar("T")
 
 
-
-
 @overload
 def init(
     function_or_actor: T,
@@ -149,9 +143,7 @@ def init(
     only_cli: bool = False,
     init_hook_registry: InitHookRegisty = None,
 ):
-    """Register a function as an init hook. This function will be called when the app is initialized.
-
-    """
+    """Register a function as an init hook. This function will be called when the app is initialized."""
     init_hook_registry = init_hook_registry or get_current_init_hook_registry()
 
     if len(func) > 1:
@@ -181,7 +173,6 @@ def init(
 
             wrapped_function.__is_init_hook__ = True
 
-
             return wrapped_function
 
         return real_decorator

arkitekt_next/qt/builders.py

@@ -8,7 +8,7 @@ from arkitekt_next.base_models import Manifest
 from arkitekt_next.apps.types import App
 from arkitekt_next.service_registry import (
     ServiceBuilderRegistry,
-    check_and_import_services,
+    get_default_service_registry,
 )
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 from qtpy import QtWidgets, QtCore
@@ -30,7 +30,6 @@ from arkitekt_next.base_models import Manifest
 from arkitekt_next.apps.types import App
 from arkitekt_next.service_registry import (
     ServiceBuilderRegistry,
-    check_and_import_services,
 )
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
@@ -117,7 +116,7 @@ def devqt(
     NextApp
         A built app, that can be used to interact with the ArkitektNext server
     """
-    registry = registry or check_and_import_services()
+    registry = registry or get_default_service_registry()
 
     url = os.getenv("FAKTS_URL", url)
     token = os.getenv("FAKTS_TOKEN", token)

arkitekt_next/service_registry.py

@@ -5,12 +5,6 @@ from herre_next import Herre
 from fakts_next import Fakts
 from .base_models import Manifest, Requirement
 from typing import Callable, Dict, Optional, Protocol, TypeVar, overload
-import importlib
-import sys
-import os
-import traceback
-import logging
-import pkgutil
 from typing import runtime_checkable
 
 Params = Dict[str, str]
@@ -93,10 +87,7 @@ basic_requirements = [
 class ServiceBuilderRegistry:
     def __init__(self, import_services=True):
         self.service_builders: Dict[str, ArkitektService] = {}
-        self.additional_requirements: Dict[str, Requirement]= {}
-        if import_services:
-            check_and_import_services(self)
-
+        self.additional_requirements: Dict[str, Requirement] = {}
 
     def register(
         self,
@@ -109,13 +100,11 @@ class ServiceBuilderRegistry:
             self.service_builders[name] = service
         else:
             raise ValueError(f"Service {name} already registered")
-        
 
     def register_requirement(self, requirement: Requirement):
         if requirement.key in self.additional_requirements:
             raise ValueError(f"Requirement {requirement.key} already registered)")
         self.additional_requirements[requirement.key] = requirement
-        
 
     def get(self, name):
         return self.services.get(name)
@@ -151,7 +140,6 @@ class ServiceBuilderRegistry:
                     taken_requirements.add(requirement.key)
                     requirements.append(requirement)
 
-
         for requirement in self.additional_requirements.values():
             if requirement.key not in taken_requirements:
                 taken_requirements.add(requirement.key)
@@ -172,73 +160,12 @@ import pkgutil
 import traceback
 import logging
 
-
-def check_and_import_services(service_registry: ServiceBuilderRegistry) -> ServiceBuilderRegistry:
-    processed_modules = set()  # Track modules that have already been processed
-
-    # Function to load and call init_extensions from __rekuest__.py
-    def load_and_call_init_extensions(module_name, rekuest_path):
-        if module_name in processed_modules:
-            return  # Skip if module has already been processed
-        try:
-            spec = importlib.util.spec_from_file_location(
-                f"{module_name}.__arkitekt__", rekuest_path
-            )
-            rekuest_module = importlib.util.module_from_spec(spec)
-            spec.loader.exec_module(rekuest_module)
-            if hasattr(rekuest_module, "build_services"):
-                for service in rekuest_module.build_services():
-                    try:
-                        service_registry.register(service)
-                    except ValueError as e:
-                        print(
-                            f"Failed to register service {service}: Another service with the same name is already registered {service_registry.service_builders}"
-                        )
-                logging.info(f"Called build_services function from {module_name}")
-            else:
-                print(
-                    f"Discovered Arkitekt-like module (containing __arkitekt__) that doesn't conform with the __arkitekt__ spec. No build_services function in {module_name}.__arkitekt__"
-                )
-            processed_modules.add(module_name)  # Mark this module as processed
-        except Exception as e:
-            print(f"Failed to call init_services for {module_name}: {e}")
-            traceback.print_exc()
-
-    # Check local modules in the current working directory
-    current_directory = os.getcwd()
-    for item in os.listdir(current_directory):
-        item_path = os.path.join(current_directory, item)
-        if os.path.isdir(item_path) and os.path.isfile(
-            os.path.join(item_path, "__init__.py")
-        ):
-            rekuest_path = os.path.join(item_path, "__arkitekt__.py")
-            if os.path.isfile(rekuest_path):
-                load_and_call_init_extensions(item, rekuest_path)
-
-    # Check installed packages
-    for _, module_name, _ in pkgutil.iter_modules():
-        try:
-            module_spec = importlib.util.find_spec(module_name)
-            if module_spec and module_spec.origin:
-                rekuest_path = os.path.join(
-                    os.path.dirname(module_spec.origin), "__arkitekt__.py"
-                )
-                if os.path.isfile(rekuest_path):
-                    load_and_call_init_extensions(module_name, rekuest_path)
-        except Exception as e:
-            print(
-                f"Failed to call init_extensions for installed package {module_name}: {e}"
-            )
-            traceback.print_exc()
-
-    return service_registry
-
-
 T = TypeVar("T")
 
+
 @overload
 def require(
-    key: str ,
+    key: str,
     service: str = None,
     description: str = None,
 ) -> Callable[[T], T]: ...
@@ -249,20 +176,11 @@ def require(
     service: str = None,
     description: str = None,
     service_registry: Optional[ServiceBuilderRegistry] = None,
-
 ):
-    """Register a requirement with the service registry
-
-    """
+    """Register a requirement with the service registry"""
     service_hook_registry = service_registry or get_current_service_registry()
 
-   
-
-    requirement = Requirement(
-        key=key,
-        service=service,
-        description=description
-    )
+    requirement = Requirement(key=key, service=service, description=description)
     service_hook_registry.register_requirement(requirement)
 
     return requirement

arkitekt_next/utils.py

@@ -61,11 +61,12 @@ def create_devcontainer_file(
 
     devcontainer_file = os.path.join(flavour_container, "devcontainer.json")
 
-
     devcontainer_content = {}
     devcontainer_content["name"] = f"{manifest.identifier} {flavour} Devcontainer"
     devcontainer_content["build"] = {}
-    devcontainer_content["build"]["dockerfile"] = os.path.relpath(docker_file_path, flavour_container)
+    devcontainer_content["build"]["dockerfile"] = os.path.relpath(
+        docker_file_path, flavour_container
+    )
     devcontainer_content["build"][
         "context"
     ] = "../.."  # This is the root of the project

{arkitekt_next-0.8.60.dist-info → arkitekt_next-0.8.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.60
+Version: 0.8.62
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -14,29 +14,39 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
+Provides-Extra: alpaka
 Provides-Extra: blok
 Provides-Extra: cli
 Provides-Extra: extended
+Provides-Extra: fluss
+Provides-Extra: kabinet
+Provides-Extra: kraph
+Provides-Extra: lovekit
+Provides-Extra: mikro
+Provides-Extra: reaktion
+Provides-Extra: rekuest
 Provides-Extra: stream
+Provides-Extra: unlok
+Requires-Dist: alpaka (>=0.1.17) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "alpaka" or extra == "extended")
 Requires-Dist: blok (>=0.0.22) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "blok")
 Requires-Dist: cryptography (>=40.0.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
 Requires-Dist: dokker (>=1.0.0)
 Requires-Dist: fakts-next (>=1.0.4)
-Requires-Dist: fluss-next (>=0.1.95) ; extra == "all"
+Requires-Dist: fluss-next (>=0.1.96) ; extra == "fluss" or extra == "all"
 Requires-Dist: herre-next (>=1.0.2)
-Requires-Dist: kabinet (>=0.1.45) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.46) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "kabinet" or extra == "all")
 Requires-Dist: koil (>=1.0.3)
-Requires-Dist: kraph (>=0.1.100) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "extended")
-Requires-Dist: lovekit (>=0.1.18) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "stream")
-Requires-Dist: mikro-next (>=0.1.50) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kraph (>=0.1.101) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "kraph" or extra == "extended")
+Requires-Dist: lovekit (>=0.1.19) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "lovekit" or extra == "stream")
+Requires-Dist: mikro-next (>=0.1.55) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "mikro" or extra == "all")
 Requires-Dist: namegenerator (>=1.0.6) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
 Requires-Dist: netifaces (>=0.11.0) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
-Requires-Dist: reaktion-next (>=0.1.86) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.58) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: reaktion-next (>=0.1.87) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "reaktion" or extra == "all")
+Requires-Dist: rekuest-next (>=0.2.62) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "rekuest" or extra == "all")
 Requires-Dist: rich-click (>=1.6.1) ; extra == "cli" or extra == "all" or extra == "blok"
 Requires-Dist: semver (>=3.0.1) ; extra == "cli" or extra == "all"
 Requires-Dist: turms (>=0.8.2) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")
-Requires-Dist: unlok-next (>=0.1.87) ; python_version >= "3.8" and python_version < "4.0"
+Requires-Dist: unlok-next (>=0.1.89) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "unlok")
 Requires-Dist: watchfiles (>=0.18.1) ; extra == "cli" or extra == "all"
 Description-Content-Type: text/markdown