dayhoff-tools 1.13.18__py3-none-any.whl → 1.14.1__py3-none-any.whl

dayhoff_tools/cli/engine1/shared.py

@@ -143,13 +143,17 @@ def make_api_request(
     api_url = get_api_url()
     url = f"{api_url}{endpoint}"
 
+    # Mark this as intentional v1 API usage (via engine1/studio1 commands)
+    # This prevents the deprecation error for users who explicitly choose v1
+    headers = {"X-DH-V1-Explicit": "true"}
+
     try:
         if method == "GET":
-            response = requests.get(url, params=params)
+            response = requests.get(url, params=params, headers=headers)
         elif method == "POST":
-            response = requests.post(url, json=json_data)
+            response = requests.post(url, json=json_data, headers=headers)
         elif method == "DELETE":
-            response = requests.delete(url)
+            response = requests.delete(url, headers=headers)
         else:
             raise ValueError(f"Unsupported HTTP method: {method}")
 

dayhoff_tools/cli/main.py

@@ -6,7 +6,7 @@ from importlib.metadata import PackageNotFoundError, version
 import typer
 from dayhoff_tools.cli.cloud_commands import aws_app, gcp_app
 from dayhoff_tools.cli.github_commands import gh_app
-from dayhoff_tools.cli.engine1 import engine_app, studio_app
+from dayhoff_tools.cli.engine1 import engine_app as engine1_app, studio_app as studio1_app
 from dayhoff_tools.cli.utility_commands import (
     add_dependency,
     build_and_upload_wheel,
@@ -70,23 +70,50 @@ app.add_typer(gcp_app, name="gcp", help="Manage GCP authentication and impersona
 app.add_typer(aws_app, name="aws", help="Manage AWS SSO authentication.")
 app.add_typer(gh_app, name="gh", help="Manage GitHub authentication.")
 
-# Engine and Studio commands (original implementation)
-app.add_typer(engine_app, name="engine", help="Manage compute engines for development.")
-app.add_typer(studio_app, name="studio", help="Manage persistent development studios.")
+# Engine and Studio commands (v2 - new default with progress tracking)
+# These use Click instead of Typer, so we need a passthrough wrapper
+@app.command(
+    "engine",
+    context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+    add_help_option=False,
+)
+def engine_cmd(ctx: typer.Context):
+    """Manage compute engines for development."""
+    from dayhoff_tools.cli.engines_studios import engine_cli
 
+    # Pass arguments directly to Click CLI
+    engine_cli(ctx.args, standalone_mode=False)
 
-# Engine and Studio commands (new implementation with progress tracking)
-# These use Click instead of Typer, so we need a passthrough wrapper
+
+@app.command(
+    "studio",
+    context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+    add_help_option=False,
+)
+def studio_cmd(ctx: typer.Context):
+    """Manage persistent development studios."""
+    from dayhoff_tools.cli.engines_studios import studio_cli
+
+    # Pass arguments directly to Click CLI
+    studio_cli(ctx.args, standalone_mode=False)
+
+
+# Engine and Studio commands (v1 - legacy, uses old infrastructure)
+app.add_typer(engine1_app, name="engine1", help="[Legacy v1] Manage engines.")
+app.add_typer(studio1_app, name="studio1", help="[Legacy v1] Manage studios.")
+
+
+# Backward compatibility aliases for v2 commands (engine2/studio2 -> engine/studio)
 @app.command(
     "engine2",
     context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
     add_help_option=False,
+    hidden=True,  # Hide from help, but still works
 )
 def engine2_cmd(ctx: typer.Context):
-    """Manage engines (new implementation with progress tracking)."""
+    """[Alias] Use 'dh engine' instead."""
     from dayhoff_tools.cli.engines_studios import engine_cli
 
-    # Pass arguments directly to Click CLI
     engine_cli(ctx.args, standalone_mode=False)
 
 
@@ -94,12 +121,12 @@ def engine2_cmd(ctx: typer.Context):
     "studio2",
     context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
     add_help_option=False,
+    hidden=True,  # Hide from help, but still works
 )
 def studio2_cmd(ctx: typer.Context):
-    """Manage studios (new implementation with progress tracking)."""
+    """[Alias] Use 'dh studio' instead."""
     from dayhoff_tools.cli.engines_studios import studio_cli
 
-    # Pass arguments directly to Click CLI
     studio_cli(ctx.args, standalone_mode=False)
 
 

{dayhoff_tools-1.13.18.dist-info → dayhoff_tools-1.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dayhoff-tools
-Version: 1.13.18
+Version: 1.14.1
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.13.18.dist-info → dayhoff_tools-1.14.1.dist-info}/RECORD

@@ -8,7 +8,7 @@ dayhoff_tools/cli/engine1/engine_core.py,sha256=TECO6766GCZTtbxOY7QRggwmjpMH9JZS
 dayhoff_tools/cli/engine1/engine_lifecycle.py,sha256=_Dk-EZs_qbm8APdOuGOuxhlbK6RgkkoLk2nrwKoo1-A,4519
 dayhoff_tools/cli/engine1/engine_maintenance.py,sha256=S9w2_Ko2C3zKpzOux-iG8QUYn0sIua6oJkC8d-7HVxw,16301
 dayhoff_tools/cli/engine1/engine_management.py,sha256=s_H3FtMlKsdfzR8pwV-j2W2QX-Fypkqj2kPC0aTqC1A,19072
-dayhoff_tools/cli/engine1/shared.py,sha256=Ecx6I1jtzmxQDn3BezKpgpQ4SJeZf4SZjUCLg-67p80,16844
+dayhoff_tools/cli/engine1/shared.py,sha256=2fP9BbBmoVhWx58E2nSbMIPJ73Pcy97lBR4a6Cc4taM,17091
 dayhoff_tools/cli/engine1/studio_commands.py,sha256=VwTQujz32-uMcYusDRE73SdzRpgvIkv7ZAF4zRv6AzA,30266
 dayhoff_tools/cli/engines_studios/__init__.py,sha256=E6aG0C6qjJnJuClemSKRFlYvLUL49MQZOvfqNQ7SDKs,159
 dayhoff_tools/cli/engines_studios/api_client.py,sha256=9mCVRjPUCYa7cFx29uVwYxmHPAM5FwsU9xdplvgftxs,13444
@@ -26,7 +26,7 @@ dayhoff_tools/cli/engines_studios/simulators/studio_list_simulator.py,sha256=nti
 dayhoff_tools/cli/engines_studios/simulators/studio_status_simulator.py,sha256=6WvpnRawJVaQf_H81zuR1_66igRRVxPxjAt8e69xjp4,5394
 dayhoff_tools/cli/engines_studios/studio_commands.py,sha256=4ul6i8HDHZTffavu1y_j4kwvsDNvjMvYMWbZGXN8nKY,25597
 dayhoff_tools/cli/github_commands.py,sha256=pfrxI68LObGm_gtPlQN-gHPahHV4l9k9T4GqO99NNL0,8948
-dayhoff_tools/cli/main.py,sha256=6DLwNscPJccv3-07vnOnwxz3Vgbl7lRazFenZ66mYls,7264
+dayhoff_tools/cli/main.py,sha256=Vmfqzabc2ZZ6Uoq9mfEA5ko1r5eGXMf9uJqagIBQUC0,8091
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=e2P4dCCtoqMUGNyb0lFBZ6GZpl5Zslm1qqE5qIvsy38,50765
 dayhoff_tools/deployment/base.py,sha256=uZnFvnPQx6pH_HmJbdThweAs3BrxMaDohpE3iX_-yk4,18377
@@ -49,7 +49,7 @@ dayhoff_tools/intake/uniprot.py,sha256=BZYJQF63OtPcBBnQ7_P9gulxzJtqyorgyuDiPeOJq
 dayhoff_tools/logs.py,sha256=DKdeP0k0kliRcilwvX0mUB2eipO5BdWUeHwh-VnsICs,838
 dayhoff_tools/sqlite.py,sha256=jV55ikF8VpTfeQqqlHSbY8OgfyfHj8zgHNpZjBLos_E,18672
 dayhoff_tools/warehouse.py,sha256=UETBtZD3r7WgvURqfGbyHlT7cxoiVq8isjzMuerKw8I,24475
-dayhoff_tools-1.13.18.dist-info/METADATA,sha256=jLFLKqtiPfoH0ZN6JyWceIhoybMQIAJ_WE_tRIZGTRA,2981
-dayhoff_tools-1.13.18.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-dayhoff_tools-1.13.18.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.13.18.dist-info/RECORD,,
+dayhoff_tools-1.14.1.dist-info/METADATA,sha256=9hTqtnpcQc7Ehvx2YP13N8mVZNiYE__EB0HiWj9_rPA,2980
+dayhoff_tools-1.14.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+dayhoff_tools-1.14.1.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.14.1.dist-info/RECORD,,