arkitekt-next 0.8.4__py3-none-any.whl → 0.8.6__py3-none-any.whl

arkitekt_next/builders.py

@@ -11,7 +11,7 @@ from arkitekt_next.apps.service.herre import build_arkitekt_next_herre
 from .utils import create_arkitekt_next_folder
 from .model import Manifest
 from .apps.types import App
-from .service_registry import ServiceBuilderRegistry, check_and_import_services, check_and_return_already_imported_services
+from .service_registry import ServiceBuilderRegistry, check_and_import_services
 from arkitekt_next.constants import DEFAULT_ARKITEKT_URL
 
 
@@ -96,7 +96,7 @@ def easy(
     NextApp
         A built app, that can be used to interact with the ArkitektNext server
     """
-    registry = registry or check_and_return_already_imported_services()
+    registry = registry or check_and_import_services()
 
     url = os.getenv("FAKTS_URL", url)
     token = os.getenv("FAKTS_TOKEN", token)

arkitekt_next/service_registry.py

@@ -76,9 +76,9 @@ def check_and_import_services() -> ServiceBuilderRegistry:
                 rekuest_module.init_services(service_builder_registry)
                 logging.info(f"Called init_service function from {module_name}")
             else:
-                logging.debug(f"No init_services function in {module_name}.__arkitekt__. Skipping.")
+                print(f"No init_services function in {module_name}.__arkitekt__")
         except Exception as e:
-            logging.critical(f"Failed to call init_services for {module_name}: {e}")
+            print(f"Failed to call init_services for {module_name}: {e}")
             traceback.print_exc()
 
     # Check local modules in the current working directory
@@ -109,72 +109,3 @@ def check_and_import_services() -> ServiceBuilderRegistry:
             traceback.print_exc()
 
     return service_builder_registry
-
-
-def check_and_return_already_imported_services() -> ServiceBuilderRegistry:
-    service_builder_registry = ServiceBuilderRegistry()
-
-    # Function to load and call init_services from __arkitekt__.py
-    def load_and_call_init_services(module_name, arkitekt_path):
-        try:
-            # Compute the full module name of the __arkitekt__ module
-            arkitekt_module_name = f"{module_name}.__arkitekt__"
-    
-
-            # Create a module spec
-            spec = importlib.util.spec_from_file_location(
-                arkitekt_module_name, arkitekt_path
-            )
-            arkitekt_module = importlib.util.module_from_spec(spec)
-
-            # Execute the module
-            spec.loader.exec_module(arkitekt_module)
-
-            # Now call init_services
-            if hasattr(arkitekt_module, "init_services"):
-                arkitekt_module.init_services(service_builder_registry)
-                logging.info(f"Called init_services function from {arkitekt_module_name}")
-            else:
-                logging.debug(f"No init_services function in {arkitekt_module_name}. Skipping.")
-        except Exception as e:
-            logging.critical(f"Failed to call init_services for {module_name}: {e}")
-            traceback.print_exc()
-
-    # Create a static list of sys.modules items to avoid RuntimeError
-    imported_modules = list(sys.modules.items())
-
-    # Keep track of processed top-level modules to avoid duplicates
-    processed_modules = set()
-
-    # Iterate over currently imported modules
-    for module_name, module in imported_modules:
-        if module is None:
-            continue
-
-        # Get the top-level parent module name
-        top_level_module_name = module_name.split('.')[0]
-
-        # Avoid processing the same top-level module multiple times
-        if top_level_module_name in processed_modules:
-            continue  # Already processed
-
-        # Get the module from sys.modules
-        top_level_module = sys.modules.get(top_level_module_name)
-        if top_level_module is None:
-            continue
-
-        # Get the module's file location
-        module_file = getattr(top_level_module, '__file__', None)
-        if not module_file:
-            continue  # Skip modules without a file attribute
-
-        # Get the module's directory
-        module_dir = os.path.dirname(module_file)
-        arkitekt_path = os.path.join(module_dir, '__arkitekt__.py')
-
-        # Check if __arkitekt__.py exists in the top-level module directory
-        if os.path.isfile(arkitekt_path):
-            load_and_call_init_services(top_level_module_name, arkitekt_path)
-            processed_modules.add(top_level_module_name)
-
-    return service_builder_registry

{arkitekt_next-0.8.4.dist-info → arkitekt_next-0.8.6.dist-info}/METADATA

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

{arkitekt_next-0.8.4.dist-info → arkitekt_next-0.8.6.dist-info}/RECORD

@@ -43,7 +43,7 @@ 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=QtDYYcv6_73iCrZIctyyrvhnAD9_SnUa3w7eU_0e2s0,7334
+arkitekt_next/builders.py,sha256=mzyvhDI9u73_6sn2tGL-ZJh7PwdL_M8PIKqPqgzd4z0,7273
 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=XkNa2WGLf7YczRobjnQSWhRCtt6fs--2qeIa6tTMUvY,2114
@@ -129,11 +129,11 @@ arkitekt_next/qt/builders.py,sha256=S5XzxzH-Tq-OAvrbP9V8BtY34Et4Zgj_7RFmnWjRN_8,
 arkitekt_next/qt/magic_bar.py,sha256=o3Z9F2QutVd6JLEY4tEQ5-vfjIBXpgfYz8HXcWgaqfc,18308
 arkitekt_next/qt/types.py,sha256=jI9UHt1Rn-fxGZfeImTO9-yHh0zJPzk7CwvpnUXdirg,1085
 arkitekt_next/qt/utils.py,sha256=MgBPtPmCSBkIuATov3UgREESwxAHh77lWNNxyE7Qs48,773
-arkitekt_next/service_registry.py,sha256=YH59EuGy_gKziWHjnU7tQrjKNchhNTurHbYzlGNCiCc,6314
+arkitekt_next/service_registry.py,sha256=0Qt3PNPRBlhIGWMeB04ZVmOmNI-cFCt_o2F6UrplKA8,3577
 arkitekt_next/tqdm.py,sha256=lQcJI5Q6Py7Gy88hOCiJujjPEEGd8G2k1mOVJJ6oYe8,1531
 arkitekt_next/utils.py,sha256=csBRBnxnErMRTilNBYAtIe0lPBb6E3uplqwsVGs5Wkk,2390
-arkitekt_next-0.8.4.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
-arkitekt_next-0.8.4.dist-info/METADATA,sha256=aoeCJIWABr4uAuurpz5II9VnHRHhIr3LQmKS029Q9-Q,6084
-arkitekt_next-0.8.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-arkitekt_next-0.8.4.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
-arkitekt_next-0.8.4.dist-info/RECORD,,
+arkitekt_next-0.8.6.dist-info/LICENSE,sha256=YZ2oRjC248t-GpoEyw7J13vwKYNG6zhYMaEAix6EzF0,1089
+arkitekt_next-0.8.6.dist-info/METADATA,sha256=ffVuIxlz1rUQpsIuse3cV-Nvt8qrS_tRYKS0rhD7oXs,6084
+arkitekt_next-0.8.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+arkitekt_next-0.8.6.dist-info/entry_points.txt,sha256=-hxikQx4xZ6TiOnWVDOlTN_kcAISgGFvTHXIchsCHSc,60
+arkitekt_next-0.8.6.dist-info/RECORD,,