arkitekt-next 0.8.66__tar.gz → 0.8.68__tar.gz

{arkitekt_next-0.8.66 → arkitekt_next-0.8.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.66
+Version: 0.8.68
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -27,23 +27,23 @@ Provides-Extra: reaktion
 Provides-Extra: rekuest
 Provides-Extra: stream
 Provides-Extra: unlok
-Requires-Dist: alpaka (>=0.1.20) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "alpaka" or extra == "extended")
+Requires-Dist: alpaka (>=0.1.21) ; (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.9") and (extra == "blok")
 Requires-Dist: dokker (>=1.0.0)
 Requires-Dist: elektro (>=0.4.1) ; (python_version >= "3.9") and (extra == "elektro")
-Requires-Dist: fakts-next (>=1.0.4)
+Requires-Dist: fakts-next (>=1.0.5)
 Requires-Dist: fluss-next (>=0.1.96) ; (python_version >= "3.9") and (extra == "fluss" or extra == "all")
 Requires-Dist: herre-next (>=1.0.2)
 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.103) ; (python_version >= "3.9") and (extra == "kraph" or extra == "extended")
+Requires-Dist: kraph (>=0.1.104) ; (python_version >= "3.9") and (extra == "kraph" or extra == "extended")
 Requires-Dist: lovekit (>=0.1.19) ; (python_version >= "3.10") and (extra == "lovekit" or extra == "stream")
 Requires-Dist: mikro-next (>=0.1.60) ; (python_version >= "3.11" and python_version < "4.0") and (extra == "mikro" or extra == "all")
 Requires-Dist: namegenerator (>=1.0.6) ; (python_version >= "3.9") and (extra == "blok")
 Requires-Dist: netifaces (>=0.11.0) ; (python_version >= "3.9") and (extra == "blok")
 Requires-Dist: reaktion-next (>=0.1.87) ; (python_version >= "3.9") and (extra == "reaktion" or extra == "all")
-Requires-Dist: rekuest-next (>=0.2.68) ; (python_version >= "3.9") and (extra == "cli" or extra == "rekuest" or extra == "all")
+Requires-Dist: rekuest-next (>=0.2.69) ; (python_version >= "3.9") 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 (extra == "cli" or extra == "all")

{arkitekt_next-0.8.66 → arkitekt_next-0.8.68}/arkitekt_next/__blok__.py

@@ -22,6 +22,7 @@ from arkitekt_next.bloks.ollama import OllamaBlok
 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
 
 
 def get_bloks():
@@ -50,5 +51,6 @@ def get_bloks():
         PreformedNamesBlok(),
         OrkestratorBlok(),
         LocalSignBlok(),
+        ElektroBlok(),
     ]
 

arkitekt_next-0.8.68/arkitekt_next/apps/service/fakts_next.py

@@ -0,0 +1,107 @@
+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 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.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:
+    identifier = manifest.identifier
+    version = manifest.version
+
+    demander = DeviceCodeDemander(
+        manifest=manifest,
+        redirect_uri="http://127.0.0.1:6767",
+        open_browser=not headless,
+        requested_client_kind=client_kind,
+    )
+
+    return ArkitektNextFaktsNext(
+        grant=RemoteGrant(
+            demander=demander,
+            discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
+            claimer=ClaimEndpointClaimer(),
+        ),
+        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,
+):
+    identifier = manifest.identifier
+    version = manifest.version
+
+    return ArkitektNextFaktsNext(
+        grant=RemoteGrant(
+            demander=RedeemDemander(token=redeem_token, manifest=manifest),
+            discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
+            claimer=ClaimEndpointClaimer(),
+        ),
+        cache=FileCache(
+            cache_file=f".arkitekt_next/cache/{identifier}-{version}_fakts_cache.json",
+            hash=manifest.hash() + url,
+        ),
+    )
+
+
+def build_arkitekt_next_token_fakts_next(
+    manifest: Manifest,
+    token: str,
+    url,
+):
+    identifier = manifest.identifier
+    version = manifest.version
+
+    return ArkitektNextFaktsNext(
+        grant=RemoteGrant(
+            demander=StaticDemander(token=token),
+            discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
+            claimer=ClaimEndpointClaimer(),
+        ),
+        cache=FileCache(
+            cache_file=f".arkitekt_next/cache/{identifier}-{version}_fakts_cache.json",
+            hash=manifest.hash() + url,
+        ),
+    )
+
+
+def build_local_fakts(manifest, fakts):
+
+    identifier = manifest.identifier
+    version = manifest.version
+
+    return ArkitektNextFaktsNext(
+        grant=HardFakts(fakts=fakts),
+
+    )

{arkitekt_next-0.8.66 → arkitekt_next-0.8.68}/arkitekt_next/bloks/arkitekt.py

@@ -14,6 +14,7 @@ from .mikro import MikroBlok
 from .orkestrator import OrkestratorBlok
 from .rekuest import RekuestBlok
 from .ollama import OllamaBlok
+from .elektro import ElektroBlok
 
 
 class AdminCredentials(BaseModel):
@@ -35,6 +36,7 @@ class AdminCredentials(BaseModel):
         KraphBlok.as_dependency(True, False),
         TailscaleBlok.as_dependency(True, False),
         OllamaBlok.as_dependency(True, False),
+        ElektroBlok.as_dependency(True, False),
     ],
 )
 class ArkitektBlok:

arkitekt_next-0.8.68/arkitekt_next/bloks/elektro.py

