arkitekt-next 0.9.4__tar.gz → 0.10.2__tar.gz

arkitekt_next-0.10.2/.gitignore

@@ -0,0 +1,148 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+**/__pycache__
+*.py[cod]
+*$py.class
+*.pyc
+*.DS_Store
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# static files generated from Django application using `collectstatic`
+media
+export
+static_collected
+data
+token.temp

{arkitekt_next-0.9.4 → arkitekt_next-0.10.2}/PKG-INFO

@@ -1,58 +1,60 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: arkitekt-next
-Version: 0.9.4
+Version: 0.10.2
 Summary: client for the arkitekt_next platform
-License: MIT
-Author: jhnnsrs
-Author-email: jhnnsrs@gmail.com
-Requires-Python: >=3.9,<4
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
+Author-email: jhnnsrs <jhnnsrs@gmail.com>
+License-Expression: MIT
+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.2.0
+Requires-Dist: koil>=2.0.4
+Requires-Dist: rath>=3.4
+Requires-Dist: rekuest-next>=0.7
 Provides-Extra: all
+Requires-Dist: fluss-next>=0.2.0; extra == 'all'
+Requires-Dist: kabinet>=0.2.0; extra == 'all'
+Requires-Dist: mikro-next>=0.2.0; extra == 'all'
+Requires-Dist: reaktion-next>=0.2.0; extra == 'all'
+Requires-Dist: rekuest-next>=0.3.1; extra == 'all'
+Requires-Dist: rich-click>=1.6.1; extra == 'all'
+Requires-Dist: semver>=3.0.1; extra == 'all'
+Requires-Dist: turms>=0.8.2; extra == 'all'
+Requires-Dist: unlok-next>=0.2.0; extra == 'all'
+Requires-Dist: watchfiles>=0.18.1; extra == 'all'
 Provides-Extra: alpaka
+Requires-Dist: alpaka>=0.2.0; extra == 'alpaka'
 Provides-Extra: blok
+Requires-Dist: blok>=0.1.0; extra == 'blok'
 Provides-Extra: cli
+Requires-Dist: rekuest-next>=0.3.1; extra == 'cli'
+Requires-Dist: turms>=0.8.2; extra == 'cli'
 Provides-Extra: elektro
+Requires-Dist: elektro>=0.5.0; extra == 'elektro'
 Provides-Extra: extended
+Requires-Dist: alpaka>=0.2.0; extra == 'extended'
+Requires-Dist: kraph>=0.2.0; extra == 'extended'
 Provides-Extra: fluss
+Requires-Dist: fluss-next>=0.2.0; extra == 'fluss'
 Provides-Extra: kabinet
+Requires-Dist: kabinet>=0.4.0; extra == 'kabinet'
 Provides-Extra: kraph
+Requires-Dist: kraph>=0.2.0; extra == 'kraph'
 Provides-Extra: lovekit
+Requires-Dist: lovekit>=0.2.0; extra == 'lovekit'
 Provides-Extra: mikro
+Requires-Dist: mikro-next>=0.3.1; extra == 'mikro'
 Provides-Extra: reaktion
+Requires-Dist: reaktion-next>=0.2.0; extra == 'reaktion'
 Provides-Extra: rekuest
-Provides-Extra: stream
+Requires-Dist: rekuest-next>=0.6.0; extra == 'rekuest'
 Provides-Extra: unlok
