arkitekt-next 0.7.31__py3-none-any.whl → 0.7.33__py3-none-any.whl

arkitekt_next/bloks/postgres.py

@@ -0,0 +1,92 @@
+from typing import Optional
+
+from blok import blok, InitContext, ExecutionContext, CLIOption
+from blok.tree import YamlFile, Repo
+from pydantic import BaseModel
+import pydantic
+import namegenerator
+import secrets
+from blok import blok, InitContext
+
+
+class AccessCredentials(BaseModel):
+    password: str
+    username: str
+    host: str
+    port: str
+    db_name: str
+    dependency: Optional[str] = None
+
+
+@blok("live.arkitekt.postgres")
+class PostgresBlok(BaseModel):
+    host: str = "db"
+    port: int = 5432
+    skip: bool = False
+    password: str = pydantic.Field(default_factory=lambda: secrets.token_hex(16))
+    user: str = pydantic.Field(default_factory=lambda: namegenerator.gen(separator=""))
+    image: str = "jhnnsrs/daten:next"
+
+    registered_dbs: dict[str, AccessCredentials] = {}
+
+    def get_dependencies(self):
+        return []
+
+    def get_identifier(self):
+        return "live.arkitekt.postgres"
+
+    def register_db(self, db_name: str) -> AccessCredentials:
+        if db_name in self.registered_dbs:
+            return self.registered_dbs[db_name]
+        else:
+            access_credentials = AccessCredentials(
+                password=self.password,
+                username=self.user,
+                host=self.host,
+                port=self.port,
+                db_name=db_name,
+                dependency=self.host if not self.skip else None,
+            )
+            self.registered_dbs[db_name] = access_credentials
+            return access_credentials
+
+    def init(self, init: InitContext):
+        for key, value in init.kwargs.items():
+            setattr(self, key, value)
+
+    def build(self, context: ExecutionContext):
+        db_service = {
+            "environment": {
+                "POSTGRES_USER": self.user,
+                "POSTGRES_PASSWORD": self.password,
+                "POSTGRES_MULTIPLE_DATABASES": ",".join(self.registered_dbs.keys()),
+            },
+            "image": "jhnnsrs/daten-next",
+            "labels": ["fakts.service=live.arkitekt.postgres"],
+        }
+
+        context.docker_compose.set_nested(f"services", self.host, db_service)
+
+    def get_options(self):
+        with_postgres_password = CLIOption(
+            subcommand="password",
+            help="The postgres password for connection",
+            default=self.password,
+        )
+        with_user_password = CLIOption(
+            subcommand="user",
+            help="The postgress user_name",
+            default=self.password,
+        )
+        skip_build = CLIOption(
+            subcommand="skip",
+            help="Should the service not be created? E.g when pointing outwards?",
+            default=self.skip,
+        )
+        with_image = CLIOption(
+            subcommand="image",
+            help="The image to use for the service",
+            default=self.image,
+        )
+
+        return [with_postgres_password, skip_build, with_user_password, with_image]

arkitekt_next/bloks/redis.py

@@ -0,0 +1,86 @@
+import click
+
+from blok import blok, InitContext, ExecutionContext, CLIOption
+from blok.tree import YamlFile, Repo
+from pydantic import BaseModel
+from typing import Dict, Any, Optional
+
+from blok import blok, InitContext
+
+
+DEFAULT_PUBLIC_URLS = ["127.0.0.1"]
+DEFAULT_PUBLIC_HOSTS = ["localhost"]
+
+
+class RedisConnection(BaseModel):
+    host: str
+    port: str
+    dependency: Optional[str] = None
+
+
+@blok("live.arkitekt.redis")
+class RedisBlok:
+    def __init__(self) -> None:
+        self.host = "redis"
+        self.port = 6379
+        self.skip = False
+        self.image = "redis"
+
+    def get_identifier(self):
+        return "live.arkitekt.redis"
+
+    def get_dependencies(self):
+        return []
+
+    def register(self) -> RedisConnection:
+        return RedisConnection(
+            host=self.host,
+            port=self.port,
+            dependency=self.host if not self.skip else None,
+        )
+
+    def init(self, init: InitContext):
+        for key, value in init.kwargs.items():
+            setattr(self, key, value)
+
+    def build(self, context: ExecutionContext):
+        redis_service = {
+            "environment": {
+                "REDIS_HOST": self.host,
+                "REDIS_PORT": self.port,
+            },
+            "image": self.image,
+            "ports": [f"{self.port}:{self.port}"],
+            "name": self.host,
+        }
+
+        context.docker_compose.set_nested(f"services", self.host, redis_service)
+
+    def get_options(self):
+        with_port = CLIOption(
+            subcommand="port",
+            help="Which port to use",
+            type=int,
+            default=self.port,
+            show_default=True,
+        )
+        with_host = CLIOption(
+            subcommand="host",
+            help="Which public hosts to use",
+            type=str,
+            default=self.host,
+            show_default=True,
+        )
+        with_skip = CLIOption(
+            subcommand="skip",
+            help="Skip docker creation (if using external redis?)",
+            is_flag=True,
+            default=self.skip,
+        )
+        with_image = CLIOption(
+            subcommand="image",
+            help="The image to use for the service",
+            default=self.image,
+        )
+
+        return [with_port, with_host, with_skip, with_image]

