arkitekt-next 0.14.1__py3-none-any.whl → 0.16.0__py3-none-any.whl

arkitekt_next/bloks/alpaka.py

@@ -66,7 +66,10 @@ class AlpakaBlok(BaseArkitektService):
 
         path_name = self.host
 
-        gateway.expose(path_name, 80, self.host)
+        gateway_path = gateway.expose_service(path_name, 80, self.host)
+        lok.register_service_on_subpath(
+            self.get_blok_meta().service_identifier, gateway_path, "ht"
+        )
 
         postgress_access = db.register_db(self.host)
         redis_access = redis.register()

arkitekt_next/bloks/base.py

@@ -83,17 +83,20 @@ class BaseArkitektService:
 
         path_name = self.host
 
-        if gateway:
-            print("Registering gateway access")
-            gateway_access = gateway.expose(path_name, 80, self.host)
-
         postgress_access = db.register_db(self.host)
         redis_access = redis.register()
         lok_access = lok.retrieve_credentials()
         admin_access = admin.retrieve()
         minio_access = s3.create_buckets(self.buckets)
-        lok_labels = lok.retrieve_labels(
-            self.get_blok_meta().service_identifier, self.get_builder()
+
+        self.service_identifier = self.get_blok_meta().service_identifier
+
+        gateway_path = gateway.expose_service(
+            path_name, 80, self.host, strip_prefix=False
+        )
+
+        lok_labels = lok.register_service_on_subpath(
+            self.service_identifier, gateway_path, "ht"
         )
 
         django_secret = secret.retrieve_secret()
@@ -135,7 +138,6 @@ class BaseArkitektService:
             depends_on.append(minio_access.dependency)
 
         service = {
-            "labels": lok_labels,
             "volumes": [f"{config_mount}:/workspace/config.yaml"],
             "depends_on": depends_on,
         }

arkitekt_next/bloks/gateway.py

@@ -42,9 +42,7 @@ class CaddyBlok:
         self.exposed_to_hosts = {}
         self.http_expose_default = None
         self.exposed_ports = {}
-        self.with_certer = True
-        self.with_tailscale = True
-        self.certer_image = "jhnnsrs/certer:next"
+        self.with_certer = False
         self.http_port = 80
         self.https_port = 443
         self.public_ips = DEFAULT_PUBLIC_URLS
@@ -68,14 +66,10 @@ class CaddyBlok:
         self,
         init: InitContext,
         name: NameService,
-        certs: CerterService,
     ):
         for key, value in init.kwargs.items():
             setattr(self, key, value)
 
