arkitekt-next 0.7.39__tar.gz → 0.7.41__tar.gz

{arkitekt_next-0.7.39 → arkitekt_next-0.7.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.39
+Version: 0.7.41
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -16,8 +16,8 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
 Provides-Extra: blok
 Provides-Extra: cli
-Requires-Dist: blok (>=0.0.9) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "blok")
-Requires-Dist: cryptography (>=40.0.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "blok")
+Requires-Dist: blok (>=0.0.9) ; (python_version >= "3.8" 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 (>=0.1.21)
 Requires-Dist: fakts (>=0.5.0)
 Requires-Dist: fluss-next (>=0.1.70) ; extra == "all"
@@ -25,8 +25,8 @@ Requires-Dist: herre (>=0.4.3)
 Requires-Dist: kabinet (>=0.1.8) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=0.3.6)
 Requires-Dist: mikro-next (>=0.1.25) ; (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 == "all" or extra == "blok")
-Requires-Dist: netifaces (>=0.11.0) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all" or extra == "blok")
+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.59) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
 Requires-Dist: rekuest-next (>=0.2.14) ; (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"

{arkitekt_next-0.7.39 → arkitekt_next-0.7.41}/arkitekt_next/bloks/lok.py

@@ -132,7 +132,11 @@ class LokBlok:
         self.tokens = []
         self.groups = []
         self.secret_key = secrets.token_hex(16)
-        self.scopes = {"openid": "The open id connect scope"}
+        self.scopes = {
+            "openid": "The open id connect scope",
+            "read": "A generic read access",
+            "write": "A generic write access",
+        }
         self.key = None
         self.deployment_name = "default"
         self.token_expiry_seconds = 700000
@@ -169,7 +173,6 @@ class LokBlok:
         secrets: SecretBlok,
         livekit: LivekitService,
         dns: DnsService,
-        scopes: list[Dict[str, str]],
     ):
         for key, value in init.kwargs.items():
             setattr(self, key, value)
@@ -177,8 +180,6 @@ class LokBlok:
         assert self.public_key, "Public key is required"
         assert self.private_key, "Private key is required"
 
-        self.scopes = {scope["scope"]: scope["description"] for scope in scopes}
-
         gateway.expose("lok", 80, self.host, strip_prefix=False)
         gateway.expose_mapped(".well-known", 80, self.host, "lok")
 
@@ -302,13 +303,6 @@ class LokBlok:
             type=GROUP,
             show_default=True,
         )
-        with_scopes = Option(
-            subcommand="scopes",
-            help="Additional scopes that should be created (normally handled by the bloks)",
-            default=[f"{key}:{value}" for key, value in self.scopes.items()],
-            multiple=True,
-            type=SCOPE,
-        )
         with_repo = Option(
             subcommand="with_repo",
             help="Which repo should we use when building the service? Only active if build_repo or mount_repo is active",
@@ -371,7 +365,6 @@ class LokBlok:
             with_host,
             with_private_key,
             with_public_key,
-            with_scopes,
             with_secret_key,
         ]
 

{arkitekt_next-0.7.39 → arkitekt_next-0.7.41}/arkitekt_next/cli/main.py

@@ -16,7 +16,6 @@ from arkitekt_next.cli.constants import *
 from arkitekt_next.cli.texts import *
 from arkitekt_next.cli.commands.run.main import run
 from arkitekt_next.cli.commands.gen.main import gen
-from arkitekt_next.cli.commands.server.main import server
 from arkitekt_next.cli.commands.kabinet.main import kabinet
 from arkitekt_next.cli.commands.init.main import init
 from arkitekt_next.cli.commands.manifest.main import manifest
@@ -76,7 +75,6 @@ cli.add_command(gen, "gen")
 cli.add_command(kabinet, "kabinet")
 cli.add_command(manifest, "manifest")
 cli.add_command(inspect, "inspect")
-cli.add_command(server, "server")
 cli.add_command(call, "call")
 
 if __name__ == "__main__":

