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

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

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

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

@@ -1,6 +1,6 @@
 from blok import blok, InitContext, Option
 from blok.tree import YamlFile, Repo
-from typing import Protocol
+from typing import Any, Protocol
 from blok.utils import check_protocol_compliance
 from dataclasses import asdict
 from arkitekt_next.bloks.services import (
@@ -50,9 +50,11 @@ def create_default_service_dependencies():
 def create_default_service_yaml(
     init: InitContext,
     self: DefaultService,
+    additional_keys: dict[str, Any] = None,
 ) -> YamlFile:
     check_protocol_compliance(self, DefaultService)
     deps = init.dependencies
+    additional_keys = additional_keys or {}
 
     init.get_service(LokService).register_scopes(self.scopes)
 
@@ -91,6 +93,7 @@ def create_default_service_yaml(
             "scopes": self.scopes,
             "force_script_name": path_name,
             "csrf_trusted_origins": csrf_trusted_origins,
+            **additional_keys,
         }
     )
 

{arkitekt_next-0.7.42 → arkitekt_next-0.7.44}/arkitekt_next/bloks/gateway.py

@@ -1,3 +1,4 @@
+from arkitekt_next.bloks.services.name import NameService
 from blok import blok, InitContext, ExecutionContext, Option
 from blok.tree import YamlFile, Repo
 from pydantic import BaseModel
@@ -54,12 +55,16 @@ class GatewayBlok:
     def get_http_port(self):
         return 80
 
-    def preflight(self, init: InitContext, dns: DnsService):
+    def retrieve_gateway_network(self):
+        return self.gateway_network
+
+    def preflight(self, init: InitContext, dns: DnsService, name: NameService):
         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("-", "_")
 
     def build(
         self,
@@ -163,6 +168,7 @@ class GatewayBlok:
             ]
             + exposed_ports_strings,
             "depends_on": caddy_depends_on,
+            "networks": [self.gateway_network, "default"],
         }
 
         context.docker_compose.set_nested("services", "caddy", caddy_container)
@@ -178,6 +184,11 @@ class GatewayBlok:
         }
 
         context.docker_compose.set_nested("services", "certer", certer_container)
+        context.docker_compose.set_nested(
+            "networks",
+            self.gateway_network,
+            {"driver": "bridge", "name": self.gateway_network},
+        )
 
     def expose(self, path_name: str, port: int, host: str, strip_prefix: bool = False):
         self.exposed_hosts[path_name] = ExposedHost(

{arkitekt_next-0.7.42 → arkitekt_next-0.7.44}/arkitekt_next/bloks/internal_docker.py

@@ -13,12 +13,17 @@ from blok.tree import YamlFile, Repo
 class InternalDockerBlok:
     def __init__(self) -> None:
         self.host = "internal_docker"
-        
-        self.image = "jhnnsrs/deployer:0.0.1-vanilla"
-        self.instance_id = "INTERNAL_DOCKER"
 
+        self.image = "jhnnsrs/deployer:0.0.8-vanilla"
+        self.instance_id = "INTERNAL_DOCKER"
 
-    def preflight(self, init: InitContext, gateway: GatewayService, lok: LokBlok, socket: DockerSocketBlok):
+    def preflight(
+        self,
+        init: InitContext,
+        gateway: GatewayService,
+        lok: LokBlok,
+        socket: DockerSocketBlok,
+    ):
         for key, value in init.kwargs.items():
             setattr(self, key, value)
 
@@ -33,9 +38,9 @@ class InternalDockerBlok:
 
         self.token = lok.retrieve_token()
 
-        self.command = (
-           f"arkitekt-next run prod --redeem-token={self.token} --url http://{self.gateway_host}:{self.gateway_port}"
-        )
+        self.gateway_network = gateway.retrieve_gateway_network()
+
+        self.command = f"arkitekt-next run prod --redeem-token={self.token} --url http://{self.gateway_host}:{self.gateway_port}"
 
         self.initialized = True
 
@@ -52,6 +57,16 @@ class InternalDockerBlok:
             "volumes": [f"{self._socket}:/var/run/docker.sock"],
             "environment": {
                 "INSTANCE_ID": self.instance_id,
+                "ARKITEKT_GATEWAY": f"http://{self.gateway_host}:{self.gateway_port}",
+                "ARKITEKT_NETWORK": self.gateway_network,
+            },
+            "deploy": {
+                "restart_policy": {
+                    "condition": "on-failure",
+                    "delay": "10s",
+                    "max_attempts": 10,
+                    "window": "300s",
+                },
             },
         }
 
@@ -68,7 +83,6 @@ class InternalDockerBlok:
             help="Should we skip creating this service?",
             default=False,
             type=bool,
-           
         )
 
         return [

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

@@ -23,7 +23,7 @@ class KabinetBlok:
         self.build_repo = False
         self.buckets = ["media"]
         self.secret_key = secrets.token_hex(16)
-        self.ensured_repos = []
+        self.ensured_repos = ["jhnnsrs/ome:main", "jhnnsrs/renderer:main"]
         self.image = "jhnnsrs/kabinet:next"
 
     def get_builder(self):
@@ -36,7 +36,9 @@ class KabinetBlok:
         for key, value in init.kwargs.items():
             setattr(self, key, value)
 
-        self.service = create_default_service_yaml(init, self)
+        self.service = create_default_service_yaml(
+            init, self, {"ensured_repos": self.ensured_repos}
+        )
 
         self.initialized = True
 

{arkitekt_next-0.7.42 → arkitekt_next-0.7.44}/arkitekt_next/bloks/services/gateway.py

@@ -12,6 +12,8 @@ class GatewayService(Protocol):
         self, path_name: str, port: int, host: str, strip_prefix: bool = True
     ): ...
 
+    def retrieve_gateway_network(self): ...
+
     def expose_mapped(self, path_name: str, port: int, host: str, to_name: str): ...
 
     def expose_default(self, port: int, host: str): ...

{arkitekt_next-0.7.42 → arkitekt_next-0.7.44}/arkitekt_next/cli/commands/run/prod.py

@@ -5,6 +5,7 @@ from arkitekt_next.cli.ui import construct_run_panel
 from importlib import import_module
 from .utils import import_builder
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
+import sys
 
 
 async def run_app(app):
@@ -58,4 +59,8 @@ def prod(ctx, entrypoint=None, builder=None, **builder_kwargs):
     panel = construct_run_panel(app)
     console.print(panel)
 
-    asyncio.run(run_app(app))
+    try:
+        asyncio.run(run_app(app))
+    except Exception as e:
+        console.print_exception()
+        sys.exit(1)

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

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