arkitekt-next 0.7.37__py3-none-any.whl → 0.7.39__py3-none-any.whl

arkitekt_next/bloks/services/lok.py

@@ -1,10 +1,9 @@
-
-
 from typing import Dict, Any, Protocol
 from blok import blok, InitContext, Option
 from blok import service
 from dataclasses import dataclass
 
+
 @dataclass
 class LokCredentials:
     issuer: str
@@ -14,14 +13,8 @@ class LokCredentials:
 
 @service("live.arkitekt.lok")
 class LokService(Protocol):
+    def retrieve_credentials(self) -> LokCredentials: ...
 
-    def retrieve_credentials(self) -> LokCredentials:
-        ...
-
-    def retrieve_labels(self, service_name: str) -> list[str]:
-        ...
-
-    def register_scopes(self, scopes_dict: Dict[str, str]):
-        ...
-        
+    def retrieve_labels(self, service_name: str, builder_name: str) -> list[str]: ...
 
+    def register_scopes(self, scopes_dict: Dict[str, str]): ...

arkitekt_next/bloks/services/name.py

@@ -0,0 +1,12 @@
+from typing import Dict, Any, Protocol
+from blok import blok, InitContext, Option
+from blok import service
+from dataclasses import dataclass
+
+
+
+@service("live.arkitekt.names")
+class NameService(Protocol):
+
+    def retrieve_name(self) -> str:
+        pass

arkitekt_next/bloks/services/redis.py

@@ -6,6 +6,7 @@ from typing import Dict, Any, Protocol, Optional
 from blok import blok, InitContext, service
 from dataclasses import dataclass
 
+
 @dataclass
 class RedisConnection:
     host: str
@@ -13,16 +14,6 @@ class RedisConnection:
     dependency: Optional[str] = None
 
 
-
 @blok("live.arkitekt.redis")
 class RedisService(Protocol):
-
-
-     def register(self) -> RedisConnection:
-        return RedisConnection(
-            host=self.host,
-            port=self.port,
-            dependency=self.host if not self.skip else None,
-        )
-
-    
+    def register(self) -> RedisConnection: ...

arkitekt_next/bloks/services/s3.py

@@ -1,12 +1,12 @@
-
-
 from typing import Dict, Any, List, Protocol, Optional
 from blok import blok, InitContext, Option
 from blok import service
 from dataclasses import dataclass
 
+
 @dataclass
 class S3Credentials:
+    name: str
     access_key: str
     buckets: Dict[str, str]
     host: str
@@ -18,9 +18,4 @@ class S3Credentials:
 
 @service("live.arkitekt.s3")
 class S3Service(Protocol):
-
-    def create_buckets(self, buckets: List[str]) -> S3Credentials:
-        ...
-
-        
-
+    def create_buckets(self, buckets: List[str]) -> S3Credentials: ...

arkitekt_next/bloks/services/secret.py

@@ -0,0 +1,17 @@
+from typing import Dict, Any, Protocol
+from blok import blok, InitContext, Option
+from blok import service
+from dataclasses import dataclass
+
+@dataclass
+class AdminCredentials:
+    password: str
+    username: str
+    email: str
+
+
+@service("live.arkitekt.secrets")
+class SecretService(Protocol):
+
+    def retrieve_secret() -> str:
+        pass

arkitekt_next/bloks/tailscale.py

