arkitekt-next 0.8.34__tar.gz → 0.8.35__tar.gz

{arkitekt_next-0.8.34 → arkitekt_next-0.8.35}/PKG-INFO

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

{arkitekt_next-0.8.34 → arkitekt_next-0.8.35}/arkitekt_next/base_models.py

@@ -17,48 +17,6 @@ class Requirement(BaseModel):
     """ The description is a human readable description of the requirement. Will be show to the user when asking for the requirement."""
 
 
-def build_default_requirements() -> List[Requirement]:
-    return [
-        Requirement(
-            key="lok",
-            service="live.arkitekt_next.lok",
-            description="An instance of ArkitektNext Lok to authenticate the user",
-        ),
-        Requirement(
-            key="rekuest",
-            service="live.arkitekt_next.rekuest",
-            description="An instance of ArkitektNext Rekuest to assign to nodes",
-        ),
-        Requirement(
-            key="kabinet",
-            service="live.arkitekt_next.kabinet",
-            description="An instance of ArkitektNext Kabinet to retrieve nodes from",
-        ),
-        Requirement(
-            key="mikro",
-            service="live.arkitekt_next.mikro",
-            description="An instance of ArkitektNext Mikro to make requests to the user's data",
-            optional=True,
-        ),
-        Requirement(
-            key="fluss",
-            service="live.arkitekt_next.fluss",
-            description="An instance of ArkitektNext Fluss to make requests to the user's data",
-            optional=False,
-        ),
-        Requirement(
-            key="port",
-            service="live.arkitekt_next.port",
-            description="An instance of ArkitektNext Fluss to make requests to the user's data",
-            optional=True,
-        ),
-        Requirement(
-            key="datalayer",
-            service="live.arkitekt_next.datalayer",
-            description="An instance of ArkitektNext Datalayer to make requests to the user's data",
-            optional=False,
-        ),
-    ]
 
 
 class Manifest(BaseModel):
@@ -85,7 +43,7 @@ class Manifest(BaseModel):
     logo: Optional[str]
     """ A URL to the logo of the app TODO: We should enforce this to be a http URL as local paths won't work """
     requirements: Optional[List[Requirement]] = Field(
-        default_factory=build_default_requirements
+        default_factory=list
     )
     """ Requirements that this app has TODO: What are the requirements? """
 

{arkitekt_next-0.8.34 → arkitekt_next-0.8.35}/arkitekt_next/builders.py

@@ -96,7 +96,6 @@ def easy(
     NextApp
         A built app, that can be used to interact with the ArkitektNext server
     """
-    print("CAAAAAAAAAAAAAAAAAAAAAAAAAAAALLLED")
     registry = registry or check_and_import_services()
 
 
@@ -113,6 +112,7 @@ def easy(
         logo=logo,
         requirements=registry.get_requirements(),
     )
+
     if token:
         fakts_next = build_arkitekt_next_token_fakts_next(
             manifest=manifest,

{arkitekt_next-0.8.34 → arkitekt_next-0.8.35}/arkitekt_next/service_registry.py

@@ -104,7 +104,6 @@ class ServiceBuilderRegistry:
             for name, service in self.service_builders.items() 
         }
 
-        print(potentially_needed_services.keys())
 
 
         return {key: value for key, value in potentially_needed_services.items() if value is not None}
@@ -113,15 +112,27 @@ class ServiceBuilderRegistry:
 
     def get_requirements(self):
 
-        requirements = basic_requirements
+        requirements = [Requirement(
+        key="lok",
+        service="live.arkitekt.lok",
+        description="An instance of ArkitektNext Lok to authenticate the user",
+    )]   
+        taken_requirements = set()
+
 
         for service in self.service_builders.values():
             for requirement in service.get_requirements():
-                requirements.append(requirement)
+                if requirement.key not in taken_requirements:
+                    taken_requirements.add(requirement.key)
+                    requirements.append(requirement)
 
 
 
-        return requirements
+        
+
+        sorted_requirements = sorted(requirements, key=lambda x: x.key)
+
+        return sorted_requirements
 
 
 class SetupInfo:

{arkitekt_next-0.8.34 → arkitekt_next-0.8.35}/pyproject.toml

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