{arkitekt_next-0.7.39 → arkitekt_next-0.7.41}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.39"
+version = "0.7.41"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -41,10 +41,6 @@ all = [
     "mikro-next",
     "kabinet",
     "fluss-next",
-    "netifaces",
-    "blok",
-    "cryptography",
-    "namegenerator",
 ]
 blok = ["netifaces", "blok", "cryptography", "namegenerator"]
 

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/down.py

@@ -1,56 +0,0 @@
-import rich_click as click
-from click import Context
-from dokker.projects.dokker import DokkerProject
-from dokker.loggers.print import PrintLogger
-from dokker.deployment import Deployment
-from typing import Optional
-import os
-from .utils import compile_options
-
-
-@click.command()
-@click.option(
-    "--name",
-    help="The name of the deployment",
-    default=None,
-    required=False,
-    type=click.Choice(compile_options()),
-)
-@click.pass_context
-def down(
-    ctx: Context,
-    name: Optional[str] = None,
-) -> None:
-    """
-    Down a deployment
-
-    Removing a deployment will stop all containers and call docker compose down
-    on the project. This will remove all containers and networks created by the
-    deployment. The deployment will still be available in the .dokker folder
-    However (depending on your settings) data that was stored in volumes managed
-    by the deployment will be removed.
-
-    If you want to simple Stop the deployment, use the stop command instead.
-
-    """
-    if not name:
-        options = compile_options()
-        if not options:
-            raise click.ClickException(
-                "No deployments found. Please run arkitekt_next server init first"
-            )
-
-        name = options[0]
-
-    print(f"Running {name}")
-
-    project = DokkerProject(
-        name=name,
-    )
-
-    deployment = Deployment(project=project, logger=PrintLogger())
-    with deployment:
-        deployment.down()
-        print("Shutting down...")
-
-    print("Done")

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/init.py

@@ -1,15 +0,0 @@
-import rich_click as click
-from click import Context
-from blok.cli import create_cli
-import asyncio
-from typing import Optional
-import os
-from arkitekt_next.cli.vars import get_console
-from arkitekt_next.__blok__ import get_bloks
-
-
-
-bloks = get_bloks()
-
-init = create_cli(*bloks)
-

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/inspect.py

@@ -1,59 +0,0 @@
-import rich_click as click
-from click import Context
-from dokker.projects.dokker import DokkerProject
-from dokker.loggers.print import PrintLogger
-from dokker.deployment import Deployment
-from typing import Optional
-import os
-from .utils import compile_options
-from rich.table import Table
-from rich.live import Live
-from arkitekt_next.cli.vars import get_console
-import json
-
-DEFAULT_REPO_URL = (
-    "https://raw.githubusercontent.com/jhnnsrs/konstruktor/master/repo/channels.json"
-)
-
-
-@click.command()
-@click.option(
-    "--name",
-    help="The name of the deployment",
-    default=None,
-    required=False,
-    type=click.Choice(compile_options()),
-)
-@click.pass_context
-def inspect(
-    ctx: Context,
-    name: Optional[str] = None,
-) -> None:
-    """
-    Inspect a deployment
-
-    Inspect helps you find information about a deployment. It will show you
-    information about the containers, networks and volumes created by the
-    deployment. If you have not run arkitekt_next server init before, this will
-    fail.
-
-    """
-    if not name:
-        options = compile_options()
-        if not options:
-            raise click.ClickException(
-                "No deployments found. Please run arkitekt_next server init first"
-            )
-
-        name = options[0]
-
-    project = DokkerProject(
-        name=name,
-    )
-
-    console = get_console(ctx)
-
-    deployment = Deployment(project=project)
-
-    with deployment:
-        print(json.dumps(deployment.inspect().dict(), indent=4))

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/main.py

