Grrr

metaflow/plugins/events_decorator.py

@@ -561,7 +561,11 @@ def flow_init(
                     "You cannot pass %s as both a command-line argument and an attribute "
                     "of the @trigger_on_finish decorator." % op
                 )
-        trigger_option = self.attributes.get("trigger", options["trigger"])
+        if "trigger" in self._user_defined_attributes:
+            trigger_option = self.attributes["trigger"]
+        else:
+            trigger_option = options["trigger"]
+
         self._option_values = options
         if trigger_option:
             from metaflow import Run

metaflow/plugins/project_decorator.py

@@ -114,8 +114,16 @@ def flow_init(
                     "You cannot pass %s as both a command-line argument and an attribute "
                     "of the @project decorator." % op
                 )
-        project_branch = self.attributes.get("branch", options["branch"])
-        project_production = self.attributes.get("production", options["production"])
+        if "branch" in self._user_defined_attributes:
+            project_branch = self.attributes["branch"]
+        else:
+            project_branch = options["branch"]
+
+        if "production" in self._user_defined_attributes:
+            project_production = self.attributes["production"]
+        else:
+            project_production = options["production"]
+
         project_flow_name, branch_name = format_name(
             flow.name,
             project_name,