arkitekt-next 0.13.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

arkitekt_next/init_registry.py

@@ -1,7 +1,7 @@
 import contextvars
 from functools import wraps
 from typing import Callable, Dict, Optional, TypeVar, overload
-from arkitekt_next.apps.protocols import App
+from .app import App
 
 Params = Dict[str, str]
 
@@ -11,25 +11,23 @@ current_init_hook_registry = contextvars.ContextVar(
 )
 
 
-
 InitHook = Callable[[App], None]
 
 
 class InitHookRegistry:
-    """ A registry for init hooks. This is used to register init hooks that
+    """A registry for init hooks. This is used to register init hooks that
     are called when the app is initialized. The init hooks are called in
     the order they are registered
-    
-    The purpose of init hooks is to allow specific initialization 
-    code to be run when the app is initialized. This is useful if you 
+
+    The purpose of init hooks is to allow specific initialization
+    code to be run when the app is initialized. This is useful if you
     plan to add some custom configuration or setup code that needs to be
     run before the app is getting conneted to the server.
-    
+
     """
-    
-    
-    
-    def __init__(self):
+
+    def __init__(self) -> None:
+        """Initialize the InitHookRegistry."""
         self.init_hooks: Dict[str, InitHook] = {}
         self.cli_only_hooks: Dict[str, InitHook] = {}
 
@@ -38,18 +36,18 @@ class InitHookRegistry:
         function: InitHook,
         name: Optional[str] = None,
         only_cli: bool = False,
-    ):
-        """ Register a function as an init hook. This function will be called
-        
-        
+    ) -> None:
+        """Register a function as an init hook. This function will be called
+
+
         when the app is initialized. The init hooks are called in the order
-        
-        
+
+
         """
-        
+
         if name is None:
             name = function.__name__
-            
+
         if only_cli:
             if name not in self.cli_only_hooks:
                 self.cli_only_hooks[name] = function
@@ -61,10 +59,11 @@ class InitHookRegistry:
         else:
             raise ValueError(f"Init Hook {name} already registered")
 
-    def run_all(self, app: App, is_cli: bool = False):
+    def run_all(self, app: App, is_cli: bool = False) -> None:
+        """ Run all registered init hooks."""
         for hook in self.init_hooks.values():
             hook(app)
-            
+
         if is_cli:
             for hook in self.cli_only_hooks.values():
                 hook(app)
@@ -78,7 +77,10 @@ def init(func: T) -> T: ...
 
 
 @overload
