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

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

@@ -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 → arkitekt_next-0.7.43}/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-0.7.42 → arkitekt_next-0.7.43}/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-0.7.42 → arkitekt_next-0.7.43}/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.43}/pyproject.toml

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