arkitekt-next 0.7.45__tar.gz → 0.7.47__tar.gz

{arkitekt_next-0.7.45 → arkitekt_next-0.7.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.45
+Version: 0.7.47
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
 Provides-Extra: blok
 Provides-Extra: cli
-Requires-Dist: blok (>=0.0.9) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
+Requires-Dist: blok (>=0.0.11) ; (python_version >= "3.8" 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 (>=0.1.21)
 Requires-Dist: fakts (>=0.5.0)

{arkitekt_next-0.7.45 → arkitekt_next-0.7.47}/arkitekt_next/__blok__.py

@@ -2,6 +2,7 @@ from arkitekt_next.bloks.admin import AdminBlok
 from arkitekt_next.bloks.arkitekt import ArkitektBlok
 from arkitekt_next.bloks.mikro import MikroBlok
 from arkitekt_next.bloks.fluss import FlussBlok
+from arkitekt_next.bloks.orkestrator import OrkestratorBlok
 from arkitekt_next.bloks.redis import RedisBlok
 from arkitekt_next.bloks.gateway import GatewayBlok
 from arkitekt_next.bloks.livekit import LocalLiveKitBlok
@@ -40,4 +41,5 @@ def get_bloks():
         TailscaleBlok(),
         SecretBlok(),
         PreformedNamesBlok(),
+        OrkestratorBlok(),
     ]

{arkitekt_next-0.7.45 → arkitekt_next-0.7.47}/arkitekt_next/bloks/arkitekt.py

@@ -9,6 +9,7 @@ from .rekuest import RekuestBlok
 from .fluss import FlussBlok
 from .gateway import GatewayBlok
 from .internal_docker import InternalDockerBlok
+from .orkestrator import OrkestratorBlok
 
 
 class AdminCredentials(BaseModel):
@@ -19,7 +20,6 @@ class AdminCredentials(BaseModel):
 
 @blok("live.arkitekt")
 class ArkitektBlok:
-
     def entry(self, renderer: Renderer):
         renderer.render(
             Panel(
@@ -30,10 +30,19 @@ class ArkitektBlok:
             )
         )
 
-    def preflight(self, lok: LocalLiveKitBlok, mikro: MikroBlok, kabinet: KabinetBlok, rekuest: RekuestBlok, fluss: FlussBlok, gateway: GatewayBlok, internal_engine: InternalDockerBlok, scale: TailscaleBlok):
-        print (lok, mikro, kabinet, rekuest, fluss, gateway, internal_engine)
-
+    def preflight(
+        self,
+        lok: LocalLiveKitBlok,
+        mikro: MikroBlok,
+        kabinet: KabinetBlok,
+        rekuest: RekuestBlok,
+        fluss: FlussBlok,
+        gateway: GatewayBlok,
+        internal_engine: InternalDockerBlok,
+        scale: TailscaleBlok,
+        orkestrator: OrkestratorBlok,
+    ):
+        print(lok, mikro, kabinet, rekuest, fluss, gateway, internal_engine)
 
     def build(self, cwd):
         pass
-

arkitekt_next-0.7.47/arkitekt_next/bloks/orkestrator.py

@@ -0,0 +1,60 @@
+from typing import Dict, Any
+import secrets
+
+from arkitekt_next.bloks.funcs import (
+    create_default_service_yaml,
+    create_default_service_dependencies,
+    build_default_service_options,
+)
+from arkitekt_next.bloks.services.mount import MountService
+from blok import blok, InitContext, ExecutionContext, Option, Command
+from blok.tree import Repo, YamlFile
+
+
+@blok("live.arkitekt.orkestrator")
+class OrkestratorBlok:
+    def __init__(self) -> None:
+        self.dev = False
+        self.disable = True
+        self.repo = "https://github.com/arkitektio/orkestrator-next"
+        self.build_command = ["yarn"]
+        self.up_command = ["yarn", "start"]
+
+    def preflight(self, init: InitContext, mount: MountService):
+        for key, value in init.kwargs.items():
+            setattr(self, key, value)
+
+        if self.disable:
+            return
+        self.mount = mount.register_mount("orkestrator", Repo(self.repo))
+
+        self.initialized = True
+
+    def build(self, context: ExecutionContext):
+        if self.disable:
+            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)
+        )
+        pass
+
+    def get_options(self):
+        with_repos = Option(
+            subcommand="repo",
+            help="The default repo to use for the orkestrator",
+            default=self.repo,
+        )
+        with_disable = Option(
+            subcommand="disable",
+            help="Should we disable the orkestrator service?",
+            default=self.disable,
+        )
+
+        return [
+            with_repos,
+            with_disable,
+        ]

{arkitekt_next-0.7.45 → arkitekt_next-0.7.47}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.45"
+version = "0.7.47"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -24,7 +24,7 @@ semver = { version = ">=3.0.1", optional = true }
 dokker = ">=0.1.21"
 koil = ">=0.3.6"
 netifaces = { version = ">=0.11.0", python = "^3.8", optional = true }
-blok = { version = ">=0.0.9", python = "^3.8", optional = true }
+blok = { version = ">=0.0.11", python = "^3.8", optional = true }
 cryptography = { version = ">=40.0.8", python = "^3.8", optional = true }
 namegenerator = { version = ">=1.0.6", python = "^3.8", optional = true }
 

arkitekt_next-0.7.45/arkitekt_next/bloks/orkestrator.py

@@ -1,55 +0,0 @@
-from typing import Dict, Any
-import secrets
-
-from arkitekt_next.bloks.funcs import (
-    create_default_service_yaml,
-    create_default_service_dependencies,
-    build_default_service_options,
-)
-from blok import blok, InitContext, ExecutionContext, Option
-from blok.tree import Repo, YamlFile
-
-
-@blok("live.arkitekt.orkestrator")
-class OrkestratorBlok:
-    def __init__(self) -> None:
-        self.dev = False
-        self.repo = "https://github.com/arkitektio/orkestrator-next"
-        self.scopes = {
-            "kabinet_deploy": "Deploy containers",
-            "kabinet_add_repo": "Add repositories to the database",
-        }
-        self.build_command = "yarn"
-        self.up_command = "yarn start"
-
-    def get_builder(self):
-        return "arkitekt.generic"
-
-    def get_dependencies(self):
-        return create_default_service_dependencies()
-
-    def preflight(self, init: InitContext):
-        for key, value in init.kwargs.items():
-            setattr(self, key, value)
-
-        self.service = create_default_service_yaml(
-            init, self, {"ensured_repos": self.ensured_repos}
-        )
-
-        self.initialized = True
-
-    def build(self, context: ExecutionContext):
-        context.docker_compose.set_nested("services", self.host, self.service)
-
-    def get_options(self):
-        def_options = build_default_service_options(self)
-        with_repos = Option(
-            subcommand="repos",
-            help="The default repos to enable for the service",
-            default=self.secret_key,
-        )
-
-        return [
-            *def_options,
-            with_repos,
-        ]