arkitekt-next 0.7.8__tar.gz → 0.7.9__tar.gz

{arkitekt_next-0.7.8 → arkitekt_next-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.7.8
+Version: 0.7.9
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs

{arkitekt_next-0.7.8 → arkitekt_next-0.7.9}/arkitekt_next/apps/types.py

@@ -20,9 +20,9 @@ from herre import Herre
 logger = logging.getLogger(__name__)
 
 
-
 class App(Composition):
     """An app that is built with the easy builder"""
+
     fakts: Fakts
     herre: Herre
     manifest: Manifest
@@ -32,22 +32,13 @@ class App(Composition):
         """Run the app"""
         self.services["rekuest"].run()
 
-
     async def __aenter__(self):
         await super().__aenter__()
-        print("Entering")
         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.8 → arkitekt_next-0.7.9}/arkitekt_next/builders.py

@@ -2,14 +2,17 @@ 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
+from arkitekt_next.apps.service.fakts_next import (
+    build_arkitekt_next_fakts_next,
+    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, get_default_service_builder_registry
+from .service_registry import ServiceBuilderRegistry, check_and_import_services
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 from qtpy import QtWidgets, QtCore
 
@@ -95,8 +98,7 @@ def easy(
     NextApp
         A built app, that can be used to interact with the ArkitektNext server
     """
-    registry = registry or get_default_service_builder_registry()
-
+    registry = registry or check_and_import_services()
 
     manifest = Manifest(
         version=version,
@@ -106,7 +108,6 @@ def easy(
         requirements=registry.get_requirements(),
     )
 
-
     if redeem_token:
         fakts = build_arkitekt_next_redeem_fakts_next(
             manifest=manifest,
@@ -128,15 +129,11 @@ def easy(
 
     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
 
@@ -144,8 +141,6 @@ def easy(
     except ImportError:
         logging.basicConfig(level=log_level)
 
-    print(registry.service_builders)
-
     app = App(
         fakts=fakts,
         herre=herre,
@@ -155,12 +150,9 @@ def easy(
 
     print()
 
-
     return app
 
 
-
-
 def publicqt(
     identifier: str,
     version: str = "latest",
@@ -175,10 +167,10 @@ def publicqt(
     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,
+    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
@@ -196,10 +188,7 @@ def publicqt(
         Arkitekt: The Arkitekt app
     """
 
-    from arkitekt.apps.qt import build_arkitekt_qt_app
-
-    registry = registry or get_default_service_builder_registry()
-
+    registry = registry or check_and_import_services()
 
     manifest = Manifest(
         version=version,
@@ -209,7 +198,6 @@ def publicqt(
         requirements=registry.get_requirements(),
     )
 
-
     if redeem_token:
         fakts = build_arkitekt_next_redeem_fakts_next(
             manifest=manifest,
@@ -228,19 +216,21 @@ def publicqt(
             settings=settings,
         )
 
-    herre = build_arkitekt_next_qt_herre(manifest=manifest, fakts=fakts, login_widget=login_widget, parent=parent, 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
 
@@ -248,8 +238,6 @@ def publicqt(
     except ImportError:
         logging.basicConfig(level=log_level)
 
-    print(registry.service_builders)
-
     app = App(
         fakts=fakts,
         herre=herre,
@@ -257,8 +245,5 @@ def publicqt(
         services=registry.build_service_map(fakts=fakts, herre=herre, params=params),
     )
 
-    print()
-
-
     app.enter()
     return app

{arkitekt_next-0.7.8 → arkitekt_next-0.7.9}/arkitekt_next/cli/commands/run/dev.py

@@ -100,6 +100,9 @@ async def run_app(app: App) -> None:
     """
 
     rekuest = app.services.get("rekuest")
+    if not rekuest:
+        raise Exception("No rekuest service found. We need this to run the app.")
+
     async with app:
         await rekuest.run()
 

{arkitekt_next-0.7.8 → arkitekt_next-0.7.9}/arkitekt_next/cli/commands/run/prod.py

@@ -6,9 +6,12 @@ from importlib import import_module
 from .utils import import_builder
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
+
 async def run_app(app):
+    rekuest = app.services.get("rekuest")
+
     async with app:
-        await app.rekuest.run()
+        await rekuest.run()
 
 
 @click.command("prod")

{arkitekt_next-0.7.8 → arkitekt_next-0.7.9}/arkitekt_next/cli/templates/filter.py

@@ -1,4 +1,4 @@
-from arkitekt_next_next import register
+from arkitekt_next import register
 from mikro.api.schema import RepresentationFragment, from_xarray
 
 

{arkitekt_next-0.7.8 → arkitekt_next-0.7.9}/arkitekt_next/cli/templates/simple.py

@@ -1,4 +1,4 @@
-from arkitekt_next_next import register
+from arkitekt_next import register
 import time
 
 

{arkitekt_next-0.7.8 → arkitekt_next-0.7.9}/arkitekt_next/cli/ui.py

@@ -56,15 +56,21 @@ def construct_app_group(app: App) -> Group:
     panel_header = f"Running App \n\n{app.manifest.identifier}:{app.manifest.version}\n"
 
     actor_tree = Tree("Registered Definitions", style="white not bold")
-    panel_group = Group(panel_header, actor_tree)
+    service_tree = Tree("Depends on services", style="white not bold")
+
+    for key, extension in app.services.items():
+        service_tree.add(key)
 
     rekuest = app.services.get("rekuest")
+    if rekuest is None:
+        return Group(panel_header, service_tree)
 
     for key, extension in rekuest.agent.extensions.items():
         tree = actor_tree.add(key)
         for template in extension.definition_registry.templates.values():
             tree.add(template.interface + "-" + template.definition.name)
 
+    panel_group = Group(panel_header, service_tree, actor_tree)
 
     return panel_group
 

arkitekt_next-0.7.9/arkitekt_next/service_registry.py

@@ -0,0 +1,99 @@
+from pydantic import BaseModel, Field
+from herre import Herre
+from fakts import Fakts
+from .model import Requirement
+from typing import Callable, Dict
+import importlib
+import sys
+import os
+import traceback
+import logging
+import pkgutil
+
+Params = Dict[str, str]
+
+
+class Registration(BaseModel):
+    name: str
+    requirement: Requirement
+    builder: Callable[[Herre, Fakts, Params], object]
+
+
+basic_requirements = {
+    "lok": Requirement(
+            service="live.arkitekt.lok",
+            description="An instance of ArkitektNext Lok to authenticate the user",
+        ),
+}
+
+
+class ServiceBuilderRegistry:
+    def __init__(self):
+        self.service_builders = {}
+        self.requirements = basic_requirements
+
+    def register(self, name: str, service_builder: Callable[[Herre, Fakts], object], requirement: Requirement):
+        self.service_builders[name] = service_builder
+        self.requirements[name] = requirement
+
+    def get(self, name):
+        return self.services.get(name)
+    
+
+    def build_service_map(self, fakts: Fakts, herre: Herre, params: Params):
+        return {name: builder(fakts, herre, params) for name, builder in self.service_builders.items()}
+    
+    def get_requirements(self):
+        return self.requirements
+    
+
+
+
+
+
+class SetupInfo:
+    services: Dict[str, object]
+
+
+
+def check_and_import_services() -> ServiceBuilderRegistry:
+
+    service_builder_registry =  ServiceBuilderRegistry()
+    
+    # Function to load and call init_extensions from __rekuest__.py
+    def load_and_call_init_extensions(module_name, rekuest_path):
+        try:
+            spec = importlib.util.spec_from_file_location(f"{module_name}.__arkitekt__", rekuest_path)
+            rekuest_module = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(rekuest_module)
+            if hasattr(rekuest_module, 'init_services'):
+                rekuest_module.init_services(service_builder_registry)
+                logging.info(f"Called init_service function from {module_name}")
+            else:
+                print(f"No init_services function in {module_name}.__arkitekt__")
+        except Exception as e:
+            print(f"Failed to call init_services for {module_name}: {e}")
+            traceback.print_exc()
+
+    # Check local modules in the current working directory
+    current_directory = os.getcwd()
+    for item in os.listdir(current_directory):
+        item_path = os.path.join(current_directory, item)
+        if os.path.isdir(item_path) and os.path.isfile(os.path.join(item_path, '__init__.py')):
+            rekuest_path = os.path.join(item_path, '__arkitekt__.py')
+            if os.path.isfile(rekuest_path):
+                load_and_call_init_extensions(item, rekuest_path)
+
+    # Check installed packages
+    for _, module_name, _ in pkgutil.iter_modules():
+        try:
+            module_spec = importlib.util.find_spec(module_name)
+            if module_spec and module_spec.origin:
+                rekuest_path = os.path.join(os.path.dirname(module_spec.origin), '__arkitekt__.py')
+                if os.path.isfile(rekuest_path):
+                    load_and_call_init_extensions(module_name, rekuest_path)
+        except Exception as e:
+            print(f"Failed to call init_extensions for installed package {module_name}: {e}")
+            traceback.print_exc()
+
+    return service_builder_registry

{arkitekt_next-0.7.8 → arkitekt_next-0.7.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arkitekt-next"
-version = "0.7.8"
+version = "0.7.9"
 description = "client for the arkitekt_next platform"
 authors = ["jhnnsrs <jhnnsrs@gmail.com>"]
 license = "MIT"

arkitekt_next-0.7.8/arkitekt_next/service_registry.py

@@ -1,51 +0,0 @@
-from pydantic import BaseModel, Field
-from herre import Herre
-from fakts import Fakts
-from .model import Requirement
-from typing import Callable, Dict
-
-
-Params = Dict[str, str]
-
-
-class Registration(BaseModel):
-    name: str
-    requirement: Requirement
-    builder: Callable[[Herre, Fakts, Params], object]
-
-
-basic_requirements = {
-    "lok": Requirement(
-            service="live.arkitekt.lok",
-            description="An instance of ArkitektNext Lok to authenticate the user",
-        ),
-}
-
-
-class ServiceBuilderRegistry:
-    def __init__(self):
-        self.service_builders = {}
-        self.requirements = basic_requirements
-
-    def register(self, name: str, service_builder: Callable[[Herre, Fakts], object], requirement: Requirement):
-        self.service_builders[name] = service_builder
-        self.requirements[name] = requirement
-
-    def get(self, name):
-        return self.services.get(name)
-    
-
-    def build_service_map(self, fakts: Fakts, herre: Herre, params: Params):
-        return {name: builder(fakts, herre, params) for name, builder in self.service_builders.items()}
-    
-    def get_requirements(self):
-        return self.requirements
-    
-
-
-service_builder_registry = ServiceBuilderRegistry()
-
-
-def get_default_service_builder_registry():
-    return service_builder_registry 
-