-        self.cert_mount = certs.retrieve_certs_mount()
-        self.depends_on = certs.retrieve_depends_on()
-
         self.gateway_network = name.retrieve_name().replace("-", "_")
 
     def build(
@@ -102,7 +96,7 @@ class CaddyBlok:
 }}
                 """
 
-        for protocol in ["http", "https"]:
+        for protocol in ["http"]:
             caddyfile += f"""
 {protocol}:// {{
 """
@@ -168,14 +162,11 @@ class CaddyBlok:
         ]
 
         volumes = ["./configs/Caddyfile:/etc/caddy/Caddyfile"]
-        if self.cert_mount:
-            volumes.append(f"{self.cert_mount}:/certs")
 
         caddy_container = {
             "image": "caddy:latest",
             "ports": [
                 f"{self.http_port}:80",
-                f"{self.https_port}:443",
             ]
             + exposed_ports_strings,
             "volumes": volumes,
@@ -190,10 +181,13 @@ class CaddyBlok:
             {"driver": "bridge", "name": self.gateway_network},
         )
 
-    def expose(self, path_name: str, port: int, host: str, strip_prefix: bool = False):
+    def expose_service(
+        self, path_name: str, port: int, host: str, strip_prefix: bool = False
+    ):
         self.exposed_hosts[path_name] = ExposedHost(
             host=host, port=port, stip_prefix=strip_prefix
         )
+        return path_name
 
     def expose_mapped(self, path_name: str, port: int, host: str, to: str):
         self.exposed_to_hosts[path_name] = ExpostedToHost(host=host, port=port, to=to)

arkitekt_next/bloks/internal_docker.py

@@ -15,7 +15,7 @@ from blok.tree import YamlFile, Repo
 )
 class InternalDockerBlok:
     def __init__(self) -> None:
-        self.host = "internal_docker"
+        self.host = "deployer"
 
         self.image = "jhnnsrs/deployer:nightly"
         self.instance_id = "INTERNAL_DOCKER"
@@ -32,9 +32,6 @@ class InternalDockerBlok:
 
         deps = init.dependencies
 
-        if self.skip:
-            return
-
         self._socket = socket.register_socket(self.host)
         self.gateway_host = gateway.get_internal_host()
         self.gateway_port = gateway.get_http_port()
@@ -48,8 +45,6 @@ class InternalDockerBlok:
         self.initialized = True
 
     def build(self, context: ExecutionContext):
-        if self.skip:
-            return
         db_service = {
             "image": self.image,
             "command": self.command,

arkitekt_next/bloks/livekit.py

@@ -51,10 +51,6 @@ class LocalLiveKitBlok:
         if self.skip:
             return
         db_service = {
-            "labels": [
-                "fakts.service=io.livekit.livekit",
-                "fakts.builder=livekitio.livekit",
-            ],
             "image": self.image,
             "command": self.command,
             "ports": [

arkitekt_next/bloks/lok.py

@@ -139,6 +139,13 @@ class LokBlok:
             "read": "A generic read access",
             "write": "A generic write access",
         }
+        self.email_service: str = "smtp"
+        self.email_host: str = "NOT_SET"
+        self.email_port: int = 587
+        self.email_user: str = "NOT_SET"
+        self.email_password: str = "NOT_SET"
+        self.email_from: str = "NOT_SET"
+
         self.buckets = ["media"]
         self.key = None
         self.deployment_name = "default"
@@ -146,6 +153,31 @@ class LokBlok:
         self.preformed_redeem_tokens = [secrets.token_hex(16) for i in range(80)]
         self.registered_tokens = {}
         self.local_access = None
+        self.registered_instances = [
+            {
+                "identifier": "local-lok",
+                "service": "live.arkitekt.lok",
+                "aliases": [
+                    {
+                        "layer": "public",
+                        "kind": "relative",
+                        "path": "lok",
+                        "challenge": "ht",
+                    }
+                ],
+            },
+            {
+                "identifier": "local-datalayer",
+                "service": "live.arkitekt.s3",
+                "aliases": [
+                    {
+                        "layer": "public",
+                        "kind": "relative",
+                        "challenge": "minio/health/live",
+                    }
+                ],
+            },
+        ]
 
     def retrieve_credentials(self) -> LokCredentials:
         return LokCredentials(
@@ -167,6 +199,21 @@ class LokBlok:
     def register_scopes(self, scopes_dict: Dict[str, str]) -> LokCredentials:
         self.scopes = self.scopes | scopes_dict
 
+    def register_service_on_subpath(self, service_name: str, subpath: str, htpath: str):
+        registered_instance = {
+            "identifier": f"local-{service_name}",
+            "service": service_name,
+            "aliases": [
+                {
+                    "layer": "public",
+                    "kind": "relative",
+                    "path": subpath,
+                    "challenge": htpath,
+                }
+            ],
+        }
+        self.registered_instances.append(registered_instance)
+
     def preflight(
         self,
         init: InitContext,
@@ -183,7 +230,11 @@ class LokBlok:
         assert self.public_key, "Public key is required"
         assert self.private_key, "Private key is required"
 
-        gateway.expose("lok", 80, self.host, strip_prefix=False)
+        self.exposed_path = gateway.expose_service(
+            "lok", 80, self.host, strip_prefix=False
+        )
+        self.exposed_services = {"live.arkitekt.lok": {}}
+
         gateway.expose_mapped(".well-known", 80, self.host, "lok")
 
         self.secret_blok = secrets
@@ -206,13 +257,8 @@ class LokBlok:
             depends_on.append(self.s3_access.dependency)
 
         db_service = {
-            "labels": [
-                "fakts.service=live.arkitekt.lok",
-                "fakts.builder=arkitekt.lok",
-            ],
             "depends_on": depends_on,
             "volumes": [
-                "/var/run/docker.sock:/var/run/docker.sock",
                 "./configs/lok.yaml:/workspace/config.yaml",
             ],
         }
@@ -255,7 +301,22 @@ class LokBlok:
                 "s3": asdict(self.s3_access),
                 "token_expire_seconds": self.token_expiry_seconds,
                 "force_script_name": "lok",
+                "layers": [
+                    {
+                        "identifier": "public",
+                        "kind": "public",
+                    }
+                ],
+                "instances": self.registered_instances,
                 "csrf_trusted_origins": trusted_origins,
+                "email": {
+                    "service": self.email_service,
+                    "host": self.email_host,
+                    "port": self.email_port,
+                    "user": self.email_user,
+                    "password": self.email_password,
+                    "from": self.email_from,
+                },
             }
         )
 

arkitekt_next/bloks/lovekit.py

@@ -64,7 +64,10 @@ class LovekitBlok:
 
         path_name = self.host
 
-        gateway.expose(path_name, 80, self.host)
+        gateway_path = gateway.expose_service(path_name, 80, self.host)
+        lok.register_service_on_subpath(
+            self.get_blok_meta().service_identifier, gateway_path, "ht"
+        )
 
         postgress_access = db.register_db(self.host)
         redis_access = redis.register()

arkitekt_next/bloks/minio.py

@@ -66,10 +66,13 @@ class MinioBlok:
         for bucket in buckets:
             bucket_name = self.name_service.retrieve_name()
             bucket_map[bucket] = bucket_name
-            self.gateway_service.expose(bucket_name, 9000, self.host)
+            self.gateway_service.expose_service(bucket_name, 9000, self.host)
 
         self.buckets.extend(bucket_map.values())
 
+        # expose the health check endpoints
+        self.gateway_service.expose_service("minio/health/live", 9000, self.host)
+
         creds = S3Credentials(
             name=self.name_service.retrieve_name(),
             access_key=new_access_key,
@@ -126,7 +129,6 @@ class MinioBlok:
             },
             "image": self.minio_image,
             "volumes": ["./data:/data"],
-            "labels": ["fakts.service=live.arkitekt.s3", "fakts.builder=arkitekt.s3"],
         }
 
         context.file_tree.set_nested("data", {})

arkitekt_next/bloks/ollama.py

@@ -38,10 +38,6 @@ class OllamaBlok:
         if self.skip:
             return
         db_service = {
-            "labels": [
-                "fakts.service=io.ollama.ollama",
-                "fakts.builder=ollama.ollama",
-            ],
             "image": self.image,
             "environment": {
                 "OLLAMA_KEEP_ALIVE": "24h",

arkitekt_next/bloks/postgres.py

@@ -61,7 +61,6 @@ class PostgresBlok(BaseModel):
                 "POSTGRES_PASSWORD": self.password,
                 "POSTGRES_MULTIPLE_DATABASES": "",
             },
-            "labels": ["fakts.service=live.arkitekt.postgres"],
         }
 
         if self.build_repo or self.dev:
@@ -73,7 +72,6 @@ class PostgresBlok(BaseModel):
             self.build_image["image"] = self.image
 
     def build(self, context: ExecutionContext):
-
         self.build_image["environment"]["POSTGRES_MULTIPLE_DATABASES"] = ",".join(
             self.registered_dbs.keys()
         )

arkitekt_next/bloks/services/gateway.py

@@ -8,9 +8,19 @@ from blok import blok, InitContext, service
 
 @service("live.arkitekt.gateway")
 class GatewayService(Protocol):
-    def expose(
+    def expose_service(
         self, path_name: str, port: int, host: str, strip_prefix: bool = True
-    ): ...
+    ) -> str:
+        """
+        Expose a service on the gateway.
+
+        :param path_name: The name of the path to expose.
+        :param port: The port to expose the service on.
+        :param host: The host to expose the service on.
+        :param strip_prefix: Whether to strip the prefix from the path.
+        :return: The name of the exposed service.
+        """
+        ...
 
     def retrieve_gateway_network(self): ...
 

arkitekt_next/bloks/services/lok.py

@@ -18,3 +18,7 @@ class LokService(Protocol):
     def retrieve_labels(self, service_name: str, builder_name: str) -> list[str]: ...
 
     def register_scopes(self, scopes_dict: Dict[str, str]): ...
+
+    def register_service_on_subpath(
+        self, service_name: str, subpath: str, htpath: str = ""
+    ) -> None: ...

{arkitekt_next-0.14.1.dist-info → arkitekt_next-0.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkitekt-next
-Version: 0.14.1
+Version: 0.16.0
 Summary: client for the arkitekt_next platform
 Author-email: jhnnsrs <jhnnsrs@gmail.com>
 License-Expression: MIT
@@ -12,20 +12,20 @@ Requires-Dist: fakts-next>=2
 Requires-Dist: kabinet>=0.5
 Requires-Dist: koil>=2.0.4
 Requires-Dist: rath>=3.4
-Requires-Dist: rekuest-next>=0.11
+Requires-Dist: rekuest-next>=0.11.1
 Requires-Dist: rich-click>=1.8.8
 Requires-Dist: semver>=3.0.4
 Requires-Dist: watchfiles>=1.0.5
 Provides-Extra: all
 Requires-Dist: fluss-next>=0.2.0; extra == 'all'
 Requires-Dist: kabinet>=0.2.0; extra == 'all'
-Requires-Dist: mikro-next>=0.4; extra == 'all'
+Requires-Dist: mikro-next>=0.6; extra == 'all'
 Requires-Dist: reaktion-next>=0.2.0; extra == 'all'
 Requires-Dist: rekuest-next>=0.7; extra == 'all'
 Requires-Dist: rich-click>=1.6.1; extra == 'all'
 Requires-Dist: semver>=3.0.1; extra == 'all'
 Requires-Dist: turms>=0.9; extra == 'all'
-Requires-Dist: unlok-next>=0.2.0; extra == 'all'
+Requires-Dist: unlok-next>=1.1.1; extra == 'all'
 Requires-Dist: watchfiles>=0.18.1; extra == 'all'
 Provides-Extra: alpaka
 Requires-Dist: alpaka>=0.2.0; extra == 'alpaka'
@@ -47,11 +47,11 @@ Requires-Dist: kraph>=0.2.0; extra == 'kraph'
 Provides-Extra: lovekit
 Requires-Dist: lovekit>=0.2.0; extra == 'lovekit'
 Provides-Extra: mikro
-Requires-Dist: mikro-next>=0.4.0; extra == 'mikro'
+Requires-Dist: mikro-next>=0.6.0; extra == 'mikro'
 Provides-Extra: reaktion
 Requires-Dist: reaktion-next>=0.2.0; extra == 'reaktion'
 Provides-Extra: unlok
-Requires-Dist: unlok-next>=0.2.0; extra == 'unlok'
+Requires-Dist: unlok-next>=1.1.1; extra == 'unlok'
 Description-Content-Type: text/markdown
 
 # arkitekt-next

{arkitekt_next-0.14.1.dist-info → arkitekt_next-0.16.0.dist-info}/RECORD

@@ -13,28 +13,27 @@ arkitekt_next/app/app.py,sha256=zj8RWXtB9d_C7mfeFxQSOO_flC9hDddmmCRwbIzHeSE,1945
 arkitekt_next/app/fakts.py,sha256=M6UcECwx-Hc0nXjyQ8qDmYyrg4pNV_26G8eZgqLuFMw,2659
 arkitekt_next/bloks/__init__.py,sha256=_4EeR63d6avQUWLG4mK2n_FvogTPQ_Jx6f2_RvNbWeA,29
 arkitekt_next/bloks/admin.py,sha256=BP2Wh3Q4BkLabX5lV8CkyyreJYH7jGIvYkzOlnhRdjM,1293
-arkitekt_next/bloks/alpaka.py,sha256=37pyi0K6sW2cYurLBH1-lfPLkV0ahfbe9CTsEEXgjvA,4546
+arkitekt_next/bloks/alpaka.py,sha256=aAVQ_3OX66nPCIJRebzDyloxWSHtn-BN-Mrd-vKgfJA,4692
 arkitekt_next/bloks/arkitekt.py,sha256=mY4NJ067Tqh-_zRU-Ylwhn-4WfWGMJgjkdu56BGsgpg,1699
-arkitekt_next/bloks/base.py,sha256=n3cfEF-7OFJFUDMA5UDEfH118Mg-9aKBxFEFtm8Vb5E,6271
+arkitekt_next/bloks/base.py,sha256=BDAmXpNSdTcRjclpv5-wnzH2uKn3K2ZMZduujSX-LPk,6285
 arkitekt_next/bloks/channel.py,sha256=PsFlb1qjL9ULtbVt8g1dsuaa9bd60zJCT059LztUkGA,739
 arkitekt_next/bloks/config.py,sha256=YMQChT4SCdc_vvvbkAj_qGyA--6JVEHds7MalqUp3lw,1269
 arkitekt_next/bloks/elektro.py,sha256=7UlSZ6EjwCV3SEN7Wn0En2pDZwZcLF_wa5nQvZmKvGI,1288
 arkitekt_next/bloks/fluss.py,sha256=8nf5Z2k-tA3CNRQeIqh7-aaFe5my_NN2lAhbyYbwKEs,1074
-arkitekt_next/bloks/gateway.py,sha256=8eQxIk7hlrmSlsOocqV0mGHVyRYCR6zdinPav4jxm-o,6431
-arkitekt_next/bloks/internal_docker.py,sha256=4onnegXts8zOaXEgg4kw8zaqlACRNwvdknJeFHipGtQ,2829
+arkitekt_next/bloks/gateway.py,sha256=mtUTbBUnuPpCzVicKmOKaU1bZjjatJ7K8JrLMER-tls,6119
+arkitekt_next/bloks/internal_docker.py,sha256=pugf1Ng6ssUPlDJq9cGHAWBJJq7Q9rI_lWQxlrsl4WU,2739
 arkitekt_next/bloks/kabinet.py,sha256=NKP6tpr8XcVvvFifX-lxgBPkP0P810kJ4URv25jf2z8,1489
 arkitekt_next/bloks/kraph.py,sha256=vbDkLNC5X644pwM_rpUpTNl4uwGpswFm0iNsyMPWY6c,1292
-arkitekt_next/bloks/l.py,sha256=37pyi0K6sW2cYurLBH1-lfPLkV0ahfbe9CTsEEXgjvA,4546
-arkitekt_next/bloks/livekit.py,sha256=HmAkmHgriGLhjOAlmX1g2v6Saal3eME6kooeferih6U,2653
-arkitekt_next/bloks/lok.py,sha256=LL5yoFwIXO4INGKHEha5k2VmkWyHgQIHmy1roDxEae0,11500
-arkitekt_next/bloks/lovekit.py,sha256=7_6eL7UiV1QCi8-3tsySmL8N1iOO50LED_BRyoJwYY0,6823
+arkitekt_next/bloks/livekit.py,sha256=fNTJ_w5UnmY6EwyzdRgo8e7ezq_zsy7og20jJctBEsE,2511
+arkitekt_next/bloks/lok.py,sha256=FnOYVuIhK5B8U1NDAineRsRGTsKjFfCtx9Bdn9r-vHg,13530
+arkitekt_next/bloks/lovekit.py,sha256=zKDYgLbzN-WKVGcTyP1_xqWUKaygC823EOtjSITSuME,6969
 arkitekt_next/bloks/mikro.py,sha256=bnI9lWd6FXyOViog0Xko3_yhKOt7AAdB_PA4N0XkXAU,1291
-arkitekt_next/bloks/minio.py,sha256=gVFVoq5Po7yWO-CeTxQQecK4b3bBr_vdnEodF991WR4,5595
+arkitekt_next/bloks/minio.py,sha256=oH8cKemO41EEk-7vofC-23Ytho1P-4CnM10Snzicdhs,5643
 arkitekt_next/bloks/mount.py,sha256=IEod6LDuV5NNKvvRJ3Xgo8l2caVZnNmJYDgGGBUB3Cg,1088
 arkitekt_next/bloks/namegen.py,sha256=W9xco2d3eJLdL2NYpTFmqw2d4s3vCpBREIFNm38gMYY,1087
-arkitekt_next/bloks/ollama.py,sha256=UtJ-ghtkDb-wHbQt2h6I1-xZHUSVT3Kv6FRjJB4BBT0,2679
+arkitekt_next/bloks/ollama.py,sha256=_aEVbzEEW7hXo_sk-Xz2vd7sIvnsO8zicFi3l92MfoI,2543
 arkitekt_next/bloks/orkestrator.py,sha256=pjLvcvQ11XF94BORi8uaGMGMBvLu4BiE-WnCi59MH6k,3537
-arkitekt_next/bloks/postgres.py,sha256=UbQnbedEUf_VKAfavz1sCGvAa-ZweDwrUeEj76lo_L8,4276
+arkitekt_next/bloks/postgres.py,sha256=-H941jU5FDgZoNKf2LHAjoLUiemYAIJ2_zHwZKY8sJ8,4211
 arkitekt_next/bloks/redis.py,sha256=A9scMZohACsk-k1LQZo-rTFTB_eq12dqL4zVZkKdKLQ,2274
 arkitekt_next/bloks/rekuest.py,sha256=mfBjFKNGDMd9t1Wqkxeu2ZxAvYyMpAvHRS30PdchYCQ,1056
 arkitekt_next/bloks/secret.py,sha256=06J9f6-o1NCE0ReakVOyA0KbmQ-xr2fCYQWKOc_z1QQ,1067
@@ -47,9 +46,9 @@ arkitekt_next/bloks/services/certer.py,sha256=5KuWf6h7-8t2M3yvNJUfatR3J40Rnb7sIh
 arkitekt_next/bloks/services/channel.py,sha256=OQm_qI748o60V2wbFz3kuCO8rQoIAqqYbfohor-ziOQ,269
 arkitekt_next/bloks/services/config.py,sha256=E0X-AweMxbbVQihqPuUEUzt9Y5J2DKY5sFX2efORtS0,378
 arkitekt_next/bloks/services/db.py,sha256=Lc8uL8xibz99-16YPxtB_ls6CP3dN_jCaOzJ9uZ8b_0,588
-arkitekt_next/bloks/services/gateway.py,sha256=X7ghhLXZ9hDQIMXMTkfBMcS9o9oc16y0C-b_3r3uwCo,847
+arkitekt_next/bloks/services/gateway.py,sha256=pVO23e-4Q0fByYfM27UK7e9cK5xSBlt-n4qbdxMsXSs,1228
 arkitekt_next/bloks/services/livekit.py,sha256=Z8iwVgpJhyJOqb6y5lGR0kFReU5RDFAtC6-aH02gckY,428
-arkitekt_next/bloks/services/lok.py,sha256=fzOGum0VmcVaONUhTv4jHYky4WrFq2ygDAYJjBv2vAI,500
+arkitekt_next/bloks/services/lok.py,sha256=v-T9J-_XU2z_5JXUUy8zJGo-FBcSv-08raJBmw_vsmo,621
 arkitekt_next/bloks/services/mount.py,sha256=UAp7IzUNGYtqrh8ACAVgRtc5jYVGvzsKjKdegBdK_i0,273
 arkitekt_next/bloks/services/name.py,sha256=ysr7b8Hn9yIeuBlqv9Zz-ngWKdQtwl3V1I1TeDvhLlA,254
 arkitekt_next/bloks/services/ollama.py,sha256=ZQ963XvQeFufTL1NEWkf7Wn6QLRWjIXutmKsU8Xdmbc,507
@@ -139,8 +138,8 @@ arkitekt_next/qt/assets/light/green pulse.gif,sha256=cUd2F3Qlvjb7SnsU-LjGgeLTa8K
 arkitekt_next/qt/assets/light/orange pulse.gif,sha256=0gDvrRed0mzZZPHB4tP6vptx7myUCAa_hEVGdjRhNy8,94769
 arkitekt_next/qt/assets/light/pink pulse.gif,sha256=rxd6ZTHSIG9JZuuHhi3jiSB_JYFBZpy7OWUeZETlhQ4,107513
 arkitekt_next/qt/assets/light/red pulse.gif,sha256=U7WLbZvSl5e-Ob5RmawtlC0Rh9VVHxkjDbGjj7NYVUo,108749
-arkitekt_next-0.14.1.dist-info/METADATA,sha256=hh6ll8JfjDAgpdOOV6SHnh_YJjHtCwBxtjK_7l0i40Q,5742
-arkitekt_next-0.14.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-arkitekt_next-0.14.1.dist-info/entry_points.txt,sha256=IY-mUEDBU6QncqnYw-Ufw5bvNNXjqSlLf1uexZZCJhc,61
-arkitekt_next-0.14.1.dist-info/licenses/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.14.1.dist-info/RECORD,,
+arkitekt_next-0.16.0.dist-info/METADATA,sha256=psuhwjuUadZxqMOaU7atiWG4Sio4RPrpe4xDpGRE4ns,5744
+arkitekt_next-0.16.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+arkitekt_next-0.16.0.dist-info/entry_points.txt,sha256=IY-mUEDBU6QncqnYw-Ufw5bvNNXjqSlLf1uexZZCJhc,61
+arkitekt_next-0.16.0.dist-info/licenses/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.16.0.dist-info/RECORD,,

arkitekt_next/bloks/l.py

@@ -1,136 +0,0 @@
-from dataclasses import asdict
-from typing import Dict, Any
-import secrets
-
-
-from arkitekt_next.bloks.services.admin import AdminService
-from arkitekt_next.bloks.services.channel import ChannelService
-from arkitekt_next.bloks.services.config import ConfigService
-from arkitekt_next.bloks.services.db import DBService
-from arkitekt_next.bloks.services.gateway import GatewayService
-from arkitekt_next.bloks.services.lok import LokService
-from arkitekt_next.bloks.services.mount import MountService
-from arkitekt_next.bloks.services.ollama import OllamaService
-from arkitekt_next.bloks.services.redis import RedisService
-from arkitekt_next.bloks.services.s3 import S3Service
-from arkitekt_next.bloks.services.secret import SecretService
-from blok import blok, InitContext, ExecutionContext, Option
-from blok.bloks.services.dns import DnsService
-from blok.tree import Repo, YamlFile
-from arkitekt_next.bloks.base import BaseArkitektService
-
-
-@blok("live.arkitekt.alpaka", description="a container and app management service")
-class AlpakaBlok(BaseArkitektService):
-    def get_builder(self):
-        return "arkitekt.generic"
-
-    def __init__(self) -> None:
-        self.dev = False
-        self.host = "alpaka"
-        self.command = "bash run-debug.sh"
-        self.repo = "https://github.com/arkitektio/alpaka-server"
-        self.scopes = {
-            "alpaka_pull": "Pull new Models",
-            "alpaka_chat": "Add repositories to the database",
-        }
-        self.mount_repo = False
-        self.build_repo = False
-        self.buckets = ["media"]
-        self.secret_key = secrets.token_hex(16)
-        self.image = "jhnnsrs/alpaka:nightly"
-
-    def preflight(
-        self,
-        lok: LokService,
-        db: DBService,
-        redis: RedisService,
-        s3: S3Service,
-        config: ConfigService,
-        ollama: OllamaService,
-        mount: MountService,
-        admin: AdminService,
-        secret: SecretService,
-        gateway: GatewayService,
-        mount_repo: bool = False,
-        host: str = "",
-        image: str = "",
-        secret_key: str = "",
-        build_repo: bool = False,
-        command: str = "",
-        repo: str = "",
-        disable: bool = False,
-        dev: bool = False,
-    ):
-        lok.register_scopes(self.scopes)
-
-        path_name = self.host
-
-        gateway.expose(path_name, 80, self.host)
-
-        postgress_access = db.register_db(self.host)
-        redis_access = redis.register()
-        lok_access = lok.retrieve_credentials()
-        admin_access = admin.retrieve()
-        minio_access = s3.create_buckets(self.buckets)
-        lok_labels = lok.retrieve_labels("live.arkitekt.alpaka", self.get_builder())
-        ollama_access = ollama.get_access()
-
-        django_secret = secret.retrieve_secret()
-
-        csrf_trusted_origins = []
-
-        configuration = YamlFile(
-            **{
-                "db": asdict(postgress_access),
-                "django": {
-                    "admin": asdict(admin_access),
-                    "debug": True,
-                    "hosts": ["*"],
-                    "secret_key": django_secret,
-                },
-                "redis": asdict(redis_access),
-                "lok": asdict(lok_access),
-                "s3": asdict(minio_access),
-                "scopes": self.scopes,
-                "force_script_name": path_name,
-                "csrf_trusted_origins": csrf_trusted_origins,
-                **self.get_additional_config(),
-            }
-        )
-
-        config_mount = config.register_config(f"{self.host}.yaml", configuration)
-
-        depends_on = []
-
-        if redis_access.dependency:
-            depends_on.append(redis_access.dependency)
-
-        if postgress_access.dependency:
-            depends_on.append(postgress_access.dependency)
-
-        if minio_access.dependency:
-            depends_on.append(minio_access.dependency)
-
-        if ollama_access.dependency:
-            depends_on.append(ollama_access.dependency)
-
-        service = {
-            "labels": lok_labels,
-            "volumes": [f"{config_mount}:/workspace/config.yaml"],
-            "depends_on": depends_on,
-        }
-
-        if mount_repo or dev:
-            mount = mount.register_mount(self.host, Repo(repo))
-            service["volumes"].extend([f"{mount}:/workspace"])
-
-        if build_repo or dev:
-            mount = mount.register_mount(self.host, Repo(repo))
-            service["build"] = mount
-        else:
-            service["image"] = image
-
-        service["command"] = command
-
-        self.service = service