arkitekt-next 0.8.54__tar.gz → 0.8.56__tar.gz

{arkitekt_next-0.8.54 → arkitekt_next-0.8.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.54
+Version: 0.8.56
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -32,7 +32,7 @@ Requires-Dist: mikro-next (>=0.1.50) ; (python_version >= "3.10" and python_vers
 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.86) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.56) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: rekuest-next (>=0.2.57) ; (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" or extra == "blok"
 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")

{arkitekt_next-0.8.54 → arkitekt_next-0.8.56}/arkitekt_next/cli/commands/inspect/templates.py

@@ -1,3 +1,4 @@
+import asyncio
 from pydantic import BaseModel
 import rich_click as click
 from importlib import import_module
@@ -8,10 +9,12 @@ from arkitekt_next.cli.options import with_builder
 import json
 import os
 
+from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
-async def run_app(app):
+
+async def run_app_inspection(app):
     async with app:
-        await app.rekuest.run()
+        return await app.services.get("rekuest").agent.adump_registry()
 
 
 @click.command("prod")
@@ -30,12 +33,20 @@ async def run_app(app):
     is_flag=True,
     default=False,
 )
+@click.option(
+    "--url",
+    "-u",
+    help="The fakts_next server to use",
+    type=str,
+    default=DEFAULT_ARKITEKT_URL,
+)
 @with_builder
 def templates(
     ctx,
     pretty: bool,
     machine_readable: bool,
     builder: str = "arkitekt_next.builders.easy",
+    url: str = DEFAULT_ARKITEKT_URL,
 ):
     """Runs the app in production mode
 
@@ -67,25 +78,19 @@ def templates(
         identifier=identifier,
         version="dev",
         logo=manifest.logo,
+        url=url,
+        headless=True,
     )
 
-    
-
-
-
-
 
     rekuest = app.services.get("rekuest")
     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[
-            "default"
-        ].definition_registry.templates.items()
-    }
+    x = asyncio.run(run_app_inspection(app))
+
+
     if machine_readable:
         print("--START_TEMPLATES--" + json.dumps(x) + "--END_TEMPLATES--")
 

{arkitekt_next-0.8.54 → arkitekt_next-0.8.56}/arkitekt_next/cli/commands/kabinet/build.py

@@ -11,6 +11,7 @@ import yaml
 from typing import Dict, Optional
 import json
 from arkitekt_next.base_models import Requirement
+from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 from arkitekt_next.utils import create_arkitekt_next_folder
 from rekuest_next.api.schema import TemplateInput
 
@@ -91,11 +92,11 @@ def inspect_docker_container(build_id: str) -> InspectionInput:
         raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
 
 
-def inspect_templates(build_id: str) -> list[TemplateInput]:
+def inspect_templates(build_id: str, url:str) -> list[TemplateInput]:
     try:
         # Run 'docker inspect' with the container ID or name
         result = subprocess.run(
-            ["docker", "run", build_id, "arkitekt-next", "inspect", "templates", "-mr"],
+            ["docker", "run", "--network", "host", build_id, "arkitekt-next", "inspect", "templates", "-mr", "--url", url],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             check=True,
@@ -173,9 +174,9 @@ def inspect_requirements(build_id: str) -> Dict[str, Requirement]:
         raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
 
 
-def inspect_build(build_id: str) -> InspectionInput:
+def inspect_build(build_id: str, url: str) -> InspectionInput:
     size, size_root_fs = inspect_docker_container(build_id)
-    templates = inspect_templates(build_id)
+    templates = inspect_templates(build_id, url)
     requirements = inspect_requirements(build_id)
 
     return InspectionInput(size=size, templates=templates, requirements=requirements)
@@ -241,8 +242,15 @@ def get_flavours(ctx: Context, select: Optional[str] = None) -> Dict[str, Flavou
     default=None,
     required=False,
 )
+@click.option(
+    "--url",
+    "-u",
+    help="The fakts_next server to use",
+    type=str,
+    default=DEFAULT_ARKITEKT_URL,
+)
 @click.pass_context
-def build(ctx: Context, flavour: str, no_inspect: bool, tag: str = None) -> None:
+def build(ctx: Context, flavour: str, no_inspect: bool, tag: str = None, url: str = DEFAULT_ARKITEKT_URL) -> None:
     """Builds the arkitekt_next app to docker"""
 
     manifest = get_manifest(ctx)
@@ -276,7 +284,7 @@ def build(ctx: Context, flavour: str, no_inspect: bool, tag: str = None) -> None
 
         inspection = None
         if not no_inspect:
-            inspection = inspect_build(build_tag)
+            inspection = inspect_build(build_tag, url)
 
         generate_build(build_run, build_tag, key, flavour, manifest, inspection)
 

{arkitekt_next-0.8.54 → arkitekt_next-0.8.56}/arkitekt_next/cli/main.py

@@ -21,7 +21,6 @@ from arkitekt_next.cli.commands.init.main import init
 from arkitekt_next.cli.commands.manifest.main import manifest
 from arkitekt_next.cli.commands.inspect.main import inspect
 from arkitekt_next.cli.commands.call.main import call
-from arkitekt_next.cli.commands.delegate.main import delegate
 from arkitekt_next.cli.io import load_manifest
 from arkitekt_next.utils import create_arkitekt_next_folder
 
@@ -77,7 +76,6 @@ cli.add_command(kabinet, "kabinet")
 cli.add_command(manifest, "manifest")
 cli.add_command(inspect, "inspect")
 cli.add_command(call, "call")
-cli.add_command(delegate, "delegate")
 
 if __name__ == "__main__":
     cli()

{arkitekt_next-0.8.54 → arkitekt_next-0.8.56}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.8.54"
+version = "0.8.56"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -16,7 +16,7 @@ mikro-next = { version = ">=0.1.50", python = "^3.10", optional = true }
 kabinet = { version = ">=0.1.45", optional = true,  python = "^3.9" }
 fluss-next = { version = ">=0.1.95", optional = true }
 reaktion-next= { version = ">=0.1.86", python = "^3.8", optional = true }
-rekuest-next= { version = ">=0.2.56", python = "^3.8", optional = true }
+rekuest-next= { version = ">=0.2.57", python = "^3.8", optional = true }
 unlok-next= { version = ">=0.1.87", python = "^3.8", optional = true }
 lovekit = { version = ">=0.1.18", python = "^3.10", optional = true }
 rich-click = { version = ">=1.6.1", optional = true }

arkitekt_next-0.8.54/arkitekt_next/cli/commands/delegate/main.py

@@ -1,20 +0,0 @@
-import rich_click as click
-
-
-import rich_click as click
-from .script import script
-
-
-@click.group()
-@click.pass_context
-def delegate(ctx):
-    """Inspects your arkitekt_next app
-
-    Inspects various parts of your arkitekt_next app. This is useful for debugging
-    and development. It also represents methods that are called by the arkitekt_next
-    server when you run your app in production mode.
-
-    """
-
-
-delegate.add_command(script, "script")

arkitekt_next-0.8.54/arkitekt_next/cli/commands/delegate/script.py

@@ -1,92 +0,0 @@
-import rich_click as click
-from arkitekt_next.cli.options import *
-import asyncio
-from arkitekt_next.cli.ui import construct_run_panel
-from importlib import import_module
-from arkitekt_next.cli.utils import import_builder
-from rekuest_next.agents.extensions.delegating.extension import CLIExtension
-from rekuest_next.api.schema import NodeKind, BindsInput
-from rich.table import Table
-from rich.console import Console
-from typing import Dict, Any
-
-from rekuest_next.rekuest import RekuestNext
-
-
-async def call_app(
-    console: Console,
-    app: App,
-    template_string: str,
-    arg: Dict[str, Any],
-):
-    async with app:
-        await app.services.get("rekuest").agent.aprovide()
-
-
-@click.command("prod")
-@click.argument("script_name", type=str, required=True, nargs=-1)
-@click.option(
-    "--url",
-    help="The fakts_next url for connection",
-    default=DEFAULT_ARKITEKT_URL,
-    envvar="FAKTS_URL",
-)
-@with_builder
-@with_token
-@with_instance_id
-@with_headless
-@with_log_level
-@with_skip_cache
-@click.pass_context
-@click.option(
-    "--arg",
-    "-a",
-    "args",
-    help="Key Value pairs for the setup",
-    type=(str, str),
-    multiple=True,
-)
-@click.option(
-    "--template",
-    "-t",
-    "template",
-    help="The template to run",
-    type=str,
-)
-def script(
-    ctx,
-    script_name,
-    entrypoint=None,
-    builder=None,
-    args=None,
-    template: str = None,
-    **builder_kwargs,
-):
-    """Runs the app in production mode
-
-    \n
-    You can specify the builder to use with the --builder flag. By default, the easy builder is used, which is designed to be easy to use and to get started with.
-
-    """
-
-    manifest = get_manifest(ctx)
-    console = get_console(ctx)
-    entrypoint = entrypoint or manifest.entrypoint
-
-    kwargs = dict(args or [])
-
-    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)
-
-    asyncio.run(call_app(console, app, template, kwargs))