arkitekt-next 0.7.45__py3-none-any.whl → 0.7.47__py3-none-any.whl

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/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/bloks/orkestrator.py

@@ -6,7 +6,8 @@ from arkitekt_next.bloks.funcs import (
     create_default_service_dependencies,
     build_default_service_options,
 )
-from blok import blok, InitContext, ExecutionContext, Option
+from arkitekt_next.bloks.services.mount import MountService
+from blok import blok, InitContext, ExecutionContext, Option, Command
 from blok.tree import Repo, YamlFile
 
 
@@ -14,42 +15,46 @@ from blok.tree import Repo, YamlFile
 class OrkestratorBlok:
     def __init__(self) -> None:
         self.dev = False
+        self.disable = True
         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"
+        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):
+    def preflight(self, init: InitContext, mount: MountService):
         for key, value in init.kwargs.items():
             setattr(self, key, value)
 
-        self.service = create_default_service_yaml(
-            init, self, {"ensured_repos": self.ensured_repos}
-        )
+        if self.disable:
+            return
+        self.mount = mount.register_mount("orkestrator", Repo(self.repo))
 
         self.initialized = True
 
     def build(self, context: ExecutionContext):
-        context.docker_compose.set_nested("services", self.host, self.service)
+        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):
-        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,
+            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 [
-            *def_options,
             with_repos,
+            with_disable,
         ]

{arkitekt_next-0.7.45.dist-info → arkitekt_next-0.7.47.dist-info}/METADATA

@@ -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.dist-info → arkitekt_next-0.7.47.dist-info}/RECORD

@@ -1,4 +1,4 @@
-arkitekt_next/__blok__.py,sha256=MednehD5TP0rhi4Y3JGOinwTVfja-0F-YliY2p83hkU,1476
+arkitekt_next/__blok__.py,sha256=gQqlPrUPSeB-b3XkvXRwDoRWMfG-vYN-3a2pWHNjz_E,1563
 arkitekt_next/__init__.py,sha256=KFM_HlnIQWX7hXSZnYba3rdmZrsBE69K58rwh8ewxoM,970
 arkitekt_next/apps/__init__.py,sha256=cx_5Y-RkJFkSQJH-hUEC_L3eW1jU2E426c4e6_csIyM,42
 arkitekt_next/apps/easy.py,sha256=8eu-0DCWit2Ok4SPw_QCyriBZHPnLc1oK9qxPUxnElg,3135
@@ -14,7 +14,7 @@ arkitekt_next/apps/service/herre_qt.py,sha256=GntkKHmwcQqEFab02SWwdd3xONo0fLVGEP
 arkitekt_next/apps/types.py,sha256=cKRqHyKlNcGamPUxzvY0wyz0sEI4sBPa4CnvFnT1sTo,1140
 arkitekt_next/bloks/__init__.py,sha256=gXny6-WJ3alV1__xveI_0wcvgDuglR1WB7v7-8h1Olo,30
 arkitekt_next/bloks/admin.py,sha256=MlUQUYCHxCWtSD75mVHgs3DcDa0s8_D6_AIBslnYjZw,1300
-arkitekt_next/bloks/arkitekt.py,sha256=1h2fyJK-TcuiOVFyE7iO2S1jwLv52APsQpfxddmHWjk,1263
+arkitekt_next/bloks/arkitekt.py,sha256=N0WcdEr_x2TzDdpIW_WP8lVodYxRbOU4I5IP-aKGLLQ,1417
 arkitekt_next/bloks/config.py,sha256=SqJg9kB0AQ62b_WpIKgJ8Jpcqpc-AKN7gdEj87O-UGY,1268
 arkitekt_next/bloks/fluss.py,sha256=5-luL5EeCb2DE9aRcjUTxjz5fu2EwgIoBWGGmdlypkc,1487
 arkitekt_next/bloks/funcs.py,sha256=IdiMNUkQN5frHpgsiXJJfJib1lFhUEVwGYjJugpSlds,5350
@@ -27,7 +27,7 @@ arkitekt_next/bloks/mikro.py,sha256=JpWqEsV1-LktxSuWhEleZnDOdecHPZDqSR49VbcGxRo,
 arkitekt_next/bloks/minio.py,sha256=k7t1J46lO3eaBO9KdP7iYF--Go-m25dEmOwisbbOoVQ,5496
 arkitekt_next/bloks/mount.py,sha256=d14w7bMiaWbl5wgvanh4PwfIqEYsDEsw91360xfX0fU,1031
 arkitekt_next/bloks/namegen.py,sha256=0k4PYya5J4EQyt3XZ3UKhDlO_k29pmUEQSaklZGN8MA,1035
-arkitekt_next/bloks/orkestrator.py,sha256=hQZzD1Cuxi2BoU4PNfLNJ0yj5VS1QVRLtSSZP5gXRm0,1608
+arkitekt_next/bloks/orkestrator.py,sha256=D0WrSrVawy4wUZy1IrNk55xCSSTC73mt_efwkFg-9Q4,1756
 arkitekt_next/bloks/postgres.py,sha256=FRUF2fobUlU6OmK1VC7aN_WuX1NctLmZhzJJA1uOOeY,2773
 arkitekt_next/bloks/redis.py,sha256=_ddmcD3WwX7VA7zzzQ7-yjSM7f4reV0C8Pl70s7R2k8,2130
 arkitekt_next/bloks/rekuest.py,sha256=X1U_5xEUt_Eb3E6UkOt52m78tn5zTsueXxTScvHNKks,1551
@@ -136,8 +136,8 @@ arkitekt_next/qt/utils.py,sha256=MgBPtPmCSBkIuATov3UgREESwxAHh77lWNNxyE7Qs48,773
 arkitekt_next/service_registry.py,sha256=pczUuP_Nve7OYwB7-oDBLIw6bkjZPnzL3xFca5TF1io,3405
 arkitekt_next/tqdm.py,sha256=DlrxPluHao7TvW-Cqgt0UokRS-fM2_ZNiWiddqvCqCc,1488
 arkitekt_next/utils.py,sha256=gmKWy9M51vimohmmaoIpAJ0CaB22TFP0w3JszRrwiak,2379
-arkitekt_next-0.7.45.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.7.45.dist-info/METADATA,sha256=gOWTppmwasS-a0vx2viZI58bQ10DNDnpRiAZzvLCj2c,5973
-arkitekt_next-0.7.45.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.7.45.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.7.45.dist-info/RECORD,,
+arkitekt_next-0.7.47.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.7.47.dist-info/METADATA,sha256=U0GHm68JJm8NNBWAt69g3pktVhF_c6HcR-ZV0Y0VM8A,5974
+arkitekt_next-0.7.47.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.7.47.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.7.47.dist-info/RECORD,,