arkitekt-next 0.8.3__py3-none-any.whl → 0.8.4__py3-none-any.whl

arkitekt_next/builders.py

@@ -11,7 +11,7 @@ from arkitekt_next.apps.service.herre import build_arkitekt_next_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 .service_registry import ServiceBuilderRegistry, check_and_import_services, check_and_return_already_imported_services
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
 
@@ -96,7 +96,7 @@ def easy(
     NextApp
         A built app, that can be used to interact with the ArkitektNext server
     """
-    registry = registry or check_and_import_services()
+    registry = registry or check_and_return_already_imported_services()
 
     url = os.getenv("FAKTS_URL", url)
     token = os.getenv("FAKTS_TOKEN", token)

arkitekt_next/cli/commands/kabinet/publish.py

@@ -87,7 +87,6 @@ def publish(ctx: Context, build: str, tag: str) -> None:
             deployment_run,
             build_model,
             tag,
-            definitions=[],
         )
 
         md = Panel(

arkitekt_next/service_registry.py

@@ -109,3 +109,72 @@ def check_and_import_services() -> ServiceBuilderRegistry:
             traceback.print_exc()
 
     return service_builder_registry
+
+
+def check_and_return_already_imported_services() -> ServiceBuilderRegistry:
+    service_builder_registry = ServiceBuilderRegistry()
+
+    # Function to load and call init_services from __arkitekt__.py
+    def load_and_call_init_services(module_name, arkitekt_path):
+        try:
+            # Compute the full module name of the __arkitekt__ module
+            arkitekt_module_name = f"{module_name}.__arkitekt__"
+    
+
+            # Create a module spec
+            spec = importlib.util.spec_from_file_location(
+                arkitekt_module_name, arkitekt_path
+            )
+            arkitekt_module = importlib.util.module_from_spec(spec)
+
+            # Execute the module
+            spec.loader.exec_module(arkitekt_module)
+
+            # Now call init_services
+            if hasattr(arkitekt_module, "init_services"):
+                arkitekt_module.init_services(service_builder_registry)
+                logging.info(f"Called init_services function from {arkitekt_module_name}")
+            else:
+                logging.debug(f"No init_services function in {arkitekt_module_name}. Skipping.")
+        except Exception as e:
+            logging.critical(f"Failed to call init_services for {module_name}: {e}")
+            traceback.print_exc()
+
+    # Create a static list of sys.modules items to avoid RuntimeError
+    imported_modules = list(sys.modules.items())
+
+    # Keep track of processed top-level modules to avoid duplicates
+    processed_modules = set()
+
+    # Iterate over currently imported modules
+    for module_name, module in imported_modules:
+        if module is None:
+            continue
+
+        # Get the top-level parent module name
+        top_level_module_name = module_name.split('.')[0]
+
+        # Avoid processing the same top-level module multiple times
+        if top_level_module_name in processed_modules:
+            continue  # Already processed
+
+        # Get the module from sys.modules
+        top_level_module = sys.modules.get(top_level_module_name)
+        if top_level_module is None:
+            continue
+
+        # Get the module's file location
+        module_file = getattr(top_level_module, '__file__', None)
+        if not module_file:
+            continue  # Skip modules without a file attribute
+
+        # Get the module's directory
+        module_dir = os.path.dirname(module_file)
+        arkitekt_path = os.path.join(module_dir, '__arkitekt__.py')
+
+        # Check if __arkitekt__.py exists in the top-level module directory
+        if os.path.isfile(arkitekt_path):
+            load_and_call_init_services(top_level_module_name, arkitekt_path)
+            processed_modules.add(top_level_module_name)
+
+    return service_builder_registry

{arkitekt_next-0.8.3.dist-info → arkitekt_next-0.8.4.dist-info}/METADATA

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

{arkitekt_next-0.8.3.dist-info → arkitekt_next-0.8.4.dist-info}/RECORD

@@ -1,11 +1,7 @@
 arkitekt_next/__blok__.py,sha256=gQqlPrUPSeB-b3XkvXRwDoRWMfG-vYN-3a2pWHNjz_E,1563
 arkitekt_next/__init__.py,sha256=JOSPhxNLlQeHbwDI6HWYvuFqPJoh9Iz8okvbVl8jmU8,1545
 arkitekt_next/apps/__init__.py,sha256=cx_5Y-RkJFkSQJH-hUEC_L3eW1jU2E426c4e6_csIyM,42
-arkitekt_next/apps/easy.py,sha256=Nz7LzGua01bmLBiniEvnaSx_WPaNxq_sla4wYyTLaKQ,3235
-arkitekt_next/apps/next.py,sha256=GF4RPwJZ1Lyhcwf_EEZvrWvu5gD6NgD0UHnM1Vxmnmk,1049
-arkitekt_next/apps/qt.py,sha256=0y3TV0T2OtIgMJBbsdhNR5jZmyEHBFd1-ZmONz67omo,3306
 arkitekt_next/apps/service/__init__.py,sha256=p4iRwiFBKRq2lfbjDBzUR_GMhPWjkjWTa01ohuKz_L4,157
-arkitekt_next/apps/service/fakts.py,sha256=72EYMeO-M1O9auZ509FA7m08pSIZ-Df_6JyNHL1iMt0,2633
 arkitekt_next/apps/service/fakts_next.py,sha256=3Mh8CLt91Zf5Kt04mPr74ROj15jS2j3PoaUcT6kwJPY,2791
 arkitekt_next/apps/service/fakts_qt.py,sha256=ba7Er9EZeeR9loScbzLn_Fe7AqL3ksJBcAGd9QzjHcs,3053
 arkitekt_next/apps/service/grant_registry.py,sha256=3om8YoVf_HFWEJbpjQCin1Zvm8Sz3yw-mGvLKDDgbrc,851
@@ -47,7 +43,7 @@ arkitekt_next/bloks/services/secret.py,sha256=cnZsH09gN9YRXBbmalZaFD2LcmWLlfm52m
 arkitekt_next/bloks/services/socket.py,sha256=3MbENiJrwQbFKrpWxax56F24elnSD7S-olgycfuOX7s,423
 arkitekt_next/bloks/socket.py,sha256=IW4954Hgms_oZsDIk9SgLoVGz07gW3sHi7-WuhN074Q,1067
 arkitekt_next/bloks/tailscale.py,sha256=87cJv9m7N_I3y2ZRvv5WVepRhvIZk4ftUpwa0yUdwj4,2961
-arkitekt_next/builders.py,sha256=mzyvhDI9u73_6sn2tGL-ZJh7PwdL_M8PIKqPqgzd4z0,7273
+arkitekt_next/builders.py,sha256=QtDYYcv6_73iCrZIctyyrvhnAD9_SnUa3w7eU_0e2s0,7334
 arkitekt_next/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/call/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/call/local.py,sha256=XkNa2WGLf7YczRobjnQSWhRCtt6fs--2qeIa6tTMUvY,2114
@@ -69,7 +65,7 @@ arkitekt_next/cli/commands/kabinet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 arkitekt_next/cli/commands/kabinet/build.py,sha256=JyMgvp5X0j2DE4w3aLPyM6ffSulfFZ1mNkS4--3wlZM,8671
 arkitekt_next/cli/commands/kabinet/init.py,sha256=T6D7Vz05PUyyJ6noNqrMhVjz8hyZUfKv4Vgi1JVxz_k,3599
 arkitekt_next/cli/commands/kabinet/main.py,sha256=U5EWekRTsMZZ34abWFfwilhzrd-zZtpZbl8RsLN_bC8,1008
-arkitekt_next/cli/commands/kabinet/publish.py,sha256=zbjnoMliowje1nEuKFolFX5pZA2D_DzLjXlSxBbD88k,3596
+arkitekt_next/cli/commands/kabinet/publish.py,sha256=uPgDAlo-NBTL6wLyNWX55JJ7T5ZcRNKMLd9RRbhOod4,3568
 arkitekt_next/cli/commands/kabinet/stage.py,sha256=bXpC8fDmG6qFQVuLhqTCieOJnvFafj3Flg1BdIeciEw,2025
 arkitekt_next/cli/commands/kabinet/utils.py,sha256=a1lGmGwhiVxsxFDt19GddNwXmAwUAfclgTMe3ErA43c,1666
 arkitekt_next/cli/commands/kabinet/validate.py,sha256=MSSuwjdJKDtXB6rkjRmG-PPK6cVwTcOuCRpgPDQ0uVg,2490
@@ -133,11 +129,11 @@ arkitekt_next/qt/builders.py,sha256=S5XzxzH-Tq-OAvrbP9V8BtY34Et4Zgj_7RFmnWjRN_8,
 arkitekt_next/qt/magic_bar.py,sha256=o3Z9F2QutVd6JLEY4tEQ5-vfjIBXpgfYz8HXcWgaqfc,18308
 arkitekt_next/qt/types.py,sha256=jI9UHt1Rn-fxGZfeImTO9-yHh0zJPzk7CwvpnUXdirg,1085
 arkitekt_next/qt/utils.py,sha256=MgBPtPmCSBkIuATov3UgREESwxAHh77lWNNxyE7Qs48,773
-arkitekt_next/service_registry.py,sha256=oryaRLS2kalmV1Qf4_SWdLotBopTsdHNaVlnt1TGZyI,3607
+arkitekt_next/service_registry.py,sha256=YH59EuGy_gKziWHjnU7tQrjKNchhNTurHbYzlGNCiCc,6314
 arkitekt_next/tqdm.py,sha256=lQcJI5Q6Py7Gy88hOCiJujjPEEGd8G2k1mOVJJ6oYe8,1531
 arkitekt_next/utils.py,sha256=csBRBnxnErMRTilNBYAtIe0lPBb6E3uplqwsVGs5Wkk,2390
-arkitekt_next-0.8.3.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.8.3.dist-info/METADATA,sha256=fHlD7Znn3UZ7aIH6wakkoEVfkEOsL47TuaLKbh8K2vE,6084
-arkitekt_next-0.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.8.3.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.8.3.dist-info/RECORD,,
+arkitekt_next-0.8.4.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.8.4.dist-info/METADATA,sha256=aoeCJIWABr4uAuurpz5II9VnHRHhIr3LQmKS029Q9-Q,6084
+arkitekt_next-0.8.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.8.4.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.8.4.dist-info/RECORD,,

arkitekt_next/apps/easy.py

@@ -1,107 +0,0 @@
-from .types import EasyApp
-from typing import Optional, List
-
-
-def build_arkitekt_app(
-    manifest: Manifest,
-    url=None,
-    no_cache=False,
-    headless=False,
-    instance_id=None,
-    token=None,
-    app_kind="development",
-    redeem_token=None,
-):
-    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_fakts_next(
-            manifest=manifest,
-            url=url,
-            no_cache=no_cache,
-            headless=headless,
-            client_kind=app_kind,
-        )
-
-    herre = build_arkitekt_next_herre(fakts=fakts)
-
-    try:
-        from arkitekt_next_next.apps.service.rekuest_next import (
-            build_arkitekt_next_rekuest_next,
-        )
-
-        rekuest = build_arkitekt_next_rekuest_next(
-            fakts=fakts, herre=herre, instance_id=instance_id
-        )
-    except ImportError as e:
-        rekuest = ImportException(import_exception=e, install_library="rekuest_next")
-
-    try:
-        from arkitekt_next_next.apps.service.mikro_next import (
-            build_arkitekt_next_mikro_next,
-        )
-
-        mikro = build_arkitekt_next_mikro_next(fakts=fakts, herre=herre)
-    except ImportError as e:
-        raise e
-        mikro = ImportException(import_exception=e, install_library="mikro_next")
-
-    try:
-        from arkitekt_next_next.apps.service.fluss_next import build_arkitekt_next_fluss
-
-        fluss = build_arkitekt_next_fluss(herre=herre, fakts=fakts)
-    except ImportError as e:
-        raise e
-        fluss = ImportException(import_exception=e, install_library="fluss_next")
-
-    try:
-        from arkitekt_next_next.apps.service.unlok_next import (
-            build_arkitekt_next_unlok_next,
-        )
-
-        unlok = build_arkitekt_next_unlok_next(herre=herre, fakts=fakts)
-    except ImportError as e:
-        raise e
-        fluss = ImportException(import_exception=e, install_library="fluss_next")
-
-    try:
-        from arkitekt_next_next.apps.service.omero_ark import (
-            build_arkitekt_next_omero_ark,
-        )
-
-        omero_ark = build_arkitekt_next_omero_ark(herre=herre, fakts=fakts)
-    except ImportError as e:
-        omero_ark = ImportException(import_exception=e, install_library="omero_ark")
-
-    try:
-        from arkitekt_next_next.apps.service.kluster import build_arkitekt_next_kluster
-
-        kluster = build_arkitekt_next_kluster(herre=herre, fakts=fakts)
-    except ImportError as e:
-        kluster = ImportException(import_exception=e, install_library="kluster")
-
-    try:
-        from arkitekt_next_next.apps.service.kabinet import build_arkitekt_next_kabinet
-
-        kabinet = build_arkitekt_next_kabinet(herre=herre, fakts=fakts)
-    except ImportError as e:
-        kabinet = ImportException(import_exception=e, install_library="kluster")
-
-    return NextApp(
-        manifest=manifest,
-        fakts=fakts,
-        herre=herre,
-        rekuest=rekuest,
-        mikro=mikro,
-        kabinet=kabinet,
-        unlok=unlok,
-        fluss=fluss,
-        kluster=kluster,
-        omero_ark=omero_ark,
-    )

arkitekt_next/apps/next.py

@@ -1,39 +0,0 @@
-from arkitekt_next_next.apps.fallbacks import ImportException
-from arkitekt_next_next.apps.service.fakts_next import (
-    build_arkitekt_next_fakts_next,
-    build_arkitekt_next_redeem_fakts_next,
-)
-from arkitekt_next_next.apps.service.herre import build_arkitekt_next_herre
-from arkitekt_next_next.model import Manifest
-
-from .types import NextApp
-
-
-def build_next_app(
-    manifest: Manifest,
-    url=None,
-    no_cache=False,
-    headless=False,
-    instance_id=None,
-    token=None,
-    app_kind="development",
-    redeem_token=None,
-):
-    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_fakts_next(
-            manifest=manifest,
-            url=url,
-            no_cache=no_cache,
-            headless=headless,
-            client_kind=app_kind,
-        )
-
-    herre = build_arkitekt_next_herre(fakts=fakts)

arkitekt_next/apps/qt.py

@@ -1,103 +0,0 @@
-from arkitekt_next_next.model import Manifest
-from arkitekt_next_next.apps.types import QtApp
-from arkitekt_next_next.apps.fallbacks import ImportException, InstallModuleException
-from typing import Any, Optional
-
-
-def build_arkitekt_next_qt_app(
-    manifest: Manifest,
-    no_cache: bool = False,
-    instance_id: Optional[str] = None,
-    beacon_widget: Any = None,
-    login_widget: Any = None,
-    parent: Any = None,
-    settings: Any = None,
-):
-    try:
-        from koil.composition.qt import QtPedanticKoil
-        from qtpy import QtCore
-
-        settings = settings or QtCore.QSettings()
-    except ImportError as e:
-        raise InstallModuleException(
-            "Please install qtpy to use arkitekt_next_qt"
-        ) from e
-
-    try:
-        from arkitekt_next_next.apps.service.fakts_qt import (
-            build_arkitekt_next_qt_fakts,
-        )
-
-        fakts = build_arkitekt_next_qt_fakts(
-            manifest=manifest,
-            no_cache=no_cache,
-            beacon_widget=beacon_widget,
-            parent=parent,
-            settings=settings,
-        )
-    except ImportError as e:
-        fakts = ImportException(import_exception=e, install_library="qtpy")
-
-    try:
-        from arkitekt_next_next.apps.service.herre_qt import (
-            build_arkitekt_next_qt_herre,
-        )
-
-        herre = build_arkitekt_next_qt_herre(
-            manifest=manifest,
-            fakts=fakts,
-            login_widget=login_widget,
-            parent=parent,
-            settings=settings,
-        )
-    except ImportError as e:
-        herre = ImportException(import_exception=e, install_library="qtpy")
-
-    try:
-        from arkitekt_next_next.apps.service.rekuest import build_arkitekt_next_rekuest
-
-        rekuest = build_arkitekt_next_rekuest(
-            fakts=fakts, herre=herre, instance_id=instance_id or "main"
-        )
-    except ImportError as e:
-        rekuest = ImportException(import_exception=e, install_library="rekuest")
-
-    try:
-        from arkitekt_next_next.apps.service.mikro import build_arkitekt_next_mikro
-
-        mikro = build_arkitekt_next_mikro(fakts=fakts, herre=herre)
-    except ImportError as e:
-        mikro = ImportException(import_exception=e, install_library="mikro")
-
-    try:
-        from arkitekt_next_next.apps.service.unlok import build_arkitekt_next_unlok
-
-        unlok = build_arkitekt_next_unlok(herre=herre, fakts=fakts)
-    except ImportError as e:
-        unlok = ImportException(import_exception=e, install_library="unlok")
-
-    try:
-        from arkitekt_next_next.apps.service.fluss import build_arkitekt_next_fluss
-
-        fluss = build_arkitekt_next_fluss(herre=herre, fakts=fakts)
-    except ImportError as e:
-        fluss = ImportException(import_exception=e, install_library="fluss")
-
-    try:
-        from arkitekt_next_next.apps.service.kluster import build_arkitekt_next_kluster
-
-        kluster = build_arkitekt_next_kluster(herre=herre, fakts=fakts)
-    except ImportError as e:
-        kluster = ImportException(import_exception=e, install_library="kluster")
-
-    return QtApp(
-        koil=QtPedanticKoil(parent=parent),
-        manifest=manifest,
-        fakts=fakts,
-        herre=herre,
-        rekuest=rekuest,
-        mikro=mikro,
-        unlok=unlok,
-        fluss=fluss,
-        kluster=kluster,
-    )

arkitekt_next/apps/service/fakts.py

@@ -1,89 +0,0 @@
-from fakts.fakts import Fakts
-from fakts.fakts import Fakts
-from typing import Optional
-from fakts.grants.remote.discovery.well_known import WellKnownDiscovery
-from fakts.grants.remote import RemoteGrant
-from fakts.grants.remote.demanders.auto_save import AutoSaveDemander
-from fakts.grants.remote.demanders.cache import CacheTokenStore
-from fakts.grants.remote.demanders.static import StaticDemander
-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_next.model import Manifest
-
-
-class ArkitektNextFaktsQt(Fakts):
-    grant: RemoteGrant
-
-
-class ArkitektNextFakts(Fakts):
-    pass
-
-
-def build_arkitekt_next_fakts(
-    manifest: Manifest,
-    url: Optional[str] = None,
-    no_cache: bool = False,
-    headless: bool = False,
-) -> ArkitektNextFakts:
-    identifier = manifest.identifier
-    version = manifest.version
-
-    if no_cache:
-        demander = DeviceCodeDemander(
-            manifest=manifest,
-            redirect_uri="http://127.0.0.1:6767",
-            open_browser=not headless,
-        )
-
-    else:
-        demander = AutoSaveDemander(
-            demander=DeviceCodeDemander(
-                manifest=manifest,
-                redirect_uri="http://127.0.0.1:6767",
-                open_browser=not headless,
-            ),
-            store=CacheTokenStore(
-                cache_file=f".arkitekt_next/cache/{identifier}-{version}_fakts_cache.json"
-            ),
-        )
-
-    return ArkitektNextFakts(
-        grant=RemoteGrant(
-            demander=demander,
-            discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
-            claimer=ClaimEndpointClaimer(),
-        )
-    )
-
-
-def build_arkitekt_next_token_fakts(
-    manifest: Manifest,
-    token: str,
-    url,
-    no_cache: Optional[bool] = False,
-    headless=False,
-):
-    return ArkitektNextFakts(
-        grant=RemoteGrant(
-            demander=StaticDemander(token=token),
-            discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
-            claimer=ClaimEndpointClaimer(),
-        )
-    )
-
-
-def build_arkitekt_next_redeem_fakts(
-    manifest: Manifest,
-    redeem_token: str,
-    url,
-    no_cache: Optional[bool] = False,
-    headless=False,
-):
-    return ArkitektNextFakts(
-        grant=RemoteGrant(
-            demander=RedeemDemander(token=redeem_token, manifest=manifest),
-            discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
-            claimer=ClaimEndpointClaimer(),
-        )
-    )