arkitekt-next 0.8.25__py3-none-any.whl → 0.8.27__py3-none-any.whl

arkitekt_next/apps/service/fakts_next.py

@@ -46,7 +46,7 @@ def build_arkitekt_next_fakts_next(
         ),
         cache=FileCache(
                 cache_file=f".arkitekt_next/cache/{identifier}-{version}_fakts_cache.json",
-                hash=manifest.hash(),
+                hash=manifest.hash() + url,
                 skip_cache=no_cache,
             ),
     )
@@ -71,7 +71,7 @@ def build_arkitekt_next_redeem_fakts_next(
         ),
         cache=FileCache(
                 cache_file=f".arkitekt_next/cache/{identifier}-{version}_fakts_cache.json",
-                hash=manifest.hash(),
+                hash=manifest.hash() + url,
             ),
     )
 
@@ -92,6 +92,6 @@ def build_arkitekt_next_token_fakts_next(
         ),
         cache=FileCache(
                 cache_file=f".arkitekt_next/cache/{identifier}-{version}_fakts_cache.json",
-                hash=manifest.hash(),
+                hash=manifest.hash() + url,
             ),
     )

arkitekt_next/base_models.py

@@ -1,6 +1,7 @@
 """Models for ArkitektNext. Thiese include extensiosn for the Fakts Manifest and the User model."""
 
 from hashlib import sha256
+import json
 from pydantic import BaseModel, Field, field_validator
 from typing import List, Optional
 
@@ -92,8 +93,33 @@ class Manifest(BaseModel):
         extra = "forbid"
 
     def hash(self):
-        """Hash the manifest"""
-        return sha256(self.model_dump_json().encode()).hexdigest()
+        """Hash the manifest
+        
+        A manifest describes all the  metadata of an app. This method
+        hashes the manifest to create a unique hash for the current configuration of the app.
+        This hash can be used to check if the app has changed since the last time it was run,
+        and can be used to invalidate caches.
+
+        Returns:
+            str: The hash of the manifest
+        
+        """
+
+        unsorted_dict = self.model_dump()
+
+        # sort the requirements
+        unsorted_dict["requirements"] = sorted(
+            unsorted_dict["requirements"], key=lambda x: x["key"]
+        )
+        # sort the scopes
+        unsorted_dict["scopes"] = sorted(unsorted_dict["scopes"])
+
+        # JSON encode the dictionary
+        json_dd = json.dumps(unsorted_dict, sort_keys=True)
+        print(json_dd)
+
+        # Hash the JSON encoded dictionary
+        return sha256(json_dd.encode()).hexdigest()
     
 
     @field_validator("identifier")

arkitekt_next/service_registry.py

@@ -19,17 +19,17 @@ class Registration(BaseModel):
     builder: Callable[[Herre, Fakts, Params], object]
 
 
-basic_requirements = [Requirement(
+basic_requirements =  {"lok": Requirement(
         key="lok",
         service="live.arkitekt.lok",
         description="An instance of ArkitektNext Lok to authenticate the user",
-    )]
+    )}
 
 
 class ServiceBuilderRegistry:
     def __init__(self):
         self.service_builders = {}
-        self.requirements = basic_requirements
+        self.requirements_map = basic_requirements
 
     def register(
         self,
@@ -37,8 +37,11 @@ class ServiceBuilderRegistry:
         service_builder: Callable[[Herre, Fakts], object],
         requirement: Requirement,
     ):
-        self.service_builders[name] = service_builder
-        self.requirements.append(requirement)
+        if name not in self.service_builders:
+            self.service_builders[name] = service_builder
+        
+        if name not in self.requirements_map:
+            self.requirements_map[name] = requirement
 
     def get(self, name):
         return self.services.get(name)
@@ -52,7 +55,7 @@ class ServiceBuilderRegistry:
         }
 
     def get_requirements(self):
-        return self.requirements
+        return self.requirements_map.values()
 
 
 class SetupInfo:

