arkitekt-next 0.11.0__tar.gz → 0.12.0__tar.gz

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkitekt-next
-Version: 0.11.0
+Version: 0.12.0
 Summary: client for the arkitekt_next platform
 Author-email: jhnnsrs <jhnnsrs@gmail.com>
 License-Expression: MIT
@@ -9,10 +9,11 @@ Requires-Python: <4,>=3.11
 Requires-Dist: click>=8.2.0
 Requires-Dist: dokker>=2.1.2
 Requires-Dist: fakts-next>=1.2.2
-Requires-Dist: herre-next>=1.2.0
+Requires-Dist: herre-next>=1.3
+Requires-Dist: kabinet>=0.5
 Requires-Dist: koil>=2.0.4
 Requires-Dist: rath>=3.4
-Requires-Dist: rekuest-next>=0.7
+Requires-Dist: rekuest-next>=0.8
 Requires-Dist: rich-click>=1.8.8
 Requires-Dist: semver>=3.0.4
 Requires-Dist: watchfiles>=1.0.5

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/__init__.py

@@ -1,7 +1,7 @@
 from .builders import easy, interactive
 from .apps.protocols import App
 from fakts_next.helpers import afakt, fakt
-from .init_registry import init, InitHookRegisty, get_current_init_hook_registry
+from .init_registry import init, InitHookRegistry, get_default_init_hook_registry
 from .service_registry import (
     require,
     ServiceBuilderRegistry,
@@ -28,6 +28,7 @@ try:
     from rekuest_next.actors.context import progress, aprogress
     from rekuest_next.actors.context import log, alog
     from rekuest_next.structures.model import model
+    from rekuest_next.actors.context import apublish, publish
     from rekuest_next.remote import (
         call,
         acall,
@@ -39,6 +40,8 @@ try:
     )
 except ImportError as e:
     raise e
+    publish = missing_install("rekuest_next", e)
+    apublish = missing_install("rekuest_next", e)
     structure = missing_install("rekuest_next", e)
     register = missing_install("rekuest_next", e)
     background = missing_install("rekuest_next", e)
@@ -73,6 +76,8 @@ __all__ = [
     "afakt",
     "fakt",
     "progress",
+    "InitHookRegistry",
+    "get_default_init_hook_registry",
     "aprogress",
     "ServiceBuilderRegistry",
     "get_default_service_registry",

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/apps/service/fakts_next.py

@@ -1,7 +1,6 @@
 from typing import Optional
 
 from fakts_next.fakts import Fakts
-from fakts_next.grants.hard import HardFakts
 from fakts_next.grants.remote import RemoteGrant
 from fakts_next.grants.remote.discovery.well_known import WellKnownDiscovery
 from fakts_next.grants.remote.demanders.static import StaticDemander
@@ -45,7 +44,7 @@ def build_arkitekt_next_fakts_next(
     )
 
 
-def build_arkitekt_next_redeem_fakts_next(manifest: Manifest, redeem_token: str, url):
+def build_arkitekt_next_redeem_fakts_next(manifest: Manifest, redeem_token: str, url: str) -> Fakts:
     identifier = manifest.identifier
     version = manifest.version
 
@@ -65,7 +64,7 @@ def build_arkitekt_next_redeem_fakts_next(manifest: Manifest, redeem_token: str,
 def build_arkitekt_next_token_fakts_next(
     manifest: Manifest,
     token: str,
-    url,
+    url: str,
 ):
     identifier = manifest.identifier
     version = manifest.version
@@ -82,11 +81,3 @@ def build_arkitekt_next_token_fakts_next(
         ),
     )
 
-
-def build_local_fakts(manifest, fakts):
-    identifier = manifest.identifier
-    version = manifest.version
-
-    return Fakts(
-        grant=HardFakts(fakts=fakts),
-    )

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/builders.py

@@ -6,14 +6,13 @@ from arkitekt_next.apps.service.fakts_next import (
     build_arkitekt_next_fakts_next,
     build_arkitekt_next_redeem_fakts_next,
     build_arkitekt_next_token_fakts_next,
-    build_local_fakts,
 )
 from arkitekt_next.apps.service.herre import build_arkitekt_next_herre_next
 from .utils import create_arkitekt_next_folder
 from .base_models import Manifest
 from .apps.protocols import App
 from .service_registry import ServiceBuilderRegistry, get_default_service_registry
-from .init_registry import InitHookRegisty, get_current_init_hook_registry
+from .init_registry import InitHookRegistry, get_default_init_hook_registry
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
 
@@ -29,9 +28,8 @@ def easy(
     no_cache: bool = False,
     redeem_token: Optional[str] = None,
     service_registry: Optional[ServiceBuilderRegistry] = None,
-    init_hook_registry: Optional[InitHookRegisty] = None,
-    fakts: Optional[str] = None,
-    **kwargs,
+    init_hook_registry: Optional[InitHookRegistry] = None,
+    instance_id: str = "main",
 ) -> App:
     """Creates a next app
 
@@ -100,12 +98,8 @@ def easy(
         A built app, that can be used to interact with the ArkitektNext server
     """
     service_registry = service_registry or get_default_service_registry()
-    init_hook_registry = init_hook_registry or get_current_init_hook_registry()
+    init_hook_registry = init_hook_registry or get_default_init_hook_registry()
 
-    if init_hook_registry is None:
-        raise ValueError(
-            "No init hook registry found. Please provide a init hook registry or use the default one."
-        )
 
     if identifier is None:
         identifier = __file__.split("/")[-1].replace(".py", "")
@@ -121,13 +115,8 @@ def easy(
         requirements=service_registry.get_requirements(),
     )
 
-    if fakts:
-        fakts_next = build_local_fakts(
-            manifest=manifest,
-            fakts=fakts,
-        )
 
-    elif token:
+    if token:
         fakts_next = build_arkitekt_next_token_fakts_next(
             manifest=manifest,
             token=token,
@@ -150,7 +139,8 @@ def easy(
 
     herre_next = build_arkitekt_next_herre_next(fakts_next=fakts_next)
 
-    params = kwargs
+    params = {
+              "instance_id": instance_id,}
 
     create_arkitekt_next_folder(with_cache=True)
 
@@ -189,8 +179,7 @@ def interactive(
     app_kind: str = "development",
     registry: Optional[ServiceBuilderRegistry] = None,
     sync_mode: bool = True,
-    **kwargs,
-):
+) -> App:
     """Creates an interactive jupyter app"""
 
     app = easy(
@@ -204,9 +193,7 @@ def interactive(
         token=token,
         no_cache=no_cache,
         redeem_token=redeem_token,
-        app_kind=app_kind,
-        registry=registry,
-        **kwargs,
+     
     )
 
     if sync_mode:
@@ -215,7 +202,7 @@ def interactive(
         # to avoid having to use await for every call. This is the default
         # behaviour for the app, but can be overwritten by setting
         # app.koil.sync_in_async = False
-        app.koil.sync_in_async = True
+        app._koil.sync_in_async = True
         app.enter()
 
     return app

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/cli/commands/call/local.py

@@ -1,4 +1,5 @@
 
+from click import Context
 import rich_click as click
 from arkitekt_next.cli.options import *
 import asyncio
@@ -8,7 +9,6 @@ from arkitekt_next.cli.utils import import_builder
 from rekuest_next.rekuest import RekuestNext
 from rich.console import Console
 from typing import Dict, Any
-import asyncio
 
 
 async def call_app(
@@ -22,15 +22,11 @@ async def call_app(
 
     async with app:
 
-        rekuest: RekuestNext = app.services["rekuest"]
-        
+        rekuest: RekuestNext = app.rekuest
         
-        raise NotImplementedError("Not implemented yet")
+        raise NotImplementedError("Not implemented yet. Do you want to implement it? :)")
 
 
-        t = asyncio.create_task(rekuest.arun())
-        
-        await t
 
 
 
@@ -66,12 +62,12 @@ async def call_app(
 )
 @click.option("--fakts", "-f", "fakts", type=(str, str), multiple=True)
 def local(
-    ctx,
-    entrypoint=None,
-    builder=None,
-    args=None,
-    template: str = None,
-    fakts: str = None,
+    ctx: Context,
+    entrypoint: str | None =None,
+    builder: str | None =None,
+    args: Optional[Dict[str, Any]] = None,
+    template: str | None = None,
+    fakts: Optional[Dict[str, str]] = None,
     **builder_kwargs,
 ):
     """Runs the app in production mode

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/cli/commands/gen/compile.py

@@ -10,7 +10,7 @@ import os
     type=click.Path(exists=True),
     default=None,
 )
-def compile(projects, config):
+def compile(projects, config: click.Path):
     """Genererate the code of a project"
 
     Uses a previously generated graphql-config.yaml file to generate the code for a or multiple projects.

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/cli/commands/kabinet/build.py

@@ -5,11 +5,13 @@ import os
 from rich.panel import Panel
 import subprocess
 import uuid
+
+from kabinet.api.schema import RequirementInput
 from .io import generate_build
 from click import Context
 from .types import Flavour, InspectionInput
 import yaml
-from typing import Dict, Optional
+from typing import Dict, List, Optional
 import json
 from arkitekt_next.base_models import Requirement
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
@@ -93,7 +95,7 @@ def inspect_docker_container(build_id: str) -> InspectionInput:
         raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
 
 
-def inspect_templates(build_id: str, url: str) -> list[ImplementationInput]:
+def inspect_implementations(build_id: str, url: str) -> list[ImplementationInput]:
     try:
         # Run 'docker inspect' with the container ID or name
         process = subprocess.Popen(
@@ -116,7 +118,7 @@ def inspect_templates(build_id: str, url: str) -> list[ImplementationInput]:
             stderr=subprocess.PIPE,
         )
 
-        lines = []
+        lines: list[str] = []
         # Poll process for new output until finished
         while True:
             if process.poll() is not None:
@@ -129,9 +131,25 @@ def inspect_templates(build_id: str, url: str) -> list[ImplementationInput]:
 
         output = process.communicate()[0]
         exitCode = process.returncode
-
         result = "\n".join(lines)
 
+        
+        
+        if exitCode != 0:
+            
+            if "ModuleNotFoundError" in result:
+                raise click.ClickException(
+                    " It looks like you are missing a module in your container. Please make sure that you have all the dependencies installed in your container. The error is listed above."
+                )
+            
+            
+            
+            
+            raise click.ClickException(
+                "When running the command `arkitekt_next inspect implementations` we got an error. The error is listed above."
+            )
+
+        
         # Parse the JSON output
         correct_part = result.split("--START_TEMPLATES--")[1].split(
             "--END_TEMPLATES--"
@@ -158,7 +176,7 @@ def inspect_templates(build_id: str, url: str) -> list[ImplementationInput]:
         raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
 
 
-def inspect_requirements(build_id: str) -> Dict[str, Requirement]:
+def inspect_requirements(build_id: str) -> List[RequirementInput]:
     try:
         # Run 'docker inspect' with the container ID or name
         result = subprocess.run(
@@ -205,10 +223,10 @@ def inspect_requirements(build_id: str) -> Dict[str, Requirement]:
 
 def inspect_build(build_id: str, url: str) -> InspectionInput:
     size, size_root_fs = inspect_docker_container(build_id)
-    templates = inspect_templates(build_id, url)
+    implementations = inspect_implementations(build_id, url)
     requirements = inspect_requirements(build_id)
 
-    return InspectionInput(size=size, templates=templates, requirements=requirements)
+    return InspectionInput(size=size, implementations=tuple(implementations), requirements=tuple(requirements))
 
 
 def get_flavours(ctx: Context, select: Optional[str] = None) -> Dict[str, Flavour]:
@@ -223,7 +241,7 @@ def get_flavours(ctx: Context, select: Optional[str] = None) -> Dict[str, Flavou
             "We could not find the flavours folder. Please run `arkitekt_next port init` first to create a buildable flavour"
         )
 
-    flavours = {}
+    flavours: Dict[str, Flavour] = {}
 
     for dir_name in os.listdir(flavours_folder):
         dir = os.path.join(flavours_folder, dir_name)
@@ -283,7 +301,7 @@ def build(
     ctx: Context,
     flavour: str,
     no_inspect: bool,
-    tag: str = None,
+    tag: str | None = None,
     url: str = DEFAULT_ARKITEKT_URL,
 ) -> None:
     """Builds the arkitekt_next app to docker"""
@@ -303,7 +321,7 @@ def build(
 
     build_run = str(uuid.uuid4())
 
-    for key, flavour in flavours.items():
+    for key, inspected_flavour in flavours.items():
         md = Panel(
             "Building Flavour [bold]{}[/bold]".format(key),
             subtitle="This may take a while...",
@@ -311,7 +329,7 @@ def build(
         )
         console.print(md)
 
-        build_tag = build_flavour(key, flavour)
+        build_tag = build_flavour(key, inspected_flavour)
 
         if tag:
             subprocess.run(["docker", "tag", build_tag, tag], check=True)
@@ -320,7 +338,7 @@ def build(
         if not no_inspect:
             inspection = inspect_build(build_tag, url)
 
-        generate_build(build_run, build_tag, key, flavour, manifest, inspection)
+        generate_build(build_run, build_tag, key, inspected_flavour, manifest, inspection)
 
         md = Panel(
             "Built Flavour [bold]{}[/bold]".format(key),

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/cli/commands/kabinet/io.py

@@ -119,7 +119,7 @@ def generate_build(
     with open(config_file, "w") as file:
         yaml.safe_dump(
             json.loads(
-                config.json(exclude_none=True, exclude_unset=True, by_alias=True)
+                config.model_dump_json(exclude_none=True, exclude_unset=True, by_alias=True)
             ),
             file,
             sort_keys=True,

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/cli/commands/run/dev.py

@@ -1,5 +1,8 @@
+from functools import partial
 from importlib import import_module, reload
 import asyncio
+
+from click import Context
 from arkitekt_next import App
 from watchfiles import awatch, Change
 from rich.panel import Panel
@@ -165,10 +168,40 @@ def is_entrypoint_change(
     return False
 
 
+
+
+def callback(console: Console, future: asyncio.Task[None]):
+    if future.cancelled():
+        return
+    else:
+        has_exception = future.exception()
+
+        if not has_exception:
+            panel = Panel(
+                "App finished running", style="bold yellow", border_style="yellow"
+            )
+            console.print(panel)
+        else:
+            try:
+                raise has_exception
+            except Exception:
+                console.print_exception()
+                panel = Panel(
+                    "Error running App", style="bold red", border_style="red"
+                )
+                console.print(panel)
+
+
+
+
+
+
+
+
 async def run_dev(
     console: Console,
     manifest: Manifest,
-    version=None,
+    version: str | None =None,
     builder: str = "arkitekt_next.builders.easy",
     deep: bool = False,
     **builder_kwargs,
@@ -209,26 +242,10 @@ async def run_dev(
         console.print(panel)
         module = None
 
-    def callback(future):
-        if future.cancelled():
-            return
-        else:
-            has_exception = future.exception()
-
-            if not has_exception:
-                panel = Panel(
-                    "App finished running", style="bold yellow", border_style="yellow"
-                )
-                console.print(panel)
-            else:
-                try:
-                    raise has_exception
-                except Exception:
-                    console.print_exception()
-                    panel = Panel(
-                        "Error running App", style="bold red", border_style="red"
-                    )
-                    console.print(panel)
+    
+    
+    current_run: asyncio.Future[None] | None = None    
+    # This is the main task that is running the app    
 
     try:
         app: App = builder_func(
@@ -241,14 +258,16 @@ async def run_dev(
         panel = Panel(group, style="bold green", border_style="green")
         console.print(panel)
 
-        x = asyncio.create_task(run_app(app))
-        x.add_done_callback(callback)
+        current_run = asyncio.create_task(run_app(app))
+        current_run.add_done_callback(partial(callback, console))
     except Exception:
         console.print_exception()
         panel = Panel(
             "Error building initial App", style="bold red", border_style="red"
         )
         console.print(panel)
+        
+        
 
     async for changes in awatch(
         ".",
@@ -257,9 +276,12 @@ async def run_dev(
         step=500,
     ):
         if deep:
+            # 
             to_be_reloaded = check_deeps(changes)
             if not to_be_reloaded:
                 continue
+        else:
+            to_be_reloaded: Set[str] = set()
 
         group = construct_changes_group(changes)
         panel = Panel(group, style="bold blue", border_style="blue")
@@ -267,17 +289,17 @@ async def run_dev(
 
         console.print(panel)
         # Cancelling the app
-        if not x or x.done():
+        if not current_run or current_run.done():
             pass
 
         else:
-            x.cancel()
+            current_run.cancel()
             panel = Panel(
                 "Cancelling latest version", style="bold yellow", border_style="yellow"
             )
             console.print(panel)
             try:
-                await x
+                await current_run
 
             except asyncio.CancelledError:
                 pass
@@ -293,6 +315,8 @@ async def run_dev(
                     if deep:
                         reload_modules(to_be_reloaded)
                     else:
+         
+         
                         reload(module)
         except Exception:
             console.print_exception()
@@ -315,8 +339,8 @@ async def run_dev(
             panel = Panel(group, style="bold green", border_style="green")
             console.print(panel)
 
-            x = asyncio.create_task(run_app(app))
-            x.add_done_callback(callback)
+            current_run = asyncio.create_task(run_app(app))
+            current_run.add_done_callback(partial(callback, console))
         except Exception:
             console.print_exception()
             panel = Panel(
@@ -340,7 +364,7 @@ async def run_dev(
     is_flag=True,
 )
 @click.pass_context
-def dev(ctx, **kwargs):
+def dev(ctx: Context, **kwargs):
     """Runs the app in dev mode (with hot reloading)
 
     Running the app in dev mode will automatically reload the app when changes are detected.

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/cli/commands/run/utils.py

@@ -4,6 +4,20 @@ from arkitekt_next.apps.protocols import App
 
 
 def import_builder(builder: str) -> Callable[..., App]:
+    """ Import a builder function from a module.
+    
+    Parameters
+    ----------
+    builder : str
+        The builder function to import, in the format "module.function".
+        
+    Returns
+    -------
+    Callable[..., App]
+        The imported builder function.
+    
+    """
+    
     module_path, function_name = builder.rsplit(".", 1)
     module = import_module(module_path)
     function = getattr(module, function_name)

{arkitekt_next-0.11.0 → arkitekt_next-0.12.0}/arkitekt_next/cli/io.py

@@ -68,7 +68,7 @@ def write_manifest(manifest: Manifest):
 
     with open(config_file, "w") as file:
         yaml.safe_dump(
-            json.loads(manifest.json(exclude_none=True, exclude_unset=True)),
+            json.loads(manifest.model_dump_json(exclude_none=True, exclude_unset=True)),
             file,
             sort_keys=True,
         )

arkitekt_next-0.12.0/arkitekt_next/init_registry.py

@@ -0,0 +1,117 @@
+import contextvars
+from functools import wraps
+from typing import Callable, Dict, Optional, TypeVar, overload
+from arkitekt_next.apps.protocols import App
+
+Params = Dict[str, str]
+
+
+current_init_hook_registry = contextvars.ContextVar(
+    "current_init_hook_registry", default=None
+)
+
+
+
+InitHook = Callable[[App], None]
+
+
+class InitHookRegistry:
+    """ A registry for init hooks. This is used to register init hooks that
+    are called when the app is initialized. The init hooks are called in
+    the order they are registered
+    
+    The purpose of init hooks is to allow specific initialization 
+    code to be run when the app is initialized. This is useful if you 
+    plan to add some custom configuration or setup code that needs to be
+    run before the app is getting conneted to the server.
+    
+    """
+    
+    
+    
+    def __init__(self):
+        self.init_hooks: Dict[str, InitHook] = {}
+        self.cli_only_hooks: Dict[str, InitHook] = {}
+
+    def register(
+        self,
+        function: InitHook,
+        name: Optional[str] = None,
+        only_cli: bool = False,
+    ):
+        """ Register a function as an init hook. This function will be called
+        
+        
+        when the app is initialized. The init hooks are called in the order
+        
+        
+        """
+        
+        if name is None:
+            name = function.__name__
+            
+        if only_cli:
+            if name not in self.cli_only_hooks:
+                self.cli_only_hooks[name] = function
+            else:
+                raise ValueError(f"CLI Hook {name} already registered")
+
+        if name not in self.init_hooks:
+            self.init_hooks[name] = function
+        else:
+            raise ValueError(f"Init Hook {name} already registered")
+
+    def run_all(self, app: App, is_cli: bool = False):
+        for hook in self.init_hooks.values():
+            hook(app)
+            
+        if is_cli:
+            for hook in self.cli_only_hooks.values():
+                hook(app)
+
+
+T = TypeVar("T", bound=InitHook)
+
+
+@overload
+def init(func: T) -> T: ...
+
+
+@overload
+def init(*, only_cli: bool = False, init_hook_registry: InitHookRegistry | None = None) -> Callable[[T], T]: ...
+
+def init(
+    func: T | None = None,
+    *,
+    only_cli: bool = False,
+    init_hook_registry: InitHookRegistry | None = None,
+) -> T | Callable[[T], T]:
+    """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_default_init_hook_registry()
+
+    if func is not None:
+        init_hook_registry.register(func, only_cli=only_cli)
+        setattr(func, "__is_init_hook__", True)
+        return func
+
+    def decorator(inner: T) -> T:
+        @wraps(inner)
+        def wrapped(app: App):
+            return inner(app)
+
+        init_hook_registry.register(wrapped, only_cli=only_cli)
+        setattr(inner, "__is_init_hook__", True)
+        return inner
+
+    return decorator
+
+
+
+GLOBAL_INIT_HOOK_REGISTRY = None
+
+
+def get_default_init_hook_registry():
+    global GLOBAL_INIT_HOOK_REGISTRY
+    if GLOBAL_INIT_HOOK_REGISTRY is None:
+        GLOBAL_INIT_HOOK_REGISTRY = InitHookRegistry() # type: ignore
+    return GLOBAL_INIT_HOOK_REGISTRY