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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.44
+Version: 0.7.45
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs

{arkitekt_next-0.7.44 → arkitekt_next-0.7.45}/arkitekt_next/bloks/fluss.py

@@ -1,5 +1,6 @@
 import secrets
 from arkitekt_next.bloks.funcs import (
+    build_default_service_options,
     create_default_service_dependencies,
     create_default_service_yaml,
 )
@@ -13,6 +14,7 @@ DEFAULT_ARKITEKT_URL = "http://localhost:8000"
 @blok("live.arkitekt.fluss")
 class FlussBlok:
     def __init__(self) -> None:
+        self.dev = False
         self.host = "fluss"
         self.command = "bash run-debug.sh"
         self.image = "jhnnsrs/fluss:next"
@@ -42,44 +44,8 @@ class FlussBlok:
         context.docker_compose.set_nested("services", self.host, self.service)
 
     def get_options(self):
-        with_repo = Option(
-            subcommand="with_repo",
-            help="Which repo should we use when building the service? Only active if build_repo or mount_repo is active",
-            default=self.repo,
-        )
-        with_command = Option(
-            subcommand="command",
-            help="Which command should be run when starting the service",
-            default=self.command,
-        )
-        mount_repo = Option(
-            subcommand="mount_repo",
-            help="Should we mount the repo into the container?",
-            type=bool,
-            default=self.mount_repo,
-        )
-        build_repo = Option(
-            subcommand="build_repo",
-            help="Should we build the container from the repo?",
-            type=bool,
-            default=self.build_repo,
-        )
-        with_host = Option(
-            subcommand="host",
-            help="How should the service be named inside the docker-compose file?",
-            default=self.host,
-        )
-        with_secret_key = Option(
-            subcommand="secret_key",
-            help="The secret key to use for the django service",
-            default=self.secret_key,
-        )
+        def_options = build_default_service_options(self)
 
         return [
-            with_repo,
-            mount_repo,
-            build_repo,
-            with_host,
-            with_command,
-            with_secret_key,
+            *def_options,
         ]

{arkitekt_next-0.7.44 → arkitekt_next-0.7.45}/arkitekt_next/bloks/funcs.py

@@ -19,6 +19,9 @@ from blok.bloks.services.dns import DnsService
 
 
 class DefaultService(Protocol):
+    dev: bool
+    repo: str
+    command: str
     service_name: str
     host: str
     buckets: list[str]
@@ -47,6 +50,53 @@ def create_default_service_dependencies():
     ]
 
 
