arkitekt-next 0.7.16__tar.gz → 0.7.18__tar.gz

{arkitekt_next-0.7.16 → arkitekt_next-0.7.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.16
+Version: 0.7.18
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -17,16 +17,17 @@ Provides-Extra: all
 Provides-Extra: cli
 Requires-Dist: dokker (>=0.1.21)
 Requires-Dist: fakts (>=0.5.0)
-Requires-Dist: fluss-next (>=0.1.63) ; extra == "all"
+Requires-Dist: fluss-next (>=0.1.67) ; extra == "all"
 Requires-Dist: herre (>=0.4.3)
-Requires-Dist: kabinet (>=0.1.2) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.5) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=0.3.6)
-Requires-Dist: mikro-next (>=0.1.9) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
-Requires-Dist: reaktion-next (>=0.1.53) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.4) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: mikro-next (>=0.1.13) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: reaktion-next (>=0.1.57) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
+Requires-Dist: rekuest-next (>=0.2.10) ; (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.62) ; 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.16 → arkitekt_next-0.7.18}/arkitekt_next/cli/commands/inspect/main.py

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

arkitekt_next-0.7.18/arkitekt_next/cli/commands/inspect/requirements.py

@@ -0,0 +1,83 @@
+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 requirements(
+    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,
+    )
+
+    x = {
+        key: item.dict(by_alias=True)
+        for key, item in app.manifest.requirements.items()
+    }
+    if machine_readable:
+        print("--START_REQUIREMENTS--" + json.dumps(x) + "--END_REQUIREMENTS--")
+
+    else:
+        if pretty:
+            console.print(json.dumps(x, indent=2))
+        else:
+            print(json.dumps(x))

{arkitekt_next-0.7.16 → arkitekt_next-0.7.18}/arkitekt_next/cli/commands/kabinet/build.py

@@ -10,6 +10,7 @@ from arkitekt_next.cli.types import Flavour, Inspection
 import yaml
 from typing import Dict, Optional
 import json
+from arkitekt_next.model import Requirement
 from arkitekt_next.utils import create_arkitekt_next_folder
 from rekuest_next.api.schema import TemplateInput
 
@@ -125,6 +126,42 @@ def inspect_templates(build_id: str) -> list[TemplateInput]:
             )
 
         raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
+    
+def inspect_requirements(build_id: str) -> Dict[str, Requirement]:
+    try:
+        # Run 'docker inspect' with the container ID or name
+        result = subprocess.run(
+            ["docker", "run", build_id, "arkitekt-next", "inspect", "requirements", "-mr"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            check=True,
+            text=True,
+        )
+
+        # Parse the JSON output
+        correct_part = result.stdout.split("--START_REQUIREMENTS--")[1].split(
+            "--START_REQUIREMENTS--"
+        )[0]
+
+        try:
+            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
+
+        return output.values()
+    except subprocess.CalledProcessError as e:
+        combined_error = e.stdout + e.stderr
+
+        if "No such command" in combined_error:
+            raise InspectionError(
+                "Could not find the command `arkitekt_next inspect definitions` in the container. Maybe"
+                + "you forgot to install arkitekt_next in the container? "
+            )
+
+        raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
 
 
 def inspect_build(build_id: str) -> Inspection:

{arkitekt_next-0.7.16 → arkitekt_next-0.7.18}/arkitekt_next/cli/dockerfiles/vanilla.dockerfile

@@ -1,6 +1,6 @@
-FROM python:3.8-slim-buster
+FROM python:3.11-slim-buster
 
-RUN pip install "arkitekt_next[all]>=0.7.a7"
+RUN pip install "arkitekt-next[all]>=0.7.15"
 
 RUN mkdir /app
 WORKDIR /app

{arkitekt_next-0.7.16 → arkitekt_next-0.7.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.16"
+version = "0.7.18"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -11,11 +11,12 @@ readme = "README.md"
 python = "^3.8"
 herre = ">=0.4.3"
 fakts = ">=0.5.0"
-mikro-next = { version = ">=0.1.9", python = "^3.10", optional = true }
-kabinet = { version = ">=0.1.2", optional = true,  python = "^3.9" }
-fluss-next = { version = ">=0.1.63", optional = true }
-reaktion-next= { version = ">=0.1.53", python = "^3.8", optional = true }
-rekuest-next= { version = ">=0.2.4", python = "^3.8", optional = true }
+mikro-next = { version = ">=0.1.13", python = "^3.10", optional = true }
+kabinet = { version = ">=0.1.5", optional = true,  python = "^3.9" }
+fluss-next = { version = ">=0.1.67", optional = true }
+reaktion-next= { version = ">=0.1.57", python = "^3.8", optional = true }
+rekuest-next= { version = ">=0.2.10", python = "^3.8", optional = true }
+unlok-next= { version = ">=0.1.62", python = "^3.8", optional = true }
 rich-click = { version = ">=1.6.1", optional = true }
 watchfiles = { version = ">=0.18.1", optional = true }
 turms = { version = ">=0.5.0", python = "^3.9", optional = true }