@@ -0,0 +1,42 @@
+import click
+from pydantic import BaseModel
+from typing import Dict, Any
+import yaml
+import secrets
+from blok import blok, InitContext
+
+from blok import blok, InitContext, ExecutionContext, Option
+from blok.tree import YamlFile, Repo
+from arkitekt_next.bloks.base import BaseArkitektService
+
+
+class AccessCredentials(BaseModel):
+    password: str
+    username: str
+    host: str
+    port: str
+    db_name: str
+
+
+@blok("live.arkitekt.elektro", description="Mikro is the bio-image database for arkitekt")
+class ElektroBlok(BaseArkitektService):
+    def __init__(self) -> None:
+        self.dev = False
+        self.host = "elektro"
+        self.command = "bash run-debug.sh"
+        self.repo = "https://github.com/jhnnsrs/elektro-server"
+        self.scopes = {
+            "mikro_read": "Read image from the database",
+            "mikro_write": "Write image to the database",
+        }
+        self.image = "jhnnsrs/elektro:nightly"
+        self.mount_repo = False
+        self.build_repo = False
+        self.buckets = ["media", "zarr", "parquet"]
+        self.secret_key = secrets.token_hex(16)
+
+    def get_builder(self):
+        return "arkitekt.generic"
+
+    def build(self, context: ExecutionContext):
+        context.docker_compose.set_nested("services", self.host, self.service)

{arkitekt_next-0.8.66 → arkitekt_next-0.8.68}/arkitekt_next/bloks/ollama.py

@@ -85,5 +85,5 @@ class OllamaBlok:
 
     def __str__(self) -> str:
         return (
-            f"LiveKitBlok(host={self.host}, command={self.command}, image={self.image})"
+            f"Ollama(host={self.host}, command={self.command}, image={self.image})"
         )

{arkitekt_next-0.8.66 → arkitekt_next-0.8.68}/arkitekt_next/builders.py

@@ -6,6 +6,7 @@ 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
@@ -30,6 +31,7 @@ def easy(
     app_kind: str = "development",
     service_registry: Optional[ServiceBuilderRegistry] = None,
     init_hook_registry: Optional[InitHookRegisty] = None,
+    fakts: Optional[str] = None,
     **kwargs,
 ) -> App:
     """Creates a next app
@@ -115,7 +117,13 @@ def easy(
         requirements=service_registry.get_requirements(),
     )
 
-    if token:
+    if fakts:
+        fakts_next = build_local_fakts(
+            manifest=manifest,
+            fakts=fakts,
+        )
+
+    elif token:
         fakts_next = build_arkitekt_next_token_fakts_next(
             manifest=manifest,
             token=token,

{arkitekt_next-0.8.66 → arkitekt_next-0.8.68}/arkitekt_next/cli/commands/call/local.py

@@ -1,9 +1,12 @@
+import json
 import rich_click as click
 from arkitekt_next.cli.options import *
 import asyncio
 from arkitekt_next.cli.ui import construct_run_panel
 from importlib import import_module
 from arkitekt_next.cli.utils import import_builder
+from rekuest_next.messages import Provide
+from rekuest_next.rekuest import RekuestNext
 from rekuest_next.api.schema import NodeKind, BindsInput
 from rich.table import Table
 from rich.console import Console
@@ -16,7 +19,27 @@ async def call_app(
     template_string: str,
     arg: Dict[str, Any],
 ):
+    
+
+
     async with app:
+
+        rekuest: RekuestNext = app.services["rekuest"]
+
+        registry = await rekuest.agent.extension_registry.get("default").aretrieve_registry()
+
+        x = await rekuest.agent.aspawn_actor_from_provision(
+            provide_message=Provide(
+                
+            )
+        )
+        
+        the_builder = registry.get_builder_for_interface(template_string)
+
+        print(the_builder)
+
+        actor = 
+
         raise NotImplementedError("Not implemented yet")
 
 
@@ -48,13 +71,16 @@ async def call_app(
     "template",
     help="The template to run",
     type=str,
+    required=True,
 )
+@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,
     **builder_kwargs,
 ):
     """Runs the app in production mode
@@ -68,6 +94,8 @@ def local(
     console = get_console(ctx)
     entrypoint = entrypoint or manifest.entrypoint
 
+
+    fakts = dict(fakts) if fakts else None
     kwargs = dict(args or [])
 
     builder = import_builder(builder)
@@ -82,6 +110,7 @@ def local(
     app = builder(
         **manifest.to_builder_dict(),
         **builder_kwargs,
+        fakts=fakts,
     )
 
     panel = construct_run_panel(app)

{arkitekt_next-0.8.66 → arkitekt_next-0.8.68}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.8.66"
+version = "0.8.68"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -10,14 +10,14 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.9,<4"
 herre-next = ">=1.0.2"
-fakts-next = ">=1.0.4"
-kraph = { version = ">=0.1.103", python = ">=3.9", optional = true }
+fakts-next = ">=1.0.5"
+kraph = { version = ">=0.1.104", python = ">=3.9", optional = true }
 mikro-next = { version = ">=0.1.60", python = "^3.11", optional = true }
 kabinet = { version = ">=0.1.46", optional = true,  python = "^3.9" }
 fluss-next = { version = ">=0.1.96", optional = true, python = ">=3.9" }
 reaktion-next= { version = ">=0.1.87", python = ">=3.9", optional = true }
-alpaka = { version = ">=0.1.20", python = "^3.10", optional = true }
-rekuest-next= { version = ">=0.2.68", python = ">=3.9", optional = true }
+alpaka = { version = ">=0.1.21", python = "^3.10", optional = true }
+rekuest-next= { version = ">=0.2.69", python = ">=3.9", optional = true }
 unlok-next= { version = ">=0.1.89", python = ">=3.9", optional = true }
 lovekit = { version = ">=0.1.19",python = ">=3.10",  optional = true }
 elektro = { version = ">=0.4.1", python = ">=3.9", optional = true }