arkitekt_next/bloks/services.py

@@ -0,0 +1,2 @@
+from blok import service
+from dataclasses import dataclass

arkitekt_next/cli/commands/run/dev.py

@@ -24,6 +24,7 @@ from arkitekt_next.cli.options import (
     with_instance_id,
     with_headless,
     with_log_level,
+    with_redeem_token,
     with_skip_cache,
 )
 from arkitekt_next.cli.vars import get_console, get_manifest
@@ -330,6 +331,7 @@ async def run_dev(
 @with_builder
 @with_token
 @with_instance_id
+@with_redeem_token
 @with_headless
 @with_log_level
 @with_skip_cache

arkitekt_next/cli/commands/run/prod.py

@@ -23,6 +23,7 @@ async def run_app(app):
 )
 @with_builder
 @with_token
+@with_redeem_token
 @with_instance_id
 @with_headless
 @with_log_level

arkitekt_next/cli/options.py

@@ -21,6 +21,13 @@ with_token = click.option(
     envvar="FAKTS_TOKEN",
     required=False,
 )
+with_redeem_token = click.option(
+    "--redeem-token",
+    "-r",
+    help="The token for the fakts instance",
+    envvar="FAKTS_REDEEM_TOKEN",
+    required=False,
+)
 with_version = click.option(
     "--version",
     "-v",

{arkitekt_next-0.7.31.dist-info → arkitekt_next-0.7.33.dist-info}/METADATA

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

{arkitekt_next-0.7.31.dist-info → arkitekt_next-0.7.33.dist-info}/RECORD

@@ -1,3 +1,4 @@
+arkitekt_next/__blok__.py,sha256=ZLa8JQZnG7-E5eEutkxH-mUwD4CfC1yiXPk-9j_ZkZE,752
 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
@@ -11,6 +12,19 @@ arkitekt_next/apps/service/grant_registry.py,sha256=3om8YoVf_HFWEJbpjQCin1Zvm8Sz
 arkitekt_next/apps/service/herre.py,sha256=DuIhyEujgXrYzhG2tKTMUgHkTScfg6UCX5eCV1vUPYI,760
 arkitekt_next/apps/service/herre_qt.py,sha256=GntkKHmwcQqEFab02SWwdd3xONo0fLVGEPQMKH6tlCE,1628
 arkitekt_next/apps/types.py,sha256=cKRqHyKlNcGamPUxzvY0wyz0sEI4sBPa4CnvFnT1sTo,1140
+arkitekt_next/bloks/__init__.py,sha256=_4EeR63d6avQUWLG4mK2n_FvogTPQ_Jx6f2_RvNbWeA,29
+arkitekt_next/bloks/admin.py,sha256=ymvfESzuZijLGxlWXd7H8ge-QX8c6H89-E9bT1V-KPE,1366
+arkitekt_next/bloks/arkitekt.py,sha256=3HmTquQXFypdXElgi2thrqVej_OLq8MBB1gYWWnszKk,1296
+arkitekt_next/bloks/fluss.py,sha256=H8a9Cjd6KE8KUZNB9Kk1chErikEdCedzeq8JerGmPOA,4586
+arkitekt_next/bloks/gateway.py,sha256=qcHSQk7NtQ4UGQ_7Z5sJgM6EBdaNWxxhzV-gHj8b0OQ,4236
+arkitekt_next/bloks/kabinet.py,sha256=_dP1fbDET5iN7a0tHwj5pR15OaDsTWSeuZ64D4jS5kA,4765
+arkitekt_next/bloks/livekit.py,sha256=OADB8_7akkeR3mzhAoMD-_sRjdfc3SoITl0hXSWGyKQ,2061
+arkitekt_next/bloks/lok.py,sha256=6rpbufR1iq6dx1vBcCiY0iamUvun2NTv6mFlZ0e4JoQ,10547
+arkitekt_next/bloks/mikro.py,sha256=v0KjlbVWKOE2A7VnM_NAXcNb5F-QM3DjQNqx4k-bqQ4,4659
+arkitekt_next/bloks/minio.py,sha256=lR7StmLaLR58kqcrgT9uJIW_VPKMJwBNrQF2uMbLHWo,5519
+arkitekt_next/bloks/postgres.py,sha256=03P5XQ_wDzclYm25ZVQL1BMejB17V6r45kKR755Eqqk,2909
+arkitekt_next/bloks/redis.py,sha256=Evyo5oSlhfzxfM_C3WJZB5l3H1w0A4RaEkgKJFPekp4,2282
+arkitekt_next/bloks/services.py,sha256=YNzcKs5_R6zVNQsCkJmlCNGHhPgpAfj85ig0w2Z2i1U,59
 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
@@ -45,9 +59,9 @@ arkitekt_next/cli/commands/manifest/scopes.py,sha256=sw0HRy8GliEcmx3Sh6cPRpBkf1v
 arkitekt_next/cli/commands/manifest/version.py,sha256=tA-a35QlcobUwoPsgGLQL9_D0E-HZvawsfO4l7DoX-Y,4832
 arkitekt_next/cli/commands/manifest/wizard.py,sha256=a8rIHgtmKuw-L4E3eO3kXwXv0TM2pN4Lq75y2QKXmcA,2498
 arkitekt_next/cli/commands/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arkitekt_next/cli/commands/run/dev.py,sha256=KRcAHM-MCsy2-Wv2UIONCzdezEF214rEVbRPWec33FE,9991
+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=5GmZayfvYvKqSYWmicT1hhadq2hFJ-q8taEL17qKK78,1513
+arkitekt_next/cli/commands/run/prod.py,sha256=5wbpKt8atp_Cz81v3iRUcOWCInStzlmlA2UmNQmg9Tw,1532
 arkitekt_next/cli/commands/run/utils.py,sha256=zH-MNNEfKgyOYQvwP6Ph8KUHVqH48fw3ZI6tiQ9unwQ,325
 arkitekt_next/cli/commands/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/server/down.py,sha256=POFe9OtzhSdlwWY7JBakGqVDZvQ9LrsiFDRSik2Hn2U,1490
@@ -66,7 +80,7 @@ arkitekt_next/cli/errors.py,sha256=zLTjaCbun6qM2nTldjyZd-DvykqKn5A3Gn80uYdx7Vc,9
 arkitekt_next/cli/inspect.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 arkitekt_next/cli/io.py,sha256=Jp8F8vYPIcAow7IAh_tgWFrsM9KRaElipAH7wj26lIo,6899
 arkitekt_next/cli/main.py,sha256=A_JgqAKmmmXNK-yxuuQ9bG6HX2I6pV2ccImCQ5fjfZQ,2329
-arkitekt_next/cli/options.py,sha256=TeHFBuoTdhI908DY2D7gw5pDFkuyCXUFgEr01TZn42I,3625
+arkitekt_next/cli/options.py,sha256=hSKdSYabK1MuioBRUsADjQIPSp9H2YeczmcyAsFUprI,3791
 arkitekt_next/cli/schemas/fluss.schema.graphql,sha256=MqrSpOxtWO9kWFCoUn9ySBPhIH3XozFiqrQl2zjEbiQ,35803
 arkitekt_next/cli/schemas/gucker.schema.graphql,sha256=r_KL-MoFRCGUobbtcBLCnpmFcali2A12TguynqQgmN4,152947
 arkitekt_next/cli/schemas/kabinet.schema.graphql,sha256=-N7igrfzFphjA2qV-abW59k8jtdJh1py4008W0MkqrM,9915
@@ -110,8 +124,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.31.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.7.31.dist-info/METADATA,sha256=jGYkZtbNo8OrW63JVav8xELycJbGvijp-LurUDt_sM8,5500
-arkitekt_next-0.7.31.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.7.31.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.7.31.dist-info/RECORD,,
+arkitekt_next-0.7.33.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.7.33.dist-info/METADATA,sha256=LxMq0uNpCivKxu0CUqgdX8UKmi6wNgmankHOZv7GDsI,5500
+arkitekt_next-0.7.33.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.7.33.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.7.33.dist-info/RECORD,,