{arkitekt_next-0.8.25.dist-info → arkitekt_next-0.8.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.25
+Version: 0.8.27
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -22,14 +22,14 @@ Requires-Dist: dokker (>=1.0.0)
 Requires-Dist: fakts-next (>=1.0.2)
 Requires-Dist: fluss-next (>=0.1.89) ; extra == "all"
 Requires-Dist: herre-next (>=1.0.2)
-Requires-Dist: kabinet (>=0.1.35) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.37) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=1.0.0)
 Requires-Dist: lovekit (>=0.1.15) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
 Requires-Dist: mikro-next (>=0.1.45) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
 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.79) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.38) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: rekuest-next (>=0.2.39) ; (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"
 Requires-Dist: semver (>=3.0.1) ; extra == "cli" or extra == "all"
 Requires-Dist: turms (>=0.6.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")

{arkitekt_next-0.8.25.dist-info → arkitekt_next-0.8.27.dist-info}/RECORD

@@ -2,13 +2,13 @@ arkitekt_next/__blok__.py,sha256=gQqlPrUPSeB-b3XkvXRwDoRWMfG-vYN-3a2pWHNjz_E,156
 arkitekt_next/__init__.py,sha256=ovVo9gHr15RHJW3NS82p8vs6NWJ4CGNTPCog16bhmU4,1694
 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=FEmxRoc3z3gAO_bqwOlZgzc3rEAXZKv5hxXigXIqEXY,2924
+arkitekt_next/apps/service/fakts_next.py,sha256=ouPBl_FPjyRTmNdaCtK2TQfTRzCqiahyVyaXrSmRZAo,2942
 arkitekt_next/apps/service/fakts_qt.py,sha256=_ayxmyjm8qPAsUmBzydYIaX63jHP4mcZ9B0i8NzPC5g,1984
 arkitekt_next/apps/service/grant_registry.py,sha256=h0jRKBd9EAXiVV6aHVtzNAlm1yiWPigg0qka68y6yKM,876
 arkitekt_next/apps/service/herre.py,sha256=jtHugrkKr8Yo26GYVm9qNZkK2hAD3_v_rMimaV3GrC4,811
 arkitekt_next/apps/service/herre_qt.py,sha256=42APOZl0SnX0FWl6K-TC9CcZUO-BSXMXyH6B31A0y3U,1679
 arkitekt_next/apps/types.py,sha256=zr3x75txS3b8orpCYYnnYAaO2mFxGgS8EZfbwh_wDfg,1286
-arkitekt_next/base_models.py,sha256=Kx8tOkdxrU2ojJw69EeCrrjk0dJUECopXB-4nM6SCRQ,4927
+arkitekt_next/base_models.py,sha256=RuXSw1-gVzneBYakTc9-9FxzoUFRfnPlJER72JbqHCQ,5772
 arkitekt_next/bloks/__init__.py,sha256=_4EeR63d6avQUWLG4mK2n_FvogTPQ_Jx6f2_RvNbWeA,29
 arkitekt_next/bloks/admin.py,sha256=mRTfjIR1vsfY1ghgjWLjKYFAOh1pGCmQ_IEt2QOR3og,1353
 arkitekt_next/bloks/arkitekt.py,sha256=ZyyHocaoPPCBZnbpBCkDzB2woXb1-ZbENr51UFERn2Q,1546
@@ -129,11 +129,11 @@ arkitekt_next/qt/builders.py,sha256=zQLn-mJJnfLHSDjfAJ7gfzv66cnQz_yNX9yKTEdapi4,
 arkitekt_next/qt/magic_bar.py,sha256=_H74_s5Nqj20FpvzLSCxRwZMuZxqobkmn_sdwhpqzCg,17632
 arkitekt_next/qt/types.py,sha256=RzliCycvB_i7SZcXgahfXCJ9ft8QNsJKkrzpNbXF9qQ,4042
 arkitekt_next/qt/utils.py,sha256=MgBPtPmCSBkIuATov3UgREESwxAHh77lWNNxyE7Qs48,773
-arkitekt_next/service_registry.py,sha256=cxQ1J4zLIW06pHFMn7s2s2NGyptayHyXS9zKPohzgCE,3598
+arkitekt_next/service_registry.py,sha256=_ajPWQKA5clfQ_Nb7V-qr_k2ypw9F5iQMDaLpfwVh4A,3736
 arkitekt_next/tqdm.py,sha256=lQcJI5Q6Py7Gy88hOCiJujjPEEGd8G2k1mOVJJ6oYe8,1531
 arkitekt_next/utils.py,sha256=QETdzn_GIMSw6LdaXL89bqvqp9MGwEBK8Lj54MpnMwc,2396
-arkitekt_next-0.8.25.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.8.25.dist-info/METADATA,sha256=9dIxz0xL0EzQfaeMtoW4CA1Tn9gLbW7DSp1kJwvRtNQ,6072
-arkitekt_next-0.8.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.8.25.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.8.25.dist-info/RECORD,,
+arkitekt_next-0.8.27.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.8.27.dist-info/METADATA,sha256=4qKmQpm9Rpjm6NZ9xklRD1s9wHrefrQesrn7RTNXICc,6072
+arkitekt_next-0.8.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.8.27.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.8.27.dist-info/RECORD,,