arkitekt-next 0.8.6__tar.gz → 0.8.8__tar.gz

{arkitekt_next-0.8.6 → arkitekt_next-0.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.6
+Version: 0.8.8
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -22,18 +22,18 @@ Requires-Dist: dokker (>=1.0.0)
 Requires-Dist: fakts (>=1.0.0)
 Requires-Dist: fluss-next (>=0.1.83) ; extra == "all"
 Requires-Dist: herre (>=1.0.0)
-Requires-Dist: kabinet (>=0.1.22) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.23) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=1.0.0)
 Requires-Dist: lovekit (>=0.1.10) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
 Requires-Dist: mikro-next (>=0.1.38) ; (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.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")
-Requires-Dist: unlok-next (>=0.1.77) ; python_version >= "3.8" and python_version < "4.0"
+Requires-Dist: unlok-next (>=0.1.78) ; 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.8.6 → arkitekt_next-0.8.8}/arkitekt_next/apps/service/fakts_qt.py

@@ -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.6 → arkitekt_next-0.8.8}/arkitekt_next/apps/types.py

@@ -32,6 +32,11 @@ 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.6 → arkitekt_next-0.8.8}/arkitekt_next/cli/commands/run/dev.py

@@ -153,7 +153,7 @@ def check_deeps(changes: Set[Tuple[Change, str]]) -> Set[str]:
 def reset_structure() -> None:
     """Resets the default defintiion rgistry and all
     regitered nodes"""
-    get_default_definition_registry().definitions.clear()
+    get_default_definition_registry().actor_builders.clear()
     get_default_hook_registry().reset()
 
 

{arkitekt_next-0.8.6 → arkitekt_next-0.8.8}/arkitekt_next/qt/builders.py

@@ -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,
@@ -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.6 → arkitekt_next-0.8.8}/arkitekt_next/qt/magic_bar.py

@@ -154,6 +154,8 @@ class ArkitektNextLogs(QtWidgets.QDialog):
     def log_level(self) -> str:
         """The log level in use."""
         return self.settings.value(self.log_level_key, "INFO", str)
+    
+
 
 
 class Profile(QtWidgets.QDialog):

arkitekt_next-0.8.8/arkitekt_next/qt/types.py

@@ -0,0 +1,120 @@
+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.6 → arkitekt_next-0.8.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.8.6"
+version = "0.8.8"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"
@@ -12,11 +12,11 @@ python = "^3.8"
 herre = ">=1.0.0"
 fakts = ">=1.0.0"
 mikro-next = { version = ">=0.1.38", python = "^3.10", optional = true }
-kabinet = { version = ">=0.1.22", optional = true,  python = "^3.9" }
+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 }
-unlok-next= { version = ">=0.1.77", 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 }
 watchfiles = { version = ">=0.18.1", optional = true }

arkitekt_next-0.8.6/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)