+def build_default_service_options(self: DefaultService) -> list[Option]:
+    return [
+        Option(
+            subcommand="dev",
+            help="Shoud we run the service in development mode (includes withrepo, mountrepo)?",
+            default=self.dev,
+        ),
+        Option(
+            subcommand="disable",
+            help="Shoud we disable the service?",
+            default=False,
+        ),
+        Option(
+            subcommand="with_repo",
+            help="Which repo should we use when building the service? Only active if build_repo or mount_repo is active",
+            default=self.repo,
+        ),
+        Option(
+            subcommand="with_command",
+            help="Which command should we use when building the service?",
+            default=self.command,
+        ),
+        Option(
+            subcommand="mount_repo",
+            help="Should we mount the repo into the container?",
+            type=bool,
+            default=self.mount_repo,
+        ),
+        Option(
+            subcommand="build_repo",
+            help="Should we build the container from the repo?",
+            type=bool,
+            default=self.build_repo,
+        ),
+        Option(
+            subcommand="host",
+            help="How should the service be named inside the docker-compose file?",
+            default=self.host,
+        ),
+        Option(
+            subcommand="secret_key",
+            help="The secret key to use for the django service",
+            default=self.secret_key,
+        ),
+    ]
+
+
 def create_default_service_yaml(
     init: InitContext,
     self: DefaultService,
@@ -118,13 +168,13 @@ def create_default_service_yaml(
         "depends_on": depends_on,
     }
 
-    if self.mount_repo:
+    if self.mount_repo or self.dev:
         mount = init.get_service(MountService).register_mount(
             self.host, Repo(self.repo)
         )
         service["volumes"].extend([f"{mount}:/workspace"])
 
-    if self.build_repo:
+    if self.build_repo or self.dev:
         mount = init.get_service(MountService).register_mount(
             self.host, Repo(self.repo)
         )

{arkitekt_next-0.7.44 → arkitekt_next-0.7.45}/arkitekt_next/bloks/kabinet.py

@@ -4,6 +4,7 @@ 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
@@ -12,9 +13,10 @@ from blok.tree import Repo, YamlFile
 @blok("live.arkitekt.kabinet")
 class KabinetBlok:
     def __init__(self) -> None:
+        self.dev = False
         self.host = "kabinet"
         self.command = "bash run-debug.sh"
-        self.repo = "https://github.com/jhnnsrs/kabinet-server"
+        self.repo = "https://github.com/arkitektio/kabinet-server"
         self.scopes = {
             "kabinet_deploy": "Deploy containers",
             "kabinet_add_repo": "Add repositories to the database",
@@ -46,38 +48,7 @@ class KabinetBlok:
         context.docker_compose.set_nested("services", self.host, self.service)
 
     def get_options(self):
-        with_repo = Option(
-            subcommand="with_repo",
-            help="Which repo should we use when building the service? Only active if build_repo or mount_repo is active",
-            default=self.repo,
-        )
-        with_command = Option(
-            subcommand="command",
-            help="Which command should be run when starting the service",
-            default=self.command,
-        )
-        mount_repo = Option(
-            subcommand="mount_repo",
-            help="Should we mount the repo into the container?",
-            type=bool,
-            default=self.mount_repo,
-        )
-        build_repo = Option(
-            subcommand="build_repo",
-            help="Should we build the container from the repo?",
-            type=bool,
-            default=self.build_repo,
-        )
-        with_host = Option(
-            subcommand="host",
-            help="How should the service be named inside the docker-compose file?",
-            default=self.host,
-        )
-        with_secret_key = Option(
-            subcommand="secret_key",
-            help="The secret key to use for the django service",
-            default=self.secret_key,
-        )
+        def_options = build_default_service_options(self)
         with_repos = Option(
             subcommand="repos",
             help="The default repos to enable for the service",
@@ -85,11 +56,6 @@ class KabinetBlok:
         )
 
         return [
-            with_repo,
-            mount_repo,
-            build_repo,
-            with_host,
-            with_command,
-            with_secret_key,
+            *def_options,
             with_repos,
         ]

{arkitekt_next-0.7.44 → arkitekt_next-0.7.45}/arkitekt_next/bloks/lok.py

@@ -5,6 +5,7 @@ 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 arkitekt_next.bloks.funcs import build_default_service_options
 from arkitekt_next.bloks.secret import SecretBlok
 from arkitekt_next.bloks.services.admin import AdminService
 from arkitekt_next.bloks.services.db import DBService
@@ -124,6 +125,7 @@ class LokBlok:
         self.private_key = None
         self.public_key = None
         self.host = "lok"
+        self.dev = False
         self.with_repo = False
         self.command = "bash run-debug.sh"
         self.repo = "https://github.com/jhnnsrs/lok-server-next"
@@ -210,11 +212,11 @@ class LokBlok:
             ],
         }
 
-        if self.mount_repo:
+        if self.mount_repo or self.dev:
             context.file_tree.set_nested("mounts", "lok", Repo(self.repo))
-            db_service["volumes"].append("./mounts/lok:/lok")
+            db_service["volumes"].append("./mounts/lok:/workspace")
 
-        if self.build_repo:
+        if self.build_repo or self.dev:
             context.file_tree.set_nested("mounts", "lok", Repo(self.repo))
             db_service["build"] = "./mounts/lok"
         else:
@@ -281,6 +283,16 @@ class LokBlok:
             .decode()
         )
 
+        def_options = build_default_service_options(self)
+
+        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",
@@ -303,38 +315,6 @@ class LokBlok:
             type=GROUP,
             show_default=True,
         )
-        with_repo = Option(
-            subcommand="with_repo",
-            help="Which repo should we use when building the service? Only active if build_repo or mount_repo is active",
-            default=self.repo,
-            show_default=True,
-        )
-        with_repo = Option(
-            subcommand="command",
-            help="Which command should be run when starting the service?",
-            default=self.command,
-            show_default=True,
-        )
-        mount_repo = Option(
-            subcommand="mount_repo",
-            help="The fakts url for connection",
-            type=bool,
-            default=False,
-        )
-        build_repo = Option(
-            subcommand="build_repo",
-            help="Should we build the container from the repo?",
-            type=bool,
-            default=False,
-            show_default=True,
-        )
-        with_host = Option(
-            subcommand="host",
-            help="Which internal hostname should be used",
-            default=self.host,
-            show_default=True,
-        )
-        #
         with_public_key = Option(
             subcommand="public_key",
             help="The public key for the JWT creation",
@@ -349,23 +329,14 @@ class LokBlok:
             callback=validate_private_key,
             required=True,
         )
-        with_secret_key = Option(
-            subcommand="secret_key",
-            help="The secret key to use for the django service",
-            default=self.secret_key,
-        )
 
         return [
+            *def_options,
             with_fakts_url,
             with_users,
-            with_repo,
-            mount_repo,
             with_groups,
-            build_repo,
-            with_host,
             with_private_key,
             with_public_key,
-            with_secret_key,
         ]
 
 

