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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.14
+Version: 0.7.16
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -22,7 +22,6 @@ 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: 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: qtpy (>=2.4.1,<3.0.0)
 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: rich-click (>=1.6.1) ; extra == "cli" or extra == "all"

{arkitekt_next-0.7.14 → arkitekt_next-0.7.16}/arkitekt_next/builders.py

@@ -7,14 +7,12 @@ from arkitekt_next.apps.service.fakts_next import (
     build_arkitekt_next_redeem_fakts_next,
 )
 from arkitekt_next.apps.service.herre import build_arkitekt_next_herre
-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 .utils import create_arkitekt_next_folder
 from .model import Manifest
 from .apps.types import App
 from .service_registry import ServiceBuilderRegistry, check_and_import_services
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
-from qtpy import QtWidgets, QtCore
+
 
 
 def easy(
@@ -153,97 +151,3 @@ def easy(
     return app
 
 
-def publicqt(
-    identifier: str,
-    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,
-    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()
-
-    manifest = Manifest(
-        version=version,
-        identifier=identifier,
-        scopes=scopes if scopes else ["openid"],
-        logo=logo,
-        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(
-        manifest=manifest,
-        fakts=fakts,
-        login_widget=login_widget,
-        parent=parent,
-        settings=settings,
-    )
-
-    params = kwargs
-
-    url = os.getenv("FAKTS_URL", url)
-    token = os.getenv("FAKTS_TOKEN", token)
-
-    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),
-    )
-
-    app.enter()
-    return app

{arkitekt_next-0.7.14 → arkitekt_next-0.7.16}/arkitekt_next/cli/commands/inspect/templates.py

@@ -75,7 +75,7 @@ def templates(
         return
 
     x = {
-        key: item.dict()
+        key: item.dict(by_alias=True)
         for key, item in rekuest.agent.extensions[
             "default"
         ].definition_registry.templates.items()

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

@@ -11,6 +11,7 @@ import yaml
 from typing import Dict, Optional
 import json
 from arkitekt_next.utils import create_arkitekt_next_folder
+from rekuest_next.api.schema import TemplateInput
 
 
 class InspectionError(Exception):
@@ -89,7 +90,7 @@ def inspect_docker_container(build_id: str) -> Inspection:
         raise InspectionError(f"An error occurred: {e.stdout + e.stderr}") from e
 
 
-def inspect_definitions(build_id: str) -> Inspection:
+def inspect_templates(build_id: str) -> list[TemplateInput]:
     try:
         # Run 'docker inspect' with the container ID or name
         result = subprocess.run(
@@ -113,7 +114,7 @@ def inspect_definitions(build_id: str) -> Inspection:
                 f"Could not decode JSON output of docker inspect. {combined_error}"
             ) from e
 
-        return output
+        return list(output.values())
     except subprocess.CalledProcessError as e:
         combined_error = e.stdout + e.stderr
 
@@ -128,9 +129,9 @@ def inspect_definitions(build_id: str) -> Inspection:
 
 def inspect_build(build_id: str) -> Inspection:
     size, size_root_fs = inspect_docker_container(build_id)
-    definitions = inspect_definitions(build_id)
+    templates = inspect_templates(build_id)
 
-    return Inspection(size=size, definitions=definitions)
+    return Inspection(size=size, templates=templates)
 
 
 def get_flavours(ctx: Context, select: Optional[str] = None) -> Dict[str, Flavour]:

{arkitekt_next-0.7.14 → arkitekt_next-0.7.16}/arkitekt_next/cli/types.py

@@ -8,6 +8,8 @@ from rekuest.api.schema import DefinitionInput
 from string import Formatter
 import os
 
+from rekuest_next.api.schema import TemplateInput
+
 ALLOWED_BUILDER_KEYS = [
     "tag",
     "dockerfile",
@@ -215,7 +217,7 @@ Selector = Union[
 
 
 class Inspection(BaseModel):
-    definitions: List[DefinitionInput]
+    templates: List[TemplateInput]
     size: int
 
 

{arkitekt_next-0.7.14 → arkitekt_next-0.7.16}/arkitekt_next/qt/__init__.py

@@ -7,3 +7,7 @@ The main component is the MagicBar, which is a widget that can be added
 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
+
+__all__ = ["MagicBar", "build_arkitekt_next_qt_app"]

arkitekt_next-0.7.16/arkitekt_next/qt/builder.py

@@ -0,0 +1,111 @@
+
+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,
+    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,
+    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()
+
+    manifest = Manifest(
+        version=version,
+        identifier=identifier,
+        scopes=scopes if scopes else ["openid"],
+        logo=logo,
+        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(
+        manifest=manifest,
+        fakts=fakts,
+        login_widget=login_widget,
+        parent=parent,
+        settings=settings,
+    )
+
+    params = kwargs
+
+    url = os.getenv("FAKTS_URL", url)
+    token = os.getenv("FAKTS_TOKEN", token)
+
+    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),
+    )
+
+    app.enter()
+    return app

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.14"
+version = "0.7.16"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -22,7 +22,6 @@ turms = { version = ">=0.5.0", python = "^3.9", optional = true }
 semver = { version = ">=3.0.1", optional = true }
 dokker = ">=0.1.21"
 koil = ">=0.3.6"
-qtpy = "^2.4.1"
 
 
 [tool.poetry.extras]