arkitekt-next 0.7.26__tar.gz → 0.7.29__tar.gz

{arkitekt_next-0.7.26 → arkitekt_next-0.7.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.26
+Version: 0.7.29
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -17,17 +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.68) ; extra == "all"
+Requires-Dist: fluss-next (>=0.1.69) ; extra == "all"
 Requires-Dist: herre (>=0.4.3)
-Requires-Dist: kabinet (>=0.1.6) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.7) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=0.3.6)
-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.58) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.12) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: mikro-next (>=0.1.24) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+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.13) ; (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.63) ; python_version >= "3.8" and python_version < "4.0"
+Requires-Dist: unlok-next (>=0.1.64) ; 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.26 → arkitekt_next-0.7.29}/arkitekt_next/apps/service/fakts_qt.py

@@ -2,6 +2,7 @@ from fakts.fakts import Fakts
 from typing import Optional
 from fakts.grants.remote import RemoteGrant
 from fakts.grants.remote.demanders.auto_save import AutoSaveDemander
+from fakts.grants.remote.demanders.device_code import DeviceCodeDemander
 from fakts.grants.remote.discovery.auto_save import AutoSaveDiscovery
 from fakts.grants.remote.discovery.qt.auto_save_endpoint_widget import (
     AutoSaveEndpointWidget,
@@ -57,9 +58,11 @@ def build_arkitekt_next_qt_fakts(
                     settings=settings,
                     save_key="fakts_token",
                 ),
-                demander=RetrieveDemander(
+                demander=DeviceCodeDemander(
                     manifest=manifest,
                     redirect_uri="http://127.0.0.1:6767",
+                    open_browser=True,
+                    requested_client_kind="desktop",
                 ),
             ),
             discovery=AutoSaveDiscovery(
@@ -75,6 +78,7 @@ def build_arkitekt_next_qt_fakts(
                     settings=settings,
                     allow_appending_slash=True,
                     auto_protocols=["http", "https"],
+                    additional_beacons=["http://localhost"]
                 ),
             ),
             claimer=ClaimEndpointClaimer(),

{arkitekt_next-0.7.26 → arkitekt_next-0.7.29}/arkitekt_next/apps/types.py

@@ -42,3 +42,7 @@ class App(Composition):
     async def __aexit__(self, exc_type, exc_value, traceback):
         for service in self.services.values():
             await service.__aexit__(exc_type, exc_value, traceback)
+
+
+
+

{arkitekt_next-0.7.26 → arkitekt_next-0.7.29}/arkitekt_next/builders.py

@@ -159,7 +159,6 @@ def easy(
         services=registry.build_service_map(fakts=fakts, herre=herre, params=params, manifest=manifest),
     )
 
-    print()
 
     return app
 

{arkitekt_next-0.7.26 → arkitekt_next-0.7.29}/arkitekt_next/cli/commands/kabinet/init.py

@@ -4,7 +4,8 @@ from arkitekt_next.cli.utils import build_relative_dir
 import rich_click as click
 from click import Context
 from rich import get_console
-from arkitekt_next.utils import create_arkitekt_next_folder
+from arkitekt_next.cli.vars import get_manifest
+from arkitekt_next.utils import create_arkitekt_next_folder, create_devcontainer_file
 import yaml
 from rich.panel import Panel
 
@@ -38,9 +39,16 @@ import os
     default="vanilla",
     type=click.Choice(compile_dockerfiles()),
 )
+@click.option(
+    "--devcontainer",
+    "-d",
+    help="Shouwld we create a devcontainer.json file?",
+    is_flag=True,
+    default=False,
+)
 @click.pass_context
 def init(
-    ctx: Context, description: str, overwrite: bool, flavour: str, template: str
+    ctx: Context, description: str, overwrite: bool, flavour: str, template: str, devcontainer: bool
 ) -> None:
     """Runs the port wizard to generate a dockerfile to be used with port"""
 
