arkitekt-next 0.8.50__tar.gz → 0.8.52__tar.gz

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.50
+Version: 0.8.52
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -18,7 +18,7 @@ Provides-Extra: blok
 Provides-Extra: cli
 Provides-Extra: extended
 Provides-Extra: stream
-Requires-Dist: blok (>=0.0.20) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "blok")
+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)

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/arkitekt_next/__blok__.py

@@ -20,6 +20,7 @@ from arkitekt_next.bloks.secret import SecretBlok
 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
 
 
 def get_bloks():
@@ -39,6 +40,7 @@ def get_bloks():
         KabinetBlok(),
         MountBlok(),
         ConfigBlok(),
+        KraphBlok(),
         InternalDockerBlok(),
         DockerSocketBlok(),
         RekuestBlok(),

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/arkitekt_next/bloks/arkitekt.py

@@ -28,9 +28,9 @@ class AdminCredentials(BaseModel):
     RekuestBlok.as_dependency(True, True),
     FlussBlok.as_dependency(True, True),
     InternalDockerBlok.as_dependency(True, True),
-    OrkestratorBlok.as_dependency(True, True),
+    LocalLiveKitBlok.as_dependency(True, True),
+    OrkestratorBlok.as_dependency(True, False),
     KraphBlok.as_dependency(True, False),
-    LocalLiveKitBlok.as_dependency(True, False),
     TailscaleBlok.as_dependency(True, False),
     OllamaBlok.as_dependency(True, False),
 ])

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/arkitekt_next/bloks/gateway.py

@@ -33,7 +33,7 @@ class ExposedPort(BaseModel):
 
 
 @blok(
-    "live.arkitekt.gateway", description="A gateway for exposing services on the host"
+    "live.arkitekt.gateway", description="A gateway for exposing services on the host",
 )
 class CaddyBlok:
     def __init__(self) -> None:
@@ -63,7 +63,7 @@ class CaddyBlok:
     def retrieve_gateway_network(self):
         return self.gateway_network
 
-    def preflight(self, init: InitContext, dns: DnsService, name: NameService, certer: Optional[CerterService] = None):
+    def preflight(self, init: InitContext, dns: DnsService, name: NameService, certer: CerterService):
         for key, value in init.kwargs.items():
             setattr(self, key, value)
 
@@ -71,9 +71,8 @@ class CaddyBlok:
         self.public_hosts = dns.get_dns_result().hostnames
         self.gateway_network = name.retrieve_name().replace("-", "_")
 
