arkitekt-next 0.7.12__tar.gz → 0.7.13__tar.gz

{arkitekt_next-0.7.12 → arkitekt_next-0.7.13}/PKG-INFO

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

{arkitekt_next-0.7.12 → arkitekt_next-0.7.13}/arkitekt_next/cli/commands/inspect/main.py

@@ -3,7 +3,7 @@ import rich_click as click
 
 import rich_click as click
 from .variables import variables
-from .definitions import definitions
+from .templates import templates
 
 
 @click.group()
@@ -19,4 +19,4 @@ def inspect(ctx):
 
 
 inspect.add_command(variables, "variables")
-inspect.add_command(definitions, "definitions")
+inspect.add_command(templates, "templates")

arkitekt_next-0.7.13/arkitekt_next/cli/commands/inspect/templates.py

@@ -0,0 +1,90 @@
+import rich_click as click
+from importlib import import_module
+from arkitekt_next.apps.types import App
+from arkitekt_next.cli.commands.run.utils import import_builder
+from arkitekt_next.cli.vars import get_console, get_manifest
+from arkitekt_next.cli.options import with_builder
+import json
+import os
+
+
+async def run_app(app):
+    async with app:
+        await app.rekuest.run()
+
+
+@click.command("prod")
+@click.pass_context
+@click.option(
+    "--pretty",
+    "-p",
+    help="Should we just output json?",
+    is_flag=True,
+    default=False,
+)
+@click.option(
+    "--machine-readable",
+    "-mr",
+    help="Should we just output json?",
+    is_flag=True,
+    default=False,
+)
+@with_builder
+def templates(
+    ctx,
+    pretty: bool,
+    machine_readable: bool,
+    builder: str = "arkitekt_next.builders.easy",
+):
+    """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.
+
+    """
+    from rekuest.definition.registry import get_default_definition_registry
+
+    manifest = get_manifest(ctx)
+    console = get_console(ctx)
+
+    entrypoint = manifest.entrypoint
+    identifier = manifest.identifier
+    entrypoint_file = f"{manifest.entrypoint}.py"
+    os.path.realpath(entrypoint_file)
+
+    builder_func = import_builder(builder)
+
+    entrypoint = manifest.entrypoint
+
+    with console.status("Loading entrypoint module..."):
+        try:
+            import_module(entrypoint)
+        except ModuleNotFoundError as e:
+            console.print(f"Could not find entrypoint module {entrypoint}")
+            raise e
+
+    app: App = builder_func(
+        identifier=identifier,
+        version="dev",
+        logo=manifest.logo,
+    )
+
+    rekuest = app.services.get("rekuest")
+    if rekuest is None:
+        console.print("No rekuest service found in app")
+        return
+
+    x = {
+        key: item.dict()
+        for key, item in rekuest.agent.extensions[
+            "default"
+        ].definition_registry.templates.items()
+    }
+    if machine_readable:
+        print("--START_TEMPLATES--" + json.dumps(x) + "--END_TEMPLATES--")
+
+    else:
+        if pretty:
+            console.print(json.dumps(x, indent=2))
+        else:
+            print(json.dumps(x))

{arkitekt_next-0.7.12 → arkitekt_next-0.7.13}/arkitekt_next/cli/commands/kabinet/build.py

@@ -93,7 +93,7 @@ def inspect_definitions(build_id: str) -> Inspection:
     try:
         # Run 'docker inspect' with the container ID or name
         result = subprocess.run(
-            ["docker", "run", build_id, "arkitekt_next", "inspect", "definitions"],
+            ["docker", "run", build_id, "arkitekt-next", "inspect", "templates", "-mr"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             check=True,
@@ -101,21 +101,19 @@ def inspect_definitions(build_id: str) -> Inspection:
         )
 
         # Parse the JSON output
+        correct_part = result.stdout.split("--START_TEMPLATES--")[1].split(
+            "--END_TEMPLATES--"
+        )[0]
 
         try:
-            output = json.loads(result.stdout)
+            output = json.loads(correct_part)
         except json.decoder.JSONDecodeError as e:
             combined_error = result.stdout + result.stderr
             raise InspectionError(
                 f"Could not decode JSON output of docker inspect. {combined_error}"
             ) from e
 
-        if "definitions" not in output:
-            raise InspectionError(
-                "Container not found or invalid JSON output for definitions"
-            )
-
-        return output["definitions"]
+        return output
     except subprocess.CalledProcessError as e:
         combined_error = e.stdout + e.stderr
 

{arkitekt_next-0.7.12 → arkitekt_next-0.7.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.12"
+version = "0.7.13"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"

arkitekt_next-0.7.12/arkitekt_next/cli/commands/inspect/definitions.py

@@ -1,53 +0,0 @@
-import rich_click as click
-from importlib import import_module
-from arkitekt_next.cli.vars import get_console, get_manifest
-from arkitekt_next.cli.options import with_builder
-import json
-
-
-async def run_app(app):
-    async with app:
-        await app.rekuest.run()
-
-
-@click.command("prod")
-@click.pass_context
-@click.option(
-    "--pretty",
-    "-p",
-    help="Should we just output json?",
-    is_flag=True,
-    default=False,
-)
-@with_builder
-def definitions(
-    ctx,
-    pretty: bool,
-    builder=None,
-):
-    """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.
-
-    """
-    from rekuest.definition.registry import get_default_definition_registry
-
-    manifest = get_manifest(ctx)
-    console = get_console(ctx)
-
-    entrypoint = manifest.entrypoint
-
-    with console.status("Loading entrypoint module..."):
-        try:
-            import_module(entrypoint)
-        except ModuleNotFoundError as e:
-            console.print(f"Could not find entrypoint module {entrypoint}")
-            raise e
-
-    definitions = get_default_definition_registry().dump()
-
-    if pretty:
-        console.print(json.dumps(definitions, indent=2))
-    else:
-        print(json.dumps(definitions))