arkitekt-next 0.7.58__tar.gz → 0.7.60__tar.gz

{arkitekt_next-0.7.58 → arkitekt_next-0.7.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.58
+Version: 0.7.60
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -20,20 +20,20 @@ Requires-Dist: blok (>=0.0.19) ; (python_version >= "3.8" and python_version < "
 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.77) ; extra == "all"
+Requires-Dist: fluss-next (>=0.1.79) ; extra == "all"
 Requires-Dist: herre (>=0.4.3)
-Requires-Dist: kabinet (>=0.1.15) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.17) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=0.3.6)
-Requires-Dist: lovekit (>=0.1.4) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
-Requires-Dist: mikro-next (>=0.1.32) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: lovekit (>=0.1.6) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: mikro-next (>=0.1.34) ; (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 == "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.67) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.23) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: reaktion-next (>=0.1.69) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
+Requires-Dist: rekuest-next (>=0.2.25) ; (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.70) ; python_version >= "3.8" and python_version < "4.0"
+Requires-Dist: unlok-next (>=0.1.73) ; 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.58 → arkitekt_next-0.7.60}/arkitekt_next/qt/__init__.py

@@ -9,7 +9,7 @@ to ArkitektNext, and configure settings.
 """
 
 from .magic_bar import MagicBar
-from .builders import publicqt
+from .builders import publicqt, devqt
 from .types import *
 
-__all__ = ["MagicBar", "publicqt", "QtApp"]
+__all__ = ["MagicBar", "publicqt", "devqt", "QtApp"]

arkitekt_next-0.7.60/arkitekt_next/qt/builders.py

@@ -0,0 +1,261 @@
+from arkitekt_next.apps.service.fakts_next import (
+    build_arkitekt_next_redeem_fakts_next,
+)
+from arkitekt_next.apps.service.fakts_qt import build_arkitekt_next_qt_fakts
+from arkitekt_next.apps.service.herre_qt import build_arkitekt_next_qt_herre
+from arkitekt_next.utils import create_arkitekt_next_folder
+from arkitekt_next.model import Manifest
+from arkitekt_next.apps.types import App
+from arkitekt_next.service_registry import (
+    ServiceBuilderRegistry,
+    check_and_import_services,
+)
+from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
+from qtpy import QtWidgets, QtCore
+from typing import List, Optional
+import os
+import logging
+from typing import List, Optional
+import logging
+import os
+
+from arkitekt_next.apps.service.fakts_next import (
+    build_arkitekt_next_fakts_next,
+    build_arkitekt_next_redeem_fakts_next,
+    build_arkitekt_next_token_fakts,
+)
+from arkitekt_next.apps.service.herre import build_arkitekt_next_herre
+from arkitekt_next.utils import create_arkitekt_next_folder
+from arkitekt_next.model import Manifest
+from arkitekt_next.apps.types import App
+from arkitekt_next.service_registry import (
+    ServiceBuilderRegistry,
+    check_and_import_services,
+)
+from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
+
+
+def devqt(
+    identifier: str,
+    version: str = "0.0.1",
+    logo: Optional[str] = None,
+    scopes: Optional[List[str]] = None,
+    url: str = DEFAULT_ARKITEKT_URL,
+    headless: bool = False,
+    log_level: str = "ERROR",
+    parent: Optional[QtWidgets.QWidget] = None,
+    token: Optional[str] = None,
+    no_cache: bool = False,
+    redeem_token: Optional[str] = None,
+    app_kind: str = "development",
+    registry: Optional[ServiceBuilderRegistry] = None,
+    **kwargs,
+) -> App:
+    """Creates a next app
+
+    A simple way to create an ArkitektNext Next app, ArkitektNext next apps are
+    development apps by default, as they will try to register themselves
+    with services that are not yet available in production (such as the
+    rekuest_next and mikro_next services). They represent the next generation
+    of ArkitektNext apps, and will be the default way to create ArkitektNext apps
+    in the future. From here be dragons.
+
+    A few things to note:
+        -   The Next builder closely mimics the easy builder, but will use the
+            next generation of services (such as rekuest_next and mikro_next)
+            and will therefore not be compatible with the current generation.
+
+        -  Next apps will try to establish themselves a "development" apps, by default
+            which means that they will be authenticated with the ArkitektNext server on
+            a per user basis. If you want to create a "desktop" app, which multiple users
+            can use, you should set the `app_kind` to "desktop" TODO: Currently not implemented (use next app for this)
+        -  The Next builder can also be used in plugin apps, and when provided with a fakts token
+           will be able to connect to the ArkitektNext server without any user interaction.
+
+
+    Parameters
+    ----------
+    identifier : str
+        The apps identifier (should be globally unique, see Manifest for more info)
+    version : str, optional
+        The version of the app, by default "0.0.1"
+    logo : str, optional
+        The logo of the app as a public http url, by default None
+    scopes : List[str], optional
+        The scopes, that this apps requires, will default to standard scopes, by default None
+    url : str, optional
+        The fakts server that will be used to configure this app, in a default ArkitektNext deployment this
+        is the address of the "Lok Service" (which provides the Fakts API), by default DEFAULT_ARKITEKT_URL
+        Will be overwritten by the FAKTS_URL environment variable
+    headless : bool, optional
+        Should we run in headless, mode, e.g printing necessary interaction into the console (will forexample
+        stop opening browser windows), by default False
+    log_level : str, optional
+        The log-level to use, by default "ERROR"
+    token : str, optional
+        A fakts token to use, by default None
+        Will be overwritten by the FAKTS_TOKEN environment variable
+    no_cache : bool, optional
+        Should we skip caching token, acess-token, by default False
+        Attention: If this is set to True, the app will always have to be configured
+        and authenticated.
+    instance_id : str, optional
+        The instance_id to use, by default "main"
+        Can be set to a different value, if you want to run multiple intstances
+        of the same app by the same user.
+        Will be overwritten by the REKUEST_INSTANCE_ID environment variable
+    register_reaktion : bool, optional
+        Should we register the reaktion extension, by default True
+        If set to False, the app will not be able to use the reaktion extension
+        (which is necessary for scheduling in app` workflows from fluss)
+    app_kind : str, optional
+        The kind of app to create, by default "development"
+        Can be set to "desktop" to create a desktop app, that can be used by multiple users.
+
+    Returns
+    -------
+    NextApp
+        A built app, that can be used to interact with the ArkitektNext server
+    """
+    registry = registry or check_and_import_services()
+
+    url = os.getenv("FAKTS_URL", url)
+    token = os.getenv("FAKTS_TOKEN", token)
+
+    manifest = Manifest(
+        version=version,
+        identifier=identifier,
+        scopes=scopes if scopes else ["openid"],
+        logo=logo,
+        requirements=registry.get_requirements(),
+    )
+    if token:
+        print("Using token")
+        fakts = build_arkitekt_next_token_fakts(
+            manifest=manifest,
+            token=token,
+            url=url,
+        )
+
+    elif redeem_token:
+        print("Using redeem token")
+        fakts = build_arkitekt_next_redeem_fakts_next(
+            manifest=manifest,
+            redeem_token=redeem_token,
+            url=url,
+            no_cache=no_cache,
+            headless=headless,
+        )
+    else:
+        print("Using normal fakts")
+        fakts = build_arkitekt_next_fakts_next(
+            manifest=manifest,
+            url=url,
+            no_cache=no_cache,
+            headless=headless,
+            client_kind=app_kind,
+        )
+
+    herre = build_arkitekt_next_herre(fakts=fakts)
+
+    params = kwargs
+
+    create_arkitekt_next_folder(with_cache=True)
+
+    try:
+        from rich.logging import RichHandler
+
+        logging.basicConfig(level=log_level, handlers=[RichHandler()])
+    except ImportError:
+        logging.basicConfig(level=log_level)
+
+    app = App(
+        fakts=fakts,
+        herre=herre,
+        manifest=manifest,
+        services=registry.build_service_map(
+            fakts=fakts, herre=herre, params=params, manifest=manifest
+        ),
+    )
+
+    app.enter()
+
+    return app
+
+
+def publicqt(
+    identifier: str,
+    version: str = "latest",
+    logo: Optional[str] = None,
+    scopes: Optional[List[str]] = None,
+    log_level: str = "ERROR",
+    registry: Optional[ServiceBuilderRegistry] = None,
+    parent: Optional[QtWidgets.QWidget] = None,
+    beacon_widget: Optional[QtWidgets.QWidget] = None,
+    login_widget: Optional[QtWidgets.QWidget] = None,
+    settings: Optional[QtCore.QSettings] = None,
+    **kwargs,
+) -> App:
+    """Public QtApp creation
+
+    A simple way to create an Arkitekt app with a public grant (allowing users to sign
+    in with the application ) utlizing a retrieve grant (necessating a previous configuration
+    of the application on the server side)
+
+    Args:
+        identifier (str): The apps identifier
+        version (str, optional): The apps verion. Defaults to "latest".
+        parent (QtWidget, optional): The QtParent (for the login and server select widget). Defaults to None.
+
+    Returns:
+        Arkitekt: The Arkitekt app
+    """
+
+    registry = registry or check_and_import_services()
+
+    settings = settings or QtCore.QSettings("arkitekt_next", f"{identifier}:{version}")
+
+    manifest = Manifest(
+        version=version,
+        identifier=identifier,
+        scopes=scopes if scopes else ["openid"],
+        logo=logo,
+        requirements=registry.get_requirements(),
+    )
+
+    fakts = build_arkitekt_next_qt_fakts(
+        manifest=manifest,
+        beacon_widget=beacon_widget,
+        parent=parent,
+        settings=settings,
+    )
+
+    herre = build_arkitekt_next_qt_herre(
+        manifest,
+        fakts=fakts,
+        login_widget=login_widget,
+        parent=parent,
+        settings=settings,
+    )
+
+    params = kwargs
+
+    try:
+        from rich.logging import RichHandler
+
+        logging.basicConfig(level=log_level, handlers=[RichHandler()])
+    except ImportError:
+        logging.basicConfig(level=log_level)
+
+    app = App(
+        fakts=fakts,
+        herre=herre,
+        manifest=manifest,
+        services=registry.build_service_map(
+            fakts=fakts, herre=herre, params=params, manifest=manifest
+        ),
+    )
+
+    app.enter()
+
+    return app

{arkitekt_next-0.7.58 → arkitekt_next-0.7.60}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.58"
+version = "0.7.60"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -11,13 +11,13 @@ readme = "README.md"
 python = "^3.8"
 herre = ">=0.4.3"
 fakts = ">=0.5.0"
-mikro-next = { version = ">=0.1.32", python = "^3.10", optional = true }
-kabinet = { version = ">=0.1.15", optional = true,  python = "^3.9" }
-fluss-next = { version = ">=0.1.77", optional = true }
-reaktion-next= { version = ">=0.1.67", python = "^3.8", optional = true }
-rekuest-next= { version = ">=0.2.23", python = "^3.8", optional = true }
-unlok-next= { version = ">=0.1.70", python = "^3.8", optional = true }
-lovekit = { version = ">=0.1.4", python = "^3.9", optional = true }
+mikro-next = { version = ">=0.1.34", python = "^3.10", optional = true }
+kabinet = { version = ">=0.1.17", optional = true,  python = "^3.9" }
+fluss-next = { version = ">=0.1.79", optional = true }
+reaktion-next= { version = ">=0.1.69", python = "^3.8", optional = true }
+rekuest-next= { version = ">=0.2.25", python = "^3.8", optional = true }
+unlok-next= { version = ">=0.1.73", python = "^3.8", optional = true }
+lovekit = { version = ">=0.1.6", python = "^3.9", 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.58/arkitekt_next/qt/builders.py

@@ -1,95 +0,0 @@
-from arkitekt_next.apps.service.fakts_next import (
-    build_arkitekt_next_redeem_fakts_next,
-)
-from arkitekt_next.apps.service.fakts_qt import build_arkitekt_next_qt_fakts
-from arkitekt_next.apps.service.herre_qt import build_arkitekt_next_qt_herre
-from arkitekt_next.utils import create_arkitekt_next_folder
-from arkitekt_next.model import Manifest
-from arkitekt_next.apps.types import App
-from arkitekt_next.service_registry import (
-    ServiceBuilderRegistry,
-    check_and_import_services,
-)
-from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
-from qtpy import QtWidgets, QtCore
-from typing import List, Optional
-import os
-import logging
-
-
-def publicqt(
-    identifier: str,
-    version: str = "latest",
-    logo: Optional[str] = None,
-    scopes: Optional[List[str]] = None,
-    log_level: str = "ERROR",
-    registry: Optional[ServiceBuilderRegistry] = None,
-    parent: Optional[QtWidgets.QWidget] = None,
-    beacon_widget: Optional[QtWidgets.QWidget] = None,
-    login_widget: Optional[QtWidgets.QWidget] = None,
-    settings: Optional[QtCore.QSettings] = None,
-    **kwargs,
-) -> App:
-    """Public QtApp creation
-
-    A simple way to create an Arkitekt app with a public grant (allowing users to sign
-    in with the application ) utlizing a retrieve grant (necessating a previous configuration
-    of the application on the server side)
-
-    Args:
-        identifier (str): The apps identifier
-        version (str, optional): The apps verion. Defaults to "latest".
-        parent (QtWidget, optional): The QtParent (for the login and server select widget). Defaults to None.
-
-    Returns:
-        Arkitekt: The Arkitekt app
-    """
-
-    registry = registry or check_and_import_services()
-
-    settings = settings or QtCore.QSettings("arkitekt_next", f"{identifier}:{version}")
-
-    manifest = Manifest(
-        version=version,
-        identifier=identifier,
-        scopes=scopes if scopes else ["openid"],
-        logo=logo,
-        requirements=registry.get_requirements(),
-    )
-
-    fakts = build_arkitekt_next_qt_fakts(
-        manifest=manifest,
-        beacon_widget=beacon_widget,
-        parent=parent,
-        settings=settings,
-    )
-
-    herre = build_arkitekt_next_qt_herre(
-        manifest,
-        fakts=fakts,
-        login_widget=login_widget,
-        parent=parent,
-        settings=settings,
-    )
-
-    params = kwargs
-
-    try:
-        from rich.logging import RichHandler
-
-        logging.basicConfig(level=log_level, handlers=[RichHandler()])
-    except ImportError:
-        logging.basicConfig(level=log_level)
-
-    app = App(
-        fakts=fakts,
-        herre=herre,
-        manifest=manifest,
-        services=registry.build_service_map(
-            fakts=fakts, herre=herre, params=params, manifest=manifest
-        ),
-    )
-
-    app.enter()
-
-    return app