Merge branch 'master' into upgrade-typeguard

Author: madhur-ob

devtools/Makefile

@@ -8,6 +8,7 @@ help:
 	@echo "  ui            - Open Metaflow UI"
 	@echo "  dashboard     - Open Minikube dashboard"
 	@echo "  down          - Stop and clean up the environment"
+	@echo "  all-up        - Start the development environment with all services"
 	@echo "  help          - Show this help message"
 
 HELM_VERSION := v3.14.0
@@ -24,10 +25,10 @@ MINIKUBE := $(MINIKUBE_DIR)/minikube
 TILT_DIR := $(DEVTOOLS_DIR)/tilt
 TILT := $(TILT_DIR)/tilt
 TILTFILE := $(MKFILE_DIR)/Tiltfile
-MAKE_CMD := $(MAKE) -C "$(MKFILE_DIR)"
+MAKE_CMD := $(MAKE) -f "$(MKFILE_PATH)"
 
 MINIKUBE_CPUS ?= 4
-MINIKUBE_MEMORY ?= 6000
+MINIKUBE_MEMORY ?= 6144
 MINIKUBE_DISK_SIZE ?= 20g
 
 ifeq ($(shell uname), Darwin)
@@ -129,7 +130,8 @@ setup-minikube:
 			--cpus $(MINIKUBE_CPUS) \
 			--memory $(MINIKUBE_MEMORY) \
 			--disk-size $(MINIKUBE_DISK_SIZE) \
-			--driver docker; \
+			--driver docker \
+		|| { echo "❌ Failed to start Minikube (check if Docker is running)"; exit 1; }; \
 		echo "🔌 Enabling metrics-server and dashboard (quietly)..."; \
 		$(MINIKUBE) addons enable metrics-server >/dev/null 2>&1; \
 		$(MINIKUBE) addons enable dashboard >/dev/null 2>&1; \
@@ -170,7 +172,6 @@ up: install-brew check-docker install-curl install-gum setup-minikube install-he
 	@echo 'trap "exit" INT TERM' >> $(DEVTOOLS_DIR)/start.sh
 	@echo 'trap "kill 0" EXIT' >> $(DEVTOOLS_DIR)/start.sh
 	@echo 'eval $$($(MINIKUBE) docker-env)' >> $(DEVTOOLS_DIR)/start.sh
-	
 	@echo 'if [ -n "$$SERVICES_OVERRIDE" ]; then' >> "$(DEVTOOLS_DIR)/start.sh"
 	@echo '    echo "🌐 Using user-provided list of services: $$SERVICES_OVERRIDE"' >> "$(DEVTOOLS_DIR)/start.sh"
 	@echo '    SERVICES="$$SERVICES_OVERRIDE"' >> "$(DEVTOOLS_DIR)/start.sh"
@@ -186,11 +187,14 @@ up: install-brew check-docker install-curl install-gum setup-minikube install-he
 	@chmod +x $(DEVTOOLS_DIR)/start.sh
 	@$(DEVTOOLS_DIR)/start.sh
 
+all-up:
+	@echo "🚀 Starting up all services..."
+	SERVICES_OVERRIDE=all $(MAKE_CMD) up
+
 down:
 	@echo "🛑 Stopping all services..."
 	@-pkill -f "$(MINIKUBE) tunnel" 2>/dev/null || true
 	@echo "⏹️  Stopping Tilt..."
-	-PATH="$(MINIKUBE_DIR):$(TILT_DIR):$$PATH" tilt down -f $(TILTFILE)
 	@echo "🧹 Cleaning up Minikube..."
 	$(MAKE_CMD) teardown-minikube
 	@echo "🗑️  Removing Tilt binary and directory..."
@@ -201,7 +205,7 @@ down:
 
 shell: setup-tilt
 	@echo "⏳ Checking if development environment is up..."
-	@set -e; \
+	@set -eu; \
 	for i in $$(seq 1 90); do \
 		if "$(TILT)" get session >/dev/null 2>&1; then \
 			found_session=1; \
@@ -210,7 +214,7 @@ shell: setup-tilt
 			sleep 2; \
 		fi; \
 	done; \
-	if [ -z "$${found_session}" ]; then \
+	if [ -z "$${found_session:-}" ]; then \
 		echo "❌ Development environment is not up."; \
 		echo "   Please run 'metaflow-dev up' in another terminal, then re-run 'metaflow-dev shell'."; \
 		exit 1; \
@@ -220,7 +224,10 @@ shell: setup-tilt
 		"$(TILT)" get uiresource generate-configs >/dev/null 2>&1; \
 		status=$$?; \
 		if [ $$status -eq 0 ]; then \
-			"$(TILT)" wait --for=condition=Ready uiresource/generate-configs; \
+			if ! "$(TILT)" wait --for=condition=Ready uiresource/generate-configs --timeout=300s; then \
+				echo "❌ Timed out waiting for development environment to be ready."; \
+				exit 1; \
+			fi; \
 			break; \
 		elif [ $$status -eq 127 ]; then \
 			echo "❌ Development environment is not up."; \
@@ -267,7 +274,10 @@ create-dev-shell: setup-tilt
 		echo "fi" >> $$SHELL_PATH && \
 		echo "" >> $$SHELL_PATH && \
 		echo "echo \"⏳ Waiting for development environment to be ready...\"" >> $$SHELL_PATH && \
-		echo "$(TILT) wait --for=condition=Ready uiresource/generate-configs" >> $$SHELL_PATH && \
+		echo "if ! $(TILT) wait --for=condition=Ready uiresource/generate-configs --timeout=300s; then" >> $$SHELL_PATH && \
+		echo "  echo \"❌ Timed out waiting for development environment to be ready.\"" >> $$SHELL_PATH && \
+		echo "  exit 1" >> $$SHELL_PATH && \
+		echo "fi" >> $$SHELL_PATH && \
 		echo "" >> $$SHELL_PATH && \
 		echo "echo \"🔧 Starting a new shell for development environment...\"" >> $$SHELL_PATH && \
 		echo "if [ -n \"\$$SHELL\" ]; then" >> $$SHELL_PATH && \