@@ -0,0 +1,68 @@
+from pydantic import BaseModel
+from typing import Dict, Any
+from arkitekt_next.bloks.services.mount import MountService
+from blok import blok, InitContext, Option, ExecutionContext
+from arkitekt_next.bloks.services.gateway import GatewayService
+from blok.bloks.services.dns import DnsService
+from blok.tree import YamlFile
+
+
+@blok("live.arkitekt.tailscale")
+class TailscaleBlok:
+
+    def __init__(self, name: str = "arkitekt") -> None:
+        self.name = name
+
+    def preflight(self, gateway: GatewayService, mount_service: MountService, dns: DnsService, net_name: str, auth_key: str, host_name: str):
+        assert auth_key, "You need to provide an auth_key"
+
+        self.caddy_service = gateway.get_internal_host()
+        self.caddy_port = gateway.get_http_port()
+        self.mount = mount_service.register_mount("tailscale_state", {})
+        self.tailnet_name = net_name
+        self.auth_key = auth_key
+        self.dns_service = dns.get_dns_result()
+        self.host_name = host_name
+
+    def build(self, ex: ExecutionContext):
+
+        if not self.tailnet_name:
+            # Trying to automatically find the hostname
+            for i in self.dns_service.hostnames:
+                if i.endswith(".ts.net"):
+                    self.tailnet_name = i.split(".")[1]
+                    break
+
+        service = {
+            "image": "jhnnsrs/tailproxy:latest",
+            "volumes": [
+                f"{self.mount}:/var/lib/tailscale" # Persist the tailscale state directory
+            ],
+            "environment": [
+                "TS_STATE_DIR=/var/lib/tailscale",
+                f"TS_AUTH_KEY={self.auth_key}",
+               f"TS_HOSTNAME={self.host_name}",
+                f"TS_TAILNET={self.tailnet_name}",
+                f"CADDY_TARGET={self.caddy_service}:{self.caddy_port}",
+            ],
+
+
+        }
+
+        ex.docker_compose.set_nested("services", "tailscale_proxy", service)
+
+    def get_options(self):
+        return [Option(
+            subcommand="net_name",
+            help="The name of your tailnet",
+            type=str,
+        ), Option(
+            subcommand="auth_key",
+            help="The auth_key of your tailnet",
+            type=str,
+        ),Option(
+            subcommand="host_name",
+            help="The hostname of your tailnet",
+            default=self.name,
+            type=str,
+        )]

{arkitekt_next-0.7.37.dist-info → arkitekt_next-0.7.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.37
+Version: 0.7.39
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -14,25 +14,25 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
+Provides-Extra: blok
 Provides-Extra: cli
-Provides-Extra: server
-Requires-Dist: blok (>=0.0.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "server")
-Requires-Dist: cryptography (>=40.0.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "server")
+Requires-Dist: blok (>=0.0.9) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "blok")
+Requires-Dist: cryptography (>=40.0.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "blok")
 Requires-Dist: dokker (>=0.1.21)
 Requires-Dist: fakts (>=0.5.0)
-Requires-Dist: fluss-next (>=0.1.69) ; extra == "all"
+Requires-Dist: fluss-next (>=0.1.70) ; extra == "all"
 Requires-Dist: herre (>=0.4.3)
