dayhoff-tools 1.7.2__py3-none-any.whl → 1.7.3__py3-none-any.whl

dayhoff_tools/cli/main.py

@@ -64,8 +64,9 @@ app.add_typer(engine_app, name="engine", help="Manage compute engines for develo
 app.add_typer(studio_app, name="studio", help="Manage persistent development studios.")
 
 
-@app.callback()
+@app.callback(invoke_without_command=True)
 def _version_option(
+    ctx: typer.Context,
     version_flag: bool = typer.Option(
         False,
         "--version",
@@ -78,6 +79,10 @@ def _version_option(
     if version_flag:
         typer.echo(_get_dht_version())
         raise typer.Exit()
+    # If no subcommand provided, show help instead of 'Missing command'
+    if ctx.invoked_subcommand is None:
+        typer.echo(ctx.get_help())
+        raise typer.Exit()
 
 
 @app.command("wheel")

dayhoff_tools/cli/utility_commands.py

@@ -112,6 +112,7 @@ def build_and_upload_wheel(bump_part: str = "patch"):
     print("Using UV_PUBLISH_TOKEN for authentication.")
 
     pyproject_path = "pyproject.toml"
+    mac_manifest_path = "pyproject.mac.toml"
     current_version = None  # Initialize in case the first try block fails
 
     try:
@@ -173,6 +174,25 @@ def build_and_upload_wheel(bump_part: str = "patch"):
         with open(pyproject_path, "w") as f:
             f.write(new_content)
         print(f"Updated {pyproject_path} with version {new_version}")
+
+        # Mirror version in pyproject.mac.toml if present (best-effort)
+        mac_updated = False
+        try:
+            mac_path = Path(mac_manifest_path)
+            if mac_path.exists():
+                mac_content = mac_path.read_text()
+                mac_pattern = re.compile(
+                    f'^version\s*=\s*"{re.escape(current_version)}"', re.MULTILINE
+                )
+                mac_new_content, mac_replacements = mac_pattern.subn(
+                    f'version = "{new_version}"', mac_content
+                )
+                if mac_replacements > 0:
+                    mac_path.write_text(mac_new_content)
+                    mac_updated = True
+                    print(f"Updated {mac_manifest_path} with version {new_version}")
+        except Exception as e:
+            print(f"Warning: Could not update {mac_manifest_path}: {e}")
         # --- End Version Bumping Logic ---
 
         # Build wheel and sdist
@@ -191,6 +211,27 @@ def build_and_upload_wheel(bump_part: str = "patch"):
 
         print(f"Successfully built and uploaded version {new_version} to PyPI")
 
+        # Re-install DHT in current venv when building from DHT itself
+        try:
+            proj_name = None
+            try:
+                proj_toml = toml.load(pyproject_path)
+                proj_name = (
+                    proj_toml.get("project", {}).get("name")
+                    if isinstance(proj_toml, dict)
+                    else None
+                )
+            except Exception:
+                pass
+            if proj_name == "dayhoff-tools":
+                print("Re-installing dayhoff-tools into the active environment…")
+                reinstall_cmd = ["uv", "pip", "install", "-e", "."]
+                print(f"Running command: {BLUE}{' '.join(reinstall_cmd)}{RESET}")
+                subprocess.run(reinstall_cmd, check=True)
+                print("dayhoff-tools reinstalled in the current environment.")
+        except subprocess.CalledProcessError as e:
+            print(f"Warning: Failed to reinstall dayhoff-tools locally: {e}")
+
     except FileNotFoundError:
         print(f"Error: {pyproject_path} not found.")
         # No version change happened, so no rollback needed
@@ -219,6 +260,24 @@ def build_and_upload_wheel(bump_part: str = "patch"):
                     print(
                         f"Warning: Could not find version {new_version} to revert in {pyproject_path}."
                     )
+
+                # Also revert mac manifest if we updated it
+                try:
+                    mac_path = Path(mac_manifest_path)
+                    if mac_path.exists():
+                        mac_content_revert = mac_path.read_text()
+                        mac_reverted, mac_num = pattern_revert.subn(
+                            f'version = "{current_version}"', mac_content_revert
+                        )
+                        if mac_num > 0:
+                            mac_path.write_text(mac_reverted)
+                            print(
+                                f"Successfully reverted version in {mac_manifest_path}."
+                            )
+                except Exception as e2:
+                    print(
+                        f"Warning: Failed to revert version change in {mac_manifest_path}: {e2}"
+                    )
             except Exception as revert_e:
                 print(
                     f"Warning: Failed to revert version change in {pyproject_path}: {revert_e}"
@@ -248,6 +307,23 @@ def build_and_upload_wheel(bump_part: str = "patch"):
                     print(
                         f"Warning: Could not find version {new_version} to revert in {pyproject_path}."
                     )
+                # Also revert mac manifest if necessary
+                try:
+                    mac_path = Path(mac_manifest_path)
+                    if mac_path.exists():
+                        mac_content_revert = mac_path.read_text()
+                        mac_reverted, mac_num = pattern_revert.subn(
+                            f'version = "{current_version}"', mac_content_revert
+                        )
+                        if mac_num > 0:
+                            mac_path.write_text(mac_reverted)
+                            print(
+                                f"Successfully reverted version in {mac_manifest_path}."
+                            )
+                except Exception as e2:
+                    print(
+                        f"Warning: Failed to revert version change in {mac_manifest_path}: {e2}"
+                    )
             except Exception as revert_e:
                 print(
                     f"Warning: Failed to revert version change in {pyproject_path}: {revert_e}"

{dayhoff_tools-1.7.2.dist-info → dayhoff_tools-1.7.3.dist-info}/METADATA

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

{dayhoff_tools-1.7.2.dist-info → dayhoff_tools-1.7.3.dist-info}/RECORD

@@ -4,9 +4,9 @@ dayhoff_tools/chemistry/utils.py,sha256=jt-7JgF-GeeVC421acX-bobKbLU_X94KNOW24p_P
 dayhoff_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dayhoff_tools/cli/cloud_commands.py,sha256=33qcWLmq-FwEXMdL3F0OHm-5Stlh2r65CldyEZgQ1no,40904
 dayhoff_tools/cli/engine_commands.py,sha256=_NQI9x4VKtAC9vTDdA4NGrILf2kb005t3Kw0aZ5oroE,96485
-dayhoff_tools/cli/main.py,sha256=vmT2P7-CkW3nY0yvfk1Q5F6DCg-Q5T-THJ9GBCwNn7k,5701
+dayhoff_tools/cli/main.py,sha256=LLMybU9KbtV_F4rwvoYAQZKTTF1nswlSZIfDMKdkh00,5925
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
-dayhoff_tools/cli/utility_commands.py,sha256=igPl3s9lsxhLV1Ul0TmPrsH060Bqv7bQffsO300u1IU,22257
+dayhoff_tools/cli/utility_commands.py,sha256=1GeflsuINXvTS1Ib7_UqGLHSixqn0tQXYx-NEarwveo,25859
 dayhoff_tools/deployment/base.py,sha256=mYp560l6hSDFtyY2H42VoM8k9VUzfwuiyh9Knqpgc28,17441
 dayhoff_tools/deployment/deploy_aws.py,sha256=GvZpE2YIFA5Dl9rkAljFjtUypmPDNbWgw8NicHYTP24,18265
 dayhoff_tools/deployment/deploy_gcp.py,sha256=xgaOVsUDmP6wSEMYNkm1yRNcVskfdz80qJtCulkBIAM,8860
@@ -27,7 +27,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=heaYc64qplgN3_1WVPFmqj53goStioWwY5NqlWc4c0s,24453
-dayhoff_tools-1.7.2.dist-info/METADATA,sha256=1KogZl3g9T9txdfivL4fwXNE5TOtpmAAUv4VwImxBpo,2914
-dayhoff_tools-1.7.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.7.2.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.7.2.dist-info/RECORD,,
+dayhoff_tools-1.7.3.dist-info/METADATA,sha256=WAnl4yvnUfIK6m7enSKQ154Pcy0IplNFNrXnVhsmy1c,2914
+dayhoff_tools-1.7.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.7.3.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.7.3.dist-info/RECORD,,