@@ -1,33 +0,0 @@
-import rich_click as click
-from .init import init
-from .up import up
-from .down import down
-from .inspect import inspect
-from .remove import remove
-from .open import open
-from .stop import stop
-from click import Context
-
-
-@click.group()
-@click.pass_context
-def server(ctx: Context) -> None:
-    """Manages your arkitekt_next deployments
-
-    You can directly deploy your app to a server with the arkitekt_next server command. This will
-    create a local docker-compose.yml file and a .arkitekt_next folder in your project. You can then
-    use the arkitekt_next server build command to build your app for port and the arkitekt_next server run
-    command to run your app on the server.
-
-    """
-
-    pass
-
-
-server.add_command(init, "init")
-server.add_command(up, "up")
-server.add_command(down, "down")
-server.add_command(remove, "remove")
-server.add_command(inspect, "inspect")
-server.add_command(open, "open")
-server.add_command(stop, "stop")

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/open.py

@@ -1,66 +0,0 @@
-import rich_click as click
-from click import Context
-from dokker.projects.dokker import DokkerProject
-from dokker.loggers.print import PrintLogger
-from dokker.deployment import Deployment
-from typing import Optional, List
-import os
-from .utils import compile_options
-from rich.table import Table
-from rich.live import Live
-from arkitekt_next.cli.vars import get_console
-import webbrowser
-
-DEFAULT_REPO_URL = (
-    "https://raw.githubusercontent.com/jhnnsrs/konstruktor/master/repo/channels.json"
-)
-
-
-@click.command()
-@click.option(
-    "--name",
-    help="The name of the deployment",
-    default=None,
-    required=False,
-    type=click.Choice(compile_options()),
-)
-@click.argument("services", nargs=-1, required=False)
-@click.pass_context
-def open(
-    ctx: Context,
-    name: Optional[str] = None,
-    services: List[str] = None,
-) -> None:
-    """
-    Opens a service in the browser
-
-    This will open the service in the browser. If you have not run arkitekt_next server init
-    before, this will fail.
-
-
-    """
-    if not name:
-        options = compile_options()
-        if not options:
-            raise click.ClickException(
-                "No deployments found. Please run arkitekt_next server init first"
-            )
-
-        name = options[0]
-
-    project = DokkerProject(
-        name=name,
-    )
-
-    console = get_console(ctx)
-
-    deployment = Deployment(project=project)
-
-    if not services:
-        services = ["orkestrator"]
-
-    with deployment:
-        for service in services:
-            link = deployment.inspect().find_service(service).get_label("arkitekt_next.link")
-            console.print(f"Opening {service} at [link={link}]{link}[/link]")
-            webbrowser.open(link)

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/remove.py

@@ -1,60 +0,0 @@
-import rich_click as click
-from click import Context
-from dokker.projects.dokker import DokkerProject
-from dokker.loggers.print import PrintLogger
-from dokker.deployment import Deployment
-from typing import Optional
-import os
-from .utils import compile_options
-
-
-@click.command()
-@click.option(
-    "--name",
-    help="The name of the deployment",
-    default=None,
-    required=False,
-    type=click.Choice(compile_options()),
-)
-@click.pass_context
-def remove(
-    ctx: Context,
-    name: Optional[str] = None,
-) -> None:
-    """
-    Remove a deployment
-
-    Removing a deployment will stop all containers and call docker compose down
-    on the project. This will remove all containers and networks created by the
-    deployment. As opposed to the down command, the deployment will also be
-    removed from the .dokker folder, and all data stored in volumes managed by
-    the deployment will be removed.
-
-    This step is irreversible, so use with caution.
-
-    """
-    if not name:
-        options = compile_options()
-        if not options:
-            raise click.ClickException(
-                "No deployments found. Please run arkitekt_next server init first"
-            )
-
-        name = options[0]
-
-    print(f"Running {name}")
-
-    project = DokkerProject(
-        name=name,
-    )
-
-    deployment = Deployment(project=project, logger=PrintLogger())
-
-    with deployment:
-        print("Shutting down...")
-        deployment.down()
-
-        print("Removing...")
-        deployment.remove()
-
-    print("Done")

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/stop.py

