arkitekt-next 0.8.32__py3-none-any.whl → 0.8.35__py3-none-any.whl

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/builders.py

@@ -112,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/cli/commands/gen/compile.py

@@ -20,6 +20,14 @@ def compile(projects, config):
     """
     app_directory = os.getcwd()
 
+
+
+
+
+
+
+    
+
     from turms.run import scan_folder_for_single_config, load_projects_from_configpath
     from turms.cli.main import generate_projects
 

arkitekt_next/cli/commands/gen/init.py

@@ -1,5 +1,6 @@
 import os
 import shutil
+from click import ClickException
 import rich_click as click
 from arkitekt_next.cli.options import (
     with_documents,
@@ -13,6 +14,7 @@ from arkitekt_next.cli.options import (
 import yaml
 from arkitekt_next.cli.utils import build_relative_dir
 from arkitekt_next.cli.vars import get_console, get_manifest
+from arkitekt_next.service_registry import check_and_import_services
 
 
 @click.command()
@@ -38,75 +40,68 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
     app_directory = os.getcwd()
 
     app_api_path = os.path.join(app_directory, path)
-    app_documents = os.path.join(app_directory, "graphql", "documents")
+    app_documents = os.path.join(app_directory, "documents")
 
-    app_schemas = os.path.join(app_directory, "graphql", "schemas")
+    app_schemas = os.path.join(app_directory, "schemas")
 
-    if documents:
-        os.makedirs(app_documents, exist_ok=True)
-    if schemas:
-        os.makedirs(app_schemas, exist_ok=True)
-    if path:
-        os.makedirs(app_api_path, exist_ok=True)
+    os.makedirs(app_documents, exist_ok=True)
+    os.makedirs(app_schemas, exist_ok=True)
+    os.makedirs(app_api_path, exist_ok=True)
 
     # Initializing the config
     projects = {}
 
+
+    registry = check_and_import_services()
+
     base_config = yaml.load(
         open(build_relative_dir("configs", "base.yaml"), "r"), Loader=yaml.FullLoader
     )
 
-    for service in services:
-        schema_path = build_relative_dir("schemas", f"{service}.schema.graphql")
+    for key, service in registry.service_builders.items():
+        try:
 
-        if documents:
-            os.makedirs(os.path.join(app_documents, service), exist_ok=True)
-            if seperate_doc_dirs:
-                os.makedirs(
-                    os.path.join(app_documents, service, "queries"), exist_ok=True
-                )
-                os.makedirs(
-                    os.path.join(app_documents, service, "mutations"), exist_ok=True
-                )
-                os.makedirs(
-                    os.path.join(app_documents, service, "subscriptions"), exist_ok=True
-                )
+            schema, project = service.get_graphql_schema(), service.get_turms_project()
 
-        if schemas:
-            if os.path.exists(schema_path):
-                try:
-                    shutil.copyfile(
-                        schema_path,
-                        os.path.join(app_schemas, service + ".graphql"),
+            if not schema or not project:
+                get_console(ctx).print(f"[red]No schema or project found for {key} [/]")
+                continue
+
+            if documents:
+                os.makedirs(os.path.join(app_documents, key), exist_ok=True)
+                if seperate_doc_dirs:
+                    os.makedirs(
+                        os.path.join(app_documents, key, "queries"), exist_ok=True
+                    )
+                    os.makedirs(
+                        os.path.join(app_documents, key, "mutations"), exist_ok=True
+                    )
+                    os.makedirs(
+                        os.path.join(app_documents, key, "subscriptions"), exist_ok=True
                     )
-                except FileExistsError:
-                    if click.confirm(
-                        f"Schema for {service} already exist. Do you want to overwrite them?"
-                    ):
-                        shutil.copyfile(
-                            schema_path,
-                            os.path.join(app_schemas, service + ".graphql"),
-                        )
-            else:
-                get_console(ctx).print(f"[red]No schema found for {service} [/]")
 
-        try:
-            project = base_config["projects"][service]
-        except KeyError:
-            get_console(ctx).print(f"[red]No config found for {service} [/]")
-            continue
-
-        if schemas:
-            project["schema"] = os.path.join(app_schemas, service + ".graphql")
-        if documents:
-            project["documents"] = (
-                os.path.join(app_documents, service) + "/**/*.graphql"
-            )
-
-        project["extensions"]["turms"]["out_dir"] = path
-        project["extensions"]["turms"]["generated_name"] = f"{service}.py"
-
-        projects[service] = project
+            if schemas:
+                out_path = os.path.join(app_schemas, key + ".schema.graphql")
+                with open(out_path, "w") as f:
+                    f.write(schema)
+                    
+
+
+            if schemas:
+                project["schema"] = os.path.join(app_schemas, key + ".schema.graphql")
+            if documents:
+                project["documents"] = (
+                    os.path.join(app_documents, key) + "/**/*.graphql"
+                )
+
+            project["extensions"]["turms"]["out_dir"] = path
+            project["extensions"]["turms"]["generated_name"] = f"{key}.py"
+            del project["extensions"]["turms"]["documents"] 
+
+            projects[key] = project
+
+        except Exception as e:
+            raise ClickException(f"Failed to initialize project for {key}. Error: {e}") from e
 
     if os.path.exists(config):
         if not click.confirm(

arkitekt_next/service_registry.py

@@ -2,46 +2,96 @@ from pydantic import BaseModel, Field
 from herre_next import Herre
 from fakts_next import Fakts
 from .base_models import Manifest, Requirement
-from typing import Callable, Dict
+from typing import Callable, Dict, Protocol
 import importlib
 import sys
 import os
 import traceback
 import logging
 import pkgutil
+from typing import runtime_checkable
 
 Params = Dict[str, str]
 
 
+
+
+
+
 class Registration(BaseModel):
     name: str
     requirement: Requirement
     builder: Callable[[Herre, Fakts, Params], object]
+    schema_loader: Callable[[str], object]
+
+
+@runtime_checkable
+class ArkitektService(Protocol):
+
+
+    def get_service_name(self):
+        pass
+
+
+    def build_service(self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest):
+        pass
+
+
+    def get_requirements(self):
+        pass
+
+
+    def get_graphql_schema(self):
+        pass
+
+    def get_turms_project(self):
+        pass
+
+
 
+class BaseArkitektService:
 
-basic_requirements =  {"lok": Requirement(
+
+    def get_service_name(self):
+        raise NotImplementedError("get_service_name not implemented")
+    
+    def build_service(self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest):
+        raise NotImplementedError("build_service not implemented")
+    
+    def get_requirements(self):
+        raise NotImplementedError("get_requirements not implemented")
+    
+    def get_graphql_schema(self):
+        return None
+    
+    def get_turms_project(self):
+        return None
+    
+
+
+basic_requirements =  [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_map = basic_requirements
+        self.service_builders: Dict[str, ArkitektService] = {}
 
     def register(
         self,
-        name: str,
-        service_builder: Callable[[Herre, Fakts], object],
-        requirement: Requirement,
+        service: ArkitektService,
     ):
+        
+        name = service.get_service_name()
+
         if name not in self.service_builders:
-            self.service_builders[name] = service_builder
+            self.service_builders[name] = service
+        else:
+            raise ValueError(f"Service {name} already registered")
         
-        if name not in self.requirements_map:
-            self.requirements_map[name] = requirement
 
     def get(self, name):
         return self.services.get(name)
@@ -49,36 +99,76 @@ class ServiceBuilderRegistry:
     def build_service_map(
         self, fakts: Fakts, herre: Herre, params: Params, manifest: Manifest
     ):
-        return {
-            name: builder(fakts, herre, params, manifest)
-            for name, builder in self.service_builders.items()
+        potentially_needed_services = {
+            name: service.build_service(fakts, herre, params, manifest)
+            for name, service in self.service_builders.items() 
         }
 
+
+
+        return {key: value for key, value in potentially_needed_services.items() if value is not None}
+
+
+
     def get_requirements(self):
-        return self.requirements_map.values()
+
+        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():
+                if requirement.key not in taken_requirements:
+                    taken_requirements.add(requirement.key)
+                    requirements.append(requirement)
+
+
+
+        
+
+        sorted_requirements = sorted(requirements, key=lambda x: x.key)
+
+        return sorted_requirements
 
 
 class SetupInfo:
     services: Dict[str, object]
 
 
-def check_and_import_services() -> ServiceBuilderRegistry:
+import os
+import importlib.util
+import pkgutil
+import traceback
+import logging
 
+def check_and_import_services() -> ServiceBuilderRegistry:
     service_builder_registry = ServiceBuilderRegistry()
+    processed_modules = set()  # Track modules that have already been processed
 
     # Function to load and call init_extensions from __rekuest__.py
     def load_and_call_init_extensions(module_name, rekuest_path):
+        if module_name in processed_modules:
+            return  # Skip if module has already been processed
         try:
             spec = importlib.util.spec_from_file_location(
                 f"{module_name}.__arkitekt__", rekuest_path
             )
             rekuest_module = importlib.util.module_from_spec(spec)
             spec.loader.exec_module(rekuest_module)
-            if hasattr(rekuest_module, "init_services"):
-                rekuest_module.init_services(service_builder_registry)
-                logging.info(f"Called init_service function from {module_name}")
+            if hasattr(rekuest_module, "build_services"):
+                for service in rekuest_module.build_services():
+                    try:
+                        service_builder_registry.register(service)
+                    except ValueError as e:
+                        print(f"Failed to register service {service}: Another service with the same name is already registered {service_builder_registry.service_builders}")
+                logging.info(f"Called build_services function from {module_name}")
             else:
-                print(f"No init_services function in {module_name}.__arkitekt__")
+                print(f"Discovered Arkitekt-like module (containing __arkitekt__) that doesn't conform with the __arkitekt__ spec. No build_services function in {module_name}.__arkitekt__")
+            processed_modules.add(module_name)  # Mark this module as processed
         except Exception as e:
             print(f"Failed to call init_services for {module_name}: {e}")
             traceback.print_exc()

{arkitekt_next-0.8.32.dist-info → arkitekt_next-0.8.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkitekt-next
-Version: 0.8.32
+Version: 0.8.35
 Summary: client for the arkitekt_next platform
 License: MIT
 Author: jhnnsrs
@@ -21,21 +21,21 @@ Requires-Dist: blok (>=0.0.19) ; (python_version >= "3.9" and python_version < "
 Requires-Dist: cryptography (>=40.0.8) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "blok")
 Requires-Dist: dokker (>=1.0.0)
 Requires-Dist: fakts-next (>=1.0.2)
-Requires-Dist: fluss-next (>=0.1.90) ; extra == "all"
+Requires-Dist: fluss-next (>=0.1.91) ; extra == "all"
 Requires-Dist: herre-next (>=1.0.2)
-Requires-Dist: kabinet (>=0.1.38) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kabinet (>=0.1.40) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "all")
 Requires-Dist: koil (>=1.0.0)
-Requires-Dist: kraph (>=0.1.91) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "extended")
-Requires-Dist: lovekit (>=0.1.15) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
-Requires-Dist: mikro-next (>=0.1.47) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: kraph (>=0.1.92) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "extended")
+Requires-Dist: lovekit (>=0.1.16) ; (python_version >= "3.10" and python_version < "4.0") and (extra == "all")
+Requires-Dist: mikro-next (>=0.1.48) ; (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.80) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
-Requires-Dist: rekuest-next (>=0.2.43) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: reaktion-next (>=0.1.81) ; (python_version >= "3.8" and python_version < "4.0") and (extra == "all")
+Requires-Dist: rekuest-next (>=0.2.44) ; (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")
-Requires-Dist: unlok-next (>=0.1.83) ; python_version >= "3.8" and python_version < "4.0"
+Requires-Dist: turms (>=0.7.0) ; (python_version >= "3.9" and python_version < "4.0") and (extra == "cli" or extra == "all")
+Requires-Dist: unlok-next (>=0.1.84) ; python_version >= "3.8" and python_version < "4.0"
 Requires-Dist: watchfiles (>=0.18.1) ; extra == "cli" or extra == "all"
 Description-Content-Type: text/markdown
 

{arkitekt_next-0.8.32.dist-info → arkitekt_next-0.8.35.dist-info}/RECORD

@@ -8,7 +8,7 @@ arkitekt_next/apps/service/grant_registry.py,sha256=h0jRKBd9EAXiVV6aHVtzNAlm1yiW
 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=3Y6FQVdvj9KMqczmyxRKRdZXbXuyYj91ZILd19YJasw,1458
-arkitekt_next/base_models.py,sha256=SpiF6pvHsx8W-q6g1gD-m7x1pW2xuNQIeegDT5qI1pY,5748
+arkitekt_next/base_models.py,sha256=AmAnzvGTBMZJHMtE-nRvRKjnQYLJSxgQumD4UGhn9gk,4153
 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
@@ -44,15 +44,15 @@ arkitekt_next/bloks/services/secret.py,sha256=cnZsH09gN9YRXBbmalZaFD2LcmWLlfm52m
 arkitekt_next/bloks/services/socket.py,sha256=3MbENiJrwQbFKrpWxax56F24elnSD7S-olgycfuOX7s,423
 arkitekt_next/bloks/socket.py,sha256=IW4954Hgms_oZsDIk9SgLoVGz07gW3sHi7-WuhN074Q,1067
 arkitekt_next/bloks/tailscale.py,sha256=87cJv9m7N_I3y2ZRvv5WVepRhvIZk4ftUpwa0yUdwj4,2961
-arkitekt_next/builders.py,sha256=6SEVMOUohV0elOXPfTeeusF2yZ64x0LYYr6AB2y1h8Y,7464
+arkitekt_next/builders.py,sha256=fC8aEDqZwIETrnUVz2SMm5Qr8TH74947-WcjnaFhFnU,7465
 arkitekt_next/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/call/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arkitekt_next/cli/commands/call/local.py,sha256=OAeC2r9ujBFclaCfKEmUpt0Mt3NAKw3sVPTDvs2w_8E,2059
 arkitekt_next/cli/commands/call/main.py,sha256=SdxlvSgA17-M_gwItiFU_srbh-CNdHpCTv_DkpOLojE,500
 arkitekt_next/cli/commands/call/remote.py,sha256=Id6t1nUdXmERx9wbutEhvryUMAM80_G4HVHkhYZosTE,2097
 arkitekt_next/cli/commands/gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arkitekt_next/cli/commands/gen/compile.py,sha256=lygqut1fIiopa4MbBXkv1X-45g6UBxDxpGP7R6h-b7U,1445
-arkitekt_next/cli/commands/gen/init.py,sha256=JV9x27Iy80QlmigXd7TSG2YIBHPGJBdEQ_HPenQaYZU,4092
+arkitekt_next/cli/commands/gen/compile.py,sha256=F0rAeBL4WWLdBGQRxVNqe5Bjek_SovhNO5rKrMEhj_4,1457
+arkitekt_next/cli/commands/gen/init.py,sha256=AErMu5qiX_9qn7EeYY-0gq53vKMp7VdSbRSLWzqW-EI,3893
 arkitekt_next/cli/commands/gen/main.py,sha256=_BdkcsXoWY5_3gmboq2e0pGYM6lAnwqQgBAyxmvdf6U,947
 arkitekt_next/cli/commands/gen/watch.py,sha256=nf4QckdTJOWxvKoeNRwvC4rXQ4xhIx8LCDDJzpPhcY8,1189
 arkitekt_next/cli/commands/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=_ajPWQKA5clfQ_Nb7V-qr_k2ypw9F5iQMDaLpfwVh4A,3736
+arkitekt_next/service_registry.py,sha256=oga1_fy7clwtcQO7XcSzWlyu2d5dna9H79uKLv8fKI0,6119
 arkitekt_next/tqdm.py,sha256=lQcJI5Q6Py7Gy88hOCiJujjPEEGd8G2k1mOVJJ6oYe8,1531
 arkitekt_next/utils.py,sha256=QETdzn_GIMSw6LdaXL89bqvqp9MGwEBK8Lj54MpnMwc,2396
-arkitekt_next-0.8.32.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.8.32.dist-info/METADATA,sha256=ZD0KcOefthfHkq0fMnwMGlaNfW2oSOoKdEIyt8lGCxI,6210
-arkitekt_next-0.8.32.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.8.32.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.8.32.dist-info/RECORD,,
+arkitekt_next-0.8.35.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.8.35.dist-info/METADATA,sha256=cVWk7aIMo0YN6Y0EbYFl_FC2fUz39gQqfwYjg0mwAvU,6210
+arkitekt_next-0.8.35.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.8.35.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.8.35.dist-info/RECORD,,