arkitekt-next 0.7.23__tar.gz → 0.7.25__tar.gz

{arkitekt_next-0.7.23 → arkitekt_next-0.7.25}/PKG-INFO

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

{arkitekt_next-0.7.23 → arkitekt_next-0.7.25}/arkitekt_next/apps/service/fakts_next.py

@@ -77,3 +77,17 @@ def build_arkitekt_next_redeem_fakts_next(
             claimer=ClaimEndpointClaimer(),
         )
     )
+
+
+def build_arkitekt_next_token_fakts(
+    manifest: Manifest,
+    token: str,
+    url,
+):
+    return ArkitektNextFaktsNext(
+        grant=RemoteGrant(
+            demander=StaticDemander(token=token),
+            discovery=WellKnownDiscovery(url=url, auto_protocols=["https", "http"]),
+            claimer=ClaimEndpointClaimer(),
+        )
+    )

{arkitekt_next-0.7.23 → arkitekt_next-0.7.25}/arkitekt_next/builders.py

@@ -5,6 +5,7 @@ import os
 from arkitekt_next.apps.service.fakts_next import (
     build_arkitekt_next_fakts_next,
     build_arkitekt_next_redeem_fakts_next,
+    build_arkitekt_next_token_fakts
 )
 from arkitekt_next.apps.service.herre import build_arkitekt_next_herre
 from .utils import create_arkitekt_next_folder
@@ -98,6 +99,11 @@ def easy(
     """
     registry = registry or check_and_import_services()
 
+
+    url = os.getenv("FAKTS_URL", url)
+    token = os.getenv("FAKTS_TOKEN", token)
+
+
     manifest = Manifest(
         version=version,
         identifier=identifier,
@@ -105,16 +111,26 @@ def easy(
         logo=logo,
         requirements=registry.get_requirements(),
     )
+    if token:
+        print("Using token")
+        fakts = build_arkitekt_next_token_fakts(
+            manifest=manifest,
+            token=token,
+            url=url,
+        )
 
-    if redeem_token:
+    elif redeem_token:
+        print("Using redeem token")
         fakts = build_arkitekt_next_redeem_fakts_next(
             manifest=manifest,
             redeem_token=redeem_token,
             url=url,
             no_cache=no_cache,
             headless=headless,
+            token=token,
         )
     else:
+        print("Using normal fakts")
         fakts = build_arkitekt_next_fakts_next(
             manifest=manifest,
             url=url,
@@ -127,9 +143,6 @@ def easy(
 
     params = kwargs
 
-    url = os.getenv("FAKTS_URL", url)
-    token = os.getenv("FAKTS_TOKEN", token)
-
     create_arkitekt_next_folder(with_cache=True)
 
     try:

{arkitekt_next-0.7.23 → arkitekt_next-0.7.25}/pyproject.toml

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