arkitekt-next 0.8.7__tar.gz → 0.8.9__tar.gz

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.7
+Version: 0.8.9
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -29,7 +29,7 @@ Requires-Dist: mikro-next (>=0.1.38) ; (python_version >= "3.10" and python_vers
 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.73) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.29) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: rekuest-next (>=0.2.31) ; (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.6.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/__init__.py

@@ -15,6 +15,9 @@ try:
     from rekuest_next.state.state import state
     from rekuest_next.actors.reactive.api import progress, aprogress
     from rekuest_next.actors.reactive.api import log, alog
+    from rekuest_next.register import test, benchmark
+    from rekuest_next.structures.model import model
+    from rekuest_next.define import define
 except ImportError as e:
     raise e
     register = missing_install("rekuest_next", e)

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/apps/service/fakts_next.py

@@ -11,7 +11,7 @@ from fakts.grants.remote.demanders.device_code import DeviceCodeDemander
 from fakts.grants.remote.claimers.post import ClaimEndpointClaimer
 from fakts.grants.remote.demanders.redeem import RedeemDemander
 
-from arkitekt_next.model import Manifest
+from arkitekt_next.base_models import Manifest
 
 
 class ArkitektNextFaktsQt(Fakts):

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/apps/service/fakts_qt.py

@@ -18,7 +18,7 @@ from fakts.grants.remote.discovery.qt.selectable_beacon import (
     SelectBeaconWidget,
     QtSelectableDiscovery,
 )
-from arkitekt_next.model import Manifest
+from arkitekt_next.base_models import Manifest
 from qtpy import QtCore, QtWidgets
 
 
@@ -52,7 +52,7 @@ def build_arkitekt_next_qt_fakts(
     )
 
     return ArkitektNextFaktsQt(
-        grant=RemoteGrant(
+        grant=ArkitektNextFaktsQtRemoteGrant(
             demander=AutoSaveDemander(
                 store=QTSettingTokenStore(
                     settings=settings,
@@ -65,7 +65,7 @@ def build_arkitekt_next_qt_fakts(
                     requested_client_kind="desktop",
                 ),
             ),
-            discovery=AutoSaveDiscovery(
+            discovery=ArkitektNextFaktsAutoSaveDiscovery(
                 store=QtSettingsEndpointStore(
                     settings=settings,
                     save_key="fakts_endpoint",

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/apps/service/herre.py

@@ -3,7 +3,7 @@ from fakts import Fakts
 from herre.grants.oauth2.refresh import RefreshGrant
 from herre.fakts.fakts_endpoint_fetcher import FaktsUserFetcher
 from herre.fakts.grant import FaktsGrant
-from arkitekt_next.model import User
+from arkitekt_next.base_models import User
 from arkitekt_next.apps.service.grant_registry import ARKITEKT_GRANT_REGISTRY
 
 

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/apps/service/herre_qt.py

@@ -7,7 +7,7 @@ from herre.fakts.fakts_qt_store import FaktsQtStore
 from herre.grants.auto_login import AutoLoginGrant
 from herre.grants.qt.auto_login import AutoLoginWidget
 from herre.fakts.fakts_endpoint_fetcher import FaktsUserFetcher
-from arkitekt_next.model import Manifest, User
+from arkitekt_next.base_models import Manifest, User
 from arkitekt_next.apps.service.grant_registry import ARKITEKT_GRANT_REGISTRY
 
 

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/apps/types.py

@@ -12,7 +12,7 @@ an import exception to the app.
 
 import logging
 from typing import TYPE_CHECKING, Any, Dict
-from arkitekt_next.model import Manifest
+from arkitekt_next.base_models import Manifest
 from koil.composition import Composition
 from fakts import Fakts
 from herre import Herre
@@ -32,6 +32,10 @@ class App(Composition):
         """Run the app"""
         self.services["rekuest"].run()
 
+    def register(self, *args, **kwargs):
+        """Register a service"""
+        self.services["rekuest"].register(*args, **kwargs)
+
     async def __aenter__(self):
         await super().__aenter__()
         for service in self.services.values():

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/builders.py

@@ -9,7 +9,7 @@ from arkitekt_next.apps.service.fakts_next import (
 )
 from arkitekt_next.apps.service.herre import build_arkitekt_next_herre
 from .utils import create_arkitekt_next_folder
-from .model import Manifest
+from .base_models import Manifest
 from .apps.types import App
 from .service_registry import ServiceBuilderRegistry, check_and_import_services
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/cli/commands/call/local.py

@@ -5,10 +5,7 @@ from arkitekt_next.cli.ui import construct_run_panel
 from importlib import import_module
 from rekuest_next.postmans.utils import arkiuse
 from arkitekt_next.cli.utils import import_builder
-from rekuest_next.api.schema import (
-    NodeKind,
-    BindsInput
-)
+from rekuest_next.api.schema import NodeKind, BindsInput
 from rich.table import Table
 from rich.console import Console
 from typing import Dict, Any

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/cli/commands/inspect/requirements.py

@@ -67,7 +67,8 @@ def requirements(
     )
 
     x = {
-        key: item.model_dump(by_alias=True) for key, item in app.manifest.requirements.items()
+        key: item.model_dump(by_alias=True)
+        for key, item in app.manifest.requirements.items()
     }
     if machine_readable:
         print("--START_REQUIREMENTS--" + json.dumps(x) + "--END_REQUIREMENTS--")

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/cli/commands/inspect/templates.py

@@ -42,7 +42,6 @@ def templates(
     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.
 
     """
-    
 
     manifest = get_manifest(ctx)
     console = get_console(ctx)

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/cli/commands/kabinet/build.py

@@ -10,7 +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.base_models import Requirement
 from arkitekt_next.utils import create_arkitekt_next_folder
 from rekuest_next.api.schema import TemplateInput
 

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/cli/commands/kabinet/init.py

@@ -87,14 +87,13 @@ def init(
         dockerfile="Dockerfile",
     )
 
-
     try:
-        package_version = arkitekt_version or version('arkitekt_next')
+        package_version = arkitekt_version or version("arkitekt_next")
         print(f"Detected Arkitekt Package version: {package_version}")
     except:
-        raise click.ClickException("Could not detect the Arkitekt package version (maybe you are running a dev version). Please provide it with the --arkitekt-version flag")
-        
-
+        raise click.ClickException(
+            "Could not detect the Arkitekt package version (maybe you are running a dev version). Please provide it with the --arkitekt-version flag"
+        )
 
     with open(config_file, "w") as file:
         yaml.dump(fl.dict(), file)

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/cli/types.py

@@ -5,7 +5,7 @@ from typing import List, Optional, Union, Literal, Dict
 from enum import Enum
 import semver
 import uuid
-from arkitekt_next.model import Requirement
+from arkitekt_next.base_models import Requirement
 from string import Formatter
 import os
 
@@ -247,7 +247,6 @@ class Flavour(BaseModel):
     def generate_build_command(self, tag: str, relative_dir: str):
         """Generates the build command for this flavour"""
 
-
         dockerfile = os.path.join(relative_dir, self.dockerfile)
 
         return [v.format(tag=tag, dockerfile=dockerfile) for v in self.build_command]

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/qt/builders.py

@@ -4,7 +4,7 @@ from arkitekt_next.apps.service.fakts_next import (
 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.base_models import Manifest
 from arkitekt_next.apps.types import App
 from arkitekt_next.service_registry import (
     ServiceBuilderRegistry,
@@ -18,7 +18,7 @@ import logging
 from typing import List, Optional
 import logging
 import os
-
+from arkitekt_next.qt.types import QtApp
 from arkitekt_next.apps.service.fakts_next import (
     build_arkitekt_next_fakts_next,
     build_arkitekt_next_redeem_fakts_next,
@@ -26,7 +26,7 @@ from arkitekt_next.apps.service.fakts_next import (
 )
 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.base_models import Manifest
 from arkitekt_next.apps.types import App
 from arkitekt_next.service_registry import (
     ServiceBuilderRegistry,
@@ -50,7 +50,7 @@ def devqt(
     app_kind: str = "development",
     registry: Optional[ServiceBuilderRegistry] = None,
     **kwargs,
-) -> App:
+) -> QtApp:
     """Creates a next app
 
     A simple way to create an ArkitektNext Next app, ArkitektNext next apps are
@@ -166,7 +166,7 @@ def devqt(
     except ImportError:
         logging.basicConfig(level=log_level)
 
-    app = App(
+    app = QtApp(
         fakts=fakts,
         herre=herre,
         manifest=manifest,
@@ -192,7 +192,7 @@ def publicqt(
     login_widget: Optional[QtWidgets.QWidget] = None,
     settings: Optional[QtCore.QSettings] = None,
     **kwargs,
-) -> App:
+) -> QtApp:
     """Public QtApp creation
 
     A simple way to create an Arkitekt app with a public grant (allowing users to sign
@@ -244,7 +244,7 @@ def publicqt(
     except ImportError:
         logging.basicConfig(level=log_level)
 
-    app = App(
+    app = QtApp(
         fakts=fakts,
         herre=herre,
         manifest=manifest,

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/qt/magic_bar.py

@@ -63,7 +63,9 @@ class Logo(QtWidgets.QWidget):
                     data = await resp.read()
                     return data
                 else:
-                    logger.error(f"Failed to download the image. Status code: {resp.status}")
+                    logger.error(
+                        f"Failed to download the image. Status code: {resp.status}"
+                    )
                     return None
 
 

arkitekt_next-0.8.9/arkitekt_next/qt/types.py

@@ -0,0 +1,123 @@
+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 register(self, *args, **kwargs):
+        """Register a function with the app (not in the Qt event loop)
+
+        This is useful for functions that do not need access to the Qt event loop
+        and can be run in a separate thread. This is the default behavior for
+        functions registered with the app.
+
+
+        """
+        self.services["rekuest"].register(*args, **kwargs)
+
+    def register_in_qt_loop(self, function: Callable, **kwargs):
+        """Register a function in the Qt event loop
+
+        This is useful for functions that need to be resolved in the Qt event loop and are
+        able to block the main thread (e.g. when prompting a necessary user input, or
+        when displaying a blocking dialog).
+
+        """
+
+        from rekuest_next.qt.builders import qtinloopactifier
+
+        return self.services["rekuest"].register(
+            function, actifier=qtinloopactifier, **kwargs
+        )
+
+    def register_with_qt_future(self, function: Callable, **kwargs):
+        """Register a function with a future that can be resolved in the Qt event loop
+
+        This is useful for functions that need to be resolved in the Qt event loop, but
+        might cause a blocking call if they are run in the same thread.
+
+        Example:
+
+        ```python
+
+            class MyWidget(QtWidgets.QWidget):
+
+                def __init__(self, app: QtApp):
+                    super().__init__()
+                    self.my_widget = QtWidgets.QWidget()
+                    self.my_widget.setWindowTitle("Do you accept?")
+                    self.my_widget.setWindowModality(QtCore.Qt.ApplicationModal)
+                    self.my_widget.setFixedSize(200, 100)
+
+                    self.my_widget.accept_button = QtWidgets.QPushButton("Accept")
+                    self.my_widget.reject_button = QtWidgets.QPushButton("Reject")
+                    self.my_widget.layout = QtWidgets.QVBoxLayout()
+                    self.my_widget.layout.addWidget(self.my_widget.accept_button)
+                    self.my_widget.layout.addWidget(self.my_widget.reject_button)
+
+                    self.app.register_with_qt_future(self.my_function)
+
+
+
+                def my_function(self, future: QtFuture, *args, **kwargs):
+                    self.my_widget.setText("Do you accept?")
+                    self.my_widget.show()
+
+                    self.current_future = future
+
+
+                def on_accept(self):
+                    self.current_future.set_result(True)
+
+                def on_reject(self):
+                    self.current_future.set_result(False)
+
+
+        """
+        from rekuest_next.qt.builders import qtwithfutureactifier
+
+        return self.services["rekuest"].register(
+            function, actifier=qtwithfutureactifier, **kwargs
+        )
+
+    def register_with_qt_generator(self, function: Callable, **kwargs):
+        from rekuest_next.qt.builders import qtwithgeneratoractifier
+
+        return self.services["rekuest"].register(
+            function, actifier=qtwithgeneratoractifier, **kwargs
+        )
+
+    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.8.7 → arkitekt_next-0.8.9}/arkitekt_next/service_registry.py

@@ -1,7 +1,7 @@
 from pydantic import BaseModel, Field
 from herre import Herre
 from fakts import Fakts
-from .model import Manifest, Requirement
+from .base_models import Manifest, Requirement
 from typing import Callable, Dict
 import importlib
 import sys

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/arkitekt_next/utils.py

@@ -1,5 +1,5 @@
 import os
-from arkitekt_next.model import Manifest
+from arkitekt_next.base_models import Manifest
 import json
 
 

{arkitekt_next-0.8.7 → arkitekt_next-0.8.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.8.7"
+version = "0.8.9"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -15,7 +15,7 @@ mikro-next = { version = ">=0.1.38", python = "^3.10", optional = true }
 kabinet = { version = ">=0.1.23", optional = true,  python = "^3.9" }
 fluss-next = { version = ">=0.1.83", optional = true }
 reaktion-next= { version = ">=0.1.73", python = "^3.8", optional = true }
-rekuest-next= { version = ">=0.2.29", python = "^3.8", optional = true }
+rekuest-next= { version = ">=0.2.31", python = "^3.8", optional = true }
 unlok-next= { version = ">=0.1.78", python = "^3.8", optional = true }
 lovekit = { version = ">=0.1.10", python = "^3.10", optional = true }
 rich-click = { version = ">=1.6.1", optional = true }

arkitekt_next-0.8.7/arkitekt_next/qt/types.py

@@ -1,40 +0,0 @@
-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)