@@ -1,56 +0,0 @@
-import rich_click as click
-from click import Context
-from dokker.projects.dokker import DokkerProject
-from dokker.loggers.print import PrintLogger
-from dokker.deployment import Deployment
-from typing import Optional
-import os
-from .utils import compile_options
-
-
-@click.command()
-@click.option(
-    "--name",
-    help="The name of the deployment",
-    default=None,
-    required=False,
-    type=click.Choice(compile_options()),
-)
-@click.pass_context
-def stop(
-    ctx: Context,
-    name: Optional[str] = None,
-) -> None:
-    """
-    Stop a deployment
-
-    Stopping a deployment will stop all containers and call docker compose stop
-    on the project. This will stop all containers and networks created by the
-    deployment. The deployment will still be available in the .dokker folder
-
-    This should not be confused with the down command, which will remove all
-    containers and remove all networks created by the deployment.
-
-    """
-    if not name:
-        options = compile_options()
-        if not options:
-            raise click.ClickException(
-                "No deployments found. Please run arkitekt_next server init first"
-            )
-
-        name = options[0]
-
-    print(f"Stopping {name}")
-
-    project = DokkerProject(
-        name=name,
-    )
-
-    deployment = Deployment(project=project, logger=PrintLogger())
-
-    with deployment:
-        print("Shutting down...")
-        deployment.stop()
-
-    print("Done")

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/up.py

@@ -1,70 +0,0 @@
-import rich_click as click
-from click import Context
-from dokker.projects.dokker import DokkerProject
-from dokker.loggers.print import PrintLogger
-from dokker.deployment import Deployment
-from typing import Optional
-import os
-from .utils import compile_options
-from rich.table import Table
-from rich.live import Live
-from arkitekt_next.cli.vars import get_console
-
-
-DEFAULT_REPO_URL = (
-    "https://raw.githubusercontent.com/jhnnsrs/konstruktor/master/repo/channels.json"
-)
-
-
-@click.command()
-@click.option(
-    "--name",
-    help="The name of the deployment",
-    default=None,
-    required=False,
-    type=click.Choice(compile_options()),
-)
-@click.pass_context
-def up(
-    ctx: Context,
-    name: Optional[str] = None,
-) -> None:
-    """
-    Ups a deployment
-
-    Up starts your deployment. This will create all containers and networks
-    needed for your deployment. If you have not run arkitekt_next server init
-    before, this will fail.
-
-
-    """
-    if not name:
-        options = compile_options()
-        if not options:
-            raise click.ClickException(
-                "No deployments found. Please run arkitekt_next server init first"
-            )
-
-        name = options[0]
-
-    print(f"Running {name}")
-
-    project = DokkerProject(
-        name=name,
-    )
-
-    console = get_console(ctx)
-
-    logger = PrintLogger(print_function=lambda x: console.log(x))
-
-    deployment = Deployment(project=project, logger=logger)
-
-    with deployment:
-        port = deployment.inspect().find_service("lok").get_label("arkitekt_next.link")
-
-        status = console.status(
-            f"[bold green]Running on the Lok Server Port {port} Press Ctrl+c once to cancel..."
-        )
-
-        with status:
-            x = deployment.up(detach=False)

arkitekt_next-0.7.39/arkitekt_next/cli/commands/server/utils.py

@@ -1,33 +0,0 @@
-import os
-from typing import List
-
-
-def compile_options() -> List[str]:
-    """Compiles the available options for the server up and down commands:
-
-    All deployments in the .arkitekt_next/deployments folder
-    """
-    deployments = os.path.join(os.getcwd(), ".dokker")
-
-    available_deployments = []
-
-    if not os.path.exists(deployments):
-        return available_deployments
-
-    for deployment in os.listdir(deployments):
-        if os.path.isdir(os.path.join(deployments, deployment)):
-            available_deployments.append(deployment)
-
-    return available_deployments
-
-
-def build_server_path(name: str) -> str:
-    """Builds the path to the server
-
-    Args:
-        name (str): The name of the server
-
-    Returns:
-        str: The path to the server
-    """
-    return os.path.join(os.getcwd(), ".arkitekt_next", "servers", name)