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

arkitekt_next/bloks/gateway.py

@@ -163,6 +163,7 @@ class GatewayBlok:
             ]
             + exposed_ports_strings,
             "depends_on": caddy_depends_on,
+            "networks": ["gateway", "default"],
         }
 
         context.docker_compose.set_nested("services", "caddy", caddy_container)
@@ -178,6 +179,7 @@ class GatewayBlok:
         }
 
         context.docker_compose.set_nested("services", "certer", certer_container)
+        context.docker_compose.set_nested("networks", "gateway", {"driver": "bridge"})
 
     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

@@ -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.2-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,7 @@ 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.command = f"arkitekt-next run prod --redeem-token={self.token} --url http://{self.gateway_host}:{self.gateway_port}"
 
         self.initialized = True
 
@@ -52,6 +55,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": "gateway",
+            },
+            "deploy": {
+                "restart_policy": {
+                    "condition": "on-failure",
+                    "delay": "10s",
+                    "max_attempts": 3,
+                    "window": "120s",
+                },
             },
         }
 
@@ -68,7 +81,6 @@ class InternalDockerBlok:
             help="Should we skip creating this service?",
             default=False,
             type=bool,
-           
         )
 
         return [

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

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

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

@@ -18,8 +18,8 @@ arkitekt_next/bloks/arkitekt.py,sha256=1h2fyJK-TcuiOVFyE7iO2S1jwLv52APsQpfxddmHW
 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=a1suHpSbdvu-KnkExYtRAxizwHhQXQhvoil8g24sLG4,6234
-arkitekt_next/bloks/internal_docker.py,sha256=q9gPPtU1m0-0eeqF4zxtCELp4lF8TVZSJi1qVwnSWus,2421
+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/livekit.py,sha256=yhre3PkIQwKGdGPFC-DhTID3rIbRQMts_UsAX9tw6-A,2561
 arkitekt_next/bloks/lok.py,sha256=MGXKg1NRvydA-wlncBQJwO2GfaQLl2shVo0g45r9J_8,12532
@@ -82,7 +82,7 @@ arkitekt_next/cli/commands/manifest/wizard.py,sha256=a8rIHgtmKuw-L4E3eO3kXwXv0TM
 arkitekt_next/cli/commands/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/run/dev.py,sha256=mobsKX155O6NXGzLK-c4_l2RN4vlM4-1lj2gQaX9HeA,10033
 arkitekt_next/cli/commands/run/main.py,sha256=0bNO3DqwbZ4ddMsDWbCGmlPD6Cs3Jlg4yh2-zilsEbY,552
-arkitekt_next/cli/commands/run/prod.py,sha256=5wbpKt8atp_Cz81v3iRUcOWCInStzlmlA2UmNQmg9Tw,1532
+arkitekt_next/cli/commands/run/prod.py,sha256=EqDMa_eYNaffHZOBHGQEGNJVKdq8NHCgfoqK8yH63B4,1637
 arkitekt_next/cli/commands/run/utils.py,sha256=zH-MNNEfKgyOYQvwP6Ph8KUHVqH48fw3ZI6tiQ9unwQ,325
 arkitekt_next/cli/configs/base.yaml,sha256=9IJ7B4Fq3swHsLUbKn1MlhhzJKqDI1wnR5PAG_VKs8A,30097
 arkitekt_next/cli/constants.py,sha256=xHG2lfXw_4atx9B4ICAY45fbNbQN0UQAfdxZQbduz_w,1411
@@ -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.42.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.7.42.dist-info/METADATA,sha256=WquBq_hol07JNoTaJQDpv2yHpAafBBvxBbfDud7DlGM,5973
-arkitekt_next-0.7.42.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.7.42.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.7.42.dist-info/RECORD,,
+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,,