-Requires-Dist: kabinet (>=0.1.7) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.8) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=0.3.6)
-Requires-Dist: mikro-next (>=0.1.24) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
-Requires-Dist: namegenerator (>=1.0.6) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "server")
-Requires-Dist: netifaces (>=0.11.0) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "server")
+Requires-Dist: mikro-next (>=0.1.25) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: namegenerator (>=1.0.6) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "blok")
+Requires-Dist: netifaces (>=0.11.0) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "blok")
 Requires-Dist: reaktion-next (>=0.1.59) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.13) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: rekuest-next (>=0.2.14) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
 Requires-Dist: rich-click (>=1.6.1) ; extra == "cli" or extra == "all"
 Requires-Dist: semver (>=3.0.1) ; extra == "cli" or extra == "all"
 Requires-Dist: turms (>=0.5.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")
-Requires-Dist: unlok-next (>=0.1.64) ; python_version >= "3.8" and python_version < "4.0"
+Requires-Dist: unlok-next (>=0.1.65) ; python_version >= "3.8" and python_version < "4.0"
 Requires-Dist: watchfiles (>=0.18.1) ; extra == "cli" or extra == "all"
 Description-Content-Type: text/markdown
 

{arkitekt_next-0.7.37.dist-info → arkitekt_next-0.7.39.dist-info}/RECORD

@@ -1,4 +1,4 @@
-arkitekt_next/__blok__.py,sha256=k4ZLfVMDgdkGXHrG3ilX7G-siKG3g0wSzat-c6eMciw,1234
+arkitekt_next/__blok__.py,sha256=MednehD5TP0rhi4Y3JGOinwTVfja-0F-YliY2p83hkU,1476
 arkitekt_next/__init__.py,sha256=KFM_HlnIQWX7hXSZnYba3rdmZrsBE69K58rwh8ewxoM,970
 arkitekt_next/apps/__init__.py,sha256=cx_5Y-RkJFkSQJH-hUEC_L3eW1jU2E426c4e6_csIyM,42
 arkitekt_next/apps/easy.py,sha256=8eu-0DCWit2Ok4SPw_QCyriBZHPnLc1oK9qxPUxnElg,3135
@@ -14,33 +14,38 @@ arkitekt_next/apps/service/herre_qt.py,sha256=GntkKHmwcQqEFab02SWwdd3xONo0fLVGEP
 arkitekt_next/apps/types.py,sha256=cKRqHyKlNcGamPUxzvY0wyz0sEI4sBPa4CnvFnT1sTo,1140
 arkitekt_next/bloks/__init__.py,sha256=gXny6-WJ3alV1__xveI_0wcvgDuglR1WB7v7-8h1Olo,30
 arkitekt_next/bloks/admin.py,sha256=MlUQUYCHxCWtSD75mVHgs3DcDa0s8_D6_AIBslnYjZw,1300
-arkitekt_next/bloks/arkitekt.py,sha256=-ZITnWpkzpniUZQ7ZPjCH_RVqyCNPBtYnXWNTHd4eYw,1185
+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=0It4jxafGH-ehzXvd1eC9Tq9ZP4Kjra24eaHBCIaHJM,2820
-arkitekt_next/bloks/funcs.py,sha256=6QImH3eOSd6KXd8XfaulexAzy16A_J8GJi58Q18MQms,2641
-arkitekt_next/bloks/gateway.py,sha256=pym9pw8ycGgTzeskirkUZ19akvCitLabgQlU1r-wZdM,5021
-arkitekt_next/bloks/internal_docker.py,sha256=HWGgt4Jjr1ftEFwkYiw7m02eTiNAK5vaRYVtn0Jskd8,2255
-arkitekt_next/bloks/kabinet.py,sha256=ELGAkBQWarS5A-leTE2tXLgwrcXQBPz_FgLbMkYdJcU,3002
-arkitekt_next/bloks/livekit.py,sha256=Es0CJcQJJjyYD4OBa3_6K8bHmQRsikrECgnPflFCO4E,2694
-arkitekt_next/bloks/lok.py,sha256=7Fxk8U-hX7MgnIj1C1vGTA7yPBDTnqRLL31vPzAbEVE,11996
-arkitekt_next/bloks/mikro.py,sha256=A0Q3SkVpZYYp1nhQFiW6gCzv5D0h8fKm_p8KdoJauXI,2817
-arkitekt_next/bloks/minio.py,sha256=XkhApIyM7wwI1NPFBZWi5ES0grzDXPbe_RwEHCCxZcs,5823
+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/kabinet.py,sha256=RMetXRKFRO9z_eGPXyzGCHTo9HJlcPaew2lfCltGoMg,2937
+arkitekt_next/bloks/livekit.py,sha256=yhre3PkIQwKGdGPFC-DhTID3rIbRQMts_UsAX9tw6-A,2561
+arkitekt_next/bloks/lok.py,sha256=xf7RZYJ6QsfFTM6a9eNm-RcCmo9y3C_W8Eh7d_57uNg,12857
+arkitekt_next/bloks/mikro.py,sha256=vNM9K7I3AK2G0WooaMQl7U8-_TN96P2YUfblqAMsvdI,2772
+arkitekt_next/bloks/minio.py,sha256=k7t1J46lO3eaBO9KdP7iYF--Go-m25dEmOwisbbOoVQ,5496
 arkitekt_next/bloks/mount.py,sha256=d14w7bMiaWbl5wgvanh4PwfIqEYsDEsw91360xfX0fU,1031
+arkitekt_next/bloks/namegen.py,sha256=0k4PYya5J4EQyt3XZ3UKhDlO_k29pmUEQSaklZGN8MA,1035
 arkitekt_next/bloks/postgres.py,sha256=FRUF2fobUlU6OmK1VC7aN_WuX1NctLmZhzJJA1uOOeY,2773
-arkitekt_next/bloks/redis.py,sha256=XKuujfu1j85IZEab9ZG2m0G09g7Jba8o28q2PIBg_0I,2134
-arkitekt_next/bloks/rekuest.py,sha256=NfYbobDzlpTfPf88_-YwEDTwgOCg-OTLwiaWw5vssNU,3007
-arkitekt_next/bloks/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arkitekt_next/bloks/redis.py,sha256=_ddmcD3WwX7VA7zzzQ7-yjSM7f4reV0C8Pl70s7R2k8,2130
+arkitekt_next/bloks/rekuest.py,sha256=OgX_OeVeGVK-pSL3S8cocUWsYX929Yv5o9NuEvkwJr0,2975
+arkitekt_next/bloks/secret.py,sha256=P4Z56FhcgVD0KbokhcMNAXwDjo_86rI99nWh3gUGXSQ,1014
+arkitekt_next/bloks/services/__init__.py,sha256=i9vGNd1lFBem3O2PblTouRzFVQkdwOYoUmqqU43dIWQ,592
 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=3tA1pS2vniVC3LhJ4O6chGRG6wUA44EPLAML4aiHm3k,530
+arkitekt_next/bloks/services/gateway.py,sha256=9dDv2aWCErkZ9JreqHdKax63_Imbc2EnWhpeScLnI7Q,799
 arkitekt_next/bloks/services/livekit.py,sha256=5u-GThgKsgXiiobEL4arm3JJOgNTZae15Q-75i-4D8g,366
-arkitekt_next/bloks/services/lok.py,sha256=OYC5BVr3MxeP8AuARO56UFL4490Yygcscdm5DQq-fVs,517
+arkitekt_next/bloks/services/lok.py,sha256=fzOGum0VmcVaONUhTv4jHYky4WrFq2ygDAYJjBv2vAI,500
 arkitekt_next/bloks/services/mount.py,sha256=MDlwHl5cTfBO8IgkofuFjQBbfIMKDm_R9suWkiyVG48,289
-arkitekt_next/bloks/services/redis.py,sha256=d5cSk2v6A6CvYULocwd2Cnx9RkHKYHmZT1mZmZQNKgs,633
-arkitekt_next/bloks/services/s3.py,sha256=njXlLzUssj46w90bMdqO-7HSAVQtZHH2r1yVNlR-mfU,492
+arkitekt_next/bloks/services/name.py,sha256=ZMDlZwnSaoIUj7STlpFo32nHKMuOibKzetYWSjh-t-c,254
+arkitekt_next/bloks/services/redis.py,sha256=hC8cKXkGzwrY183fI-8wjUY8Ge58lNhcX7r4zAPfq_k,469
+arkitekt_next/bloks/services/s3.py,sha256=_mk_9NdaeHRVZ__1M9CL1Ec1gSQKkzlOiQXse7MSx94,485
+arkitekt_next/bloks/services/secret.py,sha256=iUG1ZH_dR0tL48rueNOK2ILjEnyqNJjQCY-4KKrB_Zg,342
 arkitekt_next/bloks/services/socket.py,sha256=eXACQPldS9I1xGVDcbF6LrVkHHsBcjvG1VtlvHnM-14,427
 arkitekt_next/bloks/socket.py,sha256=YIrSKfQezrsKwRKDPdT1aXhlQzjgnx_UaNaQ9LiEfGY,1008
+arkitekt_next/bloks/tailscale.py,sha256=YXsiIxjqJV5WeQTO81yIa2Ajj40K-95X0cxH46Sq66c,2356
 arkitekt_next/builders.py,sha256=8HeQsNqyxpbFsnTrA9AAm0_BqxGjU1_ylS1Z-hbjAFw,6074
 arkitekt_next/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/call/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -140,8 +145,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.37.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.7.37.dist-info/METADATA,sha256=JlgMZxKF27Jz9ISd5p7r4X9imLi9jo1cBrav4LFYPH4,6055
-arkitekt_next-0.7.37.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.7.37.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.7.37.dist-info/RECORD,,
+arkitekt_next-0.7.39.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.7.39.dist-info/METADATA,sha256=gXziwIUKyXIwy__Mhs0Uy_GARlY72VjbFF-6ZFVjDyM,6045
+arkitekt_next-0.7.39.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.7.39.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.7.39.dist-info/RECORD,,