-Requires-Dist: alpaka (>=0.2.0) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "alpaka" or extra == "extended")
-Requires-Dist: blok (>=0.1.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "blok")
-Requires-Dist: cryptography (>=40.0.8) ; (python_version >= "3.9") and (extra == "blok")
-Requires-Dist: dokker (>=1.0.0)
-Requires-Dist: elektro (>=0.5.0) ; (python_version >= "3.9") and (extra == "elektro")
-Requires-Dist: fakts-next (>=1.1.0)
-Requires-Dist: fluss-next (>=0.2.0) ; (python_version >= "3.9") and (extra == "fluss" or extra == "all")
-Requires-Dist: herre-next (>=1.1.0)
-Requires-Dist: kabinet (>=0.2.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "kabinet" or extra == "all")
-Requires-Dist: koil (>=1.0.3)
-Requires-Dist: kraph (>=0.2.0) ; (python_version >= "3.9") and (extra == "kraph" or extra == "extended")
-Requires-Dist: lovekit (>=0.2.0) ; (python_version >= "3.10") and (extra == "lovekit" or extra == "stream")
-Requires-Dist: mikro-next (>=0.2.0) ; (python_version >= "3.11" and python_version < "4.0") and (extra == "mikro" or extra == "all")
-Requires-Dist: namegenerator (>=1.0.6) ; (python_version >= "3.9") and (extra == "blok")
-Requires-Dist: netifaces (>=0.11.0) ; (python_version >= "3.9") and (extra == "blok")
-Requires-Dist: rath (>=1.1.1)
-Requires-Dist: reaktion-next (>=0.2.0) ; (python_version >= "3.9") and (extra == "reaktion" or extra == "all")
-Requires-Dist: rekuest-next (>=0.3.1) ; (python_version >= "3.9") and (extra == "cli" or extra == "rekuest" 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 (extra == "cli" or extra == "all")
-Requires-Dist: unlok-next (>=0.2.0) ; (python_version >= "3.9") and (extra == "unlok" or extra == "all")
-Requires-Dist: watchfiles (>=0.18.1) ; extra == "cli" or extra == "all"
+Requires-Dist: unlok-next>=0.2.0; extra == 'unlok'
 Description-Content-Type: text/markdown
 
-# arkitekt_next
+# arkitekt-next
 
 [![codecov](https://codecov.io/gh/jhnnsrs/arkitekt_next/branch/master/graph/badge.svg?token=UGXEA2THBV)](https://codecov.io/gh/jhnnsrs/arkitekt_next)
 [![PyPI version](https://badge.fury.io/py/arkitekt_next.svg)](https://pypi.org/project/arkitekt_next/)
@@ -65,7 +67,7 @@ streaming analysis for mikroscopy
 
 ## Idea
 
-arkitekt_next is the python client for the arkitekt_next platform. It allows you to utilize the full extent of the platform from your python code.
+arkitekt-next is the python client for the arkitekt_next platform. It allows you to utilize the full extent of the platform from your python code.
 To understand the idea behind arkitekt_next, you need to understand the idea behind the arkitekt_next platform.
 (More on this in the [documentation](https://arkitekt.live))
 
@@ -169,4 +171,3 @@ def complex_call(x: ComplexStrucuture) -> int:
 ```
 
 Check out the arkitekt_next [documentation](https://arkitekt.live) for usage of this libary
-

{arkitekt_next-0.9.4 → arkitekt_next-0.10.2}/README.md

@@ -1,4 +1,4 @@
-# arkitekt_next
+# arkitekt-next
 
 [![codecov](https://codecov.io/gh/jhnnsrs/arkitekt_next/branch/master/graph/badge.svg?token=UGXEA2THBV)](https://codecov.io/gh/jhnnsrs/arkitekt_next)
 [![PyPI version](https://badge.fury.io/py/arkitekt_next.svg)](https://pypi.org/project/arkitekt_next/)
@@ -11,7 +11,7 @@ streaming analysis for mikroscopy
 
 ## Idea
 
-arkitekt_next is the python client for the arkitekt_next platform. It allows you to utilize the full extent of the platform from your python code.
+arkitekt-next is the python client for the arkitekt_next platform. It allows you to utilize the full extent of the platform from your python code.
 To understand the idea behind arkitekt_next, you need to understand the idea behind the arkitekt_next platform.
 (More on this in the [documentation](https://arkitekt.live))
 

{arkitekt_next-0.9.4 → arkitekt_next-0.10.2}/arkitekt_next/__blok__.py

@@ -23,9 +23,10 @@ from arkitekt_next.bloks.self_signed import SelfSignedBlok
 from arkitekt_next.bloks.kraph import KraphBlok
 from arkitekt_next.bloks.local_sign import LocalSignBlok
 from arkitekt_next.bloks.elektro import ElektroBlok
+from blok.blok import Blok
 
 
-def get_bloks():
+def get_bloks() -> list[Blok]:
     return [
         AdminBlok(),
         ArkitektBlok(),
@@ -53,4 +54,3 @@ def get_bloks():
         LocalSignBlok(),
         ElektroBlok(),
     ]
-

{arkitekt_next-0.9.4 → arkitekt_next-0.10.2}/arkitekt_next/__init__.py

@@ -1,3 +1,14 @@
+from .builders import easy, interactive
+from .apps.protocols 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_default_service_registry,
+)
+
+
 def missing_install(name: str, error: Exception):
     def real_missing_install(*args, **kwargs):
         raise ImportError(
@@ -8,27 +19,34 @@ def missing_install(name: str, error: Exception):
 
 
 try:
-    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.register import register
+    from rekuest_next.agents.hooks.background import background
+    from rekuest_next.agents.hooks.startup import startup
     from rekuest_next.agents.context import context
-    from rekuest_next.state.state import state
-    from rekuest_next.actors.reactive.api import abreakpoint, breakpoint
-    from rekuest_next.actors.reactive.api import progress, aprogress
-    from rekuest_next.actors.reactive.api import log, alog
-    from rekuest_next.register import test, benchmark
+    from rekuest_next.state.decorator import state
+    from rekuest_next.actors.context import abreakpoint, breakpoint
+    from rekuest_next.actors.context import progress, aprogress
+    from rekuest_next.actors.context import log, alog
     from rekuest_next.structures.model import model
-    from rekuest_next.utils import call, call_raw, acall, acall_raw, find, afind
-    from rekuest_next.define import define
+    from rekuest_next.remote import (
+        call,
+        acall,
+        acall_raw,
+        iterate,
+        aiterate,
+        aiterate_raw,
+        find,
+    )
 except ImportError as e:
     raise e
-    register_structure = missing_install("rekuest_next", e)
+    structure = missing_install("rekuest_next", e)
     register = missing_install("rekuest_next", e)
     background = missing_install("rekuest_next", e)
     abreakpoint = missing_install("rekuest_next", e)
     breakpoint = missing_install("rekuest_next", e)
     startup = missing_install("rekuest_next", e)
     context = missing_install("rekuest_next", e)
+    find = missing_install("rekuest_next", e)
     state = missing_install("rekuest_next", e)
     progress = missing_install("rekuest_next", e)
     aprogress = missing_install("rekuest_next", e)
@@ -40,16 +58,9 @@ except ImportError as e:
     acall_raw = missing_install("rekuest_next", e)
     find = missing_install("rekuest_next", e)
     afind = missing_install("rekuest_next", 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,
-)
+    aiterate_raw = missing_install("rekuest_next", e)
+    aiterate = missing_install("rekuest_next", e)
+    iterate = missing_install("rekuest_next", e)
 
 
 __all__ = [
@@ -57,39 +68,29 @@ __all__ = [
     "require",
     "easy",
     "interactive",
-    "publicqt",
-    "jupy",
     "log",
     "alog",
     "afakt",
     "fakt",
     "progress",
     "aprogress",
-    "scheduler",
-    "register_structure",
-    "requirement",
     "ServiceBuilderRegistry",
-    "get_current_service_registry",
+    "get_default_service_registry",
     "register",
-    "group",
-    "useGuardian",
-    "useInstanceID",
     "find",
-    "afind",
+    "breakpoint",
+    "abreakpoint",
+    "aiterate",
+    "iterate",
+    "aiterate_raw",
     "call",
-    "call_raw",
     "acall",
     "acall_raw",
     "model",
-    "test",
-    "benchmark",
-    "useUser",
-    "next",
     "state",
     "context",
     "background",
     "startup",
-    "register_next",
     "init",
     "InitHookRegisty",
     "get_current_init_hook_registry",

arkitekt_next-0.10.2/arkitekt_next/apps/__init__.py

@@ -0,0 +1,3 @@
+from .protocols import App
+
+__all__ = ["App"]

arkitekt_next-0.9.4/arkitekt_next/apps/types.py → arkitekt_next-0.10.2/arkitekt_next/apps/protocols.py

@@ -1,7 +1,6 @@
 """
 This module contains the types for the apps
 depending on the builder used.
-
 This module imports all the apps and their types
 and sets them as attributes on the App class, if they are available.
 If they are not available, they are set to Any, so that we can add
@@ -11,12 +10,17 @@ an import exception to the app.
 """
 
 import logging
-from typing import TYPE_CHECKING, Any, Dict
+from typing import Any, Dict, TYPE_CHECKING
+from koil import unkoil
 from arkitekt_next.base_models import Manifest
 from koil.composition import Composition
 from fakts_next import Fakts
 from herre_next import Herre
-from koil.helpers import KoilTask
+
+
+if TYPE_CHECKING:
+    from rekuest_next.rekuest import RekuestNext
+
 
 logger = logging.getLogger(__name__)
 
@@ -29,18 +33,27 @@ class App(Composition):
     manifest: Manifest
     services: Dict[str, Any]
 
+    @property
+    def rekuest(self) -> "RekuestNext":
+        """Get the rekuest service"""
+        if "rekuest" not in self.services:
+            raise ValueError("Rekuest service is not available")
+        return self.services["rekuest"]
+
     def run(self):
-        """Run the app"""
-        return self.services["rekuest"].run()
+        return unkoil(self.rekuest.arun)
 
-    def run_detached(self) -> KoilTask:
-        """Run the app detached"""
+    async def arun(self):
+        return await self.rekuest.arun()
 
-        return self.services["rekuest"].run_detached()
+    def run_detached(self):
+        """Run the app detached"""
+        return self.rekuest.run_detached()
 
     def register(self, *args, **kwargs):
         """Register a service"""
-        self.services["rekuest"].register(*args, **kwargs)
+
+        self.rekuest.register(*args, **kwargs)
 
     async def __aenter__(self):
         await super().__aenter__()

{arkitekt_next-0.9.4 → arkitekt_next-0.10.2}/arkitekt_next/apps/service/fakts_next.py

@@ -4,41 +4,35 @@ from fakts_next.fakts import Fakts
 from fakts_next.grants.hard import HardFakts
 from fakts_next.grants.remote import RemoteGrant
 from fakts_next.grants.remote.discovery.well_known import WellKnownDiscovery
-from fakts_next.grants.remote import RemoteGrant
 from fakts_next.grants.remote.demanders.static import StaticDemander
-from fakts_next.grants.remote.demanders.device_code import DeviceCodeDemander
+from fakts_next.grants.remote.demanders.device_code import (
+    ClientKind,
+    DeviceCodeDemander,
+)
 from fakts_next.grants.remote.claimers.post import ClaimEndpointClaimer
 from fakts_next.grants.remote.demanders.redeem import RedeemDemander
 from fakts_next.cache.file import FileCache
 from arkitekt_next.base_models import Manifest
 
 
-class ArkitektNextFaktsQt(Fakts):
-    grant: RemoteGrant
-
-
-class ArkitektNextFaktsNext(Fakts):
-    pass
-
-
 def build_arkitekt_next_fakts_next(
     manifest: Manifest,
     url: Optional[str] = None,
     no_cache: bool = False,
     headless: bool = False,
-    client_kind: str = "development",
-) -> ArkitektNextFaktsNext:
+) -> Fakts:
     identifier = manifest.identifier
     version = manifest.version
+    if url is None:
+        raise ValueError("URL must be provided")
 
     demander = DeviceCodeDemander(
         manifest=manifest,
-        redirect_uri="http://127.0.0.1:6767",
         open_browser=not headless,
-        requested_client_kind=client_kind,
+        requested_client_kind=ClientKind.DEVELOPMENT,
     )
 
-    return ArkitektNextFaktsNext(
+    return Fakts(
         grant=RemoteGrant(
             demander=demander,
             discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
@@ -47,22 +41,15 @@ def build_arkitekt_next_fakts_next(
         cache=FileCache(
             cache_file=f".arkitekt_next/cache/{identifier}-{version}_fakts_cache.json",
             hash=manifest.hash() + url,
-            skip_cache=no_cache,
         ),
     )
 
 
-def build_arkitekt_next_redeem_fakts_next(
-    manifest: Manifest,
-    redeem_token: str,
-    url,
-    no_cache: Optional[bool] = False,
-    headless=False,
-):
+def build_arkitekt_next_redeem_fakts_next(manifest: Manifest, redeem_token: str, url):
     identifier = manifest.identifier
     version = manifest.version
 
-    return ArkitektNextFaktsNext(
+    return Fakts(
         grant=RemoteGrant(
             demander=RedeemDemander(token=redeem_token, manifest=manifest),
             discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
@@ -83,9 +70,9 @@ def build_arkitekt_next_token_fakts_next(
     identifier = manifest.identifier
     version = manifest.version
 
-    return ArkitektNextFaktsNext(
+    return Fakts(
         grant=RemoteGrant(
-            demander=StaticDemander(token=token),
+            demander=StaticDemander(token=token),  # type: ignore
             discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
             claimer=ClaimEndpointClaimer(),
         ),
@@ -97,11 +84,9 @@ def build_arkitekt_next_token_fakts_next(
 
 
 def build_local_fakts(manifest, fakts):
-
     identifier = manifest.identifier
     version = manifest.version
 
-    return ArkitektNextFaktsNext(
+    return Fakts(
         grant=HardFakts(fakts=fakts),
-
-    )
+    )

{arkitekt_next-0.9.4 → arkitekt_next-0.10.2}/arkitekt_next/base_models.py

@@ -43,7 +43,7 @@ class Manifest(BaseModel):
     requirements: Optional[List[Requirement]] = Field(default_factory=list)
     """ Requirements that this app has TODO: What are the requirements? """
     model_config = ConfigDict(extra="forbid")
-    
+
     description: Optional[str] = None
     """ A human readable description of the app """
 
@@ -74,8 +74,8 @@ class Manifest(BaseModel):
         # Hash the JSON encoded dictionary
         return sha256(json_dd.encode()).hexdigest()
 
-    @field_validator("identifier")
-    def check_identifier(cls, v):
+    @field_validator("identifier", mode="after")
+    def check_identifier(cls, v: str) -> str:
         assert "/" not in v, "The identifier should not contain a /"
         assert len(v) > 0, "The identifier should not be empty"
         assert len(v) < 256, "The identifier should not be longer than 256 characters"

{arkitekt_next-0.9.4 → arkitekt_next-0.10.2}/arkitekt_next/bloks/admin.py

@@ -1,5 +1,3 @@
-from pydantic import BaseModel
-from typing import Dict, Any
 from blok import blok, InitContext, Option
 from arkitekt_next.bloks.services.admin import AdminService, AdminCredentials
 

{arkitekt_next-0.9.4 → arkitekt_next-0.10.2}/arkitekt_next/bloks/base.py

@@ -1,3 +1,4 @@
+from arkitekt_next.bloks.services.channel import ChannelService
 from blok import blok, InitContext, Option
 from blok.tree import YamlFile, Repo
 from typing import Any, Optional, Protocol
@@ -62,6 +63,7 @@ class BaseArkitektService:
         redis: RedisService,
         s3: S3Service,
         config: ConfigService,
+        channel: ChannelService,
         mount: MountService,
         admin: AdminService,
         secret: SecretService,

arkitekt_next-0.10.2/arkitekt_next/bloks/channel.py

@@ -0,0 +1,27 @@
+from pydantic import BaseModel
+from typing import Dict, Any
+from blok import blok, InitContext, Option
+from arkitekt_next.bloks.services.channel import ChannelService
+
+
+@blok(ChannelService, description="The current channel of the application")
+class ChannelBlok:
+    def __init__(self) -> None:
+        self.name = "default"
+
+    def preflight(self, init: InitContext):
+        for key, value in init.kwargs.items():
+            setattr(self, key, value)
+
+    def retrieve(self):
+        return self.name
+
+    def get_options(self):
+        with_name = Option(
+            subcommand="name",
+            help="Which channel name to use",
+            default=self.name,
+            show_default=True,
+        )
+
+        return [with_name]

arkitekt_next-0.10.2/arkitekt_next/bloks/services/channel.py

@@ -0,0 +1,12 @@
+from typing import Dict, Any, Protocol
+from blok import blok, InitContext, Option
+from blok import service
+from dataclasses import dataclass
+
+
+
+@service("live.arkitekt.channel")
+class ChannelService(Protocol):
+
+    def retrieve_channel(self) -> str:
+        return str