{arkitekt_next-0.7.44 → arkitekt_next-0.7.45}/arkitekt_next/bloks/mikro.py

@@ -8,6 +8,7 @@ from blok import blok, InitContext
 from blok import blok, InitContext, ExecutionContext, Option
 from blok.tree import YamlFile, Repo
 from arkitekt_next.bloks.funcs import (
+    build_default_service_options,
     create_default_service_dependencies,
     create_default_service_yaml,
     DefaultService,
@@ -25,6 +26,7 @@ class AccessCredentials(BaseModel):
 @blok("live.arkitekt.mikro")
 class MikroBlok:
     def __init__(self) -> None:
+        self.dev = False
         self.host = "mikro"
         self.command = "bash run-debug.sh"
         self.repo = "https://github.com/arkitektio/mikro-server-next"
@@ -56,44 +58,8 @@ class MikroBlok:
         context.docker_compose.set_nested("services", self.host, self.service)
 
     def get_options(self):
-        with_repo = Option(
-            subcommand="with_repo",
-            help="The fakts url for connection",
-            default=self.repo,
-        )
-        with_command = Option(
-            subcommand="command",
-            help="The fakts url for connection",
-            default=self.command,
-        )
-        mount_repo = Option(
-            subcommand="mount_repo",
-            help="The fakts url for connection",
-            type=bool,
-            default=self.mount_repo,
-        )
-        build_repo = Option(
-            subcommand="build_repo",
-            help="The fakts url for connection",
-            type=bool,
-            default=self.build_repo,
-        )
-        with_host = Option(
-            subcommand="host",
-            help="The fakts url for connection",
-            default=self.host,
-        )
-        with_secret_key = Option(
-            subcommand="secret_key",
-            help="The fakts url for connection",
-            default=self.secret_key,
-        )
+        def_options = build_default_service_options(self)
 
         return [
-            with_repo,
-            mount_repo,
-            build_repo,
-            with_host,
-            with_command,
-            with_secret_key,
+            *def_options,
         ]

arkitekt_next-0.7.45/arkitekt_next/bloks/orkestrator.py

@@ -0,0 +1,55 @@
+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,
+        ]

arkitekt_next-0.7.45/arkitekt_next/bloks/rekuest.py

@@ -0,0 +1,53 @@
+from typing import Dict, Any
+import secrets
+
+from arkitekt_next.bloks.funcs import (
+    build_default_service_options,
+    create_default_service_dependencies,
+    create_default_service_yaml,
+)
+from blok import blok, InitContext, ExecutionContext, Option
+from blok.tree import Repo, YamlFile
+
+
+@blok("live.arkitekt.rekuest")
+class RekuestBlok:
+    def __init__(self) -> None:
+        self.dev = False
+        self.host = "rekuest"
+        self.command = "bash run-debug.sh"
+        self.repo = "https://github.com/jhnnsrs/rekuest-server-next"
+        self.scopes = {
+            "rekuest_agent": "Act as an agent",
+            "rekuest_call": "Call other apps with rekuest",
+        }
+        self.mount_repo = False
+        self.build_repo = False
+        self.buckets = ["media"]
+        self.secret_key = secrets.token_hex(16)
+        self.ensured_repos = []
+        self.image = "jhnnsrs/rekuest:next"
+
+    def get_dependencies(self):
+        return create_default_service_dependencies()
+
+    def get_builder(self):
+        return "arkitekt.rekuest"
+
+    def preflight(self, init: InitContext):
+        for key, value in init.kwargs.items():
+            setattr(self, key, value)
+
+        self.service = create_default_service_yaml(init, self)
+
+        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)
+
+        return [
+            *def_options,
+        ]

{arkitekt_next-0.7.44 → arkitekt_next-0.7.45}/arkitekt_next/bloks/tailscale.py

@@ -9,11 +9,23 @@ from blok.tree import YamlFile
 
 @blok("live.arkitekt.tailscale")
 class TailscaleBlok:
-
     def __init__(self, name: str = "arkitekt") -> None:
         self.name = name
+        self.disable = False
 
-    def preflight(self, gateway: GatewayService, mount_service: MountService, dns: DnsService, net_name: str, auth_key: str, host_name: str):
+    def preflight(
+        self,
+        gateway: GatewayService,
+        mount_service: MountService,
+        dns: DnsService,
+        net_name: str,
+        auth_key: str,
+        host_name: str,
+        disable: bool = False,
+    ):
+        self.disable = disable
+        if self.disable:
+            return
         assert auth_key, "You need to provide an auth_key"
 
         self.caddy_service = gateway.get_internal_host()
@@ -25,6 +37,8 @@ class TailscaleBlok:
         self.host_name = host_name
 
     def build(self, ex: ExecutionContext):
