arkitekt-next 0.8.42__tar.gz → 0.8.44__tar.gz

{arkitekt_next-0.8.42 → arkitekt_next-0.8.44}/PKG-INFO

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

{arkitekt_next-0.8.42 → arkitekt_next-0.8.44}/arkitekt_next/cli/commands/gen/init.py

@@ -55,6 +55,7 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
 
     chosen_services = registry.service_builders
 
+
     if services:
         chosen_services = {
             key: service
@@ -70,6 +71,19 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
         chosen_services = {service: chosen_services[service]}
 
 
+    
+
+    if os.path.exists(config):
+        if click.confirm(
+            f"GraphQL Config file already exists. Do you want to merge your choices?"
+        ):
+            file = yaml.load(open(config, "r"), Loader=yaml.FullLoader)
+            projects = file.get("projects", {})
+            click.echo(f"Merging {','.join(chosen_services.keys())} in {','.join(projects.keys())}...")
+
+
+    has_done_something = False
+
 
     for key, service in chosen_services.items():
         try:
@@ -80,6 +94,13 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
                 get_console(ctx).print(f"[red]No schema or project found for {key} [/]")
                 continue
 
+            if key in projects:
+                get_console(ctx).print(f"[red]Project {key} already exists [/]")
+                if not click.confirm("Do you want to overwrite it?"):
+                    continue
+
+            has_done_something = True
+
             if documents:
                 os.makedirs(os.path.join(app_documents, key), exist_ok=True)
                 if seperate_doc_dirs:
@@ -119,15 +140,13 @@ def init(ctx, boring, services, config, documents, schemas, path, seperate_doc_d
         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(
-            f"GraphQL Config file already exists. Do you want to overwrite?"
-        ):
-            click.echo("Aborting...")
-            ctx.abort()
-
-    graph_config_path = os.path.join(app_directory, config)
-    yaml.safe_dump(
-        {"projects": projects}, open(graph_config_path, "w"), sort_keys=False
-    )
-    get_console(ctx).print(f"Config file written to {graph_config_path}")
+
+    if has_done_something:
+        graph_config_path = os.path.join(app_directory, config)
+        yaml.safe_dump(
+            {"projects": projects}, open(graph_config_path, "w"), sort_keys=False
+        )
+        get_console(ctx).print(f"Config file written to {graph_config_path}")
+    else:
+        get_console(ctx).print("No projects initialized")
+        get_console(ctx).print("Exiting...")

{arkitekt_next-0.8.42 → arkitekt_next-0.8.44}/pyproject.toml

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