arkitekt-next 0.8.47__py3-none-any.whl → 0.8.49__py3-none-any.whl

arkitekt_next/bloks/self_signed.py

@@ -0,0 +1,98 @@
+from arkitekt_next.bloks.services.certer import CerterService
+from arkitekt_next.bloks.services.name import NameService
+from blok import blok, InitContext, ExecutionContext, Option
+from blok.tree import YamlFile, Repo
+from pydantic import BaseModel
+from typing import Dict, Any, Optional
+
+from blok import blok, InitContext
+from blok.bloks.services.dns import DnsService
+
+DEFAULT_PUBLIC_URLS = ["127.0.0.1"]
+DEFAULT_PUBLIC_HOSTS = ["localhost"]
+
+
+class ExposedHost(BaseModel):
+    host: str
+    port: int
+    stip_prefix: bool = True
+
+
+class ExpostedToHost(BaseModel):
+    port: int
+    host: str
+    to: str
+    tls: bool = False
+
+
+class ExposedPort(BaseModel):
+    port: int
+    host: str
+    tls: bool = False
+    to: int
+
+
+@blok(
+    "live.arkitekt.certer", description="A self-signed certificate generator"
+)
+class SelfSignedBlok:
+    def __init__(self) -> None:
+        self.host = "certer"
+        self.certer_image = "jhnnsrs/certer:next"
+        self.certs_mount = "./certs"
+
+    def retrieve_certs_mount(self):
+        return self.certs_mount
+
+
+    def retrieve_depends_on(self):
+        return ["certer"]
+
+    def preflight(self, init: InitContext, dns: DnsService):
+        for key, value in init.kwargs.items():
+            setattr(self, key, value)
+
+        self.public_ips = dns.get_dns_result().ip_addresses
+        self.public_hosts = dns.get_dns_result().hostnames
+
+
+    def build(
+        self,
+        context: ExecutionContext,
+    ):
+
+        context.file_tree.set_nested("certs", {})
+
+
+        certer_container = {
+            "image": self.certer_image,
+            "volumes": ["./certs:/certs"],
+            "environment": {
+                "DOMAIN_NAMES": ",".join(self.public_hosts),
+                "IP_ADDRESSED": ",".join(self.public_ips),
+            },
+        }
+
+        context.docker_compose.set_nested("services", self.host, certer_container)
+
+   
+
+    def get_options(self):
+        with_public_urls = Option(
+            subcommand="public_url",
+            help="Which public urls to use",
+            type=str,
+            multiple=True,
+            default=DEFAULT_PUBLIC_URLS,
+            show_default=True,
+        )
+        with_public_services = Option(
+            subcommand="public_hosts",
+            help="Which public hosts to use",
+            type=str,
+            multiple=True,
+            default=DEFAULT_PUBLIC_HOSTS,
+            show_default=True,
+        )
+
+        return [with_public_urls, with_public_services]

arkitekt_next/bloks/services/certer.py

@@ -0,0 +1,14 @@
+from blok import blok, InitContext, ExecutionContext, Option
+from blok.tree import YamlFile, Repo
+from dataclasses import dataclass
+from typing import Dict, Any, Protocol
+
+from blok import blok, InitContext, service
+
+
+@service("live.arkitekt.certer", description="Generate HTTPS certificates for services")
+class CerterService(Protocol):
+
+    def retrieve_certs_mount(self) -> str: ...
+        
+    def retrieve_depends_on(self) -> list[str]: ...

arkitekt_next/bloks/services/ollama.py

@@ -0,0 +1,16 @@
+from typing import Dict, Any, Protocol
+from blok import blok, InitContext, Option
+from blok import service
+from dataclasses import dataclass
+
+
+@dataclass
+class OllamaCredentials:
+    api_key: str
+    api_secret: str
+    api_url: str
+
+
+@service("io.ollama.ollama", description=" A self-hosted ollama LLM server")
+class OllamaService(Protocol):
+    pass