+        if self.disable:
+            return
 
         if not self.tailnet_name:
             # Trying to automatically find the hostname
@@ -36,33 +50,41 @@ class TailscaleBlok:
         service = {
             "image": "jhnnsrs/tailproxy:latest",
             "volumes": [
-                f"{self.mount}:/var/lib/tailscale" # Persist the tailscale state directory
+                f"{self.mount}:/var/lib/tailscale"  # Persist the tailscale state directory
             ],
             "environment": [
                 "TS_STATE_DIR=/var/lib/tailscale",
                 f"TS_AUTH_KEY={self.auth_key}",
-               f"TS_HOSTNAME={self.host_name}",
+                f"TS_HOSTNAME={self.host_name}",
                 f"TS_TAILNET={self.tailnet_name}",
                 f"CADDY_TARGET={self.caddy_service}:{self.caddy_port}",
             ],
-
-
         }
 
         ex.docker_compose.set_nested("services", "tailscale_proxy", service)
 
     def get_options(self):
-        return [Option(
-            subcommand="net_name",
-            help="The name of your tailnet",
-            type=str,
-        ), Option(
-            subcommand="auth_key",
-            help="The auth_key of your tailnet",
-            type=str,
-        ),Option(
-            subcommand="host_name",
-            help="The hostname of your tailnet",
-            default=self.name,
-            type=str,
-        )]
+        return [
+            Option(
+                subcommand="net_name",
+                help="The name of your tailnet",
+                type=str,
+            ),
+            Option(
+                subcommand="auth_key",
+                help="The auth_key of your tailnet",
+                type=str,
+            ),
+            Option(
+                subcommand="host_name",
+                help="The hostname of your tailnet",
+                default=self.name,
+                type=str,
+            ),
+            Option(
+                subcommand="disable",
+                help="Should we disable the creation of the tailscale service?",
+                default=self.disable,
+                type=str,
+            ),
+        ]

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.44"
+version = "0.7.45"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"

arkitekt_next-0.7.44/arkitekt_next/bloks/rekuest.py

@@ -1,95 +0,0 @@
-from typing import Dict, Any
-import secrets
-
-from arkitekt_next.bloks.funcs import (
-    create_default_service_dependencies,
-    create_default_service_yaml,
-)
-from blok import blok, InitContext, ExecutionContext, Option
-from blok.tree import Repo, YamlFile
-
-
-@blok("live.arkitekt.rekuest")
-class RekuestBlok:
-    def __init__(self) -> None:
-        self.host = "rekuest"
-        self.command = "bash run-debug.sh"
-        self.repo = "https://github.com/jhnnsrs/rekuest-server_next"
-        self.scopes = {
-            "rekuest_agent": "Act as an agent",
-            "rekuest_call": "Call other apps with rekuest",
-        }
-        self.mount_repo = False
-        self.build_repo = False
-        self.buckets = ["media"]
-        self.secret_key = secrets.token_hex(16)
-        self.ensured_repos = []
-        self.image = "jhnnsrs/rekuest:next"
-
-    def get_dependencies(self):
-        return create_default_service_dependencies()
-
-    def get_builder(self):
-        return "arkitekt.rekuest"
-
-    def preflight(self, init: InitContext):
-        for key, value in init.kwargs.items():
-            setattr(self, key, value)
-
-        self.service = create_default_service_yaml(init, self)
-
-        self.initialized = True
-
-    def build(self, context: ExecutionContext):
-        context.docker_compose.set_nested("services", self.host, self.service)
-
-    def get_options(self):
-        with_repo = Option(
-            subcommand="with_repo",
-            help="Which repo should we use when building the service? Only active if build_repo or mount_repo is active",
-            type=str,
-            default=self.repo,
-        )
-        with_command = Option(
-            subcommand="command",
-            help="Which command should be run when starting the service",
-            type=str,
-            default=self.command,
-        )
-        mount_repo = Option(
-            subcommand="mount_repo",
-            help="Should we mount the repo into the container?",
-            type=bool,
-            default=self.mount_repo,
-        )
-        build_repo = Option(
-            subcommand="build_repo",
-            help="Should we build the container from the repo?",
-            type=bool,
-            default=self.build_repo,
-        )
-        with_host = Option(
-            subcommand="host",
-            help="How should the service be named inside the docker-compose file?",
-            default=self.host,
-        )
-        with_secret_key = Option(
-            subcommand="secret_key",
-            help="The secret key to use for the django service",
-            default=self.secret_key,
-        )
-        with_repos = Option(
-            subcommand="repos",
-            help="The default repos to enable for the service",
-            default=self.secret_key,
-        )
-
-        return [
-            with_repo,
-            mount_repo,
-            build_repo,
-            with_host,
-            with_command,
-            with_secret_key,
-            with_repos,
-        ]