arkitekt-next 0.12.1__py3-none-any.whl → 0.13.0__py3-none-any.whl

arkitekt_next/__blok__.py

@@ -21,7 +21,6 @@ from arkitekt_next.bloks.namegen import PreformedNamesBlok
 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
 from blok.blok import Blok
 
@@ -51,6 +50,5 @@ def get_bloks() -> list[Blok]:
         SecretBlok(),
         PreformedNamesBlok(),
         OrkestratorBlok(),
-        LocalSignBlok(),
         ElektroBlok(),
     ]

arkitekt_next/__init__.py

@@ -38,8 +38,10 @@ try:
         aiterate_raw,
         find,
     )
+    from .inspect import inspect
 except ImportError as e:
     raise e
+    inspect = missing_install("rekuest_next", e)
     publish = missing_install("rekuest_next", e)
     apublish = missing_install("rekuest_next", e)
     structure = missing_install("rekuest_next", e)
@@ -86,6 +88,7 @@ __all__ = [
     "breakpoint",
     "abreakpoint",
     "aiterate",
+    "inspect",
     "iterate",
     "aiterate_raw",
     "call",

arkitekt_next/bloks/alpaka.py

@@ -2,7 +2,18 @@ from typing import Dict, Any
 import secrets
 
 
+from arkitekt_next.bloks.services.admin import AdminService
+from arkitekt_next.bloks.services.channel import ChannelService
+from arkitekt_next.bloks.services.config import ConfigService
+from arkitekt_next.bloks.services.db import DBService
+from arkitekt_next.bloks.services.gateway import GatewayService
+from arkitekt_next.bloks.services.lok import LokService
+from arkitekt_next.bloks.services.mount import MountService
+from arkitekt_next.bloks.services.redis import RedisService
+from arkitekt_next.bloks.services.s3 import S3Service
+from arkitekt_next.bloks.services.secret import SecretService
 from blok import blok, InitContext, ExecutionContext, Option
+from blok.bloks.services.dns import DnsService
 from blok.tree import Repo, YamlFile
 from arkitekt_next.bloks.base import BaseArkitektService
 
@@ -13,7 +24,7 @@ class AlpakaBlok(BaseArkitektService):
         self.dev = False
         self.host = "alpaka"
         self.command = "bash run-debug.sh"
-        self.repo = "https://github.com/jhnnsrs/alpaka-server"
+        self.repo = "https://github.com/arkitektio/alpaka-server"
         self.scopes = {
             "alpaka_pull": "Pull new Models",
             "alpaka_chat": "Add repositories to the database",
@@ -22,11 +33,59 @@ class AlpakaBlok(BaseArkitektService):
         self.build_repo = False
         self.buckets = ["media"]
         self.secret_key = secrets.token_hex(16)
-        self.image = "jhnnsrs/alpaka:next"
+        self.image = "jhnnsrs/alpaka:nightly"
 
     def get_additional_config(self):
         return {"ensured_repos": self.ensured_repos}
 
+    def preflight(
+        self,
+        init: InitContext,
+        lok: LokService,
+        db: DBService,
+        redis: RedisService,
+        s3: S3Service,
+        config: ConfigService,
+        channel: ChannelService,
+        mount: MountService,
+        admin: AdminService,
+        secret: SecretService,
+        gateway: GatewayService | None = None,
+        dns: DnsService = None,
+        mount_repo: bool = False,
+        host: str = "",
+        image: str = "",
+        secret_key: str = "",
+        build_repo: bool = False,
+        command: str = "",
+        repo: str = "",
+        disable: bool = False,
+        dev: bool = False,
+    ):
+        return super().preflight(
+            init,
+            lok,
+            db,
+            redis,
+            s3,
+            config,
+            channel,
+            mount,
+            admin,
+            secret,
+            gateway,
+            dns,
+            mount_repo,
+            host,
+            image,
+            secret_key,
+            build_repo,
+            command,
+            repo,
+            disable,
+            dev,
+        )
+
     def get_builder(self):
         return "arkitekt.generic"
 

arkitekt_next/bloks/arkitekt.py

@@ -3,6 +3,7 @@ from typing import Any, Dict, Optional
 from pydantic import BaseModel
 
 from arkitekt_next.bloks.kraph import KraphBlok
+from arkitekt_next.bloks.lok import LokBlok
 from arkitekt_next.bloks.tailscale import TailscaleBlok
 from blok import InitContext, Panel, Renderer, blok
 
@@ -26,21 +27,17 @@ class AdminCredentials(BaseModel):
 @blok(
     "live.arkitekt",
     dependencies=[
+        LokBlok.as_dependency(True, True),
         MikroBlok.as_dependency(True, True),
         KabinetBlok.as_dependency(True, True),
         RekuestBlok.as_dependency(True, True),
         FlussBlok.as_dependency(True, True),
         InternalDockerBlok.as_dependency(True, True),
-        LocalLiveKitBlok.as_dependency(True, True),
-        OrkestratorBlok.as_dependency(True, False),
-        KraphBlok.as_dependency(True, False),
-        TailscaleBlok.as_dependency(True, False),
-        OllamaBlok.as_dependency(True, False),
-        ElektroBlok.as_dependency(True, False),
+        KraphBlok.as_dependency(True, True),
+        ElektroBlok.as_dependency(True, True),
     ],
 )
 class ArkitektBlok:
-
     def entry(self, renderer: Renderer):
         renderer.render(
             Panel(

arkitekt_next/bloks/base.py

@@ -63,12 +63,10 @@ class BaseArkitektService:
         redis: RedisService,
         s3: S3Service,
         config: ConfigService,
-        channel: ChannelService,
         mount: MountService,
         admin: AdminService,
         secret: SecretService,
-        gateway: Optional[GatewayService] = None,
-        dns: DnsService = None,
+        gateway: GatewayService,
         mount_repo: bool = False,
         host: str = "",
         image: str = "",
@@ -100,12 +98,7 @@ class BaseArkitektService:
 
         django_secret = secret.retrieve_secret()
 
-        dns_result = dns.get_dns_result()
-
         csrf_trusted_origins = []
-        for hostname in dns_result.hostnames:
-            csrf_trusted_origins.append(f"http://{hostname}")
-            csrf_trusted_origins.append(f"https://{hostname}")
 
         configuration = YamlFile(
             **{

arkitekt_next/bloks/gateway.py

@@ -67,20 +67,13 @@ class CaddyBlok:
     def preflight(
         self,
         init: InitContext,
-        dns: DnsService,
         name: NameService,
-        certer: CerterService,
     ):
         for key, value in init.kwargs.items():
             setattr(self, key, value)
 
-        self.public_ips = dns.get_dns_result().ip_addresses
-        self.public_hosts = dns.get_dns_result().hostnames
         self.gateway_network = name.retrieve_name().replace("-", "_")
 
-        self.cert_mount = certer.retrieve_certs_mount()
-        self.depends_on = certer.retrieve_depends_on()
-
     def build(
         self,
         context: ExecutionContext,
@@ -95,7 +88,6 @@ class CaddyBlok:
             if port.tls:
                 caddyfile += f"""
 :{port.port} {{
-    tls /certs/caddy.crt /certs/caddy.key
     reverse_proxy {port.host}:{port.to}
 }}
                 """
@@ -112,7 +104,6 @@ class CaddyBlok:
 """
             caddyfile += (
                 """
-    tls /certs/caddy.crt /certs/caddy.key
     """
                 if protocol == "https" and self.cert_mount
                 else ""
@@ -173,8 +164,6 @@ class CaddyBlok:
         ]
 
         volumes = ["./configs/Caddyfile:/etc/caddy/Caddyfile"]
-        if self.cert_mount:
-            volumes.append(f"{self.cert_mount}:/certs")
 
         caddy_container = {
             "image": "caddy:latest",
@@ -184,7 +173,6 @@ class CaddyBlok:
             ]
             + exposed_ports_strings,
             "volumes": volumes,
-            "depends_on": caddy_depends_on,
             "networks": [self.gateway_network, "default"],
         }
 

arkitekt_next/bloks/lok.py

@@ -35,7 +35,7 @@ class UserParamType(click.ParamType):
             return value
         try:
             name, password = value.split(":")
-            return {"name": name, "password": password}
+            return {"username": name, "password": password}
         except ValueError:
             self.fail(
                 f"User '{value}' is not in the correct format. It should be 'name:password'.",
@@ -176,8 +176,6 @@ class LokBlok:
         admin: AdminService,
         secrets: SecretBlok,
         s3: S3Service,
-        dns: DnsService,
-        livekit: Optional[LivekitService] = None,
     ):
         for key, value in init.kwargs.items():
             setattr(self, key, value)
@@ -193,9 +191,6 @@ class LokBlok:
         self.redis_access = redis.register()
         self.admin_access = admin.retrieve()
         self.s3_access = s3.create_buckets(self.buckets)
-        if livekit:
-            self.local_access = livekit.retrieve_access()
-        self.dns_result = dns.get_dns_result()
         self.initialized = True
 
     def build(self, context: ExecutionContext):
@@ -206,7 +201,7 @@ class LokBlok:
 
         if self.postgress_access.dependency:
             depends_on.append(self.postgress_access.dependency)
-            
+
         if self.s3_access.dependency:
             depends_on.append(self.s3_access.dependency)
 
@@ -219,7 +214,6 @@ class LokBlok:
             "volumes": [
                 "/var/run/docker.sock:/var/run/docker.sock",
                 "./configs/lok.yaml:/workspace/config.yaml",
-                "./certs:/certs",
             ],
         }
 
@@ -237,10 +231,6 @@ class LokBlok:
 
         trusted_origins = []
 
-        for i in self.dns_result.hostnames:
-            trusted_origins.append(f"http://{i}")
-            trusted_origins.append(f"https://{i}")
-
         configuration = YamlFile(
             **{
                 "db": asdict(self.postgress_access),
@@ -262,14 +252,8 @@ class LokBlok:
                 ],
                 "groups": [group for group in self.groups],
                 "deployment": {"name": self.deployment_name},
-                "livekit": (
-                    asdict(self.local_access)
-                    if self.local_access
-                    else {"api_key": "dev", "api_secret": "secret", "api_url": None}
-                ),
                 "s3": asdict(self.s3_access),
                 "token_expire_seconds": self.token_expiry_seconds,
-                "apps": [],
                 "force_script_name": "lok",
                 "csrf_trusted_origins": trusted_origins,
             }

arkitekt_next/builders.py

@@ -100,7 +100,6 @@ def easy(
     service_registry = service_registry or get_default_service_registry()
     init_hook_registry = init_hook_registry or get_default_init_hook_registry()
 
-
     if identifier is None:
         identifier = __file__.split("/")[-1].replace(".py", "")
 
@@ -115,7 +114,6 @@ def easy(
         requirements=service_registry.get_requirements(),
     )
 
-
     if token:
         fakts_next = build_arkitekt_next_token_fakts_next(
             manifest=manifest,
@@ -140,7 +138,8 @@ def easy(
     herre_next = build_arkitekt_next_herre_next(fakts_next=fakts_next)
 
     params = {
-              "instance_id": instance_id,}
+        "instance_id": instance_id,
+    }
 
     create_arkitekt_next_folder(with_cache=True)
 
@@ -176,7 +175,6 @@ def interactive(
     token: Optional[str] = None,
     no_cache: bool = False,
     redeem_token: Optional[str] = None,
-    app_kind: str = "development",
     registry: Optional[ServiceBuilderRegistry] = None,
     sync_mode: bool = True,
 ) -> App:
@@ -193,7 +191,7 @@ def interactive(
         token=token,
         no_cache=no_cache,
         redeem_token=redeem_token,
-     
+        service_registry=registry,
     )
 
     if sync_mode:
@@ -202,7 +200,8 @@ 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
+        if app.__koil:
+            app.__koil.sync_in_async = True
         app.enter()
 
     return app

arkitekt_next/inspect.py

@@ -0,0 +1,29 @@
+import typing
+from rekuest_next.structures.default import get_default_structure_registry
+import subprocess
+import sys
+import webbrowser
+import os
+from rath.scalars import ID
+
+
+def open_orkestrator_link(link: str):
+    webbrowser.open(link)
+
+
+class IDBearer(typing.Protocol):
+    id: ID
+
+
+def inspect(x: IDBearer) -> None:
+    """
+    Inspects the given object by opening it in the orkestrator.
+
+
+
+    """
+    structure_reg = get_default_structure_registry()
+
+    identifier = structure_reg.get_identifier_for_cls(type(x))
+
+    open_orkestrator_link(f"orkestrator://{identifier}/{x.id}")

arkitekt_next/protocols.py

@@ -1,4 +1,3 @@
-from typing import Any, Protocol
 """
 This module contains the types for the apps
 depending on the builder used.
@@ -10,12 +9,14 @@ an import exception to the app.
 
 """
 
+from typing import Any, Protocol, cast
 import logging
-from typing import Any, Dict, TYPE_CHECKING
+from typing import Dict, TYPE_CHECKING
 from koil import unkoil
 from koil.composition import KoiledModel
 from arkitekt_next.base_models import Manifest
 from fakts_next import Fakts
+from herre_next import Herre
 
 
 if TYPE_CHECKING:
@@ -25,15 +26,9 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-
-
-    
-
-
-
-
 class App(Protocol):
     """An app that is built with the easy builder"""
+
     fakts: Fakts
     herre: Herre
     manifest: Manifest
@@ -44,7 +39,7 @@ class App(Protocol):
         """Get the rekuest service"""
         if "rekuest" not in self.services:
             raise ValueError("Rekuest service is not available")
-        return self.services["rekuest"]
+        return cast("RekuestNext", self.services["rekuest"])
 
     def run(self):
         return unkoil(self.rekuest.arun)
@@ -79,5 +74,4 @@ class Builder(Protocol):
     This protocol defines the methods that a builder class must implement.
     """
 
-    def __call__(self, *args: Any, **kwds: Any) -> Any:
-        return super().__call__(*args, **kwds)
+    def __call__(self, *args: Any, **kwds: Any) -> Any: ...

{arkitekt_next-0.12.1.dist-info → arkitekt_next-0.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkitekt-next
-Version: 0.12.1
+Version: 0.13.0
 Summary: client for the arkitekt_next platform
 Author-email: jhnnsrs <jhnnsrs@gmail.com>
 License-Expression: MIT
@@ -20,12 +20,12 @@ Requires-Dist: watchfiles>=1.0.5
 Provides-Extra: all
 Requires-Dist: fluss-next>=0.2.0; extra == 'all'
 Requires-Dist: kabinet>=0.2.0; extra == 'all'
-Requires-Dist: mikro-next>=0.3.1; extra == 'all'
+Requires-Dist: mikro-next>=0.4; extra == 'all'
 Requires-Dist: reaktion-next>=0.2.0; extra == 'all'
 Requires-Dist: rekuest-next>=0.7; extra == 'all'
 Requires-Dist: rich-click>=1.6.1; extra == 'all'
 Requires-Dist: semver>=3.0.1; extra == 'all'
-Requires-Dist: turms>=0.8.2; extra == 'all'
+Requires-Dist: turms>=0.9; extra == 'all'
 Requires-Dist: unlok-next>=0.2.0; extra == 'all'
 Requires-Dist: watchfiles>=0.18.1; extra == 'all'
 Provides-Extra: alpaka
@@ -33,7 +33,7 @@ Requires-Dist: alpaka>=0.2.0; extra == 'alpaka'
 Provides-Extra: blok
 Requires-Dist: blok>=0.1.0; extra == 'blok'
 Provides-Extra: cli
-Requires-Dist: turms>=0.8.2; extra == 'cli'
+Requires-Dist: turms>=0.9.0; extra == 'cli'
 Provides-Extra: elektro
 Requires-Dist: elektro>=0.5.0; extra == 'elektro'
 Provides-Extra: extended
@@ -48,7 +48,7 @@ Requires-Dist: kraph>=0.2.0; extra == 'kraph'
 Provides-Extra: lovekit
 Requires-Dist: lovekit>=0.2.0; extra == 'lovekit'
 Provides-Extra: mikro
-Requires-Dist: mikro-next>=0.3.1; extra == 'mikro'
+Requires-Dist: mikro-next>=0.4.0; extra == 'mikro'
 Provides-Extra: reaktion
 Requires-Dist: reaktion-next>=0.2.0; extra == 'reaktion'
 Provides-Extra: unlok

{arkitekt_next-0.12.1.dist-info → arkitekt_next-0.13.0.dist-info}/RECORD

@@ -1,10 +1,11 @@
-arkitekt_next/__blok__.py,sha256=68Zx7ydA5CBnvm1ADdZZV31Oqp3ZV65-0jG7YZ_xKBc,1983
-arkitekt_next/__init__.py,sha256=HOKaWJpoMBgHx9Xo8WaO6vY-RhF_bQ6aUQh3p5r20B4,3108
+arkitekt_next/__blok__.py,sha256=1u-ggUla503bHMWsnHLOucmUMF4JuHNQRKuG1Vc343Q,1901
+arkitekt_next/__init__.py,sha256=6id-PHkRWAvHSSUpOg9rS7pTKYGherVpCO-Fy_ZVVvE,3205
 arkitekt_next/base_models.py,sha256=GlxtMcV4YbeY8wkbK943HsIFzB8caEsDOfzJ2EDLJ9s,4247
-arkitekt_next/builders.py,sha256=7FsGNpLa9mGhSW9UTAXt1ZJLdlIvbsPy7qQxYD0LEmU,7627
+arkitekt_next/builders.py,sha256=VjVipPc4EIpeHVQPSwfBzxIt1pJMIU8AweYN2WP91Yg,7646
 arkitekt_next/constants.py,sha256=N_tP85BDHPiOG663wwaEyMWYiUGtL2T_h4wBVPgsSUU,87
 arkitekt_next/init_registry.py,sha256=RHAHBI1dJNpFrNZRiDxMHBj_p4GLq2Oj0GnY9Vs31os,3230
-arkitekt_next/protocols.py,sha256=rLm9xeO3JT6b8Vrm8jOMZt_dxmbjvN_uubNrM3BwLwc,2032
+arkitekt_next/inspect.py,sha256=iJKyN_9jlrsoEEgl_kMriEZ46uKDNV-vz6PwzqDRE3g,587
+arkitekt_next/protocols.py,sha256=ZZFLOKtLlSjrKX4kWqZC-_C7QqSXN2MyeA8AbD9jfgo,2031
 arkitekt_next/service_registry.py,sha256=gA7c2JKWqZPme5VatVJWFlX0e8HPcxb2BkzZrBMGPUk,7307
 arkitekt_next/tqdm.py,sha256=KLGeviRa8iEx89OENMXOuoz8hRDKxDktwG3L8oPlR7I,3415
 arkitekt_next/utils.py,sha256=7kWfUU4jacD8sKgV2-GsZV547EXYpzDNx_7LnIrb0oU,2454
@@ -19,20 +20,19 @@ arkitekt_next/apps/service/herre_qt.py,sha256=42APOZl0SnX0FWl6K-TC9CcZUO-BSXMXyH
 arkitekt_next/apps/service/local_fakts.py,sha256=Wy37fjsEP2yjKZPtMlLilNlkO0olFX_7P5IIr6g3jkE,2900
 arkitekt_next/bloks/__init__.py,sha256=_4EeR63d6avQUWLG4mK2n_FvogTPQ_Jx6f2_RvNbWeA,29
 arkitekt_next/bloks/admin.py,sha256=LzlcGWtpoS3NR3llRjzj1EuwH5o_hroBje3ZSm7ZXOI,1293
-arkitekt_next/bloks/alpaka.py,sha256=d7m_qRJZUBdKmIQlWv51bhdvXtSXnRXwgAp1viLYVeM,1393
-arkitekt_next/bloks/arkitekt.py,sha256=DYMj0aRaCIN256jgZMJSOK4oLVRXNIwDKkzz_F3bTDA,1697
-arkitekt_next/bloks/base.py,sha256=0PBKYVb9-sWz4q90fu8uOlhGUQWRM8JtL4k2tSCW4cw,6567
+arkitekt_next/bloks/alpaka.py,sha256=Ojw1iOQL6JtEEwCTGshYO5e6iYn5dwx8LiG4ArdDCa4,3151
+arkitekt_next/bloks/arkitekt.py,sha256=BiqKLcptePUIDKtZ-IOf0mQnYPtZCquYbs0qKj8pUFk,1580
+arkitekt_next/bloks/base.py,sha256=n3cfEF-7OFJFUDMA5UDEfH118Mg-9aKBxFEFtm8Vb5E,6271
 arkitekt_next/bloks/channel.py,sha256=PsFlb1qjL9ULtbVt8g1dsuaa9bd60zJCT059LztUkGA,739
 arkitekt_next/bloks/config.py,sha256=YMQChT4SCdc_vvvbkAj_qGyA--6JVEHds7MalqUp3lw,1269
 arkitekt_next/bloks/elektro.py,sha256=7UlSZ6EjwCV3SEN7Wn0En2pDZwZcLF_wa5nQvZmKvGI,1288
 arkitekt_next/bloks/fluss.py,sha256=8nf5Z2k-tA3CNRQeIqh7-aaFe5my_NN2lAhbyYbwKEs,1074
-arkitekt_next/bloks/gateway.py,sha256=WBnqw-tfqYWNRJtyvTKxKbicR-Foe_jreMYNPQOARjk,6706
+arkitekt_next/bloks/gateway.py,sha256=H_8ZzEaeTOgVUjL8_qOa0hm6b8kqhXma6p2lxRDPfiY,6207
 arkitekt_next/bloks/internal_docker.py,sha256=4onnegXts8zOaXEgg4kw8zaqlACRNwvdknJeFHipGtQ,2829
 arkitekt_next/bloks/kabinet.py,sha256=NKP6tpr8XcVvvFifX-lxgBPkP0P810kJ4URv25jf2z8,1489
 arkitekt_next/bloks/kraph.py,sha256=vbDkLNC5X644pwM_rpUpTNl4uwGpswFm0iNsyMPWY6c,1292
 arkitekt_next/bloks/livekit.py,sha256=Wf4JM236ZwuWC5qHnZkGDPq_FZftKLi1nDWbkwRoVso,2611
-arkitekt_next/bloks/local_sign.py,sha256=UwqfPV3Z38CI2T8N1uJAX-CRlrRxzkdGfKDukPVHMJ4,8030
-arkitekt_next/bloks/lok.py,sha256=REa2HF6_FOqVyZ2KEdGTWfdgxXvGI5xvqqPJtyrzIJY,12136
+arkitekt_next/bloks/lok.py,sha256=LL5yoFwIXO4INGKHEha5k2VmkWyHgQIHmy1roDxEae0,11500
 arkitekt_next/bloks/mikro.py,sha256=bnI9lWd6FXyOViog0Xko3_yhKOt7AAdB_PA4N0XkXAU,1291
 arkitekt_next/bloks/minio.py,sha256=gVFVoq5Po7yWO-CeTxQQecK4b3bBr_vdnEodF991WR4,5595
 arkitekt_next/bloks/mount.py,sha256=IEod6LDuV5NNKvvRJ3Xgo8l2caVZnNmJYDgGGBUB3Cg,1088
@@ -144,8 +144,8 @@ arkitekt_next/qt/assets/light/green pulse.gif,sha256=cUd2F3Qlvjb7SnsU-LjGgeLTa8K
 arkitekt_next/qt/assets/light/orange pulse.gif,sha256=0gDvrRed0mzZZPHB4tP6vptx7myUCAa_hEVGdjRhNy8,94769
 arkitekt_next/qt/assets/light/pink pulse.gif,sha256=rxd6ZTHSIG9JZuuHhi3jiSB_JYFBZpy7OWUeZETlhQ4,107513
 arkitekt_next/qt/assets/light/red pulse.gif,sha256=U7WLbZvSl5e-Ob5RmawtlC0Rh9VVHxkjDbGjj7NYVUo,108749
-arkitekt_next-0.12.1.dist-info/METADATA,sha256=imfi-RE_4pppWlN1UEIsrNmsP4ja-PZ7iwZoD5-zgRQ,5782
-arkitekt_next-0.12.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-arkitekt_next-0.12.1.dist-info/entry_points.txt,sha256=IY-mUEDBU6QncqnYw-Ufw5bvNNXjqSlLf1uexZZCJhc,61
-arkitekt_next-0.12.1.dist-info/licenses/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.12.1.dist-info/RECORD,,
+arkitekt_next-0.13.0.dist-info/METADATA,sha256=VW7ONrep0p_hY3IFfYVm4ag-FAYjBxP9qVxX6MxXiTw,5778
+arkitekt_next-0.13.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+arkitekt_next-0.13.0.dist-info/entry_points.txt,sha256=IY-mUEDBU6QncqnYw-Ufw5bvNNXjqSlLf1uexZZCJhc,61
+arkitekt_next-0.13.0.dist-info/licenses/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.13.0.dist-info/RECORD,,

arkitekt_next/bloks/local_sign.py

@@ -1,261 +0,0 @@
-import click
-
-from pydantic import BaseModel
-from cryptography.hazmat.primitives import serialization as crypto_serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.hazmat.backends import default_backend as crypto_default_backend
-from typing import Dict, Optional
-from arkitekt_next.bloks.secret import SecretBlok
-from arkitekt_next.bloks.services.admin import AdminService
-from arkitekt_next.bloks.services.db import DBService
-from arkitekt_next.bloks.services.gateway import GatewayService
-from arkitekt_next.bloks.services.livekit import LivekitService
-from arkitekt_next.bloks.services.lok import LokCredentials, LokService
-import yaml
-import secrets
-from dataclasses import asdict
-
-from arkitekt_next.bloks.services.redis import RedisService
-from blok import blok, InitContext, ExecutionContext, Option
-from blok.bloks.services.dns import DnsService
-from blok.tree import YamlFile, Repo
-from blok import blok, InitContext
-
-
-DEFAULT_ARKITEKT_URL = "http://localhost:8000"
-
-
-# Define a custom user type that will parse and validate the user input
-class UserParamType(click.ParamType):
-    name = "user"
-
-    def convert(self, value, param, ctx):
-        if isinstance(value, dict):
-            return value
-        try:
-            name, password = value.split(":")
-            return {"name": name, "password": password}
-        except ValueError:
-            self.fail(
-                f"User '{value}' is not in the correct format. It should be 'name:password'.",
-                param,
-                ctx,
-            )
-
-
-USER = UserParamType()
-
-
-# Define a custom user type that will parse and validate the user input
-class GroupParamType(click.ParamType):
-    name = "group"
-
-    def convert(self, value, param, ctx):
-        if isinstance(value, dict):
-            return value
-        try:
-            name, description = value.split(":")
-            return {"name": name, "description": description}
-        except ValueError:
-            self.fail(
-                f"User '{value}' is not in the correct format. It should be 'name:password'.",
-                param,
-                ctx,
-            )
-
-
-GROUP = GroupParamType()
-
-
-class RedeemTokenParamType(click.ParamType):
-    name = "redeem_token"
-
-    def convert(self, value, param, ctx):
-        if isinstance(value, dict):
-            assert "user" in value, f"scope is required {value}"
-            assert "token" in value, f"description is required {value}"
-            return value
-
-        try:
-            user, token = value.split(":")
-            return {"user": user, "token": token}
-        except ValueError:
-            self.fail(
-                f"RedeemToken '{value}' is not in the correct format. It should be 'username:token'.",
-                param,
-                ctx,
-            )
-
-
-TOKEN = RedeemTokenParamType()
-
-
-class ScopeParamType(click.ParamType):
-    name = "scope"
-
-    def convert(self, value, param, ctx):
-        if isinstance(value, dict):
-            assert "scope" in value, f"scope is required {value}"
-            assert "description" in value, f"description is required {value}"
-            return value
-
-        try:
-            name, description = value.split(":")
-            return {"scope": name, "description": description}
-        except ValueError:
-            self.fail(
-                f"Scopes '{value}' is not in the correct format. It should be 'scope:description'.",
-                param,
-                ctx,
-            )
-
-
-SCOPE = ScopeParamType()
-
-
-@blok(LokService, description="A local sign service")
-class LocalSignBlok:
-    db_name: str
-
-    def __init__(self) -> None:
-        self.db_name = "lok_db"
-        self.mount_repo = False
-        self.build_repo = False
-        self.private_key = None
-        self.public_key = None
-        self.host = "lok"
-        self.dev = False
-        self.with_repo = False
-        self.users = []
-        self.tokens = []
-        self.groups = []
-        self.scopes = {}
-        self.key = None
-        self.deployment_name = "default"
-        self.token_expiry_seconds = 700000
-        self.preformed_redeem_tokens = [secrets.token_hex(16) for i in range(80)]
-        self.registered_tokens = {}
-        self.local_access = None
-
-    def retrieve_credentials(self) -> LokCredentials:
-        return LokCredentials(
-            public_key=self.public_key, key_type="RS256", issuer="lok"
-        )
-
-    def retrieve_labels(self, service_name: str, builder_name: str) -> list[str]:
-        return [
-            f"fakts.service={service_name}",
-            f"fakts.builder={builder_name}",
-        ]
-
-    def retrieve_token(self, user: str = "admin") -> str:
-        pass 
-        return "fake-token"
-
-    def register_scopes(self, scopes_dict: Dict[str, str]) -> LokCredentials:
-        self.scopes = self.scopes | scopes_dict
-
-    def preflight(
-        self,
-        init: InitContext
-    ):
-        for key, value in init.kwargs.items():
-            setattr(self, key, value)
-
-        assert self.public_key, "Public key is required"
-        assert self.private_key, "Private key is required"
-
-
-    def build(self, context: ExecutionContext):
-        context.file_tree.set_nested("secrets", "public_key.pem", self.public_key)
-        context.file_tree.set_nested("secrets", "private_key.pem", self.private_key)
-
-    def get_options(self):
-        key = rsa.generate_private_key(
-            public_exponent=65537, key_size=2048, backend=crypto_default_backend()
-        )
-
-        private_key = key.private_bytes(
-            crypto_serialization.Encoding.PEM,
-            crypto_serialization.PrivateFormat.PKCS8,
-            crypto_serialization.NoEncryption(),
-        ).decode()
-
-        public_key = (
-            key.public_key()
-            .public_bytes(
-                crypto_serialization.Encoding.OpenSSH,
-                crypto_serialization.PublicFormat.OpenSSH,
-            )
-            .decode()
-        )
-
-        with_dev = Option(
-            subcommand="dev",
-            help="Run the service in development mode",
-            type=bool,
-            default=self.dev,
-            show_default=True,
-        )
-
-        with_fakts_url = Option(
-            subcommand="db_name",
-            help="The name of the database",
-            default="db_name",
-            show_default=True,
-        )
-        with_users = Option(
-            subcommand="users",
-            help="Users that should be greated by default. Format is name:password",
-            default=["admin:admin"],
-            multiple=True,
-            type=USER,
-            show_default=True,
-        )
-        with_groups = Option(
-            subcommand="groups",
-            help="Groups that should be greated by default. Format is name:description",
-            default=["admin:admin_group"],
-            multiple=True,
-            type=GROUP,
-            show_default=True,
-        )
-        with_public_key = Option(
-            subcommand="public_key",
-            help="The public key for the JWT creation",
-            default=public_key,
-            required=True,
-            callback=validate_public_key,
-        )
-        with_private_key = Option(
-            subcommand="private_key",
-            help="The corresponding private key for the JWT creation",
-            default=private_key,
-            callback=validate_private_key,
-            required=True,
-        )
-
-        return [
-            with_dev,
-            with_fakts_url,
-            with_users,
-            with_groups,
-            with_private_key,
-            with_public_key,
-        ]
-
-
-def validate_public_key(ctx, param, value):
-    if not value.startswith("ssh-rsa"):
-        raise click.BadParameter(
-            f"Public key must be in ssh-rsa format. Started with {value}"
-        )
-    return value
-
-
-def validate_private_key(ctx, param, value):
-    if not value.startswith("-----BEGIN PRIVATE KEY-----"):
-        raise click.BadParameter(
-            f"Private key must be in PEM format. Started with {value}"
-        )
-    return value