-        if certer is not None:
-            self.cert_mount = certer.retrieve_certs_mount()
-            self.depends_on = certer.retrieve_depends_on()
+        self.cert_mount = certer.retrieve_certs_mount()
+        self.depends_on = certer.retrieve_depends_on()
         
 
     def build(
@@ -110,6 +109,7 @@ class CaddyBlok:
     tls /certs/caddy.crt /certs/caddy.key
     """
                 if protocol == "https"
+                and self.cert_mount
                 else ""
             )
             caddyfile += """
@@ -186,17 +186,6 @@ class CaddyBlok:
 
         context.docker_compose.set_nested("services", "caddy", caddy_container)
 
-        context.file_tree.set_nested("certs", {})
-        certer_container = {
-            "image": self.certer_image,
-            "volumes": ["./certs:/certs"],
-            "environment": {
-                "DOMAIN_NAMES": ",".join(self.public_hosts),
-                "IP_ADDRESSED": ",".join(self.public_ips),
-            },
-        }
-
-        context.docker_compose.set_nested("services", "certer", certer_container)
         context.docker_compose.set_nested(
             "networks",
             self.gateway_network,

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/arkitekt_next/bloks/internal_docker.py

@@ -11,7 +11,7 @@ from blok.tree import YamlFile, Repo
 
 @blok(
     "live.arkitekt.internal_engine",
-    description="an arktitekt deployer app that uses docker",
+    description="An Arkitekt plugin engine running inside a docker container",
 )
 class InternalDockerBlok:
     def __init__(self) -> None:

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/arkitekt_next/bloks/livekit.py

@@ -23,6 +23,7 @@ class LocalLiveKitBlok:
         self.skip = False
 
     def preflight(self, init: InitContext, gateway: GatewayService):
+
         for key, value in init.kwargs.items():
             setattr(self, key, value)
 

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/arkitekt_next/bloks/lok.py

@@ -4,7 +4,7 @@ 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
+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
@@ -143,6 +143,7 @@ class LokBlok:
         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(
@@ -172,8 +173,8 @@ class LokBlok:
         redis: RedisService,
         admin: AdminService,
         secrets: SecretBlok,
-        livekit: LivekitService,
         dns: DnsService,
+        livekit: Optional[LivekitService] = None,
     ):
         for key, value in init.kwargs.items():
             setattr(self, key, value)
@@ -188,7 +189,8 @@ class LokBlok:
         self.postgress_access = db.register_db(self.host)
         self.redis_access = redis.register()
         self.admin_access = admin.retrieve()
-        self.local_access = livekit.retrieve_access()
+        if livekit:
+            self.local_access = livekit.retrieve_access()
         self.dns_result = dns.get_dns_result()
         self.initialized = True
 
@@ -232,6 +234,8 @@ class LokBlok:
             trusted_origins.append(f"http://{i}")
             trusted_origins.append(f"https://{i}")
 
+
+
         configuration = YamlFile(
             **{
                 "db": asdict(self.postgress_access),
@@ -253,7 +257,7 @@ class LokBlok:
                 ],
                 "groups": [group for group in self.groups],
                 "deployment": {"name": self.deployment_name},
-                "livekit": asdict(self.local_access),
+                "livekit": asdict(self.local_access) if self.local_access else {"api_key": "dev", "api_secret": "secret", "api_url": None},
                 "token_expire_seconds": self.token_expiry_seconds,
                 "apps": [],
                 "force_script_name": "lok",

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/arkitekt_next/bloks/orkestrator.py

@@ -10,12 +10,12 @@ from blok.tree import Repo, YamlFile
 
 @blok(
     "live.arkitekt.orkestrator",
-    description="Orkestrator is the electron-based UI for arkitekt",
+    description="Orkestrator in its web-based UI",
 )
 class OrkestratorBlok:
     def __init__(self) -> None:
         self.dev = False
-        self.disable = True
+        self.disable = False
         self.host = "orkestrator"
         self.path_name = "orkestrator"
         self.repo = "https://github.com/arkitektio/orkestrator-next"
@@ -75,16 +75,17 @@ class OrkestratorBlok:
             return
         
         if self.dev:
-            context.docker_compose.set_nested("services", self.host, self.service)
 
+            context.install_commands.set_nested(
+                "orkestrator", Command(self.build_command, cwd=self.mount)
+            )
+            context.up_commands.set_nested(
+                "orkestrator", Command(self.up_command, cwd=self.mount)
+            )
             return
 
-        context.install_commands.set_nested(
-            "orkestrator", Command(self.build_command, cwd=self.mount)
-        )
-        context.up_commands.set_nested(
-            "orkestrator", Command(self.up_command, cwd=self.mount)
-        )
+        
+        context.docker_compose.set_nested("services", self.host, self.service)
         pass
 
     def get_options(self):

{arkitekt_next-0.8.50 → arkitekt_next-0.8.52}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.8.50"
+version = "0.8.52"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -26,7 +26,7 @@ semver = { version = ">=3.0.1", optional = true }
 dokker = ">=1.0.0"
 koil = ">=1.0.3"
 netifaces = { version = ">=0.11.0", python = "^3.8", optional = true }
-blok = { version = ">=0.0.20", python = "^3.9", optional = true }
+blok = { version = ">=0.0.22", python = "^3.9", optional = true }
 cryptography = { version = ">=40.0.8", python = "^3.8", optional = true }
 namegenerator = { version = ">=1.0.6", python = "^3.8", optional = true }