arkitekt-next 0.9.4__py3-none-any.whl → 0.10.2__py3-none-any.whl

arkitekt_next/__blok__.py

@@ -23,9 +23,10 @@ from arkitekt_next.bloks.self_signed import SelfSignedBlok
 from arkitekt_next.bloks.kraph import KraphBlok
 from arkitekt_next.bloks.local_sign import LocalSignBlok
 from arkitekt_next.bloks.elektro import ElektroBlok
+from blok.blok import Blok
 
 
-def get_bloks():
+def get_bloks() -> list[Blok]:
     return [
         AdminBlok(),
         ArkitektBlok(),
@@ -53,4 +54,3 @@ def get_bloks():
         LocalSignBlok(),
         ElektroBlok(),
     ]
-

arkitekt_next/__init__.py

@@ -1,3 +1,14 @@
+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 .service_registry import (
+    require,
+    ServiceBuilderRegistry,
+    get_default_service_registry,
+)
+
+
 def missing_install(name: str, error: Exception):
     def real_missing_install(*args, **kwargs):
         raise ImportError(
@@ -8,27 +19,34 @@ def missing_install(name: str, error: Exception):
 
 
 try:
-    from rekuest_next.register import register, register_structure
-    from rekuest_next.agents.hooks import background
-    from rekuest_next.agents.hooks import startup
+    from rekuest_next.register import register
+    from rekuest_next.agents.hooks.background import background
+    from rekuest_next.agents.hooks.startup import startup
     from rekuest_next.agents.context import context
-    from rekuest_next.state.state import state
-    from rekuest_next.actors.reactive.api import abreakpoint, breakpoint
-    from rekuest_next.actors.reactive.api import progress, aprogress
-    from rekuest_next.actors.reactive.api import log, alog
-    from rekuest_next.register import test, benchmark
+    from rekuest_next.state.decorator import state
+    from rekuest_next.actors.context import abreakpoint, breakpoint
+    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.utils import call, call_raw, acall, acall_raw, find, afind
-    from rekuest_next.define import define
+    from rekuest_next.remote import (
+        call,
+        acall,
+        acall_raw,
+        iterate,
+        aiterate,
+        aiterate_raw,
+        find,
+    )
 except ImportError as e:
     raise e
-    register_structure = missing_install("rekuest_next", e)
+    structure = missing_install("rekuest_next", e)
     register = missing_install("rekuest_next", e)
     background = missing_install("rekuest_next", e)
     abreakpoint = missing_install("rekuest_next", e)
     breakpoint = missing_install("rekuest_next", e)
     startup = missing_install("rekuest_next", e)
     context = missing_install("rekuest_next", e)
+    find = missing_install("rekuest_next", e)
     state = missing_install("rekuest_next", e)
     progress = missing_install("rekuest_next", e)
     aprogress = missing_install("rekuest_next", e)
@@ -40,16 +58,9 @@ except ImportError as e:
     acall_raw = missing_install("rekuest_next", e)
     find = missing_install("rekuest_next", e)
     afind = missing_install("rekuest_next", e)
-
-from .builders import easy, interactive
-from .apps.types import App
-from fakts_next.helpers import afakt, fakt
-from .init_registry import init, InitHookRegisty, get_current_init_hook_registry
-from .service_registry import (
-    require,
-    ServiceBuilderRegistry,
-    get_current_service_registry,
-)
+    aiterate_raw = missing_install("rekuest_next", e)
+    aiterate = missing_install("rekuest_next", e)
+    iterate = missing_install("rekuest_next", e)
 
 
 __all__ = [
@@ -57,39 +68,29 @@ __all__ = [
     "require",
     "easy",
     "interactive",
-    "publicqt",
-    "jupy",
     "log",
     "alog",
     "afakt",
     "fakt",
     "progress",
     "aprogress",
-    "scheduler",
-    "register_structure",
-    "requirement",
     "ServiceBuilderRegistry",
-    "get_current_service_registry",
+    "get_default_service_registry",
     "register",
-    "group",
-    "useGuardian",
-    "useInstanceID",
     "find",
-    "afind",
+    "breakpoint",
+    "abreakpoint",
+    "aiterate",
+    "iterate",
+    "aiterate_raw",
     "call",
-    "call_raw",
     "acall",
     "acall_raw",
     "model",
-    "test",
-    "benchmark",
-    "useUser",
-    "next",
     "state",
     "context",
     "background",
     "startup",
-    "register_next",
     "init",
     "InitHookRegisty",
     "get_current_init_hook_registry",

arkitekt_next/apps/__init__.py

@@ -1,3 +1,3 @@
-from .types import App
+from .protocols import App
 
 __all__ = ["App"]

arkitekt_next/apps/{types.py → protocols.py}

@@ -1,7 +1,6 @@
 """
 This module contains the types for the apps
 depending on the builder used.
-
 This module imports all the apps and their types
 and sets them as attributes on the App class, if they are available.
 If they are not available, they are set to Any, so that we can add
@@ -11,12 +10,17 @@ an import exception to the app.
 """
 
 import logging
-from typing import TYPE_CHECKING, Any, Dict
+from typing import Any, Dict, TYPE_CHECKING
+from koil import unkoil
 from arkitekt_next.base_models import Manifest
 from koil.composition import Composition
 from fakts_next import Fakts
 from herre_next import Herre
-from koil.helpers import KoilTask
+
+
+if TYPE_CHECKING:
+    from rekuest_next.rekuest import RekuestNext
+
 
 logger = logging.getLogger(__name__)
 
@@ -29,18 +33,27 @@ class App(Composition):
     manifest: Manifest
     services: Dict[str, Any]
 
+    @property
+    def rekuest(self) -> "RekuestNext":
+        """Get the rekuest service"""
+        if "rekuest" not in self.services:
+            raise ValueError("Rekuest service is not available")
+        return self.services["rekuest"]
+
     def run(self):
-        """Run the app"""
-        return self.services["rekuest"].run()
+        return unkoil(self.rekuest.arun)
 
-    def run_detached(self) -> KoilTask:
-        """Run the app detached"""
+    async def arun(self):
+        return await self.rekuest.arun()
 
-        return self.services["rekuest"].run_detached()
+    def run_detached(self):
+        """Run the app detached"""
+        return self.rekuest.run_detached()
 
     def register(self, *args, **kwargs):
         """Register a service"""
-        self.services["rekuest"].register(*args, **kwargs)
+
+        self.rekuest.register(*args, **kwargs)
 
     async def __aenter__(self):
         await super().__aenter__()

arkitekt_next/apps/service/fakts_next.py

@@ -4,41 +4,35 @@ 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 import RemoteGrant
 from fakts_next.grants.remote.demanders.static import StaticDemander
-from fakts_next.grants.remote.demanders.device_code import DeviceCodeDemander
+from fakts_next.grants.remote.demanders.device_code import (
+    ClientKind,
+    DeviceCodeDemander,
+)
 from fakts_next.grants.remote.claimers.post import ClaimEndpointClaimer
 from fakts_next.grants.remote.demanders.redeem import RedeemDemander
 from fakts_next.cache.file import FileCache
 from arkitekt_next.base_models import Manifest
 
 
-class ArkitektNextFaktsQt(Fakts):
-    grant: RemoteGrant
-
-
-class ArkitektNextFaktsNext(Fakts):
-    pass
-
-
 def build_arkitekt_next_fakts_next(
     manifest: Manifest,
     url: Optional[str] = None,
     no_cache: bool = False,
     headless: bool = False,
-    client_kind: str = "development",
-) -> ArkitektNextFaktsNext:
+) -> Fakts:
     identifier = manifest.identifier
     version = manifest.version
+    if url is None:
+        raise ValueError("URL must be provided")
 
     demander = DeviceCodeDemander(
         manifest=manifest,
-        redirect_uri="http://127.0.0.1:6767",
         open_browser=not headless,
-        requested_client_kind=client_kind,
+        requested_client_kind=ClientKind.DEVELOPMENT,
     )
 
-    return ArkitektNextFaktsNext(
+    return Fakts(
         grant=RemoteGrant(
             demander=demander,
             discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
@@ -47,22 +41,15 @@ def build_arkitekt_next_fakts_next(
         cache=FileCache(
             cache_file=f".arkitekt_next/cache/{identifier}-{version}_fakts_cache.json",
             hash=manifest.hash() + url,
-            skip_cache=no_cache,
         ),
     )
 
 
-def build_arkitekt_next_redeem_fakts_next(
-    manifest: Manifest,
-    redeem_token: str,
-    url,
-    no_cache: Optional[bool] = False,
-    headless=False,
-):
+def build_arkitekt_next_redeem_fakts_next(manifest: Manifest, redeem_token: str, url):
     identifier = manifest.identifier
     version = manifest.version
 
-    return ArkitektNextFaktsNext(
+    return Fakts(
         grant=RemoteGrant(
             demander=RedeemDemander(token=redeem_token, manifest=manifest),
             discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
@@ -83,9 +70,9 @@ def build_arkitekt_next_token_fakts_next(
     identifier = manifest.identifier
     version = manifest.version
 
-    return ArkitektNextFaktsNext(
+    return Fakts(
         grant=RemoteGrant(
-            demander=StaticDemander(token=token),
+            demander=StaticDemander(token=token),  # type: ignore
             discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
             claimer=ClaimEndpointClaimer(),
         ),
@@ -97,11 +84,9 @@ def build_arkitekt_next_token_fakts_next(
 
 
 def build_local_fakts(manifest, fakts):
-
     identifier = manifest.identifier
     version = manifest.version
 
-    return ArkitektNextFaktsNext(
+    return Fakts(
         grant=HardFakts(fakts=fakts),
-
-    )
+    )

arkitekt_next/base_models.py

@@ -43,7 +43,7 @@ class Manifest(BaseModel):
     requirements: Optional[List[Requirement]] = Field(default_factory=list)
     """ Requirements that this app has TODO: What are the requirements? """
     model_config = ConfigDict(extra="forbid")
-    
+
     description: Optional[str] = None
     """ A human readable description of the app """
 
@@ -74,8 +74,8 @@ class Manifest(BaseModel):
         # Hash the JSON encoded dictionary
         return sha256(json_dd.encode()).hexdigest()
 
-    @field_validator("identifier")
-    def check_identifier(cls, v):
+    @field_validator("identifier", mode="after")
+    def check_identifier(cls, v: str) -> str:
         assert "/" not in v, "The identifier should not contain a /"
         assert len(v) > 0, "The identifier should not be empty"
         assert len(v) < 256, "The identifier should not be longer than 256 characters"

arkitekt_next/bloks/admin.py

@@ -1,5 +1,3 @@
-from pydantic import BaseModel
-from typing import Dict, Any
 from blok import blok, InitContext, Option
 from arkitekt_next.bloks.services.admin import AdminService, AdminCredentials
 

arkitekt_next/bloks/base.py

@@ -1,3 +1,4 @@
+from arkitekt_next.bloks.services.channel import ChannelService
 from blok import blok, InitContext, Option
 from blok.tree import YamlFile, Repo
 from typing import Any, Optional, Protocol
@@ -62,6 +63,7 @@ class BaseArkitektService:
         redis: RedisService,
         s3: S3Service,
         config: ConfigService,
+        channel: ChannelService,
         mount: MountService,
         admin: AdminService,
         secret: SecretService,

arkitekt_next/bloks/channel.py

@@ -0,0 +1,27 @@
+from pydantic import BaseModel
+from typing import Dict, Any
+from blok import blok, InitContext, Option
+from arkitekt_next.bloks.services.channel import ChannelService
+
+
+@blok(ChannelService, description="The current channel of the application")
+class ChannelBlok:
+    def __init__(self) -> None:
+        self.name = "default"
+
+    def preflight(self, init: InitContext):
+        for key, value in init.kwargs.items():
+            setattr(self, key, value)
+
+    def retrieve(self):
+        return self.name
+
+    def get_options(self):
+        with_name = Option(
+            subcommand="name",
+            help="Which channel name to use",
+            default=self.name,
+            show_default=True,
+        )
+
+        return [with_name]

arkitekt_next/bloks/services/channel.py

@@ -0,0 +1,12 @@
+from typing import Dict, Any, Protocol
+from blok import blok, InitContext, Option
+from blok import service
+from dataclasses import dataclass
+
+
+
+@service("live.arkitekt.channel")
+class ChannelService(Protocol):
+
+    def retrieve_channel(self) -> str:
+        return str

arkitekt_next/builders.py

@@ -11,14 +11,14 @@ from arkitekt_next.apps.service.fakts_next import (
 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.types import App
-from .service_registry import ServiceBuilderRegistry, get_current_service_registry
+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 arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
 
 def easy(
-    identifier: str = None,
+    identifier: str | None = None,
     version: str = "0.0.1",
     logo: Optional[str] = None,
     scopes: Optional[List[str]] = None,
@@ -28,7 +28,6 @@ def easy(
     token: Optional[str] = None,
     no_cache: bool = False,
     redeem_token: Optional[str] = None,
-    app_kind: str = "development",
     service_registry: Optional[ServiceBuilderRegistry] = None,
     init_hook_registry: Optional[InitHookRegisty] = None,
     fakts: Optional[str] = None,
@@ -100,9 +99,14 @@ def easy(
     NextApp
         A built app, that can be used to interact with the ArkitektNext server
     """
-    service_registry = service_registry or get_current_service_registry()
+    service_registry = service_registry or get_default_service_registry()
     init_hook_registry = init_hook_registry or get_current_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", "")
 
@@ -135,8 +139,6 @@ def easy(
             manifest=manifest,
             redeem_token=redeem_token,
             url=url,
-            no_cache=no_cache,
-            headless=headless,
         )
     else:
         fakts_next = build_arkitekt_next_fakts_next(
@@ -144,7 +146,6 @@ def easy(
             url=url,
             no_cache=no_cache,
             headless=headless,
-            client_kind=app_kind,
         )
 
     herre_next = build_arkitekt_next_herre_next(fakts_next=fakts_next)

arkitekt_next/cli/commands/call/main.py

@@ -1,3 +1,4 @@
+from click import Context
 import rich_click as click
 
 
@@ -7,7 +8,7 @@ from .remote import remote
 
 @click.group()
 @click.pass_context
-def call(ctx):
+def call(ctx: Context) -> None:
     """Inspects your arkitekt_next app
 
     Inspects various parts of your arkitekt_next app. This is useful for debugging

arkitekt_next/cli/commands/call/remote.py

@@ -1,3 +1,4 @@
+from click import Context
 import rich_click as click
 from arkitekt_next.cli.options import *
 import asyncio
@@ -49,7 +50,9 @@ async def call_app(
     help="The hash of the node to run",
     type=str,
 )
-def remote(ctx, entrypoint=None, builder=None, args=None, hash=str, **builder_kwargs):
+def remote(
+    ctx: Context, entrypoint=None, builder=None, args=None, hash=str, **builder_kwargs
+):
     """ALlows you to run a get the output of a node in a remote app.
 
     This is useful for debugging and testing. In this mode the app itself will not

arkitekt_next/cli/commands/inspect/requirements.py

@@ -1,7 +1,7 @@
-from arkitekt_next import get_current_service_registry
+from arkitekt_next import get_default_service_registry
 import rich_click as click
 from importlib import import_module
-from arkitekt_next.apps.types import App
+from arkitekt_next.apps.protocols 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
@@ -48,7 +48,6 @@ def requirements(
     entrypoint_file = f"{manifest.entrypoint}.py"
     os.path.realpath(entrypoint_file)
 
-
     entrypoint = manifest.entrypoint
 
     with console.status("Loading entrypoint module..."):
@@ -58,13 +57,9 @@ def requirements(
             console.print(f"Could not find entrypoint module {entrypoint}")
             raise e
 
-
-    service_registry = get_current_service_registry()
-    
-    
+    service_registry = get_default_service_registry()
 
     x = [item.model_dump(by_alias=True) for item in service_registry.get_requirements()]
-    
 
     if machine_readable:
         print("--START_REQUIREMENTS--" + json.dumps(x) + "--END_REQUIREMENTS--")

arkitekt_next/cli/commands/inspect/templates.py

@@ -2,7 +2,7 @@ import asyncio
 from pydantic import BaseModel
 import rich_click as click
 from importlib import import_module
-from arkitekt_next.apps.types import App
+from arkitekt_next.apps.protocols 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
@@ -18,7 +18,6 @@ except ImportError:
     pass
 
 
-
 @click.command("prod")
 @click.pass_context
 @click.option(
@@ -77,17 +76,15 @@ def templates(
     )
 
     rekuest = app.services.get("rekuest")
-    
-    registry =  get_default_definition_registry()
+
+    registry = get_default_definition_registry()
     global_list = []
     if registry is None:
         raise Exception("No default registry found")
-    
-    to_be_created_templates = tuple(
-            x.model_dump() for x in registry.templates.values()
-    )
+
+    to_be_created_templates = tuple(x.model_dump() for x in registry.templates.values())
     global_list.extend(to_be_created_templates)
-        
+
     console.print(f"Templates to be created: {len(global_list)}")
 
     if rekuest is None:

arkitekt_next/cli/commands/run/dev.py

@@ -9,14 +9,13 @@ import os
 import sys
 import inspect
 from rekuest_next.definition.registry import get_default_definition_registry
-from rekuest_next.agents.hooks import get_default_hook_registry
+from rekuest_next.agents.hooks.registry import get_default_hook_registry
 from typing import MutableSet, Tuple, Any, Set
 from arkitekt_next.cli.ui import construct_changes_group, construct_app_group
 from arkitekt_next.cli.commands.run.utils import import_builder
 from arkitekt_next.cli.types import Manifest
-from arkitekt_next.apps.types import App
+from arkitekt_next.apps.protocols import App
 import rich_click as click
-import os
 from arkitekt_next.cli.options import (
     with_fakts_next_url,
     with_builder,
@@ -105,7 +104,7 @@ async def run_app(app: App) -> None:
         raise Exception("No rekuest service found. We need this to run the app.")
 
     async with app:
-        await rekuest.run()
+        await rekuest.arun()
 
 
 def reload_modules(reloadable_modules) -> None:

arkitekt_next/cli/commands/run/utils.py

@@ -1,6 +1,6 @@
 from importlib import import_module
 from typing import Callable
-from arkitekt_next.apps.types import App
+from arkitekt_next.apps.protocols import App
 
 
 def import_builder(builder: str) -> Callable[..., App]:

arkitekt_next/cli/ui.py

@@ -11,7 +11,6 @@ try:
 except ImportError:
     get_default_definition_registry = lambda: None
     pass
-    
 
 
 def construct_codegen_welcome_panel() -> Panel:
@@ -71,12 +70,11 @@ def construct_app_group(app: App) -> Group:
     rekuest = app.services.get("rekuest")
     if rekuest is None:
         return Group(panel_header, service_tree)
-    
+
     default = get_default_definition_registry()
     if default is not None:
-        for key, template in default.templates.items():
+        for key, template in default.implementations.items():
             actor_tree.add(key + "-" + template.definition.name)
-    
 
     panel_group = Group(panel_header, service_tree, actor_tree)
 

arkitekt_next/cli/utils.py

@@ -1,6 +1,6 @@
 from importlib import import_module
 from typing import Callable
-from arkitekt_next.apps.types import App
+from arkitekt_next.apps.protocols import App
 import os
 
 

arkitekt_next/constants.py

@@ -1,4 +1,2 @@
 REPO_URL = "https://arkitekt.live/repo.json"
-
-
 DEFAULT_ARKITEKT_URL = "http://127.0.0.1"