arkitekt_next/builders.py

@@ -98,7 +98,6 @@ def easy(
     """
     registry = registry or check_and_import_services()
 
-
     if identifier is None:
         identifier = __file__.split("/")[-1].replace(".py", "")
 

arkitekt_next/cli/commands/delegate/script.py

@@ -77,19 +77,15 @@ def script(
 
     builder = import_builder(builder)
 
-    
-
     app = builder(
         **manifest.to_builder_dict(),
         **builder_kwargs,
     )
 
-
     rekuest: RekuestNext = app.services.get("rekuest")
 
     rekuest.agent.register_extension("cli", CLIExtension(" ".join(script_name)))
 
-
     panel = construct_run_panel(app)
     console.print(panel)
 

arkitekt_next/cli/commands/gen/compile.py

@@ -20,14 +20,6 @@ def compile(projects, config):
     """
     app_directory = os.getcwd()
 
-
-
-
-
-
-
-    
-
     from turms.run import scan_folder_for_single_config, load_projects_from_configpath
     from turms.cli.main import generate_projects
 

arkitekt_next/cli/commands/gen/init.py

@@ -55,7 +55,6 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
 
     chosen_services = registry.service_builders
 
-
     if services:
         chosen_services = {
             key: service
@@ -70,21 +69,18 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
 
         chosen_services = {service: chosen_services[service]}
 
-
-    
-
     if os.path.exists(config):
         if click.confirm(
             f"GraphQL Config file already exists. Do you want to merge your choices?"
         ):
             file = yaml.load(open(config, "r"), Loader=yaml.FullLoader)
             projects = file.get("projects", {})
-            click.echo(f"Merging {','.join(chosen_services.keys())} in {','.join(projects.keys())}...")
-
+            click.echo(
+                f"Merging {','.join(chosen_services.keys())} in {','.join(projects.keys())}..."
+            )
 
     has_done_something = False
 
-
     for key, service in chosen_services.items():
         try:
 
@@ -118,8 +114,6 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
                 out_path = os.path.join(app_schemas, key + ".schema.graphql")
                 with open(out_path, "w") as f:
                     f.write(schema)
-                    
-
 
             if schemas:
                 project["schema"] = os.path.join(app_schemas, key + ".schema.graphql")
@@ -128,18 +122,17 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
                     os.path.join(app_documents, key) + "/**/*.graphql"
                 )
 
-
-
             project["extensions"]["turms"]["out_dir"] = path
             project["extensions"]["turms"]["generated_name"] = f"{key}.py"
-            del project["extensions"]["turms"]["documents"] 
+            del project["extensions"]["turms"]["documents"]
             del project["schema_url"]
 
             projects[key] = project
 
         except Exception as e:
-            raise ClickException(f"Failed to initialize project for {key}. Error: {e}") from e
-
+            raise ClickException(
+                f"Failed to initialize project for {key}. Error: {e}"
+            ) from e
 
     if has_done_something:
         graph_config_path = os.path.join(app_directory, config)

arkitekt_next/cli/commands/inspect/requirements.py

@@ -66,10 +66,7 @@ def requirements(
         logo=manifest.logo,
     )
 
-    x = [
-        item.model_dump(by_alias=True)
-        for item in app.manifest.requirements
-    ]
+    x = [item.model_dump(by_alias=True) for item in app.manifest.requirements]
     if machine_readable:
         print("--START_REQUIREMENTS--" + json.dumps(x) + "--END_REQUIREMENTS--")
 

arkitekt_next/cli/commands/inspect/templates.py

@@ -73,7 +73,7 @@ def templates(
     if rekuest is None:
         console.print("No rekuest service found in app")
         return
-    
+
     x = {
         key: item.model_dump(by_alias=True)
         for key, item in rekuest.agent.extensions[

arkitekt_next/cli/commands/kabinet/build.py

@@ -233,8 +233,16 @@ def get_flavours(ctx: Context, select: Optional[str] = None) -> Dict[str, Flavou
     is_flag=True,
     default=False,
 )
+@click.option(
+    "--tag",
+    "-t",
+    help="Tag the build with a specific tag",
+    type=str,
+    default=None,
+    required=False,
+)
 @click.pass_context
-def build(ctx: Context, flavour: str, no_inspect: bool) -> None:
+def build(ctx: Context, flavour: str, no_inspect: bool, tag: str = None) -> None:
     """Builds the arkitekt_next app to docker"""
 
     manifest = get_manifest(ctx)
@@ -262,6 +270,10 @@ def build(ctx: Context, flavour: str, no_inspect: bool) -> None:
 
         build_tag = build_flavour(key, flavour)
 
+        if tag:
+            subprocess.run(["docker", "tag", build_tag, tag], check=True)
+
+
         inspection = None
         if not no_inspect:
             inspection = inspect_build(build_tag)

arkitekt_next/cli/io.py

@@ -10,7 +10,12 @@ from arkitekt_next.cli.types import (
     Flavour,
     DeploymentsConfigFile,
 )
-from kabinet.api.schema import InspectionInput, AppImageInput, DockerImageInput, ManifestInput
+from kabinet.api.schema import (
+    InspectionInput,
+    AppImageInput,
+    DockerImageInput,
+    ManifestInput,
+)
 
 import yaml
 import json
@@ -116,18 +121,11 @@ def get_builds(selected_run: Optional[str] = None) -> Dict[str, Build]:
         )
 
 
-
-
 def manifest_to_input(manifest: Manifest) -> ManifestInput:
 
     return ManifestInput(**manifest.model_dump(by_alias=True))
 
 
-
-
-
-
-
 def generate_build(
     build_run: str,
     build_id: str,
@@ -246,7 +244,6 @@ def generate_deployment(
         selectors=build.selectors,
         inspection=build.inspection,
         image=DockerImageInput(imageString=image, buildAt=datetime.datetime.now()),
-
     )
 
     if os.path.exists(config_file):
@@ -255,7 +252,9 @@ def generate_deployment(
             config.app_images.append(app_image)
             config.latest_app_image = app_image.app_image_id
     else:
-        config = DeploymentsConfigFile(app_images=[app_image], latest_app_image=app_image.app_image_id)
+        config = DeploymentsConfigFile(
+            app_images=[app_image], latest_app_image=app_image.app_image_id
+        )
 
     with open(config_file, "w") as file:
         yaml.safe_dump(

arkitekt_next/cli/texts.py

@@ -15,4 +15,6 @@ LOGO = r"""
                                                                    
 """
 
-ERROR_EPILOGUE = "To find out more, visit [link=https://arkitekt.live]https://arkitekt.live[/link]"
+ERROR_EPILOGUE = (
+    "To find out more, visit [link=https://arkitekt.live]https://arkitekt.live[/link]"
+)

arkitekt_next/cli/types.py

@@ -9,7 +9,12 @@ from arkitekt_next.base_models import Requirement
 from string import Formatter
 import os
 
-from kabinet.api.schema import AppImageInput, InspectionInput, SelectorInput, ManifestInput
+from kabinet.api.schema import (
+    AppImageInput,
+    InspectionInput,
+    SelectorInput,
+    ManifestInput,
+)
 from rekuest_next.api.schema import TemplateInput
 
 ALLOWED_BUILDER_KEYS = [
@@ -94,7 +99,9 @@ class Flavour(BaseModel):
         """Checks that the build_command templates are valid"""
 
         for v in value:
-            for literal_text, field_name, format_spec, conversion in Formatter().parse(v):
+            for literal_text, field_name, format_spec, conversion in Formatter().parse(
+                v
+            ):
                 if field_name is not None:
                     assert (
                         field_name in ALLOWED_BUILDER_KEYS
@@ -120,7 +127,6 @@ class Flavour(BaseModel):
             )
 
 
-
 class DeploymentsConfigFile(BaseModel):
     """The ConfigFile is a pydantic model that represents the deployments.yaml file
 

arkitekt_next/qt/magic_bar.py

@@ -213,12 +213,8 @@ class Profile(QtWidgets.QDialog):
         self.infobar.addWidget(QtWidgets.QLabel(self.app.manifest.identifier))
         self.infobar.addWidget(QtWidgets.QLabel(self.app.manifest.version))
 
-
         self.unkonfigure_button = QtWidgets.QPushButton("Reconnect")
-        self.unkonfigure_button.clicked.connect(
-            lambda: self.bar.refresh_task.run(
-            )
-        )
+        self.unkonfigure_button.clicked.connect(lambda: self.bar.refresh_task.run())
 
         button_bar = QtWidgets.QHBoxLayout()
         self.infobar.addLayout(button_bar)

arkitekt_next/qt/types.py

@@ -4,6 +4,7 @@ from typing import List, Callable, Dict, Any
 
 class QtApp(App):
     """An app that is built with the easy builder"""
+
     hooks: Dict[str, List[Callable]] = {
         "on_start": [],
         "on_stop": [],

arkitekt_next/service_registry.py

@@ -14,10 +14,6 @@ from typing import runtime_checkable
 Params = Dict[str, str]
 
 
-
-
-
-
 class Registration(BaseModel):
     name: str
     requirement: Requirement
@@ -28,19 +24,17 @@ class Registration(BaseModel):
 @runtime_checkable
 class ArkitektService(Protocol):
 
-
     def get_service_name(self):
         pass
 
-
-    def build_service(self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest):
+    def build_service(
+        self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest
+    ):
         pass
 
-
     def get_requirements(self):
         pass
 
-
     def get_graphql_schema(self):
         pass
 
@@ -48,32 +42,33 @@ class ArkitektService(Protocol):
         pass
 
 
-
 class BaseArkitektService:
 
-
     def get_service_name(self):
         raise NotImplementedError("get_service_name not implemented")
-    
-    def build_service(self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest):
+
+    def build_service(
+        self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest
+    ):
         raise NotImplementedError("build_service not implemented")
-    
+
     def get_requirements(self):
         raise NotImplementedError("get_requirements not implemented")
-    
+
     def get_graphql_schema(self):
         return None
-    
+
     def get_turms_project(self):
         return None
-    
 
 
-basic_requirements =  [Requirement(
+basic_requirements = [
+    Requirement(
         key="lok",
         service="live.arkitekt.lok",
         description="An instance of ArkitektNext Lok to authenticate the user",
-    )]
+    )
+]
 
 
 class ServiceBuilderRegistry:
@@ -84,14 +79,13 @@ class ServiceBuilderRegistry:
         self,
         service: ArkitektService,
     ):
-        
+
         name = service.get_service_name()
 
         if name not in self.service_builders:
             self.service_builders[name] = service
         else:
             raise ValueError(f"Service {name} already registered")
-        
 
     def get(self, name):
         return self.services.get(name)
@@ -101,35 +95,32 @@ class ServiceBuilderRegistry:
     ):
         potentially_needed_services = {
             name: service.build_service(fakts, herre, params, manifest)
-            for name, service in self.service_builders.items() 
+            for name, service in self.service_builders.items()
         }
 
-
-
-        return {key: value for key, value in potentially_needed_services.items() if value is not None}
-
-
+        return {
+            key: value
+            for key, value in potentially_needed_services.items()
+            if value is not None
+        }
 
     def get_requirements(self):
 
-        requirements = [Requirement(
-        key="lok",
-        service="live.arkitekt.lok",
-        description="An instance of ArkitektNext Lok to authenticate the user",
-    )]   
+        requirements = [
+            Requirement(
+                key="lok",
+                service="live.arkitekt.lok",
+                description="An instance of ArkitektNext Lok to authenticate the user",
+            )
+        ]
         taken_requirements = set()
 
-
         for service in self.service_builders.values():
             for requirement in service.get_requirements():
                 if requirement.key not in taken_requirements:
                     taken_requirements.add(requirement.key)
                     requirements.append(requirement)
 
-
-
-        
-
         sorted_requirements = sorted(requirements, key=lambda x: x.key)
 
         return sorted_requirements
@@ -145,6 +136,7 @@ import pkgutil
 import traceback
 import logging
 
+
 def check_and_import_services() -> ServiceBuilderRegistry:
     service_builder_registry = ServiceBuilderRegistry()
     processed_modules = set()  # Track modules that have already been processed
@@ -164,10 +156,14 @@ def check_and_import_services() -> ServiceBuilderRegistry:
                     try:
                         service_builder_registry.register(service)
                     except ValueError as e:
-                        print(f"Failed to register service {service}: Another service with the same name is already registered {service_builder_registry.service_builders}")
+                        print(
+                            f"Failed to register service {service}: Another service with the same name is already registered {service_builder_registry.service_builders}"
+                        )
                 logging.info(f"Called build_services function from {module_name}")
             else:
-                print(f"Discovered Arkitekt-like module (containing __arkitekt__) that doesn't conform with the __arkitekt__ spec. No build_services function in {module_name}.__arkitekt__")
+                print(
+                    f"Discovered Arkitekt-like module (containing __arkitekt__) that doesn't conform with the __arkitekt__ spec. No build_services function in {module_name}.__arkitekt__"
+                )
             processed_modules.add(module_name)  # Mark this module as processed
         except Exception as e:
             print(f"Failed to call init_services for {module_name}: {e}")

arkitekt_next/utils.py

@@ -57,14 +57,15 @@ def create_devcontainer_file(
     os.makedirs(devcontainer_path, exist_ok=True)
 
     flavour_container = os.path.join(devcontainer_path, flavour)
-    os.makedirs(os.path.join(devcontainer_path, flavour), exist_ok=True)
+    os.makedirs(flavour_container, exist_ok=True)
 
     devcontainer_file = os.path.join(flavour_container, "devcontainer.json")
 
+
     devcontainer_content = {}
     devcontainer_content["name"] = f"{manifest.identifier} {flavour} Devcontainer"
     devcontainer_content["build"] = {}
-    devcontainer_content["build"]["dockerfile"] = os.path.join("..", docker_file_path)
+    devcontainer_content["build"]["dockerfile"] = os.path.relpath(docker_file_path, flavour_container)
     devcontainer_content["build"][
         "context"
     ] = "../.."  # This is the root of the project

{arkitekt_next-0.8.47.dist-info → arkitekt_next-0.8.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.47
+Version: 0.8.49
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -18,21 +18,21 @@ Provides-Extra: blok
 Provides-Extra: cli
 Provides-Extra: extended
 Provides-Extra: stream
-Requires-Dist: blok (>=0.0.19) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "blok")
+Requires-Dist: blok (>=0.0.20) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "blok")
 Requires-Dist: cryptography (>=40.0.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
 Requires-Dist: dokker (>=1.0.0)
-Requires-Dist: fakts-next (>=1.0.2)
+Requires-Dist: fakts-next (>=1.0.3)
 Requires-Dist: fluss-next (>=0.1.95) ; extra == "all"
 Requires-Dist: herre-next (>=1.0.2)
 Requires-Dist: kabinet (>=0.1.45) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=1.0.3)
 Requires-Dist: kraph (>=0.1.100) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "extended")
-Requires-Dist: lovekit (>=0.1.16) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "stream")
+Requires-Dist: lovekit (>=0.1.18) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "stream")
 Requires-Dist: mikro-next (>=0.1.50) ; (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 == "blok")
 Requires-Dist: netifaces (>=0.11.0) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
-Requires-Dist: reaktion-next (>=0.1.85) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.52) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: reaktion-next (>=0.1.86) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
+Requires-Dist: rekuest-next (>=0.2.54) ; (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.8.2) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")