arkitekt-next 0.8.53__py3-none-any.whl → 0.8.55__py3-none-any.whl

arkitekt_next/__init__.py

@@ -8,7 +8,7 @@ def missing_install(name: str, error: Exception):
 
 
 try:
-    from rekuest_next.register import register
+    from rekuest_next.register import register, register_structure
     from rekuest_next.agents.hooks import background
     from rekuest_next.agents.hooks import startup
     from rekuest_next.agents.context import context
@@ -19,6 +19,7 @@ try:
     from rekuest_next.structures.model import model
     from rekuest_next.define import define
 except ImportError as e:
+    register_structure = missing_install("rekuest_next", e)
     register = missing_install("rekuest_next", e)
     background = missing_install("rekuest_next", e)
     startup = missing_install("rekuest_next", e)
@@ -32,11 +33,13 @@ except ImportError as e:
 from .builders import easy, interactive
 from .apps.types import App
 from fakts_next.helpers import afakt, fakt
+from .init_registry import init, InitHookRegisty, get_current_init_hook_registry
+from .service_registry import require, ServiceBuilderRegistry, get_current_service_registry
 
 
 __all__ = [
     "App",
-    "register",
+    "require",
     "easy",
     "interactive",
     "publicqt",
@@ -49,6 +52,10 @@ __all__ = [
     "aprogress",
     "scheduler",
     "register_structure",
+    "requirement",
+    "ServiceBuilderRegistry",
+    "get_current_service_registry",
+    "register",
     "group",
     "useGuardian",
     "useInstanceID",
@@ -59,4 +66,7 @@ __all__ = [
     "background",
     "startup",
     "register_next",
+    "init",
+    "InitHookRegisty",
+    "get_current_init_hook_registry",
 ]

arkitekt_next/builders.py

@@ -11,7 +11,8 @@ from arkitekt_next.apps.service.herre import build_arkitekt_next_herre_next
 from .utils import create_arkitekt_next_folder
 from .base_models import Manifest
 from .apps.types import App
-from .service_registry import ServiceBuilderRegistry, check_and_import_services
+from .service_registry import ServiceBuilderRegistry, get_current_service_registry
+from .init_registry import InitHookRegisty, get_current_init_hook_registry
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
 
@@ -27,7 +28,8 @@ def easy(
     no_cache: bool = False,
     redeem_token: Optional[str] = None,
     app_kind: str = "development",
-    registry: Optional[ServiceBuilderRegistry] = None,
+    service_registry: Optional[ServiceBuilderRegistry] = None,
+    init_hook_registry: Optional[InitHookRegisty] = None,
     **kwargs,
 ) -> App:
     """Creates a next app
@@ -96,7 +98,8 @@ def easy(
     NextApp
         A built app, that can be used to interact with the ArkitektNext server
     """
-    registry = registry or check_and_import_services()
+    service_registry = service_registry or get_current_service_registry()
+    init_hook_registry = init_hook_registry or get_current_init_hook_registry()
 
     if identifier is None:
         identifier = __file__.split("/")[-1].replace(".py", "")
@@ -109,7 +112,7 @@ def easy(
         identifier=identifier,
         scopes=scopes if scopes else ["openid"],
         logo=logo,
-        requirements=registry.get_requirements(),
+        requirements=service_registry.get_requirements(),
     )
 
     if token:
@@ -153,11 +156,13 @@ def easy(
         fakts=fakts_next,
         herre=herre_next,
         manifest=manifest,
-        services=registry.build_service_map(
+        services=service_registry.build_service_map(
             fakts=fakts_next, herre=herre_next, params=params, manifest=manifest
         ),
     )
 
+    init_hook_registry.run_all(app)
+
     return app
 
 

arkitekt_next/cli/commands/inspect/templates.py

@@ -1,3 +1,4 @@
+import asyncio
 from pydantic import BaseModel
 import rich_click as click
 from importlib import import_module
@@ -9,9 +10,9 @@ import json
 import os
 
 
-async def run_app(app):
+async def run_app_inspection(app):
     async with app:
-        await app.rekuest.run()
+        return await app.services.get("rekuest").agent.adump_registry()
 
 
 @click.command("prod")
@@ -69,17 +70,15 @@ def templates(
         logo=manifest.logo,
     )
 
+
     rekuest = app.services.get("rekuest")
     if rekuest is None:
         console.print("No rekuest service found in app")
         return
 
-    x = {
-        key: item.model_dump(by_alias=True)
-        for key, item in rekuest.agent.extensions[
-            "default"
-        ].definition_registry.templates.items()
-    }
+    x = asyncio.run(run_app_inspection(app))
+
+
     if machine_readable:
         print("--START_TEMPLATES--" + json.dumps(x) + "--END_TEMPLATES--")
 

arkitekt_next/init_registry.py

@@ -0,0 +1,187 @@
+import contextvars
+from functools import wraps
+from pydantic import BaseModel, Field
+from herre_next import Herre
+from fakts_next import Fakts
+from .base_models import Manifest, Requirement
+from typing import Callable, Dict, Optional, Protocol, TypeVar, overload
+import importlib
+import sys
+import os
+import traceback
+import logging
+import pkgutil
+from typing import runtime_checkable, TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from arkitekt_next.apps import App
+else:
+    App = Any
+
+Params = Dict[str, str]
+
+
+current_init_hook_registry = contextvars.ContextVar(
+    "current_init_hook_registry", default=None
+)
+GLOBAL_INIT_HOOK_REGISTRY = None
+
+
+def get_default_init_hook_registry():
+    global GLOBAL_INIT_HOOK_REGISTRY
+    if GLOBAL_INIT_HOOK_REGISTRY is None:
+        GLOBAL_INIT_HOOK_REGISTRY = InitHookRegisty()
+    return GLOBAL_INIT_HOOK_REGISTRY
+
+
+def get_current_init_hook_registry(allow_global=True):
+    return current_init_hook_registry.get(get_default_init_hook_registry())
+
+
+class Registration(BaseModel):
+    name: str
+    requirement: Requirement
+    builder: Callable[[Herre, Fakts, Params], object]
+    schema_loader: Callable[[str], object]
+
+
+@runtime_checkable
+class ArkitektService(Protocol):
+
+    def get_service_name(self):
+        pass
+
+    def build_service(
+        self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest
+    ):
+        pass
+
+    def get_requirements(self):
+        pass
+
+    def get_graphql_schema(self):
+        pass
+
+    def get_turms_project(self):
+        pass
+
+
+class BaseArkitektService:
+
+    def get_service_name(self):
+        raise NotImplementedError("get_service_name not implemented")
+
+    def build_service(
+        self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest
+    ):
+        raise NotImplementedError("build_service not implemented")
+
+    def get_requirements(self):
+        raise NotImplementedError("get_requirements not implemented")
+
+    def get_graphql_schema(self):
+        return None
+
+    def get_turms_project(self):
+        return None
+
+
+basic_requirements = [
+    Requirement(
+        key="lok",
+        service="live.arkitekt.lok",
+        description="An instance of ArkitektNext Lok to authenticate the user",
+    )
+]
+
+
+InitHook = Callable[[App], None]
+
+
+class InitHookRegisty:
+
+    def __init__(self):
+        self.init_hooks: Dict[str, InitHook] = {}
+        
+
+    def register(
+        self,
+        function: InitHook,
+        name: Optional[str] = None,
+        only_cli: bool = False,
+
+    ):
+        
+        if name is None:
+            name = function.__name__
+
+
+        if name not in self.init_hooks:
+            self.init_hooks[name] = function
+        else:
+            raise ValueError(f"Service {name} already registered")
+
+    def run_all(self, app: App):
+        for hook in self.init_hooks.values():
+            hook(app)
+
+
+
+T = TypeVar("T")
+
+
+
+
+@overload
+def init(
+    function_or_actor: T,
+) -> T: ...
+
+
+@overload
+def init(
+    function_or_actor: None = None,
+) -> Callable[[T], T]: ...
+
+
+def init(
+    *func,
+    only_cli: bool = False,
+    init_hook_registry: InitHookRegisty = None,
+):
+    """Register a function as an init hook. This function will be called when the app is initialized.
+
+    """
+    init_hook_registry = init_hook_registry or get_current_init_hook_registry()
+
+    if len(func) > 1:
+        raise ValueError("You can only register one function or actor at a time.")
+    if len(func) == 1:
+        function_or_actor = func[0]
+
+        @wraps(function_or_actor)
+        def wrapped_function(*args, **kwargs):
+            return function_or_actor(*args, **kwargs)
+
+        init_hook_registry.register(wrapped_function)
+
+        wrapped_function.__is_init_hook__ = True
+
+        return wrapped_function
+
+    else:
+
+        def real_decorator(function_or_actor):
+            # Simple bypass for now
+            @wraps(function_or_actor)
+            def wrapped_function(*args, **kwargs):
+                return function_or_actor(*args, **kwargs)
+
+            init_hook_registry.register(wrapped_function, only_cli=only_cli)
+
+            wrapped_function.__is_init_hook__ = True
+
+
+            return wrapped_function
+
+        return real_decorator

arkitekt_next/service_registry.py

@@ -1,8 +1,10 @@
+import contextvars
+from functools import wraps
 from pydantic import BaseModel, Field
 from herre_next import Herre
 from fakts_next import Fakts
 from .base_models import Manifest, Requirement
-from typing import Callable, Dict, Protocol
+from typing import Callable, Dict, Optional, Protocol, TypeVar, overload
 import importlib
 import sys
 import os
@@ -14,6 +16,23 @@ from typing import runtime_checkable
 Params = Dict[str, str]
 
 
+current_service_registry = contextvars.ContextVar(
+    "current_service_registry", default=None
+)
+GLOBAL_SERVICE_REGISTRY = None
+
+
+def get_default_service_registry():
+    global GLOBAL_SERVICE_REGISTRY
+    if GLOBAL_SERVICE_REGISTRY is None:
+        GLOBAL_SERVICE_REGISTRY = ServiceBuilderRegistry()
+    return GLOBAL_SERVICE_REGISTRY
+
+
+def get_current_service_registry(allow_global=True):
+    return current_service_registry.get(get_default_service_registry())
+
+
 class Registration(BaseModel):
     name: str
     requirement: Requirement
@@ -72,8 +91,12 @@ basic_requirements = [
 
 
 class ServiceBuilderRegistry:
-    def __init__(self):
+    def __init__(self, import_services=True):
         self.service_builders: Dict[str, ArkitektService] = {}
+        self.additional_requirements: Dict[str, Requirement]= {}
+        if import_services:
+            check_and_import_services(self)
+
 
     def register(
         self,
@@ -86,6 +109,13 @@ class ServiceBuilderRegistry:
             self.service_builders[name] = service
         else:
             raise ValueError(f"Service {name} already registered")
+        
+
+    def register_requirement(self, requirement: Requirement):
+        if requirement.key in self.additional_requirements:
+            raise ValueError(f"Requirement {requirement.key} already registered)")
+        self.additional_requirements[requirement.key] = requirement
+        
 
     def get(self, name):
         return self.services.get(name)
@@ -121,6 +151,12 @@ class ServiceBuilderRegistry:
                     taken_requirements.add(requirement.key)
                     requirements.append(requirement)
 
+
+        for requirement in self.additional_requirements.values():
+            if requirement.key not in taken_requirements:
+                taken_requirements.add(requirement.key)
+                requirements.append(requirement)
+
         sorted_requirements = sorted(requirements, key=lambda x: x.key)
 
         return sorted_requirements
@@ -137,8 +173,7 @@ import traceback
 import logging
 
 
-def check_and_import_services() -> ServiceBuilderRegistry:
-    service_builder_registry = ServiceBuilderRegistry()
+def check_and_import_services(service_registry: ServiceBuilderRegistry) -> ServiceBuilderRegistry:
     processed_modules = set()  # Track modules that have already been processed
 
     # Function to load and call init_extensions from __rekuest__.py
@@ -154,10 +189,10 @@ def check_and_import_services() -> ServiceBuilderRegistry:
             if hasattr(rekuest_module, "build_services"):
                 for service in rekuest_module.build_services():
                     try:
-                        service_builder_registry.register(service)
+                        service_registry.register(service)
                     except ValueError as e:
                         print(
-                            f"Failed to register service {service}: Another service with the same name is already registered {service_builder_registry.service_builders}"
+                            f"Failed to register service {service}: Another service with the same name is already registered {service_registry.service_builders}"
                         )
                 logging.info(f"Called build_services function from {module_name}")
             else:
@@ -196,4 +231,38 @@ def check_and_import_services() -> ServiceBuilderRegistry:
             )
             traceback.print_exc()
 
-    return service_builder_registry
+    return service_registry
+
+
+T = TypeVar("T")
+
+@overload
+def require(
+    key: str ,
+    service: str = None,
+    description: str = None,
+) -> Callable[[T], T]: ...
+
+
+def require(
+    key: str,
+    service: str = None,
+    description: str = None,
+    service_registry: Optional[ServiceBuilderRegistry] = None,
+
+):
+    """Register a requirement with the service registry
+
+    """
+    service_hook_registry = service_registry or get_current_service_registry()
+
+   
+
+    requirement = Requirement(
+        key=key,
+        service=service,
+        description=description
+    )
+    service_hook_registry.register_requirement(requirement)
+
+    return requirement

{arkitekt_next-0.8.53.dist-info → arkitekt_next-0.8.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.53
+Version: 0.8.55
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -32,7 +32,7 @@ Requires-Dist: mikro-next (>=0.1.50) ; (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.86) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.54) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: rekuest-next (>=0.2.57) ; (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" or extra == "blok"
 Requires-Dist: semver (>=3.0.1) ; extra == "cli" or extra == "all"
 Requires-Dist: turms (>=0.8.2) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")

{arkitekt_next-0.8.53.dist-info → arkitekt_next-0.8.55.dist-info}/RECORD

@@ -1,5 +1,5 @@
 arkitekt_next/__blok__.py,sha256=Xo2cTi1yYMKzXtl3i58rgRoRb4DJ9EB_iBCVvKmYX14,1785
-arkitekt_next/__init__.py,sha256=hJ42LbKrxY19XwX9ltWXxhTvTZFh26vuItZd-2grSSM,1751
+arkitekt_next/__init__.py,sha256=CBk_M-lSOJeaX7F4Lf5HPFWv6vx20Fvgs-kIGJGUpSk,2177
 arkitekt_next/apps/__init__.py,sha256=cx_5Y-RkJFkSQJH-hUEC_L3eW1jU2E426c4e6_csIyM,42
 arkitekt_next/apps/service/__init__.py,sha256=p4iRwiFBKRq2lfbjDBzUR_GMhPWjkjWTa01ohuKz_L4,157
 arkitekt_next/apps/service/fakts_next.py,sha256=Wy37fjsEP2yjKZPtMlLilNlkO0olFX_7P5IIr6g3jkE,2900
@@ -49,7 +49,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=rnEaE8qoRwWNwf5SMnO5JwOZsVJAVeRrMBB-eOyWe4A,7464
+arkitekt_next/builders.py,sha256=OkjamGoowr33cUenu1_nBHhxwFVhqMKSFhFVwkgfIMI,7760
 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=OAeC2r9ujBFclaCfKEmUpt0Mt3NAKw3sVPTDvs2w_8E,2059
@@ -68,7 +68,7 @@ arkitekt_next/cli/commands/init/main.py,sha256=1ZbZDBECZRxlcnulycdS15s-uQ5ngx4xP
 arkitekt_next/cli/commands/inspect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/inspect/main.py,sha256=Bu1vAZudkFCtjDnZAB8yQLDt-UKY9pJGhLBlEfDqtkw,626
 arkitekt_next/cli/commands/inspect/requirements.py,sha256=bLYaWddScW2_qQFCwRtCFUZNM3N-ZnS26ee9xXQAi14,1862
-arkitekt_next/cli/commands/inspect/templates.py,sha256=pymiXPTcpgKopt_nt-NC9hv4zxveQJQOMyndoPJ8knk,2286
+arkitekt_next/cli/commands/inspect/templates.py,sha256=7iU26gTNs2KL7OvOHGMK-hEsfIsa1AXoMrvgYEfS-Z0,2219
 arkitekt_next/cli/commands/inspect/variables.py,sha256=LonDlbS2qH1v-jD6RfEhTv-mxmgeBMKqD3oO2iDJRjE,2698
 arkitekt_next/cli/commands/kabinet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/kabinet/build.py,sha256=uQh0nPBGsQNJ8iy-cQwMjpNx1c2ZRrBybbyZYg5doVc,8957
@@ -122,6 +122,7 @@ arkitekt_next/cli/validators.py,sha256=XkLrOrDzBJwcG1keTawa_NJPt3QIBhb5KjepeH4N1
 arkitekt_next/cli/vars.py,sha256=ev7cKDSPoik8hU9A_ohNpjRZX4FT1GYJaBoGLnxCKjU,982
 arkitekt_next/cli/versions/v1.yaml,sha256=rv2-F6FQbTZi_H6pSE_csdICdtKBObDdoo_asOFi43Y,12
 arkitekt_next/constants.py,sha256=sJkLlkH21REjbpiSHnXCiW0lWOwWT-2VqGvWlxjQePY,89
+arkitekt_next/init_registry.py,sha256=31E7FCYKMaf54otwFoIcEmyWvwL80XEvl7OSoRbg61k,4192
 arkitekt_next/qt/__init__.py,sha256=5tCCd-FA3sMN9Lo5JRUYUM6xgs2zxyHj5YDpdWYbR0w,471
 arkitekt_next/qt/assets/dark/gear.png,sha256=nYl1JZhcpwd7s5FgG2g-1RpkK7TH_QQRqJMmK6r0BpU,6296
 arkitekt_next/qt/assets/dark/green pulse.gif,sha256=cUd2F3Qlvjb7SnsU-LjGgeLTa8KoPgu3C-LNrixIQds,105386
@@ -137,11 +138,11 @@ arkitekt_next/qt/builders.py,sha256=zQLn-mJJnfLHSDjfAJ7gfzv66cnQz_yNX9yKTEdapi4,
 arkitekt_next/qt/magic_bar.py,sha256=b3WS8vN9cwaDHzBMtiKpw2UQcZwO1dF0mCLbLffO-eo,17596
 arkitekt_next/qt/types.py,sha256=_oo3XCSvP_iMp1bdPRxOGRrmeyHnBKTQsf86q09irL4,4043
 arkitekt_next/qt/utils.py,sha256=MgBPtPmCSBkIuATov3UgREESwxAHh77lWNNxyE7Qs48,773
-arkitekt_next/service_registry.py,sha256=iGbTflBsL2HzCeulLUn1kRcuk_do9bdlQ881BIiE_HY,6276
+arkitekt_next/service_registry.py,sha256=Enu88Ja7k0VBNMhNjibBqGxCiz6Qixfbvs4pUA-Mqp8,8094
 arkitekt_next/tqdm.py,sha256=lQcJI5Q6Py7Gy88hOCiJujjPEEGd8G2k1mOVJJ6oYe8,1531
 arkitekt_next/utils.py,sha256=4e4zEQSA7FZou8M01xV8oPBG1JvJJ0ySDP_nm3E3pMA,2390
-arkitekt_next-0.8.53.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.8.53.dist-info/METADATA,sha256=KZZPMgPvtoCLZUwyoY-wc4QMuxoWwvFoWCAY6txNWao,6256
-arkitekt_next-0.8.53.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.8.53.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.8.53.dist-info/RECORD,,
+arkitekt_next-0.8.55.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.8.55.dist-info/METADATA,sha256=Yz4OLxCO364eZHFbyS5otWnao7KSEnKIXbPAFFY8UAo,6256
+arkitekt_next-0.8.55.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.8.55.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.8.55.dist-info/RECORD,,