arkitekt-next 0.7.43__py3-none-any.whl → 0.7.44__py3-none-any.whl

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/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,7 +168,7 @@ class GatewayBlok:
             ]
             + exposed_ports_strings,
             "depends_on": caddy_depends_on,
-            "networks": ["gateway", "default"],
+            "networks": [self.gateway_network, "default"],
         }
 
         context.docker_compose.set_nested("services", "caddy", caddy_container)
@@ -179,7 +184,11 @@ class GatewayBlok:
         }
 
         context.docker_compose.set_nested("services", "certer", certer_container)
-        context.docker_compose.set_nested("networks", "gateway", {"driver": "bridge"})
+        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/bloks/internal_docker.py

@@ -14,7 +14,7 @@ class InternalDockerBlok:
     def __init__(self) -> None:
         self.host = "internal_docker"
 
-        self.image = "jhnnsrs/deployer:0.0.2-vanilla"
+        self.image = "jhnnsrs/deployer:0.0.8-vanilla"
         self.instance_id = "INTERNAL_DOCKER"
 
     def preflight(
@@ -38,6 +38,8 @@ class InternalDockerBlok:
 
         self.token = lok.retrieve_token()
 
+        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
@@ -56,14 +58,14 @@ class InternalDockerBlok:
             "environment": {
                 "INSTANCE_ID": self.instance_id,
                 "ARKITEKT_GATEWAY": f"http://{self.gateway_host}:{self.gateway_port}",
-                "ARKITEKT_NETWORK": "gateway",
+                "ARKITEKT_NETWORK": self.gateway_network,
             },
             "deploy": {
                 "restart_policy": {
                     "condition": "on-failure",
                     "delay": "10s",
-                    "max_attempts": 3,
-                    "window": "120s",
+                    "max_attempts": 10,
+                    "window": "300s",
                 },
             },
         }

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/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.43.dist-info → arkitekt_next-0.7.44.dist-info}/METADATA

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

{arkitekt_next-0.7.43.dist-info → arkitekt_next-0.7.44.dist-info}/RECORD

@@ -17,10 +17,10 @@ arkitekt_next/bloks/admin.py,sha256=MlUQUYCHxCWtSD75mVHgs3DcDa0s8_D6_AIBslnYjZw,
 arkitekt_next/bloks/arkitekt.py,sha256=1h2fyJK-TcuiOVFyE7iO2S1jwLv52APsQpfxddmHWjk,1263
 arkitekt_next/bloks/config.py,sha256=SqJg9kB0AQ62b_WpIKgJ8Jpcqpc-AKN7gdEj87O-UGY,1268
 arkitekt_next/bloks/fluss.py,sha256=07l8mdS35JyuEthv4xH9qpCCNepMkJGm02PxEakQBD0,2671
-arkitekt_next/bloks/funcs.py,sha256=z1b58hENZfTfXYEqg_pP_2hm3ogDyu9_Ek8wk1P5XkA,3633
-arkitekt_next/bloks/gateway.py,sha256=D3qP2LuMVQ8gQgR33stSXnk_BxJprrDh9gfgiteblT4,6369
-arkitekt_next/bloks/internal_docker.py,sha256=ETxPA0i_Wc0DTEfy7t49LOI6tU6RP5tkOnVFEBsCgP0,2812
-arkitekt_next/bloks/kabinet.py,sha256=RMetXRKFRO9z_eGPXyzGCHTo9HJlcPaew2lfCltGoMg,2937
+arkitekt_next/bloks/funcs.py,sha256=CMGIWgsrYCr_QHiKMw9udsrjD1D7hOREHLNQNHtFVyE,3757
+arkitekt_next/bloks/gateway.py,sha256=Qfw_SkJbyMe5GrZ8YJaaLVyZ2ZlKpacJjUFLBk97vbg,6692
+arkitekt_next/bloks/internal_docker.py,sha256=4jhKwfVKPCZzhkuEVq1iw4gIpc6_R0Cco-_s0L8PiZI,2891
+arkitekt_next/bloks/kabinet.py,sha256=IE-fuu1ABWl-LmUWAlRw6ohkDKtYe11FeAhsUckqOh0,3041
 arkitekt_next/bloks/livekit.py,sha256=yhre3PkIQwKGdGPFC-DhTID3rIbRQMts_UsAX9tw6-A,2561
 arkitekt_next/bloks/lok.py,sha256=MGXKg1NRvydA-wlncBQJwO2GfaQLl2shVo0g45r9J_8,12532
 arkitekt_next/bloks/mikro.py,sha256=vNM9K7I3AK2G0WooaMQl7U8-_TN96P2YUfblqAMsvdI,2772
@@ -35,7 +35,7 @@ arkitekt_next/bloks/services/__init__.py,sha256=i9vGNd1lFBem3O2PblTouRzFVQkdwOYo
 arkitekt_next/bloks/services/admin.py,sha256=OXMAHph5lABNPFsXm8aboWffJ7CzSSNvke7xpmj9raI,463
 arkitekt_next/bloks/services/config.py,sha256=BLtbKXRRWmuZxvaaksuxt9EiDcazYwKL_IUIRhXBin8,393
 arkitekt_next/bloks/services/db.py,sha256=jMO751KJYjNmvHD0tOTWgkkemwTXc6mLHAge_i68JSA,600
-arkitekt_next/bloks/services/gateway.py,sha256=9dDv2aWCErkZ9JreqHdKax63_Imbc2EnWhpeScLnI7Q,799
+arkitekt_next/bloks/services/gateway.py,sha256=8gxbVi7DP1pXv6d7Lm4sA8sKptIWeNIVtQHWa1M-YUk,844
 arkitekt_next/bloks/services/livekit.py,sha256=5u-GThgKsgXiiobEL4arm3JJOgNTZae15Q-75i-4D8g,366
 arkitekt_next/bloks/services/lok.py,sha256=fzOGum0VmcVaONUhTv4jHYky4WrFq2ygDAYJjBv2vAI,500
 arkitekt_next/bloks/services/mount.py,sha256=MDlwHl5cTfBO8IgkofuFjQBbfIMKDm_R9suWkiyVG48,289
@@ -135,8 +135,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.43.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.7.43.dist-info/METADATA,sha256=pTmq2hp1u2N5nkyC85ToBuYTS7YzKCJHEFNeY0XgkAI,5973
-arkitekt_next-0.7.43.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.7.43.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.7.43.dist-info/RECORD,,
+arkitekt_next-0.7.44.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.7.44.dist-info/METADATA,sha256=dQWKNH07t3jsnXbDhkp_eNvwV2VI4TP_g74vEwzihkI,5973
+arkitekt_next-0.7.44.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.7.44.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.7.44.dist-info/RECORD,,