-def init(*, only_cli: bool = False, init_hook_registry: InitHookRegistry | None = None) -> Callable[[T], T]: ...
+def init(
+    *, only_cli: bool = False, init_hook_registry: InitHookRegistry | None = None
+) -> Callable[[T], T]: ...
+
 
 def init(
     func: T | None = None,
@@ -96,7 +98,7 @@ def init(
 
     def decorator(inner: T) -> T:
         @wraps(inner)
-        def wrapped(app: App):
+        def wrapped(app: App) -> None:
             return inner(app)
 
         init_hook_registry.register(wrapped, only_cli=only_cli)
@@ -106,12 +108,15 @@ def init(
     return decorator
 
 
-
 GLOBAL_INIT_HOOK_REGISTRY = None
 
 
-def get_default_init_hook_registry():
+def get_default_init_hook_registry()-> InitHookRegistry:
+    """Get the default init hook registry. This is used to register init hooks
+    that are called when the app is initialized. If no registry is set, a new
+    registry is created and returned.
+    """
     global GLOBAL_INIT_HOOK_REGISTRY
     if GLOBAL_INIT_HOOK_REGISTRY is None:
-        GLOBAL_INIT_HOOK_REGISTRY = InitHookRegistry() # type: ignore
-    return GLOBAL_INIT_HOOK_REGISTRY
+        GLOBAL_INIT_HOOK_REGISTRY = InitHookRegistry()  # type: ignore
+    return GLOBAL_INIT_HOOK_REGISTRY

arkitekt_next/protocols.py

@@ -9,14 +9,11 @@ an import exception to the app.
 
 """
 
-from typing import Any, Protocol, cast
+from typing import Any, Protocol
 import logging
 from typing import Dict, TYPE_CHECKING
-from koil import unkoil
 from koil.composition import KoiledModel
-from arkitekt_next.base_models import Manifest
 from fakts_next import Fakts
-from herre_next import Herre
 
 
 if TYPE_CHECKING:
@@ -30,22 +27,16 @@ class App(Protocol):
     """An app that is built with the easy builder"""
 
     fakts: Fakts
-    herre: Herre
-    manifest: Manifest
     services: Dict[str, KoiledModel]
 
     @property
     def rekuest(self) -> "RekuestNext":
         """Get the rekuest service"""
-        if "rekuest" not in self.services:
-            raise ValueError("Rekuest service is not available")
-        return cast("RekuestNext", self.services["rekuest"])
+        ...
 
-    def run(self):
-        return unkoil(self.rekuest.arun)
+    def run(self): ...
 
-    async def arun(self):
-        return await self.rekuest.arun()
+    async def arun(self): ...
 
     def run_detached(self):
         """Run the app detached"""
@@ -53,19 +44,11 @@ class App(Protocol):
 
     def register(self, *args, **kwargs):
         """Register a service"""
+        ...
 
-        self.rekuest.register(*args, **kwargs)
+    async def __aenter__(self): ...
 
-    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)
+    async def __aexit__(self, exc_type, exc_value, traceback): ...
 
 
 class Builder(Protocol):

arkitekt_next/qt/__init__.py

@@ -9,7 +9,7 @@ to ArkitektNext, and configure settings.
 """
 
 from .magic_bar import MagicBar
-from .builders import publicqt, devqt
+from .builders import qt
 from .types import *
 
-__all__ = ["MagicBar", "publicqt", "devqt", "QtApp"]
+__all__ = ["MagicBar", "qt", "QtApp"]

arkitekt_next/qt/builders.py

@@ -1,11 +1,10 @@
-from arkitekt_next.apps.service.fakts_next import (
-    build_arkitekt_next_redeem_fakts_next,
+from arkitekt_next.app.fakts import (
+    build_device_code_fakts,
+    build_redeem_fakts,
+    build_token_fakts,
 )
-from arkitekt_next.apps.service.fakts_qt import build_arkitekt_next_qt_fakts_next
-from arkitekt_next.apps.service.herre_qt import build_arkitekt_next_qt_herre_next
 from arkitekt_next.utils import create_arkitekt_next_folder
-from arkitekt_next.base_models import Manifest
-from arkitekt_next.apps.protocols import App
+from fakts_next.models import Manifest
 from arkitekt_next.service_registry import (
     ServiceBuilderRegistry,
     get_default_service_registry,
@@ -15,26 +14,10 @@ from qtpy import QtWidgets, QtCore
 from typing import List, Optional
 import os
 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,
-    build_arkitekt_next_token_fakts_next,
-)
-from arkitekt_next.apps.service.herre import build_arkitekt_next_herre_next
-from arkitekt_next.utils import create_arkitekt_next_folder
-from arkitekt_next.base_models import Manifest
-from arkitekt_next.apps.protocols import App
-from arkitekt_next.service_registry import (
-    ServiceBuilderRegistry,
-)
-from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
 
-def devqt(
+def qt(
     identifier: str,
     version: str = "0.0.1",
     logo: Optional[str] = None,
@@ -131,31 +114,23 @@ def devqt(
         description=description,
     )
     if token:
-        fakts_next = build_arkitekt_next_token_fakts_next(
+        fakts_next = build_token_fakts(
             manifest=manifest,
             token=token,
             url=url,
         )
 
     elif redeem_token:
-        fakts_next = build_arkitekt_next_redeem_fakts_next(
-            manifest=manifest,
-            redeem_token=redeem_token,
-            url=url,
-            no_cache=no_cache,
-            headless=headless,
+        fakts_next = build_redeem_fakts(
+            manifest=manifest, redeem_token=redeem_token, url=url
         )
     else:
-        fakts_next = build_arkitekt_next_fakts_next(
+        fakts_next = build_device_code_fakts(
             manifest=manifest,
             url=url,
             no_cache=no_cache,
-            headless=headless,
-            client_kind=app_kind,
         )
 
-    herre_next = build_arkitekt_next_herre_next(fakts_next=fakts_next)
-
     params = kwargs
 
     create_arkitekt_next_folder(with_cache=True)
@@ -169,89 +144,7 @@ def devqt(
 
     app = QtApp(
         fakts=fakts_next,
-        herre=herre_next,
-        manifest=manifest,
-        services=registry.build_service_map(
-            fakts=fakts_next, herre=herre_next, params=params, manifest=manifest
-        ),
-    )
-
-    app.enter()
-
-    return app
-
-
-def publicqt(
-    identifier: str,
-    version: str = "latest",
-    logo: Optional[str] = None,
-    scopes: Optional[List[str]] = None,
-    log_level: str = "ERROR",
-    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,
-    **kwargs,
-) -> QtApp:
-    """Public QtApp creation
-
-    A simple way to create an Arkitekt app with a public grant (allowing users to sign
-    in with the application ) utlizing a retrieve grant (necessating a previous configuration
-    of the application on the server side)
-
-    Args:
-        identifier (str): The apps identifier
-        version (str, optional): The apps verion. Defaults to "latest".
-        parent (QtWidget, optional): The QtParent (for the login and server select widget). Defaults to None.
-
-    Returns:
-        Arkitekt: The Arkitekt app
-    """
-
-    registry = registry or check_and_import_services()
-
-    settings = settings or QtCore.QSettings("arkitekt_next", f"{identifier}:{version}")
-
-    manifest = Manifest(
-        version=version,
-        identifier=identifier,
-        scopes=scopes if scopes else ["openid"],
-        logo=logo,
-        requirements=registry.get_requirements(),
-    )
-
-    fakts_next = build_arkitekt_next_qt_fakts_next(
-        manifest=manifest,
-        beacon_widget=beacon_widget,
-        parent=parent,
-        settings=settings,
-    )
-
-    herre_next = build_arkitekt_next_qt_herre_next(
-        manifest,
-        fakts=fakts_next,
-        login_widget=login_widget,
-        parent=parent,
-        settings=settings,
-    )
-
-    params = kwargs
-
-    try:
-        from rich.logging import RichHandler
-
-        logging.basicConfig(level=log_level, handlers=[RichHandler()])
-    except ImportError:
-        logging.basicConfig(level=log_level)
-
-    app = QtApp(
-        fakts=fakts_next,
-        herre=herre_next,
-        manifest=manifest,
-        services=registry.build_service_map(
-            fakts=fakts_next, herre=herre_next, params=params, manifest=manifest
-        ),
+        services=registry.build_service_map(fakts=fakts_next, params=params),
     )
 
     app.enter()

arkitekt_next/qt/magic_bar.py

@@ -3,7 +3,7 @@ from qtpy import QtWidgets, QtGui, QtCore
 from arkitekt_next.qt.types import QtApp
 from koil.qt import async_to_qt
 
-from arkitekt_next.apps.protocols import App
+from arkitekt_next.app.app import App
 from .utils import get_image_path
 from typing import Optional, Callable
 import logging

arkitekt_next/qt/types.py

@@ -1,4 +1,4 @@
-from arkitekt_next.apps.protocols import App, Fakts, Herre, Manifest
+from arkitekt_next.app.app import App
 from typing import List, Callable, Dict, Any
 
 

arkitekt_next/service_registry.py

@@ -1,8 +1,7 @@
 import contextvars
-from herre_next import Herre
 from fakts_next import Fakts
 from koil.composition.base import KoiledModel
-from .base_models import Manifest, Requirement
+from fakts_next.models import Manifest, Requirement
 from typing import Any, Callable, Dict, Optional, Protocol, Set, TypeVar
 from typing import runtime_checkable
 from pydantic import BaseModel
@@ -18,7 +17,7 @@ current_service_registry = contextvars.ContextVar(
 class Registration(BaseModel):
     name: str
     requirement: Requirement
-    builder: Callable[[Herre, Fakts, Params], object]
+    builder: Callable[[Fakts, Params], object]
     schema_loader: Callable[[str], object]
 
 
@@ -30,9 +29,7 @@ class ArkitektService(Protocol):
         """
         ...
 
-    def build_service(
-        self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest
-    ) -> Optional[KoiledModel]:
+    def build_service(self, fakts: Fakts, params: Params) -> Optional[KoiledModel]:
         """Build the service. This is used to build the service and return
         the service instance. The service instance should be a KoiledModel
         that is used to interact with the service.
@@ -70,9 +67,7 @@ class BaseArkitektService:
     def get_service_name(self) -> str:
         raise NotImplementedError("get_service_name not implemented")
 
-    def build_service(
-        self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest
-    ) -> Optional[KoiledModel]:
+    def build_service(self, fakts: Fakts, params: Params) -> Optional[KoiledModel]:
         raise NotImplementedError("build_service not implemented")
 
     def get_requirements(self) -> list[Requirement]:
@@ -89,13 +84,7 @@ class BaseArkitektService:
         return None
 
 
-basic_requirements = [
-    Requirement(
-        key="lok",
-        service="live.arkitekt.lok",
-        description="An instance of ArkitektNext Lok to authenticate the user",
-    )
-]
+basic_requirements = []
 
 
 class ServiceBuilderRegistry:
@@ -122,11 +111,9 @@ class ServiceBuilderRegistry:
     def get(self, name: str) -> Optional[ArkitektService]:
         return self.service_builders.get(name)
 
-    def build_service_map(
-        self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest
-    ):
+    def build_service_map(self, fakts: Fakts, params: Params):
         potentially_needed_services = {
-            name: service.build_service(fakts, herre, params, manifest)
+            name: service.build_service(fakts, params)
             for name, service in self.service_builders.items()
         }
 
@@ -162,8 +149,6 @@ class ServiceBuilderRegistry:
         return sorted_requirements
 
 
-
-
 T = TypeVar("T")
 
 
@@ -174,25 +159,25 @@ def require(
     service_registry: Optional[ServiceBuilderRegistry] = None,
 ) -> Requirement:
     """Register a requirement with the service registry
-    
+
     Parameters
     ----------
     key : str
         The key for the requirement. This should be unique across all
         requirements.
-        
+
     service : str
         The service that you require. This should be a uinque fakts
         service name. I.e `live.arkitekt.lok` or `live.arkitekt.lok:0.0.1`
-    
+
     description : str | None
         The description for the requirement. This should be a short
         description of the requirement that gets displayed to the user.
-        
+
     service_registry : ServiceBuilderRegistry | None
         The service registry to register the requirement with. If
         None, the default service registry will be used.
-        
+
     Returns
     -------
     Requirement
@@ -208,12 +193,11 @@ def require(
     return requirement
 
 
-
 GLOBAL_SERVICE_REGISTRY = None
 
 
 def get_default_service_registry() -> "ServiceBuilderRegistry":
     global GLOBAL_SERVICE_REGISTRY
     if GLOBAL_SERVICE_REGISTRY is None:
-        GLOBAL_SERVICE_REGISTRY = ServiceBuilderRegistry() # type: ignore
+        GLOBAL_SERVICE_REGISTRY = ServiceBuilderRegistry()  # type: ignore
     return GLOBAL_SERVICE_REGISTRY

arkitekt_next/utils.py

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

{arkitekt_next-0.13.0.dist-info → arkitekt_next-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkitekt-next
-Version: 0.13.0
+Version: 0.14.0
 Summary: client for the arkitekt_next platform
 Author-email: jhnnsrs <jhnnsrs@gmail.com>
 License-Expression: MIT
@@ -8,8 +8,7 @@ License-File: LICENSE
 Requires-Python: <4,>=3.11
 Requires-Dist: click>=8.2.0
 Requires-Dist: dokker>=2.1.2
-Requires-Dist: fakts-next>=1.2.2
-Requires-Dist: herre-next>=1.3
+Requires-Dist: fakts-next>=2
 Requires-Dist: kabinet>=0.5
 Requires-Dist: koil>=2.0.4
 Requires-Dist: rath>=3.4