@@ -317,6 +327,6 @@ ui: setup-tilt
 	@echo "🔗 Opening Metaflow UI at http://localhost:3000"
 	@open http://localhost:3000
 
-.PHONY: install-helm setup-minikube setup-tilt teardown-minikube tunnel up down check-docker install-curl install-gum install-brew up down dashboard shell ui help
+.PHONY: install-helm setup-minikube setup-tilt teardown-minikube tunnel up down check-docker install-curl install-gum install-brew up down dashboard shell ui all-up help
 
 .DEFAULT_GOAL := up

devtools/Tiltfile

@@ -23,8 +23,13 @@ components = {
     "argo-events": ["argo-workflows"],
 }
 
-if os.getenv("SERVICES", "").strip():
-    requested_components = os.getenv("SERVICES", "").split(",")
+services_env = os.getenv("SERVICES", "").strip().lower()
+
+if services_env:
+    if services_env == "all":
+        requested_components = list(components.keys())
+    else:
+        requested_components = services_env.split(",")
 else:
     requested_components = list(components.keys())
 
@@ -78,7 +83,7 @@ for component in requested_components:
         if result not in enabled_components:
             enabled_components.append(result)
 
-# Print a friendly summary when running `tilt up`.            
+# Print a friendly summary when running `tilt up`.
 if config.tilt_subcommand == 'up':
     print("\n📦 Components to install:")
     for component in enabled_components:
@@ -499,7 +504,7 @@ if "argo-events" in enabled_components:
         'argo-events-controller-manager',
         labels=['argo-events'],
     )
-    
+
     metaflow_config["METAFLOW_ARGO_EVENTS_EVENT"] = "metaflow-event"
     metaflow_config["METAFLOW_ARGO_EVENTS_EVENT_BUS"] = "default"
     metaflow_config["METAFLOW_ARGO_EVENTS_EVENT_SOURCE"] = "argo-events-webhook"
@@ -617,4 +622,4 @@ local_resource(
     name="generate-configs",
     cmd=write_config_files(),
     resource_deps=config_resources,
-)
+)

metaflow/cmd/develop/stub_generator.py

@@ -1133,13 +1133,16 @@ def _extract_signature_from_decorator(
             result = result[1:]
         # Add doc to first and last overloads. Jedi uses the last one and pycharm
         # the first one. Go figure.
+        result_docstring = docs["func_doc"]
+        if docs["param_doc"]:
+            result_docstring += "\nParameters\n----------\n" + docs["param_doc"]
         result[0] = (
             result[0][0],
-            docs["func_doc"] + "\nParameters\n----------\n" + docs["param_doc"],
+            result_docstring,
         )
         result[-1] = (
             result[-1][0],
-            docs["func_doc"] + "\nParameters\n----------\n" + docs["param_doc"],
+            result_docstring,
         )
         return result
 

metaflow/cmd/make_wrapper.py

@@ -2,15 +2,47 @@
 import subprocess
 from pathlib import Path
 import sysconfig
+import site
+
+
+def find_makefile():
+    possible_dirs = []
+
+    # 1) The standard sysconfig-based location
+    data_dir = sysconfig.get_paths()["data"]
+    possible_dirs.append(Path(data_dir) / "share" / "metaflow" / "devtools")
+
+    # 2) The user base (e.g. ~/.local on many systems)
+    user_base = site.getuserbase()  # e.g. /home/runner/.local
+    possible_dirs.append(Path(user_base) / "share" / "metaflow" / "devtools")
+
+    # 3) site-packages can vary, we can guess share/.. near each site-packages
+    # (Works if pip actually placed devtools near site-packages.)
+    for p in site.getsitepackages():
+        possible_dirs.append(Path(p).parent / "share" / "metaflow" / "devtools")
+    user_site = site.getusersitepackages()
+    possible_dirs.append(Path(user_site).parent / "share" / "metaflow" / "devtools")
+
+    for candidate_dir in possible_dirs:
+        makefile_candidate = candidate_dir / "Makefile"
+        if makefile_candidate.is_file():
+            return makefile_candidate
+
+    return None
 
 
 def main():
-    share_dir = Path(sysconfig.get_paths()["data"]) / "share" / "metaflow" / "devtools"
-    makefile_path = share_dir / "Makefile"
+    makefile_path = find_makefile()
+    if not makefile_path:
+        print("ERROR: Could not find executable in any known location.")
+        sys.exit(1)
     cmd = ["make", "-f", str(makefile_path)] + sys.argv[1:]
-    # subprocess.run(cmd, check=True)
+
     try:
         completed = subprocess.run(cmd, check=True)
         sys.exit(completed.returncode)
     except subprocess.CalledProcessError as ex:
         sys.exit(ex.returncode)
+    except KeyboardInterrupt:
+        print("Process interrupted by user. Exiting cleanly.")
+        sys.exit(1)

metaflow/plugins/kubernetes/kubernetes_jobsets.py

@@ -319,6 +319,8 @@ def _fetch_pod(self):
     def kill(self):
         plural = "jobsets"
         client = self._client.get()
+        if not (self.is_running or self.is_waiting):
+            return
         try:
             # Killing the control pod will trigger the jobset to mark everything as failed.
             # Since jobsets have a successPolicy set to `All` which ensures that everything has

metaflow/version.py

@@ -1 +1 @@
-metaflow_version = "2.15.0"
+metaflow_version = "2.15.2"