@@ -57,6 +65,8 @@ def init(
     config_file = os.path.join(flavour_folder, "config.yaml")
     dockerfile = os.path.join(flavour_folder, "Dockerfile")
 
+    manifest = get_manifest(ctx)
+
     fl = Flavour(
         selectors=[],
         description=description,
@@ -72,6 +82,11 @@ def init(
     with open(dockerfile, "w") as f:
         f.write(dockerfile_content)
 
+
+    if devcontainer or click.confirm("Do you want to create a devcontainer.json file?"):
+        create_devcontainer_file(manifest, flavour, dockerfile)
+
+
     panel = Panel(
         title=f"Created new flavour [bold]{flavour}[/bold]\n",
         renderable="You can now edit the Dockerfile and add selectors to the config.yaml file\n"

{arkitekt_next-0.7.26 → arkitekt_next-0.7.29}/arkitekt_next/qt/__init__.py

@@ -8,6 +8,7 @@ to any Qt application. It will then allow the user to configure and connect
 to ArkitektNext, and configure settings.
 """
 from .magic_bar import MagicBar
-from .builder import build_arkitekt_next_qt_app
+from .builders import publicqt
+from .types import *
 
-__all__ = ["MagicBar", "build_arkitekt_next_qt_app"]
+__all__ = ["MagicBar", "publicqt", "QtApp"]

arkitekt_next-0.7.26/arkitekt_next/qt/builder.py → arkitekt_next-0.7.29/arkitekt_next/qt/builders.py

@@ -20,14 +20,7 @@ def publicqt(
     version: str = "latest",
     logo: Optional[str] = None,
     scopes: Optional[List[str]] = None,
-    url: str = "http://localhost:11000",
-    headless: bool = False,
     log_level: str = "ERROR",
-    token: Optional[str] = None,
-    no_cache: bool = False,
-    instance_id: str = "main",
-    redeem_token: Optional[str] = None,
-    app_kind: str = "desktop",
     registry: Optional[ServiceBuilderRegistry] = None,
     parent: Optional[QtWidgets.QWidget] = None,
     beacon_widget: Optional[QtWidgets.QWidget] = None,
@@ -52,6 +45,9 @@ def publicqt(
 
     registry = registry or check_and_import_services()
 
+    settings = settings or QtCore.QSettings("arkitekt_next", f"{identifier}:{version}")
+
+
     manifest = Manifest(
         version=version,
         identifier=identifier,
@@ -60,38 +56,17 @@ def publicqt(
         requirements=registry.get_requirements(),
     )
 
-    if redeem_token:
-        fakts = build_arkitekt_next_redeem_fakts_next(
-            manifest=manifest,
-            redeem_token=redeem_token,
-            url=url,
-            no_cache=no_cache,
-            headless=headless,
-        )
-    else:
-        fakts = build_arkitekt_next_qt_fakts(
-            manifest=manifest,
-            url=url,
-            no_cache=no_cache,
-            client_kind=app_kind,
-            beacon_widget=beacon_widget,
-            settings=settings,
-        )
-
-    herre = build_arkitekt_next_qt_herre(
+    fakts = build_arkitekt_next_qt_fakts(
         manifest=manifest,
-        fakts=fakts,
-        login_widget=login_widget,
+        beacon_widget=beacon_widget,
         parent=parent,
         settings=settings,
     )
 
-    params = kwargs
+    herre = build_arkitekt_next_qt_herre(manifest, fakts=fakts, login_widget=login_widget, parent=parent, settings=settings)
 
-    url = os.getenv("FAKTS_URL", url)
-    token = os.getenv("FAKTS_TOKEN", token)
+    params = kwargs
 
-    create_arkitekt_next_folder(with_cache=True)
 
     try:
         from rich.logging import RichHandler
@@ -104,8 +79,9 @@ def publicqt(
         fakts=fakts,
         herre=herre,
         manifest=manifest,
-        services=registry.build_service_map(fakts=fakts, herre=herre, params=params),
+        services=registry.build_service_map(fakts=fakts, herre=herre, params=params, manifest=manifest),
     )
 
     app.enter()
+
     return app

{arkitekt_next-0.7.26 → arkitekt_next-0.7.29}/arkitekt_next/qt/magic_bar.py

@@ -1,5 +1,6 @@
 from enum import Enum
 from qtpy import QtWidgets, QtGui, QtCore
+from arkitekt_next.qt.types import QtApp
 from koil.qt import async_to_qt
 
 from arkitekt_next.apps.types import App
@@ -304,7 +305,7 @@ class MagicBar(QtWidgets.QWidget):
 
     def __init__(
         self,
-        app: App,
+        app: QtApp,
         dark_mode: bool = False,
         on_error: Optional[Callable[[Exception], None]] = None,
     ) -> None:
@@ -351,7 +352,7 @@ class MagicBar(QtWidgets.QWidget):
         self.refresh_token_task.errored.connect(self.login_errored)
         self.refresh_token_task.returned.connect(self.set_unprovided)
 
-        self.provide_task = async_to_qt(self.app.rekuest.agent.aprovide)
+        self.provide_task = async_to_qt(self.app.services.get("rekuest").agent.aprovide)
         self.provide_task.errored.connect(self.provide_errored)
         self.provide_task.returned.connect(self.set_unprovided)
 

arkitekt_next-0.7.29/arkitekt_next/qt/types.py

@@ -0,0 +1,44 @@
+from arkitekt_next.apps.types import App, Fakts, Herre, Manifest
+from typing import List, Callable, Dict, Any
+
+class QtApp(App):
+    """An app that is built with the easy builder"""
+
+    fakts: Fakts
+    herre: Herre
+    manifest: Manifest
+    services: Dict[str, Any]
+    hooks: Dict[str, List[Callable]] = {
+        "on_start": [],
+        "on_stop": [],
+        "on_error": [],
+        "on_message": [],
+        "on_warning": [],
+        "on_info": [],
+        "on_debug": [],
+        "on_enter": [],
+    }
+
+
+    def register_hook(self, hook_name: str, hook: Callable):
+        """Register a hook"""
+        self.hooks[hook_name].append(hook)
+    
+
+
+    def run(self):
+        """Run the app"""
+        self.services["rekuest"].run()
+
+
+
+    async def __aenter__(self):
+        await super().__aenter__()
+        for service in self.services.values():
+            await service.__aenter__()
+
+        return self
+
+    async def __aexit__(self, exc_type, exc_value, traceback):
+        for service in self.services.values():
+            await service.__aexit__(exc_type, exc_value, traceback)

{arkitekt_next-0.7.26 → arkitekt_next-0.7.29}/arkitekt_next/utils.py

@@ -1,4 +1,6 @@
 import os
+from arkitekt_next.model import Manifest
+import json 
 
 
 def create_arkitekt_next_folder(with_cache: bool = True) -> str:
@@ -36,3 +38,37 @@ def create_arkitekt_next_folder(with_cache: bool = True) -> str:
             )
 
     return os.path.abspath(".arkitekt_next")
+
+
+
+def create_devcontainer_file(manifest: Manifest, flavour: str, docker_file_path, devcontainer_path=".devcontainer", ) -> None:
+    """Creates a devcontainer.json file in the flavour folder.
+
+    Parameters
+    ----------
+    flavour_folder : str
+        The path to the flavour folder.
+    """
+
+    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)
+
+
+
+
+    
+
+
+    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"]["context"] = "../.." # This is the root of the project
+    devcontainer_content["runArgs"] = ["--network=host"]
+    
+    json.dump(devcontainer_content, open(devcontainer_file, "w"), indent=4)

{arkitekt_next-0.7.26 → arkitekt_next-0.7.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.26"
+version = "0.7.29"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -11,12 +11,12 @@ readme = "README.md"
 python = "^3.8"
 herre = ">=0.4.3"
 fakts = ">=0.5.0"
-mikro-next = { version = ">=0.1.13", python = "^3.10", optional = true }
-kabinet = { version = ">=0.1.6", optional = true,  python = "^3.9" }
-fluss-next = { version = ">=0.1.68", optional = true }
-reaktion-next= { version = ">=0.1.58", python = "^3.8", optional = true }
-rekuest-next= { version = ">=0.2.12", python = "^3.8", optional = true }
-unlok-next= { version = ">=0.1.63", python = "^3.8", optional = true }
+mikro-next = { version = ">=0.1.24", python = "^3.10", optional = true }
+kabinet = { version = ">=0.1.7", optional = true,  python = "^3.9" }
+fluss-next = { version = ">=0.1.69", optional = true }
+reaktion-next= { version = ">=0.1.59", python = "^3.8", optional = true }
+rekuest-next= { version = ">=0.2.13", python = "^3.8", optional = true }
+unlok-next= { version = ">=0.1.64", 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 }

arkitekt_next-0.7.26/arkitekt_next/apps/service/fluss_next.py

@@ -1,31 +0,0 @@
-from fluss_next.fluss import Fluss
-from fluss_next.rath import FlussLinkComposition, FlussRath
-from rath.links.split import SplitLink
-from rath.contrib.fakts.links.aiohttp import FaktsAIOHttpLink
-from rath.contrib.fakts.links.graphql_ws import FaktsGraphQLWSLink
-from rath.contrib.herre.links.auth import HerreAuthLink
-from graphql import OperationType
-from arkitekt_next_next.healthz import FaktsHealthz
-from fakts import Fakts
-from herre import Herre
-
-
-class ArkitektNextFluss(Fluss):
-    rath: FlussRath
-    healthz: FaktsHealthz
-
-
-def build_arkitekt_next_fluss(herre: Herre, fakts: Fakts):
-    return ArkitektNextFluss(
-        rath=FlussRath(
-            link=FlussLinkComposition(
-                auth=HerreAuthLink(herre=herre),
-                split=SplitLink(
-                    left=FaktsAIOHttpLink(fakts_group="fluss", fakts=fakts),
-                    right=FaktsGraphQLWSLink(fakts_group="fluss", fakts=fakts),
-                    split=lambda o: o.node.operation != OperationType.SUBSCRIPTION,
-                ),
-            )
-        ),
-        healthz=FaktsHealthz(fakts_group="fluss", fakts=fakts),
-    )

arkitekt_next-0.7.26/arkitekt_next/apps/service/kabinet.py

@@ -1,31 +0,0 @@
-from kabinet.kabinet import Kabinet
-from kabinet.rath import KabinetLinkComposition, KabinetRath
-from rath.links.split import SplitLink
-from rath.contrib.fakts.links.aiohttp import FaktsAIOHttpLink
-from rath.contrib.fakts.links.graphql_ws import FaktsGraphQLWSLink
-from rath.contrib.herre.links.auth import HerreAuthLink
-from graphql import OperationType
-from arkitekt_next_next.healthz import FaktsHealthz
-from fakts import Fakts
-from herre import Herre
-
-
-class ArkitektNextKabinet(Kabinet):
-    rath: KabinetRath
-    healthz: FaktsHealthz
-
-
-def build_arkitekt_next_kabinet(herre: Herre, fakts: Fakts):
-    return ArkitektNextKabinet(
-        rath=KabinetRath(
-            link=KabinetLinkComposition(
-                auth=HerreAuthLink(herre=herre),
-                split=SplitLink(
-                    left=FaktsAIOHttpLink(fakts_group="kabinet", fakts=fakts),
-                    right=FaktsGraphQLWSLink(fakts_group="kabinet", fakts=fakts),
-                    split=lambda o: o.node.operation != OperationType.SUBSCRIPTION,
-                ),
-            )
-        ),
-        healthz=FaktsHealthz(fakts_group="kabinet", fakts=fakts),
-    )

arkitekt_next-0.7.26/arkitekt_next/apps/service/mikro_next.py

@@ -1,81 +0,0 @@
-"""
-This modules provides the main app. It is responsible for setting up the connection to the mikro-server and
-handling authentification and setting up the configuration. Mikro handles the creation of the datalayer and
-the graphql client.
-
-You can compose this app together with other apps to create a full fledged app. (Like combining with
-arkitekt_next to enable to call functions that you define on the app)
-
-Example:
-
-    A simple app that takes it configuraiton from basic.fakts and connects to the mikro-server.
-    You can define all of the logic within the context manager
-
-    ```python
-    from mikro.app import MikroApp
-
-    app = MikroApp(fakts=Fakts(subapp="basic"))
-
-    with app:
-        # do stuff
-
-    ```
-
-    Async Usage:
-
-
-    ```python
-    from mikro.app import MikroApp
-
-    app = MikroApp(fakts=Fakts(subapp="basic"))
-
-    async with app:
-        # do stuff
-
-    ```
-
- 
-"""
-
-
-from arkitekt_next_next.healthz import FaktsHealthz
-from mikro_next.mikro_next import MikroNext
-from mikro_next.rath import MikroNextLinkComposition, MikroNextRath
-from rath.links.split import SplitLink
-from rath.contrib.fakts.links.aiohttp import FaktsAIOHttpLink
-from rath.contrib.fakts.links.graphql_ws import FaktsGraphQLWSLink
-from rath.contrib.herre.links.auth import HerreAuthLink
-from mikro_next.contrib.fakts.datalayer import FaktsDataLayer
-from mikro_next.links.upload import UploadLink
-from mikro_next.datalayer import DataLayer
-from graphql import OperationType
-from herre import Herre
-from fakts import Fakts
-
-
-class ArkitektNextMikroNext(MikroNext):
-    rath: MikroNextRath
-    datalayer: DataLayer
-    healthz: FaktsHealthz
-
-
-def build_arkitekt_next_mikro_next(herre: Herre, fakts: Fakts):
-    datalayer = FaktsDataLayer(fakts_group="datalayer", fakts=fakts)
-
-    return ArkitektNextMikroNext(
-        rath=MikroNextRath(
-            link=MikroNextLinkComposition(
-                auth=HerreAuthLink(herre=herre),
-                upload=UploadLink(
-                    datalayer=datalayer,
-                ),
-                split=SplitLink(
-                    left=FaktsAIOHttpLink(fakts_group="mikro", fakts=fakts),
-                    right=FaktsGraphQLWSLink(fakts_group="mikro", fakts=fakts),
-                    split=lambda o: o.node.operation != OperationType.SUBSCRIPTION,
-                ),
-            )
-        ),
-        datalayer=datalayer,
-        healthz=FaktsHealthz(fakts_group="mikro", fakts=fakts),
-    )

arkitekt_next-0.7.26/arkitekt_next/apps/service/rekuest_next.py

@@ -1,53 +0,0 @@
-from arkitekt_next_next.healthz import FaktsHealthz
-from rath.contrib.fakts.links.aiohttp import FaktsAIOHttpLink
-from rath.links.split import SplitLink
-from rath.contrib.fakts.links.graphql_ws import FaktsGraphQLWSLink
-from rath.contrib.herre.links.auth import HerreAuthLink
-from rekuest_next.rath import RekuestNextLinkComposition, RekuestNextRath
-from rekuest_next.rekuest import RekuestNext
-from graphql import OperationType
-from rekuest_next.contrib.arkitekt_next.websocket_agent_transport import (
-    ArkitektNextWebsocketAgentTransport,
-)
-
-from rekuest_next.agents.base import BaseAgent
-from fakts import Fakts
-from herre import Herre
-from rekuest_next.postmans.graphql import GraphQLPostman
-
-
-class ArkitektNextRekuestNext(RekuestNext):
-    rath: RekuestNextRath
-    agent: BaseAgent
-    healthz: FaktsHealthz
-
-
-def build_arkitekt_next_rekuest_next(
-    fakts: Fakts, herre: Herre, instance_id: str
-) -> ArkitektNextRekuestNext:
-    rath = RekuestNextRath(
-        link=RekuestNextLinkComposition(
-            auth=HerreAuthLink(herre=herre),
-            split=SplitLink(
-                left=FaktsAIOHttpLink(fakts_group="rekuest", fakts=fakts),
-                right=FaktsGraphQLWSLink(fakts_group="rekuest", fakts=fakts),
-                split=lambda o: o.node.operation != OperationType.SUBSCRIPTION,
-            ),
-        )
-    )
-
-    return ArkitektNextRekuestNext(
-        rath=rath,
-        agent=BaseAgent(
-            transport=ArkitektNextWebsocketAgentTransport(
-                fakts_group="rekuest.agent", fakts=fakts, herre=herre
-            ),
-            instance_id=instance_id,
-            rath=rath,
-        ),
-        postman=GraphQLPostman(
-            rath=rath,
-            instance_id=instance_id,
-        ),
-        healthz=FaktsHealthz(fakts_group="rekuest", fakts=fakts),
-    )

arkitekt_next-0.7.26/arkitekt_next/apps/service/unlok_next.py

@@ -1,32 +0,0 @@
-from herre import Herre
-from rath.contrib.fakts.links.aiohttp import FaktsAIOHttpLink
-from rath.contrib.fakts.links.graphql_ws import FaktsGraphQLWSLink
-from rath.contrib.herre.links.auth import HerreAuthLink
-from rath.links.split import SplitLink
-
-from arkitekt_next_next.healthz import FaktsHealthz
-from fakts import Fakts
-from graphql import OperationType
-from unlok_next.rath import UnlokLinkComposition, UnlokRath
-from unlok_next.unlok import Unlok
-
-
-class ArkitektNextUnlok(Unlok):
-    rath: UnlokRath
-    healthz: FaktsHealthz
-
-
-def build_arkitekt_next_unlok_next(herre: Herre, fakts: Fakts):
-    return ArkitektNextUnlok(
-        rath=UnlokRath(
-            link=UnlokLinkComposition(
-                auth=HerreAuthLink(herre=herre),
-                split=SplitLink(
-                    left=FaktsAIOHttpLink(fakts_group="lok", fakts=fakts),
-                    right=FaktsGraphQLWSLink(fakts_group="lok", fakts=fakts),
-                    split=lambda o: o.node.operation != OperationType.SUBSCRIPTION,
-                ),
-            )
-        ),
-        healthz=FaktsHealthz(fakts_group="lok", fakts=fakts),
-    )